57731 files changed, 11250795 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..416fa8c63b14
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.doc binary
+*.sdw binary
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..ddc5d8042ab4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,87 @@
+# backup and temporary files
+*~
+.*.sw[op]
+
+# where the 'subrepos' and downloads are located
+/clone
+/src
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/unxlng???
+/*/unxlng???.pro
+/*/wntmsc???
+/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
+/*/unxmac??
+/*/unxmac??.pro
+/*/unx?bsd??
+/*/unx?bsd??.pro
+/*/unxdfly??
+/*/unxdfly??.pro
+/*/unxso???
+/*/unxso???.pro
+/*/unxaig??
+/*/unxaig??.pro
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
+/workdir
+/solver
+/instsetoo_native/util/LibreOffice
+/instsetoo_native/util/LibreOffice_SDK
+
+# autoconf generated stuff
+/aclocal.m4
+/autom4te.cache
+/autogen.lastrun
+/bootstrap
+/ChangeLog
+/config.guess
+/config.log
+/config.parms
+/config.status
+/configure
+/Makefile
+/makefile.mk
+/set_soenv
+/visibility.cxx
+/post_download
+/bin/repo-list
+/src.downloaded
+/ooo.lst
+
+# misc
+/cross-build-toolset.built
+/set_soenv.last
+/set_soenv.stamp
+/warn
+/build.log
+/post_download.log
+/install
+/downloaded
+/Env.Build.sh
+/Env.Host.sh
+/ID
+/tags
+/docs
+/autogen.save
+
+/*/*.exe
+
+# external dlls etc
+/external/*/*.dll
+/external/*/*.exe
+/external/*/*.manifest
+/external/*/*.txt
+/moz/zipped/*.zip
+
+# links to the other repositories
+/binfilter
+/dictionaries
+/helpcontent2
+/translations
+
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 000000000000..be50d1d4034d
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,17 @@
+# just dumb wrapper; make install comes later
+
+SHELL=/bin/sh
+
+all:
+	. ./*Env.Set.sh && \
+	./bootstrap && \
+		cd instsetoo_native && ../solenv/bin/build.pl --all
+
+distclean:
+	. ./*Env.Set.sh && \
+	dmake distclean
+
+clean:
+	. ./*Env.Set.sh && \
+	dmake clean
+	
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 000000000000..71f01544d11b
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,138 @@
+dnl @synopsis AX_FUNC_WHICH_GETSPNAM_R
+dnl
+dnl Determines which historical variant of the getspnam_r() call
+dnl (taking four or five arguments) is available on the system
+dnl and sets NEW_SHADOW_API=YES if there are five arguments.
+dnl
+dnl Originally named "AX_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
+dnl for AX_FUNC_WHICH_GETSPNAM_R
+dnl
+dnl @author Caolan McNamara <caolan@skynet.ie>
+dnl @author Daniel Richard G. <skunk@iskunk.org>
+dnl @version 2006-05-01
+dnl @license LGPL
+
+AC_DEFUN([AX_FUNC_WHICH_GETSPNAM_R], [
+
+    AC_LANG_PUSH(C)
+    AC_MSG_CHECKING([how many arguments getspnam_r() takes])
+
+    AC_CACHE_VAL(ac_cv_func_which_getspnam_r, [
+
+################################################################
+
+ac_cv_func_which_getspnam_r=unknown
+
+#
+# ONE ARGUMENT (sanity check)
+#
+
+# This should fail, as there is no variant of getspnam_r() that takes
+# a single argument. If it actually compiles, then we can assume that
+# netdb.h is not declaring the function, and the compiler is thereby
+# assuming an implicit prototype. In which case, we're out of luck.
+#
+AC_COMPILE_IFELSE(
+    AC_LANG_PROGRAM(
+	[[
+	    #include <sys/types.h>
+	    #include <shadow.h>
+	]],
+	[[
+	    const char *name = "myname";
+	    getspnam_r(name) /* ; */
+	]]),
+    ac_cv_func_which_getspnam_r=no)
+
+#
+# FIVE ARGUMENTS
+#
+
+if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
+
+AC_COMPILE_IFELSE(
+    AC_LANG_PROGRAM(
+	[[
+	    #include <sys/types.h>
+	    #include <shadow.h>
+	]],
+	[[
+	    char buffer[[]] = { '\0' };
+	    struct spwd spwdStruct;
+	    const char *name = "myname";
+	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer, 0) /* ; */
+	]]),
+    ac_cv_func_which_getspnam_r=five)
+
+fi
+
+#
+# FOUR ARGUMENTS
+#
+
+if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
+
+AC_COMPILE_IFELSE(
+    AC_LANG_PROGRAM(
+	[[
+	    #include <sys/types.h>
+	    #include <shadow.h>
+	]],
+	[[
+	    char buffer[[]] = { '\0' };
+	    struct spwd spwdStruct;
+	    const char *name = "myname";
+	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer) /* ; */
+	]]),
+    ac_cv_func_which_getspnam_r=four)
+
+fi
+
+################################################################
+
+]) dnl end AC_CACHE_VAL
+
+case "$ac_cv_func_which_getspnam_r" in
+    five)
+    AC_MSG_RESULT([five])
+    NEW_SHADOW_API=YES
+    ;;
+
+    four)
+    AC_MSG_RESULT([four])
+    ;;
+
+    no)
+    AC_MSG_RESULT([cannot find function declaration in shadow.h])
+    ;;
+
+    unknown)
+    AC_MSG_RESULT([can't tell])
+    ;;
+
+    *)
+    AC_MSG_ERROR([internal error])
+    ;;
+esac
+
+AC_LANG_POP(C)
+
+]) dnl end AC_DEFUN
+
+dnl PKG_CHECK_MODULES_MACHACK is like PKG_CHECK_MODULES but sneaks in an extra
+dnl argument between the first and second, denoting a program to call instead of
+dnl pkg-config on Mac OS X (aka Darwin):
+AC_DEFUN([PKG_CHECK_MODULES_MACHACK],
+[if test "$_os" = "Darwin"; then
+   AC_MSG_CHECKING($1_CFLAGS)
+   $1_CFLAGS=`$2 --cflags`
+   AC_MSG_RESULT($$1_CFLAGS)
+   AC_MSG_CHECKING($1_LIBS)
+   $1_LIBS=`$2 --libs`
+   AC_MSG_RESULT($$1_LIBS)
+   AC_SUBST($1_CFLAGS)
+   AC_SUBST($1_LIBS)
+ else
+   PKG_CHECK_MODULES($1, $3, $4, $5, $6)
+ fi
+])
diff --git a/afms/delzip b/afms/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/afms/delzip
diff --git a/afms/makefile.mk b/afms/makefile.mk
new file mode 100644
index 000000000000..b1d2eafe7555
--- /dev/null
+++ b/afms/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=afms
+TARGET=afms
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+.IF "$(L10N_framework)"==""
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=Adobe-Core35_AFMs-314
+TARFILE_MD5=1756c4fa6c616ae15973c104cd8cb256
+TARFILE_ROOTDIR=Adobe-Core35_AFMs-314
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+
+ZIP1DIR         = $(MISC)$/build$/$(TARFILE_NAME)
+ZIP1TARGET      = fontunxafm
+ZIP1LIST        = *.afm -x "*Helvetica-Narrow*"
+
+.ENDIF # L10N_framework
+.INCLUDE : target.mk
+
+.INCLUDE : tg_ext.mk
+.IF "$(L10N_framework)"==""
+$(ZIP1TARGETN):	$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+
+.ENDIF # L10N_framework
diff --git a/afms/prj/build.lst b/afms/prj/build.lst
new file mode 100644
index 000000000000..ed3d01fd2909
--- /dev/null
+++ b/afms/prj/build.lst
@@ -0,0 +1,3 @@
+af	afms : solenv NULL
+af	afms		usr1	-	all	af_mkout NULL
+af	afms		nmake	-	all	af_fonts NULL
diff --git a/afms/prj/d.lst b/afms/prj/d.lst
new file mode 100644
index 000000000000..78396a65f9e4
--- /dev/null
+++ b/afms/prj/d.lst
@@ -0,0 +1,3 @@
+mkdir: %_DEST%\pck%_EXT%
+..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+
diff --git a/agg/inc/agg_alpha_mask_u8.h b/agg/inc/agg_alpha_mask_u8.h
new file mode 100755
index 000000000000..b7e5c926092f
--- /dev/null
+++ b/agg/inc/agg_alpha_mask_u8.h
@@ -0,0 +1,499 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// scanline_u8 class
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_ALPHA_MASK_U8_INCLUDED
+#define AGG_ALPHA_MASK_U8_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+#include "agg_rendering_buffer.h"
+
+namespace agg
+{
+    //===================================================one_component_mask_u8
+    struct one_component_mask_u8
+    {
+        static unsigned calculate(const int8u* p) { return *p; }
+    };
+
+
+    //=====================================================rgb_to_gray_mask_u8
+    template<unsigned R, unsigned G, unsigned B>
+    struct rgb_to_gray_mask_u8
+    {
+        static unsigned calculate(const int8u* p)
+        {
+            return (p[R]*77 + p[G]*150 + p[B]*29) >> 8;
+        }
+    };
+
+    //==========================================================alpha_mask_u8
+    template<unsigned Step=1, unsigned Offset=0, class MaskF=one_component_mask_u8>
+    class alpha_mask_u8
+    {
+    public:
+        typedef int8u cover_type;
+        typedef alpha_mask_u8<Step, Offset, MaskF> self_type;
+        enum
+        {
+            cover_shift = 8,
+            cover_none  = 0,
+            cover_full  = 255
+        };
+
+        alpha_mask_u8() : m_rbuf(0) {}
+        alpha_mask_u8(rendering_buffer& rbuf) : m_rbuf(&rbuf) {}
+
+        void attach(rendering_buffer& rbuf) { m_rbuf = &rbuf; }
+
+        MaskF& mask_function() { return m_mask_function; }
+        const MaskF& mask_function() const { return m_mask_function; }
+
+
+        //--------------------------------------------------------------------
+        cover_type pixel(int x, int y) const
+        {
+            if(x >= 0 && y >= 0 &&
+               x < (int)m_rbuf->width() &&
+               y <= (int)m_rbuf->height())
+            {
+                return (cover_type)m_mask_function.calculate(
+                                        m_rbuf->row(y) + x * Step + Offset);
+            }
+            return 0;
+        }
+
+        //--------------------------------------------------------------------
+        cover_type combine_pixel(int x, int y, cover_type val) const
+        {
+            if(x >= 0 && y >= 0 &&
+               x < (int)m_rbuf->width() &&
+               y <= (int)m_rbuf->height())
+            {
+                return (cover_type)((val *
+                                     m_mask_function.calculate(
+                                        m_rbuf->row(y) + x * Step + Offset)) >>
+                                     cover_shift);
+            }
+            return 0;
+        }
+
+
+        //--------------------------------------------------------------------
+        void fill_hspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            int xmax = m_rbuf->width() - 1;
+            int ymax = m_rbuf->height() - 1;
+
+            int count = num_pix;
+            cover_type* covers = dst;
+
+            if(y < 0 || y > ymax)
+            {
+                memset(dst, 0, num_pix * sizeof(cover_type));
+                return;
+            }
+
+            if(x < 0)
+            {
+                count += x;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers, 0, -x * sizeof(cover_type));
+                covers -= x;
+                x = 0;
+            }
+
+            if(x + count > xmax)
+            {
+                int rest = x + count - xmax - 1;
+                count -= rest;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers + count, 0, rest * sizeof(cover_type));
+            }
+
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *covers++ = (cover_type)m_mask_function.calculate(mask);
+                mask += Step;
+            }
+            while(--count);
+        }
+
+
+        //--------------------------------------------------------------------
+        void combine_hspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            int xmax = m_rbuf->width() - 1;
+            int ymax = m_rbuf->height() - 1;
+
+            int count = num_pix;
+            cover_type* covers = dst;
+
+            if(y < 0 || y > ymax)
+            {
+                memset(dst, 0, num_pix * sizeof(cover_type));
+                return;
+            }
+
+            if(x < 0)
+            {
+                count += x;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers, 0, -x * sizeof(cover_type));
+                covers -= x;
+                x = 0;
+            }
+
+            if(x + count > xmax)
+            {
+                int rest = x + count - xmax - 1;
+                count -= rest;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers + count, 0, rest * sizeof(cover_type));
+            }
+
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *covers = (cover_type)(((*covers) *
+                                       m_mask_function.calculate(mask)) >>
+                                       cover_shift);
+                ++covers;
+                mask += Step;
+            }
+            while(--count);
+        }
+
+        //--------------------------------------------------------------------
+        void fill_vspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            int xmax = m_rbuf->width() - 1;
+            int ymax = m_rbuf->height() - 1;
+
+            int count = num_pix;
+            cover_type* covers = dst;
+
+            if(x < 0 || x > xmax)
+            {
+                memset(dst, 0, num_pix * sizeof(cover_type));
+                return;
+            }
+
+            if(y < 0)
+            {
+                count += y;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers, 0, -y * sizeof(cover_type));
+                covers -= y;
+                y = 0;
+            }
+
+            if(y + count > ymax)
+            {
+                int rest = y + count - ymax - 1;
+                count -= rest;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers + count, 0, rest * sizeof(cover_type));
+            }
+
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *covers++ = (cover_type)m_mask_function.calculate(mask);
+                mask += m_rbuf->stride();
+            }
+            while(--count);
+        }
+
+        //--------------------------------------------------------------------
+        void combine_vspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            int xmax = m_rbuf->width() - 1;
+            int ymax = m_rbuf->height() - 1;
+
+            int count = num_pix;
+            cover_type* covers = dst;
+
+            if(x < 0 || x > xmax)
+            {
+                memset(dst, 0, num_pix * sizeof(cover_type));
+                return;
+            }
+
+            if(y < 0)
+            {
+                count += y;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers, 0, -y * sizeof(cover_type));
+                covers -= y;
+                y = 0;
+            }
+
+            if(y + count > ymax)
+            {
+                int rest = y + count - ymax - 1;
+                count -= rest;
+                if(count <= 0)
+                {
+                    memset(dst, 0, num_pix * sizeof(cover_type));
+                    return;
+                }
+                memset(covers + count, 0, rest * sizeof(cover_type));
+            }
+
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *covers = (cover_type)(((*covers) *
+                                       m_mask_function.calculate(mask)) >>
+                                       cover_shift);
+                ++covers;
+                mask += m_rbuf->stride();
+            }
+            while(--count);
+        }
+
+
+    private:
+        alpha_mask_u8(const self_type&);
+        const self_type& operator = (const self_type&);
+
+        rendering_buffer* m_rbuf;
+        MaskF             m_mask_function;
+    };
+
+
+    typedef alpha_mask_u8<1, 0> alpha_mask_gray8;   //----alpha_mask_gray8
+
+    typedef alpha_mask_u8<3, 0> alpha_mask_rgb24r;  //----alpha_mask_rgb24r
+    typedef alpha_mask_u8<3, 1> alpha_mask_rgb24g;  //----alpha_mask_rgb24g
+    typedef alpha_mask_u8<3, 2> alpha_mask_rgb24b;  //----alpha_mask_rgb24b
+
+    typedef alpha_mask_u8<3, 2> alpha_mask_bgr24r;  //----alpha_mask_bgr24r
+    typedef alpha_mask_u8<3, 1> alpha_mask_bgr24g;  //----alpha_mask_bgr24g
+    typedef alpha_mask_u8<3, 0> alpha_mask_bgr24b;  //----alpha_mask_bgr24b
+
+    typedef alpha_mask_u8<4, 0> alpha_mask_rgba32r; //----alpha_mask_rgba32r
+    typedef alpha_mask_u8<4, 1> alpha_mask_rgba32g; //----alpha_mask_rgba32g
+    typedef alpha_mask_u8<4, 2> alpha_mask_rgba32b; //----alpha_mask_rgba32b
+    typedef alpha_mask_u8<4, 3> alpha_mask_rgba32a; //----alpha_mask_rgba32a
+
+    typedef alpha_mask_u8<4, 1> alpha_mask_argb32r; //----alpha_mask_argb32r
+    typedef alpha_mask_u8<4, 2> alpha_mask_argb32g; //----alpha_mask_argb32g
+    typedef alpha_mask_u8<4, 3> alpha_mask_argb32b; //----alpha_mask_argb32b
+    typedef alpha_mask_u8<4, 0> alpha_mask_argb32a; //----alpha_mask_argb32a
+
+    typedef alpha_mask_u8<4, 2> alpha_mask_bgra32r; //----alpha_mask_bgra32r
+    typedef alpha_mask_u8<4, 1> alpha_mask_bgra32g; //----alpha_mask_bgra32g
+    typedef alpha_mask_u8<4, 0> alpha_mask_bgra32b; //----alpha_mask_bgra32b
+    typedef alpha_mask_u8<4, 3> alpha_mask_bgra32a; //----alpha_mask_bgra32a
+
+    typedef alpha_mask_u8<4, 3> alpha_mask_abgr32r; //----alpha_mask_abgr32r
+    typedef alpha_mask_u8<4, 2> alpha_mask_abgr32g; //----alpha_mask_abgr32g
+    typedef alpha_mask_u8<4, 1> alpha_mask_abgr32b; //----alpha_mask_abgr32b
+    typedef alpha_mask_u8<4, 0> alpha_mask_abgr32a; //----alpha_mask_abgr32a
+
+    typedef alpha_mask_u8<3, 0, rgb_to_gray_mask_u8<0, 1, 2> > alpha_mask_rgb24gray;  //----alpha_mask_rgb24gray
+    typedef alpha_mask_u8<3, 0, rgb_to_gray_mask_u8<2, 1, 0> > alpha_mask_bgr24gray;  //----alpha_mask_bgr24gray
+    typedef alpha_mask_u8<4, 0, rgb_to_gray_mask_u8<0, 1, 2> > alpha_mask_rgba32gray; //----alpha_mask_rgba32gray
+    typedef alpha_mask_u8<4, 1, rgb_to_gray_mask_u8<0, 1, 2> > alpha_mask_argb32gray; //----alpha_mask_argb32gray
+    typedef alpha_mask_u8<4, 0, rgb_to_gray_mask_u8<2, 1, 0> > alpha_mask_bgra32gray; //----alpha_mask_bgra32gray
+    typedef alpha_mask_u8<4, 1, rgb_to_gray_mask_u8<2, 1, 0> > alpha_mask_abgr32gray; //----alpha_mask_abgr32gray
+
+
+
+    //==========================================================amask_no_clip_u8
+    template<unsigned Step=1, unsigned Offset=0, class MaskF=one_component_mask_u8>
+    class amask_no_clip_u8
+    {
+    public:
+        typedef int8u cover_type;
+        typedef amask_no_clip_u8<Step, Offset, MaskF> self_type;
+        enum
+        {
+            cover_shift = 8,
+            cover_none  = 0,
+            cover_full  = 255
+        };
+
+        amask_no_clip_u8() : m_rbuf(0) {}
+        amask_no_clip_u8(rendering_buffer& rbuf) : m_rbuf(&rbuf) {}
+
+        void attach(rendering_buffer& rbuf) { m_rbuf = &rbuf; }
+
+        MaskF& mask_function() { return m_mask_function; }
+        const MaskF& mask_function() const { return m_mask_function; }
+
+
+        //--------------------------------------------------------------------
+        cover_type pixel(int x, int y) const
+        {
+            return (cover_type)m_mask_function.calculate(
+                                   m_rbuf->row(y) + x * Step + Offset);
+        }
+
+
+        //--------------------------------------------------------------------
+        cover_type combine_pixel(int x, int y, cover_type val) const
+        {
+            return (cover_type)((val *
+                                 m_mask_function.calculate(
+                                    m_rbuf->row(y) + x * Step + Offset)) >>
+                                 cover_shift);
+        }
+
+
+        //--------------------------------------------------------------------
+        void fill_hspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *dst++ = (cover_type)m_mask_function.calculate(mask);
+                mask += Step;
+            }
+            while(--num_pix);
+        }
+
+
+
+        //--------------------------------------------------------------------
+        void combine_hspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *dst = (cover_type)(((*dst) *
+                                    m_mask_function.calculate(mask)) >>
+                                    cover_shift);
+                ++dst;
+                mask += Step;
+            }
+            while(--num_pix);
+        }
+
+
+        //--------------------------------------------------------------------
+        void fill_vspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *dst++ = (cover_type)m_mask_function.calculate(mask);
+                mask += m_rbuf->stride();
+            }
+            while(--num_pix);
+        }
+
+
+        //--------------------------------------------------------------------
+        void combine_vspan(int x, int y, cover_type* dst, int num_pix) const
+        {
+            const int8u* mask = m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *dst = (cover_type)(((*dst) *
+                                    m_mask_function.calculate(mask)) >>
+                                    cover_shift);
+                ++dst;
+                mask += m_rbuf->stride();
+            }
+            while(--num_pix);
+        }
+
+    private:
+        amask_no_clip_u8(const self_type&);
+        const self_type& operator = (const self_type&);
+
+        rendering_buffer* m_rbuf;
+        MaskF             m_mask_function;
+    };
+
+
+    typedef amask_no_clip_u8<1, 0> amask_no_clip_gray8;   //----amask_no_clip_gray8
+
+    typedef amask_no_clip_u8<3, 0> amask_no_clip_rgb24r;  //----amask_no_clip_rgb24r
+    typedef amask_no_clip_u8<3, 1> amask_no_clip_rgb24g;  //----amask_no_clip_rgb24g
+    typedef amask_no_clip_u8<3, 2> amask_no_clip_rgb24b;  //----amask_no_clip_rgb24b
+
+    typedef amask_no_clip_u8<3, 2> amask_no_clip_bgr24r;  //----amask_no_clip_bgr24r
+    typedef amask_no_clip_u8<3, 1> amask_no_clip_bgr24g;  //----amask_no_clip_bgr24g
+    typedef amask_no_clip_u8<3, 0> amask_no_clip_bgr24b;  //----amask_no_clip_bgr24b
+
+    typedef amask_no_clip_u8<4, 0> amask_no_clip_rgba32r; //----amask_no_clip_rgba32r
+    typedef amask_no_clip_u8<4, 1> amask_no_clip_rgba32g; //----amask_no_clip_rgba32g
+    typedef amask_no_clip_u8<4, 2> amask_no_clip_rgba32b; //----amask_no_clip_rgba32b
+    typedef amask_no_clip_u8<4, 3> amask_no_clip_rgba32a; //----amask_no_clip_rgba32a
+
+    typedef amask_no_clip_u8<4, 1> amask_no_clip_argb32r; //----amask_no_clip_argb32r
+    typedef amask_no_clip_u8<4, 2> amask_no_clip_argb32g; //----amask_no_clip_argb32g
+    typedef amask_no_clip_u8<4, 3> amask_no_clip_argb32b; //----amask_no_clip_argb32b
+    typedef amask_no_clip_u8<4, 0> amask_no_clip_argb32a; //----amask_no_clip_argb32a
+
+    typedef amask_no_clip_u8<4, 2> amask_no_clip_bgra32r; //----amask_no_clip_bgra32r
+    typedef amask_no_clip_u8<4, 1> amask_no_clip_bgra32g; //----amask_no_clip_bgra32g
+    typedef amask_no_clip_u8<4, 0> amask_no_clip_bgra32b; //----amask_no_clip_bgra32b
+    typedef amask_no_clip_u8<4, 3> amask_no_clip_bgra32a; //----amask_no_clip_bgra32a
+
+    typedef amask_no_clip_u8<4, 3> amask_no_clip_abgr32r; //----amask_no_clip_abgr32r
+    typedef amask_no_clip_u8<4, 2> amask_no_clip_abgr32g; //----amask_no_clip_abgr32g
+    typedef amask_no_clip_u8<4, 1> amask_no_clip_abgr32b; //----amask_no_clip_abgr32b
+    typedef amask_no_clip_u8<4, 0> amask_no_clip_abgr32a; //----amask_no_clip_abgr32a
+
+    typedef amask_no_clip_u8<3, 0, rgb_to_gray_mask_u8<0, 1, 2> > amask_no_clip_rgb24gray;  //----amask_no_clip_rgb24gray
+    typedef amask_no_clip_u8<3, 0, rgb_to_gray_mask_u8<2, 1, 0> > amask_no_clip_bgr24gray;  //----amask_no_clip_bgr24gray
+    typedef amask_no_clip_u8<4, 0, rgb_to_gray_mask_u8<0, 1, 2> > amask_no_clip_rgba32gray; //----amask_no_clip_rgba32gray
+    typedef amask_no_clip_u8<4, 1, rgb_to_gray_mask_u8<0, 1, 2> > amask_no_clip_argb32gray; //----amask_no_clip_argb32gray
+    typedef amask_no_clip_u8<4, 0, rgb_to_gray_mask_u8<2, 1, 0> > amask_no_clip_bgra32gray; //----amask_no_clip_bgra32gray
+    typedef amask_no_clip_u8<4, 1, rgb_to_gray_mask_u8<2, 1, 0> > amask_no_clip_abgr32gray; //----amask_no_clip_abgr32gray
+
+
+}
+
+
+
+#endif
diff --git a/agg/inc/agg_arc.h b/agg/inc/agg_arc.h
new file mode 100755
index 000000000000..80b148d910d0
--- /dev/null
+++ b/agg/inc/agg_arc.h
@@ -0,0 +1,74 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Arc vertex generator
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_ARC_INCLUDED
+#define AGG_ARC_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //=====================================================================arc
+    //
+    // See Implementation agg_arc.cpp
+    //
+    class arc
+    {
+    public:
+        arc() : m_scale(1.0), m_initialized(false) {}
+        arc(double x,  double y,
+            double rx, double ry,
+            double a1, double a2,
+            bool ccw=true);
+
+        void init(double x,  double y,
+                  double rx, double ry,
+                  double a1, double a2,
+                  bool ccw=true);
+
+        void approximation_scale(double s);
+        double approximation_scale() const { return m_scale;  }
+
+        void rewind(unsigned);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        void normalize(double a1, double a2, bool ccw);
+
+        double   m_x;
+        double   m_y;
+        double   m_rx;
+        double   m_ry;
+        double   m_angle;
+        double   m_start;
+        double   m_end;
+        double   m_scale;
+        double   m_da;
+        bool     m_ccw;
+        bool     m_initialized;
+        unsigned m_path_cmd;
+    };
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_array.h b/agg/inc/agg_array.h
new file mode 100755
index 000000000000..2970181c4510
--- /dev/null
+++ b/agg/inc/agg_array.h
@@ -0,0 +1,887 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_ARRAY_INCLUDED
+#define AGG_ARRAY_INCLUDED
+
+#include <stddef.h>
+#include <string.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+
+
+    //-------------------------------------------------------pod_array_adaptor
+    template<class T> class pod_array_adaptor
+    {
+    public:
+        typedef T value_type;
+        pod_array_adaptor(T* array, unsigned _size) :
+            m_array(array), m_size(_size) {}
+
+        unsigned size() const { return m_size; }
+        const T& operator [] (unsigned idx) const { return m_array[idx]; }
+              T& operator [] (unsigned idx)       { return m_array[idx]; }
+    private:
+        T*       m_array;
+        unsigned m_size;
+    };
+
+
+
+    //---------------------------------------------------------pod_auto_array
+    template<class T, unsigned Size> class pod_auto_array
+    {
+    public:
+        typedef T value_type;
+        typedef pod_auto_array<T, Size> self_type;
+
+        pod_auto_array() {}
+        explicit pod_auto_array(const T* c)
+        {
+            memcpy(m_array, c, sizeof(T) * Size);
+        }
+
+        const self_type& operator = (const T* c)
+        {
+            memcpy(m_array, c, sizeof(T) * Size);
+            return *this;
+        }
+
+        static unsigned size() { return Size; }
+        const T& operator [] (unsigned i) const { return m_array[i]; }
+              T& operator [] (unsigned i)       { return m_array[i]; }
+    private:
+        T m_array[Size];
+    };
+
+
+
+
+
+    //---------------------------------------------------------------pod_array
+    // A simple class template to store Plain Old Data, a vector
+    // of a fixed size. The data is continous in memory
+    //------------------------------------------------------------------------
+    template<class T> class pod_array
+    {
+    public:
+        typedef T value_type;
+
+        ~pod_array() { delete [] m_array; }
+        pod_array() : m_size(0), m_capacity(0), m_array(0) {}
+        pod_array(unsigned cap, unsigned extra_tail=0);
+
+        // Copying
+        pod_array(const pod_array<T>&);
+        const pod_array<T>& operator = (const pod_array<T>&);
+
+        unsigned capacity() const { return m_capacity; }
+        void capacity(unsigned cap, unsigned extra_tail=0);
+
+        void resize(unsigned new_size);
+
+        void add(const T& v)  { m_array[m_size++] = v; }
+        void inc_size(unsigned _size) { m_size += _size; }
+        unsigned size()      const { return m_size; }
+        unsigned byte_size() const { return m_size * sizeof(T); }
+        void serialize(int8u* ptr) const;
+        void deserialize(const int8u* data, unsigned byte_size);
+        const T& operator [] (unsigned idx) const { return m_array[idx]; }
+              T& operator [] (unsigned idx)       { return m_array[idx]; }
+
+        void remove_all()         { m_size = 0; }
+        void cut_at(unsigned num) { if(num < m_size) m_size = num; }
+
+    private:
+        unsigned m_size;
+        unsigned m_capacity;
+        T*       m_array;
+    };
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void pod_array<T>::capacity(unsigned cap, unsigned extra_tail)
+    {
+        m_size = 0;
+        if(cap > m_capacity)
+        {
+            delete [] m_array;
+            m_capacity = cap + extra_tail;
+            m_array = m_capacity ? new T [m_capacity] : 0;
+        }
+    }
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void pod_array<T>::resize(unsigned new_size)
+    {
+        if(new_size > m_size)
+        {
+            if(new_size > m_capacity)
+            {
+                T* data = new T[new_size];
+                memcpy(data, m_array, m_size * sizeof(T));
+                delete [] m_array;
+                m_array = data;
+            }
+        }
+        else
+        {
+            m_size = new_size;
+        }
+    }
+
+    //------------------------------------------------------------------------
+    template<class T> pod_array<T>::pod_array(unsigned cap, unsigned extra_tail) :
+        m_size(cap), m_capacity(cap + extra_tail), m_array(new T[m_capacity]) {}
+
+    //------------------------------------------------------------------------
+    template<class T> pod_array<T>::pod_array(const pod_array<T>& v) :
+        m_size(v.m_size),
+        m_capacity(v.m_capacity),
+        m_array(v.m_capacity ? new T [v.m_capacity] : 0)
+    {
+        memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
+    }
+
+    //------------------------------------------------------------------------
+    template<class T> const pod_array<T>&
+    pod_array<T>::operator = (const pod_array<T>&v)
+    {
+        capacity(v.m_capacity);
+        if(v.m_size) memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
+        return *this;
+    }
+
+    //------------------------------------------------------------------------
+    template<class T> void pod_array<T>::serialize(int8u* ptr) const
+    {
+        if(m_size) memcpy(ptr, m_array, m_size * sizeof(T));
+    }
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void pod_array<T>::deserialize(const int8u* data, unsigned _byte_size)
+    {
+        _byte_size /= sizeof(T);
+        capacity(_byte_size);
+        if(_byte_size) memcpy(m_array, data, _byte_size * sizeof(T));
+    }
+
+
+
+
+
+    //---------------------------------------------------------------pod_deque
+    // A simple class template to store Plain Old Data, similar to std::deque
+    // It doesn't reallocate memory but instead, uses blocks of data of size
+    // of (1 << S), that is, power of two. The data is NOT contiguous in memory,
+    // so the only valid access method is operator [] or curr(), prev(), next()
+    //
+    // There reallocs occure only when the pool of pointers to blocks needs
+    // to be extended (it happens very rarely). You can control the value
+    // of increment to reallocate the pointer buffer. See the second constructor.
+    // By default, the incremeent value equals (1 << S), i.e., the block size.
+    //------------------------------------------------------------------------
+    template<class T, unsigned S=6> class pod_deque
+    {
+    public:
+        enum
+        {
+            block_shift = S,
+            block_size  = 1 << block_shift,
+            block_mask  = block_size - 1
+        };
+
+        typedef T value_type;
+
+        ~pod_deque();
+        pod_deque();
+        pod_deque(unsigned block_ptr_inc);
+
+        // Copying
+        pod_deque(const pod_deque<T, S>& v);
+        const pod_deque<T, S>& operator = (const pod_deque<T, S>& v);
+
+        void remove_all() { m_size = 0; }
+        void free_all() { free_tail(0); }
+        void free_tail(unsigned size);
+        void add(const T& val);
+        void modify_last(const T& val);
+        void remove_last();
+
+        int allocate_continuous_block(unsigned num_elements);
+
+        void add_array(const T* ptr, unsigned num_elem)
+        {
+            while(num_elem--)
+            {
+                add(*ptr++);
+            }
+        }
+
+        template<class DataAccessor> void add_data(DataAccessor& data)
+        {
+            while(data.size())
+            {
+                add(*data);
+                ++data;
+            }
+        }
+
+        void cut_at(unsigned _size)
+        {
+            if(_size < m_size) m_size = _size;
+        }
+
+        unsigned size() const { return m_size; }
+
+        const T& operator [] (unsigned idx) const
+        {
+            return m_blocks[idx >> block_shift][idx & block_mask];
+        }
+
+        T& operator [] (unsigned idx)
+        {
+            return m_blocks[idx >> block_shift][idx & block_mask];
+        }
+
+        const T& curr(unsigned idx) const
+        {
+            return (*this)[idx];
+        }
+
+        T& curr(unsigned idx)
+        {
+            return (*this)[idx];
+        }
+
+        const T& prev(unsigned idx) const
+        {
+            return (*this)[(idx + m_size - 1) % m_size];
+        }
+
+        T& prev(unsigned idx)
+        {
+            return (*this)[(idx + m_size - 1) % m_size];
+        }
+
+        const T& next(unsigned idx) const
+        {
+            return (*this)[(idx + 1) % m_size];
+        }
+
+        T& next(unsigned idx)
+        {
+            return (*this)[(idx + 1) % m_size];
+        }
+
+        const T& last() const
+        {
+            return (*this)[m_size - 1];
+        }
+
+        T& last()
+        {
+            return (*this)[m_size - 1];
+        }
+
+        unsigned byte_size() const;
+        void serialize(int8u* ptr) const;
+        void deserialize(const int8u* data, unsigned byte_size);
+        void deserialize(unsigned start, const T& empty_val,
+                         const int8u* data, unsigned byte_size);
+
+        template<class ByteAccessor>
+        void deserialize(ByteAccessor data)
+        {
+            remove_all();
+            unsigned elem_size = data.size() / sizeof(T);
+
+            for(unsigned i = 0; i < elem_size; ++i)
+            {
+                int8u* ptr = (int8u*)data_ptr();
+                for(unsigned j = 0; j < sizeof(T); ++j)
+                {
+                    *ptr++ = *data;
+                    ++data;
+                }
+                ++m_size;
+            }
+        }
+
+        template<class ByteAccessor>
+        void deserialize(unsigned start, const T& empty_val, ByteAccessor data)
+        {
+            while(m_size < start)
+            {
+                add(empty_val);
+            }
+
+            unsigned elem_size = data.size() / sizeof(T);
+            for(unsigned i = 0; i < elem_size; ++i)
+            {
+                int8u* ptr;
+                if(start + i < m_size)
+                {
+                    ptr = (int8u*)(&((*this)[start + i]));
+                }
+                else
+                {
+                    ptr = (int8u*)data_ptr();
+                    ++m_size;
+                }
+                for(unsigned j = 0; j < sizeof(T); ++j)
+                {
+                    *ptr++ = *data;
+                    ++data;
+                }
+            }
+        }
+
+        const T* block(unsigned nb) const { return m_blocks[nb]; }
+
+    private:
+        void allocate_block(unsigned nb);
+        T*   data_ptr();
+
+        unsigned        m_size;
+        unsigned        m_num_blocks;
+        unsigned        m_max_blocks;
+        T**             m_blocks;
+        unsigned        m_block_ptr_inc;
+    };
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S> pod_deque<T, S>::~pod_deque()
+    {
+        if(m_num_blocks)
+        {
+            T** blk = m_blocks + m_num_blocks - 1;
+            while(m_num_blocks--)
+            {
+                delete [] *blk;
+                --blk;
+            }
+            delete [] m_blocks;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void pod_deque<T, S>::free_tail(unsigned _size)
+    {
+        if(_size < m_size)
+        {
+            unsigned nb = (_size + block_mask) >> block_shift;
+            while(m_num_blocks > nb)
+            {
+                delete [] m_blocks[--m_num_blocks];
+            }
+            m_size = _size;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S> pod_deque<T, S>::pod_deque() :
+        m_size(0),
+        m_num_blocks(0),
+        m_max_blocks(0),
+        m_blocks(0),
+        m_block_ptr_inc(block_size)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    pod_deque<T, S>::pod_deque(unsigned block_ptr_inc) :
+        m_size(0),
+        m_num_blocks(0),
+        m_max_blocks(0),
+        m_blocks(0),
+        m_block_ptr_inc(block_ptr_inc)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    pod_deque<T, S>::pod_deque(const pod_deque<T, S>& v) :
+        m_size(v.m_size),
+        m_num_blocks(v.m_num_blocks),
+        m_max_blocks(v.m_max_blocks),
+        m_blocks(v.m_max_blocks ? new T* [v.m_max_blocks] : 0),
+        m_block_ptr_inc(v.m_block_ptr_inc)
+    {
+        unsigned i;
+        for(i = 0; i < v.m_num_blocks; ++i)
+        {
+            m_blocks[i] = new T [block_size];
+            memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    const pod_deque<T, S>& pod_deque<T, S>::operator = (const pod_deque<T, S>& v)
+    {
+        unsigned i;
+        for(i = m_num_blocks; i < v.m_num_blocks; ++i)
+        {
+            allocate_block(i);
+        }
+        for(i = 0; i < v.m_num_blocks; ++i)
+        {
+            memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
+        }
+        m_size = v.m_size;
+        return *this;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void pod_deque<T, S>::allocate_block(unsigned nb)
+    {
+        if(nb >= m_max_blocks)
+        {
+            T** new_blocks = new T* [m_max_blocks + m_block_ptr_inc];
+
+            if(m_blocks)
+            {
+                memcpy(new_blocks,
+                       m_blocks,
+                       m_num_blocks * sizeof(T*));
+
+                delete [] m_blocks;
+            }
+            m_blocks = new_blocks;
+            m_max_blocks += m_block_ptr_inc;
+        }
+        m_blocks[nb] = new T [block_size];
+        m_num_blocks++;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    inline T* pod_deque<T, S>::data_ptr()
+    {
+        unsigned nb = m_size >> block_shift;
+        if(nb >= m_num_blocks)
+        {
+            allocate_block(nb);
+        }
+        return m_blocks[nb] + (m_size & block_mask);
+    }
+
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    inline void pod_deque<T, S>::add(const T& val)
+    {
+        *data_ptr() = val;
+        ++m_size;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    inline void pod_deque<T, S>::remove_last()
+    {
+        if(m_size) --m_size;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void pod_deque<T, S>::modify_last(const T& val)
+    {
+        remove_last();
+        add(val);
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    int pod_deque<T, S>::allocate_continuous_block(unsigned num_elements)
+    {
+        if(num_elements < block_size)
+        {
+            data_ptr(); // Allocate initial block if necessary
+            unsigned rest = block_size - (m_size & block_mask);
+            unsigned index;
+            if(num_elements <= rest)
+            {
+                // The rest of the block is good, we can use it
+                //-----------------
+                index = m_size;
+                m_size += num_elements;
+                return index;
+            }
+
+            // New block
+            //---------------
+            m_size += rest;
+            data_ptr();
+            index = m_size;
+            m_size += num_elements;
+            return index;
+        }
+        return -1; // Impossible to allocate
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    unsigned pod_deque<T, S>::byte_size() const
+    {
+        return m_size * sizeof(T);
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void pod_deque<T, S>::serialize(int8u* ptr) const
+    {
+        unsigned i;
+        for(i = 0; i < m_size; i++)
+        {
+            memcpy(ptr, &(*this)[i], sizeof(T));
+            ptr += sizeof(T);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void pod_deque<T, S>::deserialize(const int8u* data, unsigned _byte_size)
+    {
+        remove_all();
+        _byte_size /= sizeof(T);
+        for(unsigned i = 0; i < _byte_size; ++i)
+        {
+            T* ptr = data_ptr();
+            memcpy(ptr, data, sizeof(T));
+            ++m_size;
+            data += sizeof(T);
+        }
+    }
+
+
+    // Replace or add a number of elements starting from "start" position
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void pod_deque<T, S>::deserialize(unsigned start, const T& empty_val,
+                                      const int8u* data, unsigned _byte_size)
+    {
+        while(m_size < start)
+        {
+            add(empty_val);
+        }
+
+        _byte_size /= sizeof(T);
+        for(unsigned i = 0; i < _byte_size; ++i)
+        {
+            if(start + i < m_size)
+            {
+                memcpy(&((*this)[start + i]), data, sizeof(T));
+            }
+            else
+            {
+                T* ptr = data_ptr();
+                memcpy(ptr, data, sizeof(T));
+                ++m_size;
+            }
+            data += sizeof(T);
+        }
+    }
+
+
+    //-----------------------------------------------------------pod_allocator
+    // Allocator for arbitrary POD data. Most usable in different cache
+    // systems for efficient memory allocations.
+    // Memory is allocated with blocks of fixed size ("block_size" in
+    // the constructor). If required size exceeds the block size the allocator
+    // creates a new block of the required size. However, the most efficient
+    // use is when the average reqired size is much less than the block size.
+    //------------------------------------------------------------------------
+    class pod_allocator
+    {
+    public:
+        void remove_all()
+        {
+            if(m_num_blocks)
+            {
+                int8u** blk = m_blocks + m_num_blocks - 1;
+                while(m_num_blocks--)
+                {
+                    delete [] *blk;
+                    --blk;
+                }
+                delete [] m_blocks;
+            }
+            m_num_blocks = 0;
+            m_max_blocks = 0;
+            m_blocks = 0;
+            m_buf_ptr = 0;
+            m_rest = 0;
+        }
+
+        ~pod_allocator()
+        {
+            remove_all();
+        }
+
+        pod_allocator(unsigned block_size, unsigned block_ptr_inc=256-8) :
+            m_block_size(block_size),
+            m_block_ptr_inc(block_ptr_inc),
+            m_num_blocks(0),
+            m_max_blocks(0),
+            m_blocks(0),
+            m_buf_ptr(0),
+            m_rest(0)
+        {
+        }
+
+
+        int8u* allocate(unsigned size, unsigned alignment=1)
+        {
+            if(size == 0) return 0;
+            if(size <= m_rest)
+            {
+                int8u* ptr = m_buf_ptr;
+                if(alignment > 1)
+                {
+                    unsigned align = (alignment - unsigned((size_t)ptr) % alignment) % alignment;
+                    size += align;
+                    ptr += align;
+                    if(size <= m_rest)
+                    {
+                        m_rest -= size;
+                        m_buf_ptr += size;
+                        return ptr;
+                    }
+                    allocate_block(size);
+                    return allocate(size - align, alignment);
+                }
+                m_rest -= size;
+                m_buf_ptr += size;
+                return ptr;
+            }
+            allocate_block(size + alignment - 1);
+            return allocate(size, alignment);
+        }
+
+
+    private:
+        void allocate_block(unsigned size)
+        {
+            if(size < m_block_size) size = m_block_size;
+            if(m_num_blocks >= m_max_blocks)
+            {
+                int8u** new_blocks = new int8u* [m_max_blocks + m_block_ptr_inc];
+
+                if(m_blocks)
+                {
+                    memcpy(new_blocks,
+                           m_blocks,
+                           m_num_blocks * sizeof(int8u*));
+
+                    delete [] m_blocks;
+                }
+                m_blocks = new_blocks;
+                m_max_blocks += m_block_ptr_inc;
+            }
+            m_blocks[m_num_blocks] = m_buf_ptr = new int8u [size];
+            m_num_blocks++;
+            m_rest = size;
+        }
+
+        unsigned m_block_size;
+        unsigned m_block_ptr_inc;
+        unsigned m_num_blocks;
+        unsigned m_max_blocks;
+        int8u**  m_blocks;
+        int8u*   m_buf_ptr;
+        unsigned m_rest;
+    };
+
+
+
+
+
+
+
+
+    //------------------------------------------------------------------------
+    enum
+    {
+        quick_sort_threshold = 9
+    };
+
+
+    //-----------------------------------------------------------swap_elements
+    template<class T> inline void swap_elements(T& a, T& b)
+    {
+        T temp = a;
+        a = b;
+        b = temp;
+    }
+
+
+    //--------------------------------------------------------------quick_sort
+    template<class Array, class Less>
+    void quick_sort(Array& arr, Less less)
+    {
+        if(arr.size() < 2) return;
+
+        typename Array::value_type* e1;
+        typename Array::value_type* e2;
+
+        int  stack[80];
+        int* top = stack;
+        int  limit = arr.size();
+        int  base = 0;
+
+        for(;;)
+        {
+            int len = limit - base;
+
+            int i;
+            int j;
+            int pivot;
+
+            if(len > quick_sort_threshold)
+            {
+                // we use base + len/2 as the pivot
+                pivot = base + len / 2;
+                swap_elements(arr[base], arr[pivot]);
+
+                i = base + 1;
+                j = limit - 1;
+
+                // now ensure that *i <= *base <= *j
+                e1 = &(arr[j]);
+                e2 = &(arr[i]);
+                if(less(*e1, *e2)) swap_elements(*e1, *e2);
+
+                e1 = &(arr[base]);
+                e2 = &(arr[i]);
+                if(less(*e1, *e2)) swap_elements(*e1, *e2);
+
+                e1 = &(arr[j]);
+                e2 = &(arr[base]);
+                if(less(*e1, *e2)) swap_elements(*e1, *e2);
+
+                for(;;)
+                {
+                    do i++; while( less(arr[i], arr[base]) );
+                    do j--; while( less(arr[base], arr[j]) );
+
+                    if( i > j )
+                    {
+                        break;
+                    }
+
+                    swap_elements(arr[i], arr[j]);
+                }
+
+                swap_elements(arr[base], arr[j]);
+
+                // now, push the largest sub-array
+                if(j - base > limit - i)
+                {
+                    top[0] = base;
+                    top[1] = j;
+                    base   = i;
+                }
+                else
+                {
+                    top[0] = i;
+                    top[1] = limit;
+                    limit  = j;
+                }
+                top += 2;
+            }
+            else
+            {
+                // the sub-array is small, perform insertion sort
+                j = base;
+                i = j + 1;
+
+                for(; i < limit; j = i, i++)
+                {
+                    for(; less(*(e1 = &(arr[j + 1])), *(e2 = &(arr[j]))); j--)
+                    {
+                        swap_elements(*e1, *e2);
+                        if(j == base)
+                        {
+                            break;
+                        }
+                    }
+                }
+                if(top > stack)
+                {
+                    top  -= 2;
+                    base  = top[0];
+                    limit = top[1];
+                }
+                else
+                {
+                    break;
+                }
+            }
+        }
+    }
+
+
+
+
+    //------------------------------------------------------remove_duplicates
+    // Remove duplicates from a sorted array. It doesn't cut the the
+    // tail of the array, it just returns the number of remaining elements.
+    //-----------------------------------------------------------------------
+    template<class Array, class Equal>
+    unsigned remove_duplicates(Array& arr, Equal equal)
+    {
+        if(arr.size() < 2) return arr.size();
+
+        unsigned i, j;
+        for(i = 1, j = 1; i < arr.size(); i++)
+        {
+            typename Array::value_type& e = arr[i];
+            if(!equal(e, arr[i - 1]))
+            {
+                arr[j++] = e;
+            }
+        }
+        return j;
+    }
+
+
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_arrowhead.h b/agg/inc/agg_arrowhead.h
new file mode 100755
index 000000000000..aac99c5ae980
--- /dev/null
+++ b/agg/inc/agg_arrowhead.h
@@ -0,0 +1,82 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Simple arrowhead/arrowtail generator
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_ARROWHEAD_INCLUDED
+#define AGG_ARROWHEAD_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //===============================================================arrowhead
+    //
+    // See implementation agg_arrowhead.cpp
+    //
+    class arrowhead
+    {
+    public:
+        arrowhead();
+
+        void head(double d1, double d2, double d3, double d4)
+        {
+            m_head_d1 = d1;
+            m_head_d2 = d2;
+            m_head_d3 = d3;
+            m_head_d4 = d4;
+            m_head_flag = true;
+        }
+
+        void head()    { m_head_flag = true; }
+        void no_head() { m_head_flag = false; }
+
+        void tail(double d1, double d2, double d3, double d4)
+        {
+            m_tail_d1 = d1;
+            m_tail_d2 = d2;
+            m_tail_d3 = d3;
+            m_tail_d4 = d4;
+            m_tail_flag = true;
+        }
+
+        void tail()    { m_tail_flag = true;  }
+        void no_tail() { m_tail_flag = false; }
+
+        void rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        double   m_head_d1;
+        double   m_head_d2;
+        double   m_head_d3;
+        double   m_head_d4;
+        double   m_tail_d1;
+        double   m_tail_d2;
+        double   m_tail_d3;
+        double   m_tail_d4;
+        bool     m_head_flag;
+        bool     m_tail_flag;
+        double   m_coord[16];
+        unsigned m_cmd[8];
+        unsigned m_curr_id;
+        unsigned m_curr_coord;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_basics.h b/agg/inc/agg_basics.h
new file mode 100755
index 000000000000..d9ca881ab328
--- /dev/null
+++ b/agg/inc/agg_basics.h
@@ -0,0 +1,343 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_BASICS_INCLUDED
+#define AGG_BASICS_INCLUDED
+
+#include "agg_config.h"
+
+//-------------------------------------------------------- Default basic types
+//
+// If the compiler has different capacity of the basic types you can redefine
+// them via the compiler command line or by generating agg_config.h that is
+// empty by default.
+//
+#ifndef AGG_INT8
+#define AGG_INT8 signed char
+#endif
+
+#ifndef AGG_INT8U
+#define AGG_INT8U unsigned char
+#endif
+
+#ifndef AGG_INT16
+#define AGG_INT16 short
+#endif
+
+#ifndef AGG_INT16U
+#define AGG_INT16U unsigned short
+#endif
+
+#ifndef AGG_INT32
+#define AGG_INT32 int
+#endif
+
+#ifndef AGG_INT32U
+#define AGG_INT32U unsigned
+#endif
+
+#ifndef AGG_INT64
+#if defined(_MSC_VER)
+#define AGG_INT64 signed __int64
+#else
+#define AGG_INT64 signed long long
+#endif
+#endif
+
+#ifndef AGG_INT64U
+#if defined(_MSC_VER)
+#define AGG_INT64U unsigned __int64
+#else
+#define AGG_INT64U unsigned long long
+#endif
+#endif
+
+//------------------------------------------------ Some fixes for MS Visual C++
+#if defined(_MSC_VER)
+#pragma warning(disable:4786) // Identifier was truncated...
+#endif
+
+#if defined(_MSC_VER)
+#define AGG_INLINE __forceinline
+#else
+#define AGG_INLINE inline
+#endif
+
+namespace agg
+{
+    //-------------------------------------------------------------------------
+    typedef AGG_INT8   int8;         //----int8
+    typedef AGG_INT8U  int8u;        //----int8u
+    typedef AGG_INT16  int16;        //----int16
+    typedef AGG_INT16U int16u;       //----int16u
+    typedef AGG_INT32  int32;        //----int32
+    typedef AGG_INT32U int32u;       //----int32u
+    typedef AGG_INT64  int64;        //----int64
+    typedef AGG_INT64U int64u;       //----int64u
+
+    //-------------------------------------------------------------------------
+    typedef unsigned char cover_type;    //----cover_type
+    enum
+    {
+        cover_shift = 8,                 //----cover_shift
+        cover_size  = 1 << cover_shift,  //----cover_size
+        cover_mask  = cover_size - 1,    //----cover_mask
+        cover_none  = 0,                 //----cover_none
+        cover_full  = cover_mask         //----cover_full
+    };
+
+
+    //-----------------------------------------------------------------------pi
+    const double pi = 3.14159265358979323846;
+
+    //------------------------------------------------------------------deg2rad
+    inline double deg2rad(double deg)
+    {
+        return deg * pi / 180.0;
+    }
+
+    //------------------------------------------------------------------rad2deg
+    inline double rad2deg(double rad)
+    {
+        return rad * 180.0 / pi;
+    }
+
+    //----------------------------------------------------------------rect_base
+    template<class T> struct rect_base
+    {
+        typedef rect_base<T> self_type;
+        T x1;
+        T y1;
+        T x2;
+        T y2;
+
+        rect_base() {}
+        rect_base(T x1_, T y1_, T x2_, T y2_) :
+            x1(x1_), y1(y1_), x2(x2_), y2(y2_) {}
+
+        const self_type& normalize()
+        {
+            T t;
+            if(x1 > x2) { t = x1; x1 = x2; x2 = t; }
+            if(y1 > y2) { t = y1; y1 = y2; y2 = t; }
+            return *this;
+        }
+
+        bool clip(const self_type& r)
+        {
+            if(x2 > r.x2) x2 = r.x2;
+            if(y2 > r.y2) y2 = r.y2;
+            if(x1 < r.x1) x1 = r.x1;
+            if(y1 < r.y1) y1 = r.y1;
+            return x1 <= x2 && y1 <= y2;
+        }
+
+        bool is_valid() const
+        {
+            return x1 <= x2 && y1 <= y2;
+        }
+    };
+
+    //-----------------------------------------------------intersect_rectangles
+    template<class Rect>
+    inline Rect intersect_rectangles(const Rect& r1, const Rect& r2)
+    {
+        Rect r = r1;
+
+        // First process x2,y2 because the other order
+        // results in Internal Compiler Error under
+        // Microsoft Visual C++ .NET 2003 69462-335-0000007-18038 in
+        // case of "Maximize Speed" optimization option.
+        //-----------------
+        if(r.x2 > r2.x2) r.x2 = r2.x2;
+        if(r.y2 > r2.y2) r.y2 = r2.y2;
+        if(r.x1 < r2.x1) r.x1 = r2.x1;
+        if(r.y1 < r2.y1) r.y1 = r2.y1;
+        return r;
+    }
+
+
+    //---------------------------------------------------------unite_rectangles
+    template<class Rect>
+    inline Rect unite_rectangles(const Rect& r1, const Rect& r2)
+    {
+        Rect r = r1;
+        if(r.x2 < r2.x2) r.x2 = r2.x2;
+        if(r.y2 < r2.y2) r.y2 = r2.y2;
+        if(r.x1 > r2.x1) r.x1 = r2.x1;
+        if(r.y1 > r2.y1) r.y1 = r2.y1;
+        return r;
+    }
+
+    typedef rect_base<int>    rect;   //----rect
+    typedef rect_base<double> rect_d; //----rect_d
+
+    //---------------------------------------------------------path_commands_e
+    enum path_commands_e
+    {
+        path_cmd_stop     = 0,        //----path_cmd_stop
+        path_cmd_move_to  = 1,        //----path_cmd_move_to
+        path_cmd_line_to  = 2,        //----path_cmd_line_to
+        path_cmd_curve3   = 3,        //----path_cmd_curve3
+        path_cmd_curve4   = 4,        //----path_cmd_curve4
+        path_cmd_end_poly = 6,        //----path_cmd_end_poly
+        path_cmd_mask     = 0x0F      //----path_cmd_mask
+    };
+
+    //------------------------------------------------------------path_flags_e
+    enum path_flags_e
+    {
+        path_flags_none  = 0,         //----path_flags_none
+        path_flags_ccw   = 0x10,      //----path_flags_ccw
+        path_flags_cw    = 0x20,      //----path_flags_cw
+        path_flags_close = 0x40,      //----path_flags_close
+        path_flags_mask  = 0xF0       //----path_flags_mask
+    };
+
+    //---------------------------------------------------------------is_vertex
+    inline bool is_vertex(unsigned c)
+    {
+        return c >= path_cmd_move_to && c < path_cmd_end_poly;
+    }
+
+    //-----------------------------------------------------------------is_stop
+    inline bool is_stop(unsigned c)
+    {
+        return c == path_cmd_stop;
+    }
+
+    //--------------------------------------------------------------is_move_to
+    inline bool is_move_to(unsigned c)
+    {
+        return c == path_cmd_move_to;
+    }
+
+    //--------------------------------------------------------------is_line_to
+    inline bool is_line_to(unsigned c)
+    {
+        return c == path_cmd_line_to;
+    }
+
+    //----------------------------------------------------------------is_curve
+    inline bool is_curve(unsigned c)
+    {
+        return c == path_cmd_curve3 || c == path_cmd_curve4;
+    }
+
+    //---------------------------------------------------------------is_curve3
+    inline bool is_curve3(unsigned c)
+    {
+        return c == path_cmd_curve3;
+    }
+
+    //---------------------------------------------------------------is_curve4
+    inline bool is_curve4(unsigned c)
+    {
+        return c == path_cmd_curve4;
+    }
+
+    //-------------------------------------------------------------is_end_poly
+    inline bool is_end_poly(unsigned c)
+    {
+        return (c & path_cmd_mask) == path_cmd_end_poly;
+    }
+
+    //----------------------------------------------------------------is_close
+    inline bool is_close(unsigned c)
+    {
+        return (c & ~(path_flags_cw | path_flags_ccw)) ==
+               (((bool)path_cmd_end_poly) | ((bool)path_flags_close));
+    }
+
+    //------------------------------------------------------------is_next_poly
+    inline bool is_next_poly(unsigned c)
+    {
+        return is_stop(c) || is_move_to(c) || is_end_poly(c);
+    }
+
+    //-------------------------------------------------------------------is_cw
+    inline bool is_cw(unsigned c)
+    {
+        return (c & path_flags_cw) != 0;
+    }
+
+    //------------------------------------------------------------------is_ccw
+    inline bool is_ccw(unsigned c)
+    {
+        return (c & path_flags_ccw) != 0;
+    }
+
+    //-------------------------------------------------------------is_oriented
+    inline bool is_oriented(unsigned c)
+    {
+        return (c & (path_flags_cw | path_flags_ccw)) != 0;
+    }
+
+    //---------------------------------------------------------------is_closed
+    inline bool is_closed(unsigned c)
+    {
+        return (c & path_flags_close) != 0;
+    }
+
+    //----------------------------------------------------------get_close_flag
+    inline unsigned get_close_flag(unsigned c)
+    {
+        return c & path_flags_close;
+    }
+
+    //-------------------------------------------------------clear_orientation
+    inline unsigned clear_orientation(unsigned c)
+    {
+        return c & ~(path_flags_cw | path_flags_ccw);
+    }
+
+    //---------------------------------------------------------get_orientation
+    inline unsigned get_orientation(unsigned c)
+    {
+        return c & (path_flags_cw | path_flags_ccw);
+    }
+
+    //---------------------------------------------------------set_orientation
+    inline unsigned set_orientation(unsigned c, unsigned o)
+    {
+        return clear_orientation(c) | o;
+    }
+
+    //--------------------------------------------------------------point_type
+    struct point_type
+    {
+        double x, y;
+
+        point_type() {}
+        point_type(double x_, double y_) : x(x_), y(y_) {}
+    };
+
+    //-------------------------------------------------------------vertex_type
+    struct vertex_type
+    {
+        double   x, y;
+        unsigned cmd;
+
+        vertex_type() {}
+        vertex_type(double x_, double y_, unsigned cmd_) :
+            x(x_), y(y_), cmd(cmd_) {}
+    };
+
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_bezier_arc.h b/agg/inc/agg_bezier_arc.h
new file mode 100755
index 000000000000..f437ab0a00bd
--- /dev/null
+++ b/agg/inc/agg_bezier_arc.h
@@ -0,0 +1,158 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Arc generator. Produces at most 4 consecutive cubic bezier curves, i.e.,
+// 4, 7, 10, or 13 vertices.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_BEZIER_ARC_INCLUDED
+#define AGG_BEZIER_ARC_INCLUDED
+
+#include "agg_conv_transform.h"
+
+namespace agg
+{
+
+    //-----------------------------------------------------------------------
+    void arc_to_bezier(double cx, double cy, double rx, double ry,
+                       double start_angle, double sweep_angle,
+                       double* curve);
+
+
+    //==============================================================bezier_arc
+    //
+    // See implemantaion agg_bezier_arc.cpp
+    //
+    class bezier_arc
+    {
+    public:
+        //--------------------------------------------------------------------
+        bezier_arc() : m_vertex(26) {}
+        bezier_arc(double x,  double y,
+                   double rx, double ry,
+                   double start_angle,
+                   double sweep_angle)
+        {
+            init(x, y, rx, ry, start_angle, sweep_angle);
+        }
+
+        //--------------------------------------------------------------------
+        void init(double x,  double y,
+                  double rx, double ry,
+                  double start_angle,
+                  double sweep_angle);
+
+        //--------------------------------------------------------------------
+        void rewind(unsigned)
+        {
+            m_vertex = 0;
+        }
+
+        //--------------------------------------------------------------------
+        unsigned vertex(double* x, double* y)
+        {
+            if(m_vertex >= m_num_vertices) return path_cmd_stop;
+            *x = m_vertices[m_vertex];
+            *y = m_vertices[m_vertex + 1];
+            m_vertex += 2;
+            return (m_vertex == 2) ? path_cmd_move_to : path_cmd_curve4;
+        }
+
+        // Supplemantary functions. num_vertices() actually returns doubled
+        // number of vertices. That is, for 1 vertex it returns 2.
+        //--------------------------------------------------------------------
+        unsigned  num_vertices() const { return m_num_vertices; }
+        const double* vertices() const { return m_vertices;     }
+        double*       vertices()       { return m_vertices;     }
+
+    private:
+        unsigned m_vertex;
+        unsigned m_num_vertices;
+        double   m_vertices[26];
+    };
+
+
+
+    //==========================================================bezier_arc_svg
+    // Compute an SVG-style bezier arc.
+    //
+    // Computes an elliptical arc from (x1, y1) to (x2, y2). The size and
+    // orientation of the ellipse are defined by two radii (rx, ry)
+    // and an x-axis-rotation, which indicates how the ellipse as a whole
+    // is rotated relative to the current coordinate system. The center
+    // (cx, cy) of the ellipse is calculated automatically to satisfy the
+    // constraints imposed by the other parameters.
+    // large-arc-flag and sweep-flag contribute to the automatic calculations
+    // and help determine how the arc is drawn.
+    class bezier_arc_svg
+    {
+    public:
+        //--------------------------------------------------------------------
+        bezier_arc_svg() : m_arc(), m_radii_ok(false) {}
+
+        bezier_arc_svg(double x1, double y1,
+                       double rx, double ry,
+                       double angle,
+                       bool large_arc_flag,
+                       bool sweep_flag,
+                       double x2, double y2) :
+            m_arc(), m_radii_ok(false)
+        {
+            init(x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2);
+        }
+
+        //--------------------------------------------------------------------
+        void init(double x1, double y1,
+                  double rx, double ry,
+                  double angle,
+                  bool large_arc_flag,
+                  bool sweep_flag,
+                  double x2, double y2);
+
+        //--------------------------------------------------------------------
+        bool radii_ok() const { return m_radii_ok; }
+
+        //--------------------------------------------------------------------
+        void rewind(unsigned)
+        {
+            m_arc.rewind(0);
+        }
+
+        //--------------------------------------------------------------------
+        unsigned vertex(double* x, double* y)
+        {
+            return m_arc.vertex(x, y);
+        }
+
+        // Supplemantary functions. num_vertices() actually returns doubled
+        // number of vertices. That is, for 1 vertex it returns 2.
+        //--------------------------------------------------------------------
+        unsigned  num_vertices() const { return m_arc.num_vertices(); }
+        const double* vertices() const { return m_arc.vertices();     }
+        double*       vertices()       { return m_arc.vertices();     }
+
+    private:
+        bezier_arc m_arc;
+        bool       m_radii_ok;
+    };
+
+
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_bitset_iterator.h b/agg/inc/agg_bitset_iterator.h
new file mode 100755
index 000000000000..543432b65d54
--- /dev/null
+++ b/agg/inc/agg_bitset_iterator.h
@@ -0,0 +1,54 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_BITSET_ITERATOR_INCLUDED
+#define AGG_BITSET_ITERATOR_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    class bitset_iterator
+    {
+    public:
+        bitset_iterator(const int8u* bits, unsigned offset = 0) :
+            m_bits(bits + (offset >> 3)),
+            m_mask(0x80 >> (offset & 7))
+        {}
+
+        void operator ++ ()
+        {
+            m_mask >>= 1;
+            if(m_mask == 0)
+            {
+                ++m_bits;
+                m_mask = 0x80;
+            }
+        }
+
+        unsigned bit() const
+        {
+            return (*m_bits) & m_mask;
+        }
+
+    private:
+        const int8u* m_bits;
+        int8u        m_mask;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_bounding_rect.h b/agg/inc/agg_bounding_rect.h
new file mode 100755
index 000000000000..9a3c301069d7
--- /dev/null
+++ b/agg/inc/agg_bounding_rect.h
@@ -0,0 +1,116 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// bounding_rect function template
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_BOUNDING_RECT_INCLUDED
+#define AGG_BOUNDING_RECT_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //-----------------------------------------------------------bounding_rect
+    template<class VertexSource, class GetId, class CoordT>
+    bool bounding_rect(VertexSource& vs, GetId& gi,
+                       unsigned start, unsigned num,
+                       CoordT* x1, CoordT* y1, CoordT* x2, CoordT* y2)
+    {
+        unsigned i;
+        double x;
+        double y;
+        bool first = true;
+
+        *x1 = CoordT(1);
+        *y1 = CoordT(1);
+        *x2 = CoordT(0);
+        *y2 = CoordT(0);
+
+        for(i = 0; i < num; i++)
+        {
+            vs.rewind(gi[start + i]);
+            unsigned cmd;
+            while(!is_stop(cmd = vs.vertex(&x, &y)))
+            {
+                if(is_vertex(cmd))
+                {
+                    if(first)
+                    {
+                        *x1 = CoordT(x);
+                        *y1 = CoordT(y);
+                        *x2 = CoordT(x);
+                        *y2 = CoordT(y);
+                        first = false;
+                    }
+                    else
+                    {
+                        if(CoordT(x) < *x1) *x1 = CoordT(x);
+                        if(CoordT(y) < *y1) *y1 = CoordT(y);
+                        if(CoordT(x) > *x2) *x2 = CoordT(x);
+                        if(CoordT(y) > *y2) *y2 = CoordT(y);
+                    }
+                }
+            }
+        }
+        return *x1 <= *x2 && *y1 <= *y2;
+    }
+
+
+    //-----------------------------------------------------bounding_rect_single
+    template<class VertexSource, class CoordT>
+    bool bounding_rect_single(VertexSource& vs, unsigned path_id,
+                              CoordT* x1, CoordT* y1, CoordT* x2, CoordT* y2)
+    {
+        double x;
+        double y;
+        bool first = true;
+
+        *x1 = CoordT(1);
+        *y1 = CoordT(1);
+        *x2 = CoordT(0);
+        *y2 = CoordT(0);
+
+        vs.rewind(path_id);
+        unsigned cmd;
+        while(!is_stop(cmd = vs.vertex(&x, &y)))
+        {
+            if(is_vertex(cmd))
+            {
+                if(first)
+                {
+                    *x1 = CoordT(x);
+                    *y1 = CoordT(y);
+                    *x2 = CoordT(x);
+                    *y2 = CoordT(y);
+                    first = false;
+                }
+                else
+                {
+                    if(CoordT(x) < *x1) *x1 = CoordT(x);
+                    if(CoordT(y) < *y1) *y1 = CoordT(y);
+                    if(CoordT(x) > *x2) *x2 = CoordT(x);
+                    if(CoordT(y) > *y2) *y2 = CoordT(y);
+                }
+            }
+        }
+        return *x1 <= *x2 && *y1 <= *y2;
+    }
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_bspline.h b/agg/inc/agg_bspline.h
new file mode 100755
index 000000000000..ca58fa839b44
--- /dev/null
+++ b/agg/inc/agg_bspline.h
@@ -0,0 +1,77 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class bspline
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_BSPLINE_INCLUDED
+#define AGG_BSPLINE_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    //----------------------------------------------------------------bspline
+    // A very simple class of Bi-cubic Spline interpolation.
+    // First call init(num, x[], y[]) where num - number of source points,
+    // x, y - arrays of X and Y values respectively. Here Y must be a function
+    // of X. It means that all the X-coordinates must be arranged in the ascending
+    // order.
+    // Then call get(x) that calculates a value Y for the respective X.
+    // The class supports extrapolation, i.e. you can call get(x) where x is
+    // outside the given with init() X-range. Extrapolation is a simple linear
+    // function.
+    //
+    //  See Implementation agg_bspline.cpp
+    //------------------------------------------------------------------------
+    class bspline
+    {
+    public:
+        ~bspline();
+        bspline();
+        bspline(int num);
+        bspline(int num, const double* x, const double* y);
+
+        void   init(int num);
+        void   add_point(double x, double y);
+        void   prepare();
+
+        void   init(int num, const double* x, const double* y);
+
+        double get(double x) const;
+        double get_stateful(double x) const;
+
+    private:
+        bspline(const bspline&);
+        const bspline& operator = (const bspline&);
+
+        static void bsearch(int n, const double *x, double x0, int *i);
+        double extrapolation_left(double x) const;
+        double extrapolation_right(double x) const;
+        double interpolation(double x, int i) const;
+
+        int     m_max;
+        int     m_num;
+        double* m_x;
+        double* m_y;
+        double* m_am;
+        mutable int m_last_idx;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_clip_liang_barsky.h b/agg/inc/agg_clip_liang_barsky.h
new file mode 100755
index 000000000000..e229d52bc6e9
--- /dev/null
+++ b/agg/inc/agg_clip_liang_barsky.h
@@ -0,0 +1,209 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Liang-Barsky clipping
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CLIP_LIANG_BARSKY_INCLUDED
+#define AGG_CLIP_LIANG_BARSKY_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //----------------------------------------------------------clipping_flags
+    // Determine the clipping code of the vertex according to the
+    // Cyrus-Beck line clipping algorithm
+    //
+    //        |        |
+    //  0110  |  0010  | 0011
+    //        |        |
+    // -------+--------+-------- clip_box.y2
+    //        |        |
+    //  0100  |  0000  | 0001
+    //        |        |
+    // -------+--------+-------- clip_box.y1
+    //        |        |
+    //  1100  |  1000  | 1001
+    //        |        |
+    //  clip_box.x1  clip_box.x2
+    //
+    //
+    template<class T>
+    inline unsigned clipping_flags(T x, T y, const rect_base<T>& clip_box)
+    {
+        return  (x > clip_box.x2) |
+               ((y > clip_box.y2) << 1) |
+               ((x < clip_box.x1) << 2) |
+               ((y < clip_box.y1) << 3);
+    }
+
+
+
+    //-------------------------------------------------------clip_liang_barsky
+    template<class T>
+    /*inline*/ unsigned clip_liang_barsky(T x1, T y1, T x2, T y2,
+                                      const rect_base<T>& clip_box,
+                                      T* x, T* y)
+    {
+        const double nearzero = 1e-30;
+
+        double deltax = x2 - x1;
+        double deltay = y2 - y1;
+        double xin;
+        double xout;
+        double yin;
+        double yout;
+        double tinx;
+        double tiny;
+        double toutx;
+        double touty;
+        double tin1;
+        double tin2;
+        double tout1;
+        unsigned np = 0;
+
+        if(deltax == 0.0)
+        {
+            // bump off of the vertical
+            deltax = (x1 > clip_box.x1) ? -nearzero : nearzero;
+        }
+
+        if(deltay == 0.0)
+        {
+            // bump off of the horizontal
+            deltay = (y1 > clip_box.y1) ? -nearzero : nearzero;
+        }
+
+        if(deltax > 0.0)
+        {
+            // points to right
+            xin  = clip_box.x1;
+            xout = clip_box.x2;
+        }
+        else
+        {
+            xin  = clip_box.x2;
+            xout = clip_box.x1;
+        }
+
+        if(deltay > 0.0)
+        {
+            // points up
+            yin  = clip_box.y1;
+            yout = clip_box.y2;
+        }
+        else
+        {
+            yin  = clip_box.y2;
+            yout = clip_box.y1;
+        }
+
+        tinx = (xin - x1) / deltax;
+        tiny = (yin - y1) / deltay;
+
+        if (tinx < tiny)
+        {
+            // hits x first
+            tin1 = tinx;
+            tin2 = tiny;
+        }
+        else
+        {
+            // hits y first
+            tin1 = tiny;
+            tin2 = tinx;
+        }
+
+        if(tin1 <= 1.0)
+        {
+            if(0.0 < tin1)
+            {
+                *x++ = (T)xin;
+                *y++ = (T)yin;
+                ++np;
+            }
+
+            if(tin2 <= 1.0)
+            {
+                toutx = (xout - x1) / deltax;
+                touty = (yout - y1) / deltay;
+
+                tout1 = (toutx < touty) ? toutx : touty;
+
+                if(tin2 > 0.0 || tout1 > 0.0)
+                {
+                    if(tin2 <= tout1)
+                    {
+                        if(tin2 > 0.0)
+                        {
+                            if(tinx > tiny)
+                            {
+                                *x++ = (T)xin;
+                                *y++ = (T)(y1 + tinx * deltay);
+                            }
+                            else
+                            {
+                                *x++ = (T)(x1 + tiny * deltax);
+                                *y++ = (T)yin;
+                            }
+                            ++np;
+                        }
+
+                        if(tout1 < 1.0)
+                        {
+                            if(toutx < touty)
+                            {
+                                *x++ = (T)xout;
+                                *y++ = (T)(y1 + toutx * deltay);
+                            }
+                            else
+                            {
+                                *x++ = (T)(x1 + touty * deltax);
+                                *y++ = (T)yout;
+                            }
+                        }
+                        else
+                        {
+                            *x++ = x2;
+                            *y++ = y2;
+                        }
+                        ++np;
+                    }
+                    else
+                    {
+                        if(tinx > tiny)
+                        {
+                            *x++ = (T)xin;
+                            *y++ = (T)yout;
+                        }
+                        else
+                        {
+                            *x++ = (T)xout;
+                            *y++ = (T)yin;
+                        }
+                        ++np;
+                    }
+                }
+            }
+        }
+        return np;
+    }
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_color_gray.h b/agg/inc/agg_color_gray.h
new file mode 100755
index 000000000000..1d0ffd8e773d
--- /dev/null
+++ b/agg/inc/agg_color_gray.h
@@ -0,0 +1,364 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+//
+// color types gray8, gray16
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_COLOR_GRAY_INCLUDED
+#define AGG_COLOR_GRAY_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+
+namespace agg
+{
+
+    //===================================================================gray8
+    struct gray8
+    {
+        typedef int8u  value_type;
+        typedef int32u calc_type;
+        typedef int32  long_type;
+        enum
+        {
+            base_shift = 8,
+            base_size  = 1 << base_shift,
+            base_mask  = base_size - 1
+        };
+        typedef gray8 self_type;
+
+        value_type v;
+        value_type a;
+
+        //--------------------------------------------------------------------
+        gray8() {}
+
+        //--------------------------------------------------------------------
+        gray8(unsigned v_, unsigned a_=base_mask) :
+            v(int8u(v_)), a(int8u(a_)) {}
+
+        //--------------------------------------------------------------------
+        gray8(const self_type& c, unsigned a_) :
+            v(c.v), a(value_type(a_)) {}
+
+        //--------------------------------------------------------------------
+        gray8(const rgba& c) :
+            v(value_type((0.299*c.r + 0.587*c.g + 0.114*c.b) * double(base_mask) + 0.5)),
+            a(value_type(c.a * double(base_mask))) {}
+
+        //--------------------------------------------------------------------
+        gray8(const rgba& c, double a_) :
+            v(value_type((0.299*c.r + 0.587*c.g + 0.114*c.b) * double(base_mask) + 0.5)),
+            a(value_type(a_ * double(base_mask))) {}
+
+        //--------------------------------------------------------------------
+        gray8(const rgba8& c) :
+            v((c.r*77 + c.g*150 + c.b*29) >> 8),
+            a(c.a) {}
+
+        //--------------------------------------------------------------------
+        gray8(const rgba8& c, unsigned a_) :
+            v((c.r*77 + c.g*150 + c.b*29) >> 8),
+            a(a_) {}
+
+        //--------------------------------------------------------------------
+        void clear()
+        {
+            v = a = 0;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& transparent()
+        {
+            a = 0;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        void opacity(double a_)
+        {
+            if(a_ < 0.0) a_ = 0.0;
+            if(a_ > 1.0) a_ = 1.0;
+            a = value_type(a_ * double(base_mask));
+        }
+
+        //--------------------------------------------------------------------
+        double opacity() const
+        {
+            return double(a) / double(base_mask);
+        }
+
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                v = 0;
+                return *this;
+            }
+            v = value_type((calc_type(v) * a) >> base_shift);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply(unsigned a_)
+        {
+            if(a == base_mask && a_ >= base_mask) return *this;
+            if(a == 0 || a_ == 0)
+            {
+                v = a = 0;
+                return *this;
+            }
+            calc_type v_ = (calc_type(v) * a_) / a;
+            v = value_type((v_ > a_) ? a_ : v_);
+            a = value_type(a_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& demultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                v = 0;
+                return *this;
+            }
+            calc_type v_ = (calc_type(v) * base_mask) / a;
+            v = value_type((v_ > base_mask) ? base_mask : v_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        self_type gradient(self_type c, double k) const
+        {
+            self_type ret;
+            calc_type ik = calc_type(k * base_size);
+            ret.v = value_type(calc_type(v) + (((calc_type(c.v) - v) * ik) >> base_shift));
+            ret.a = value_type(calc_type(a) + (((calc_type(c.a) - a) * ik) >> base_shift));
+            return ret;
+        }
+
+        //--------------------------------------------------------------------
+        static self_type no_color() { return self_type(0,0); }
+    };
+
+
+    //-------------------------------------------------------------gray8_pre
+    inline gray8 gray8_pre(unsigned v, unsigned a = gray8::base_mask)
+    {
+        return gray8(v,a).premultiply();
+    }
+    inline gray8 gray8_pre(const gray8& c, unsigned a)
+    {
+        return gray8(c,a).premultiply();
+    }
+    inline gray8 gray8_pre(const rgba& c)
+    {
+        return gray8(c).premultiply();
+    }
+    inline gray8 gray8_pre(const rgba& c, double a)
+    {
+        return gray8(c,a).premultiply();
+    }
+    inline gray8 gray8_pre(const rgba8& c)
+    {
+        return gray8(c).premultiply();
+    }
+    inline gray8 gray8_pre(const rgba8& c, unsigned a)
+    {
+        return gray8(c,a).premultiply();
+    }
+
+
+
+
+    //==================================================================gray16
+    struct gray16
+    {
+        typedef int16u value_type;
+        typedef int32u calc_type;
+        typedef int64  long_type;
+        enum
+        {
+            base_shift = 16,
+            base_size  = 1 << base_shift,
+            base_mask  = base_size - 1
+        };
+        typedef gray16 self_type;
+
+        value_type v;
+        value_type a;
+
+        //--------------------------------------------------------------------
+        gray16() {}
+
+        //--------------------------------------------------------------------
+        gray16(unsigned v_, unsigned a_=base_mask) :
+            v(int16u(v_)), a(int16u(a_)) {}
+
+        //--------------------------------------------------------------------
+        gray16(const self_type& c, unsigned a_) :
+            v(c.v), a(value_type(a_)) {}
+
+        //--------------------------------------------------------------------
+        gray16(const rgba& c) :
+            v(value_type((0.299*c.r + 0.587*c.g + 0.114*c.b) * double(base_mask) + 0.5)),
+            a(value_type(c.a * double(base_mask))) {}
+
+        //--------------------------------------------------------------------
+        gray16(const rgba& c, double a_) :
+            v(value_type((0.299*c.r + 0.587*c.g + 0.114*c.b) * double(base_mask) + 0.5)),
+            a(value_type(a_ * double(base_mask))) {}
+
+        //--------------------------------------------------------------------
+        gray16(const rgba8& c) :
+            v(c.r*77 + c.g*150 + c.b*29),
+            a((value_type(c.a) << 8) | c.a) {}
+
+        //--------------------------------------------------------------------
+        gray16(const rgba8& c, unsigned a_) :
+            v(c.r*77 + c.g*150 + c.b*29),
+            a((value_type(a_) << 8) | c.a) {}
+
+        //--------------------------------------------------------------------
+        void clear()
+        {
+            v = a = 0;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& transparent()
+        {
+            a = 0;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        void opacity(double a_)
+        {
+            if(a_ < 0.0) a_ = 0.0;
+            if(a_ > 1.0) a_ = 1.0;
+            a = value_type(a_ * double(base_mask));
+        }
+
+        //--------------------------------------------------------------------
+        double opacity() const
+        {
+            return double(a) / double(base_mask);
+        }
+
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                v = 0;
+                return *this;
+            }
+            v = value_type((calc_type(v) * a) >> base_shift);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply(unsigned a_)
+        {
+            if(a == base_mask && a_ >= base_mask) return *this;
+            if(a == 0 || a_ == 0)
+            {
+                v = a = 0;
+                return *this;
+            }
+            calc_type v_ = (calc_type(v) * a_) / a;
+            v = value_type((v_ > a_) ? a_ : v_);
+            a = value_type(a_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& demultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                v = 0;
+                return *this;
+            }
+            calc_type v_ = (calc_type(v) * base_mask) / a;
+            v = value_type((v_ > base_mask) ? base_mask : v_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        self_type gradient(self_type c, double k) const
+        {
+            self_type ret;
+            calc_type ik = calc_type(k * base_size);
+            ret.v = value_type(calc_type(v) + (((calc_type(c.v) - v) * ik) >> base_shift));
+            ret.a = value_type(calc_type(a) + (((calc_type(c.a) - a) * ik) >> base_shift));
+            return ret;
+        }
+
+        //--------------------------------------------------------------------
+        static self_type no_color() { return self_type(0,0); }
+    };
+
+
+    //------------------------------------------------------------gray16_pre
+    inline gray16 gray16_pre(unsigned v, unsigned a = gray16::base_mask)
+    {
+        return gray16(v,a).premultiply();
+    }
+    inline gray16 gray16_pre(const gray16& c, unsigned a)
+    {
+        return gray16(c,a).premultiply();
+    }
+    inline gray16 gray16_pre(const rgba& c)
+    {
+        return gray16(c).premultiply();
+    }
+    inline gray16 gray16_pre(const rgba& c, double a)
+    {
+        return gray16(c,a).premultiply();
+    }
+    inline gray16 gray16_pre(const rgba8& c)
+    {
+        return gray16(c).premultiply();
+    }
+    inline gray16 gray16_pre(const rgba8& c, unsigned a)
+    {
+        return gray16(c,a).premultiply();
+    }
+
+
+}
+
+
+
+
+#endif
diff --git a/agg/inc/agg_color_rgba.h b/agg/inc/agg_color_rgba.h
new file mode 100755
index 000000000000..e1f77206cc66
--- /dev/null
+++ b/agg/inc/agg_color_rgba.h
@@ -0,0 +1,618 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_COLOR_RGBA_INCLUDED
+#define AGG_COLOR_RGBA_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+    // Supported byte orders for RGB and RGBA pixel formats
+    //=======================================================================
+    struct order_rgb  { enum { R=0, G=1, B=2, rgb_tag }; };       //----order_rgb
+    struct order_bgr  { enum { B=0, G=1, R=2, rgb_tag }; };       //----order_bgr
+    struct order_rgba { enum { R=0, G=1, B=2, A=3, rgba_tag }; }; //----order_rgba
+    struct order_argb { enum { A=0, R=1, G=2, B=3, rgba_tag }; }; //----order_argb
+    struct order_abgr { enum { A=0, B=1, G=2, R=3, rgba_tag }; }; //----order_abgr
+    struct order_bgra { enum { B=0, G=1, R=2, A=3, rgba_tag }; }; //----order_bgra
+
+    //====================================================================rgba
+    struct rgba
+    {
+        typedef double value_type;
+
+        double r;
+        double g;
+        double b;
+        double a;
+
+        //--------------------------------------------------------------------
+        rgba() {}
+
+        //--------------------------------------------------------------------
+        rgba(double r_, double g_, double b_, double a_=1.0) :
+            r(r_), g(g_), b(b_), a(a_) {}
+
+        //--------------------------------------------------------------------
+        rgba(const rgba& c, double a_) : r(c.r), g(c.g), b(c.b), a(a_) {}
+
+        //--------------------------------------------------------------------
+        void clear()
+        {
+            r = g = b = a = 0;
+        }
+
+        //--------------------------------------------------------------------
+        const rgba& transparent()
+        {
+            a = 0.0;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const rgba& opacity(double a_)
+        {
+            if(a_ < 0.0) a_ = 0.0;
+            if(a_ > 1.0) a_ = 1.0;
+            a = a_;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        double opacity() const
+        {
+            return a;
+        }
+
+        //--------------------------------------------------------------------
+        const rgba& premultiply()
+        {
+            r *= a;
+            g *= a;
+            b *= a;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const rgba& premultiply(double a_)
+        {
+            if(a <= 0.0 || a_ <= 0.0)
+            {
+                r = g = b = a = 0.0;
+                return *this;
+            }
+            a_ /= a;
+            r *= a_;
+            g *= a_;
+            b *= a_;
+            a  = a_;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const rgba& demultiply()
+        {
+            if(a == 0)
+            {
+                r = g = b = 0;
+                return *this;
+            }
+            double a_ = 1.0 / a;
+            r *= a_;
+            g *= a_;
+            b *= a_;
+            return *this;
+        }
+
+
+        //--------------------------------------------------------------------
+        rgba gradient(rgba c, double k) const
+        {
+            rgba ret;
+            ret.r = r + (c.r - r) * k;
+            ret.g = g + (c.g - g) * k;
+            ret.b = b + (c.b - b) * k;
+            ret.a = a + (c.a - a) * k;
+            return ret;
+        }
+
+        //--------------------------------------------------------------------
+        static rgba no_color() { return rgba(0,0,0,0); }
+
+        //--------------------------------------------------------------------
+        static rgba from_wavelength(double wl, double gamma = 1.0);
+
+        //--------------------------------------------------------------------
+        rgba(double wavelen, double gamma=1.0)
+        {
+            *this = from_wavelength(wavelen, gamma);
+        }
+
+    };
+
+    //----------------------------------------------------------------rgba_pre
+    inline rgba rgba_pre(double r, double g, double b, double a=1.0)
+    {
+        return rgba(r, g, b, a).premultiply();
+    }
+    inline rgba rgba_pre(const rgba& c)
+    {
+        return rgba(c).premultiply();
+    }
+    inline rgba rgba_pre(const rgba& c, double a)
+    {
+        return rgba(c, a).premultiply();
+    }
+
+    //------------------------------------------------------------------------
+    inline rgba rgba::from_wavelength(double wl, double gamma)
+    {
+        rgba t(0.0, 0.0, 0.0);
+
+        if(wl >= 380.0 && wl <= 440.0)
+        {
+            t.r = -1.0 * (wl - 440.0) / (440.0 - 380.0);
+            t.b = 1.0;
+        }
+        else
+        if(wl >= 440.0 && wl <= 490.0)
+        {
+            t.g = (wl - 440.0) / (490.0 - 440.0);
+            t.b = 1.0;
+        }
+        else
+        if(wl >= 490.0 && wl <= 510.0)
+        {
+            t.g = 1.0;
+            t.b = -1.0 * (wl - 510.0) / (510.0 - 490.0);
+        }
+        else
+        if(wl >= 510.0 && wl <= 580.0)
+        {
+            t.r = (wl - 510.0) / (580.0 - 510.0);
+            t.g = 1.0;
+        }
+        else
+        if(wl >= 580.0 && wl <= 645.0)
+        {
+            t.r = 1.0;
+            t.g = -1.0 * (wl - 645.0) / (645.0 - 580.0);
+        }
+        else
+        if(wl >= 645.0 && wl <= 780.0)
+        {
+            t.r = 1.0;
+        }
+
+        double s = 1.0;
+        if(wl > 700.0)       s = 0.3 + 0.7 * (780.0 - wl) / (780.0 - 700.0);
+        else if(wl <  420.0) s = 0.3 + 0.7 * (wl - 380.0) / (420.0 - 380.0);
+
+        t.r = pow(t.r * s, gamma);
+        t.g = pow(t.g * s, gamma);
+        t.b = pow(t.b * s, gamma);
+        return t;
+    }
+
+
+
+
+    //===================================================================rgba8
+    struct rgba8
+    {
+        typedef int8u  value_type;
+        typedef int32u calc_type;
+        typedef int32  long_type;
+        enum
+        {
+            base_shift = 8,
+            base_size  = 1 << base_shift,
+            base_mask  = base_size - 1
+        };
+        typedef rgba8 self_type;
+
+
+        value_type r;
+        value_type g;
+        value_type b;
+        value_type a;
+
+        //--------------------------------------------------------------------
+        rgba8() {}
+
+        //--------------------------------------------------------------------
+        rgba8(unsigned r_, unsigned g_, unsigned b_, unsigned a_=base_mask) :
+            r(value_type(r_)),
+            g(value_type(g_)),
+            b(value_type(b_)),
+            a(value_type(a_)) {}
+
+        //--------------------------------------------------------------------
+        rgba8(const rgba& c, double a_) :
+            r(value_type(c.r * double(base_mask) + 0.5)),
+            g(value_type(c.g * double(base_mask) + 0.5)),
+            b(value_type(c.b * double(base_mask) + 0.5)),
+            a(value_type(a_  * double(base_mask) + 0.5)) {}
+
+        //--------------------------------------------------------------------
+        rgba8(const self_type& c, unsigned a_) :
+            r(c.r), g(c.g), b(c.b), a(value_type(a_)) {}
+
+        //--------------------------------------------------------------------
+        rgba8(const rgba& c) :
+            r(value_type(c.r * double(base_mask) + 0.5)),
+            g(value_type(c.g * double(base_mask) + 0.5)),
+            b(value_type(c.b * double(base_mask) + 0.5)),
+            a(value_type(c.a * double(base_mask) + 0.5)) {}
+
+        //--------------------------------------------------------------------
+        void clear()
+        {
+            r = g = b = a = 0;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& transparent()
+        {
+            a = 0;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& opacity(double a_)
+        {
+            if(a_ < 0.0) a_ = 0.0;
+            if(a_ > 1.0) a_ = 1.0;
+            a = value_type(a_ * double(base_mask) + 0.5);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        double opacity() const
+        {
+            return double(a) / double(base_mask);
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                r = g = b = 0;
+                return *this;
+            }
+            r = value_type((calc_type(r) * a) >> base_shift);
+            g = value_type((calc_type(g) * a) >> base_shift);
+            b = value_type((calc_type(b) * a) >> base_shift);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply(unsigned a_)
+        {
+            if(a == base_mask && a_ >= base_mask) return *this;
+            if(a == 0 || a_ == 0)
+            {
+                r = g = b = a = 0;
+                return *this;
+            }
+            calc_type r_ = (calc_type(r) * a_) / a;
+            calc_type g_ = (calc_type(g) * a_) / a;
+            calc_type b_ = (calc_type(b) * a_) / a;
+            r = value_type((r_ > a_) ? a_ : r_);
+            g = value_type((g_ > a_) ? a_ : g_);
+            b = value_type((b_ > a_) ? a_ : b_);
+            a = value_type(a_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& demultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                r = g = b = 0;
+                return *this;
+            }
+            calc_type r_ = (calc_type(r) * base_mask) / a;
+            calc_type g_ = (calc_type(g) * base_mask) / a;
+            calc_type b_ = (calc_type(b) * base_mask) / a;
+            r = value_type((r_ > base_mask) ? base_mask : r_);
+            g = value_type((g_ > base_mask) ? base_mask : g_);
+            b = value_type((b_ > base_mask) ? base_mask : b_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        self_type gradient(const self_type& c, double k) const
+        {
+            self_type ret;
+            calc_type ik = calc_type(k * base_size);
+            ret.r = value_type(calc_type(r) + (((calc_type(c.r) - r) * ik) >> base_shift));
+            ret.g = value_type(calc_type(g) + (((calc_type(c.g) - g) * ik) >> base_shift));
+            ret.b = value_type(calc_type(b) + (((calc_type(c.b) - b) * ik) >> base_shift));
+            ret.a = value_type(calc_type(a) + (((calc_type(c.a) - a) * ik) >> base_shift));
+            return ret;
+        }
+
+        //--------------------------------------------------------------------
+        static self_type no_color() { return self_type(0,0,0,0); }
+
+        //--------------------------------------------------------------------
+        static self_type from_wavelength(double wl, double gamma = 1.0)
+        {
+            return self_type(rgba::from_wavelength(wl, gamma));
+        }
+    };
+
+
+    //-------------------------------------------------------------rgba8_pre
+    inline rgba8 rgba8_pre(unsigned r, unsigned g, unsigned b,
+                           unsigned a = rgba8::base_mask)
+    {
+        return rgba8(r,g,b,a).premultiply();
+    }
+    inline rgba8 rgba8_pre(const rgba8& c)
+    {
+        return rgba8(c).premultiply();
+    }
+    inline rgba8 rgba8_pre(const rgba8& c, unsigned a)
+    {
+        return rgba8(c,a).premultiply();
+    }
+    inline rgba8 rgba8_pre(const rgba& c)
+    {
+        return rgba8(c).premultiply();
+    }
+    inline rgba8 rgba8_pre(const rgba& c, double a)
+    {
+        return rgba8(c,a).premultiply();
+    }
+
+
+    //-----------------------------------------------------------rgb8_packed
+    inline rgba8 rgb8_packed(unsigned v)
+    {
+        return rgba8((v >> 16) & 0xFF, (v >> 8) & 0xFF, v & 0xFF);
+    }
+
+    //-----------------------------------------------------------bgr8_packed
+    inline rgba8 bgr8_packed(unsigned v)
+    {
+        return rgba8(v & 0xFF, (v >> 8) & 0xFF, (v >> 16) & 0xFF);
+    }
+
+    //----------------------------------------------------------argb8_packed
+    inline rgba8 argb8_packed(unsigned v)
+    {
+        return rgba8((v >> 16) & 0xFF, (v >> 8) & 0xFF, v & 0xFF, v >> 24);
+    }
+
+
+
+
+
+
+
+
+    //=================================================================rgba16
+    struct rgba16
+    {
+        typedef int16u value_type;
+        typedef int32u calc_type;
+        typedef int64  long_type;
+        enum
+        {
+            base_shift = 16,
+            base_size  = 1 << base_shift,
+            base_mask  = base_size - 1
+        };
+        typedef rgba16 self_type;
+
+        value_type r;
+        value_type g;
+        value_type b;
+        value_type a;
+
+        //--------------------------------------------------------------------
+        rgba16() {}
+
+        //--------------------------------------------------------------------
+        rgba16(unsigned r_, unsigned g_, unsigned b_, unsigned a_=base_mask) :
+            r(value_type(r_)),
+            g(value_type(g_)),
+            b(value_type(b_)),
+            a(value_type(a_)) {}
+
+        //--------------------------------------------------------------------
+        rgba16(const self_type& c, unsigned a_) :
+            r(c.r), g(c.g), b(c.b), a(value_type(a_)) {}
+
+        //--------------------------------------------------------------------
+        rgba16(const rgba& c) :
+            r(value_type(c.r * double(base_mask) + 0.5)),
+            g(value_type(c.g * double(base_mask) + 0.5)),
+            b(value_type(c.b * double(base_mask) + 0.5)),
+            a(value_type(c.a * double(base_mask) + 0.5)) {}
+
+        //--------------------------------------------------------------------
+        rgba16(const rgba& c, double a_) :
+            r(value_type(c.r * double(base_mask) + 0.5)),
+            g(value_type(c.g * double(base_mask) + 0.5)),
+            b(value_type(c.b * double(base_mask) + 0.5)),
+            a(value_type(a_  * double(base_mask) + 0.5)) {}
+
+        //--------------------------------------------------------------------
+        rgba16(const rgba8& c) :
+            r(value_type((value_type(c.r) << 8) | c.r)),
+            g(value_type((value_type(c.g) << 8) | c.g)),
+            b(value_type((value_type(c.b) << 8) | c.b)),
+            a(value_type((value_type(c.a) << 8) | c.a)) {}
+
+        //--------------------------------------------------------------------
+        rgba16(const rgba8& c, unsigned a_) :
+            r(value_type((value_type(c.r) << 8) | c.r)),
+            g(value_type((value_type(c.g) << 8) | c.g)),
+            b(value_type((value_type(c.b) << 8) | c.b)),
+            a(value_type((             a_ << 8) | c.a)) {}
+
+        //--------------------------------------------------------------------
+        void clear()
+        {
+            r = g = b = a = 0;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& transparent()
+        {
+            a = 0;
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& opacity(double a_)
+        {
+            if(a_ < 0.0) a_ = 0.0;
+            if(a_ > 1.0) a_ = 1.0;
+            a = value_type(a_ * double(base_mask) + 0.5);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        double opacity() const
+        {
+            return double(a) / double(base_mask);
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                r = g = b = 0;
+                return *this;
+            }
+            r = value_type((calc_type(r) * a) >> base_shift);
+            g = value_type((calc_type(g) * a) >> base_shift);
+            b = value_type((calc_type(b) * a) >> base_shift);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& premultiply(unsigned a_)
+        {
+            if(a == base_mask && a_ >= base_mask) return *this;
+            if(a == 0 || a_ == 0)
+            {
+                r = g = b = a = 0;
+                return *this;
+            }
+            calc_type r_ = (calc_type(r) * a_) / a;
+            calc_type g_ = (calc_type(g) * a_) / a;
+            calc_type b_ = (calc_type(b) * a_) / a;
+            r = value_type((r_ > a_) ? a_ : r_);
+            g = value_type((g_ > a_) ? a_ : g_);
+            b = value_type((b_ > a_) ? a_ : b_);
+            a = value_type(a_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        const self_type& demultiply()
+        {
+            if(a == base_mask) return *this;
+            if(a == 0)
+            {
+                r = g = b = 0;
+                return *this;
+            }
+            calc_type r_ = (calc_type(r) * base_mask) / a;
+            calc_type g_ = (calc_type(g) * base_mask) / a;
+            calc_type b_ = (calc_type(b) * base_mask) / a;
+            r = value_type((r_ > base_mask) ? base_mask : r_);
+            g = value_type((g_ > base_mask) ? base_mask : g_);
+            b = value_type((b_ > base_mask) ? base_mask : b_);
+            return *this;
+        }
+
+        //--------------------------------------------------------------------
+        self_type gradient(const self_type& c, double k) const
+        {
+            self_type ret;
+            calc_type ik = calc_type(k * base_size);
+            ret.r = value_type(calc_type(r) + (((calc_type(c.r) - r) * ik) >> base_shift));
+            ret.g = value_type(calc_type(g) + (((calc_type(c.g) - g) * ik) >> base_shift));
+            ret.b = value_type(calc_type(b) + (((calc_type(c.b) - b) * ik) >> base_shift));
+            ret.a = value_type(calc_type(a) + (((calc_type(c.a) - a) * ik) >> base_shift));
+            return ret;
+        }
+
+        //--------------------------------------------------------------------
+        static self_type no_color() { return self_type(0,0,0,0); }
+
+        //--------------------------------------------------------------------
+        static self_type from_wavelength(double wl, double gamma = 1.0)
+        {
+            return self_type(rgba::from_wavelength(wl, gamma));
+        }
+    };
+
+
+
+    //--------------------------------------------------------------rgba16_pre
+    inline rgba16 rgba16_pre(unsigned r, unsigned g, unsigned b,
+                             unsigned a = rgba16::base_mask)
+    {
+        return rgba16(r,g,b,a).premultiply();
+    }
+    inline rgba16 rgba16_pre(const rgba16& c, unsigned a)
+    {
+        return rgba16(c,a).premultiply();
+    }
+    inline rgba16 rgba16_pre(const rgba& c)
+    {
+        return rgba16(c).premultiply();
+    }
+    inline rgba16 rgba16_pre(const rgba& c, double a)
+    {
+        return rgba16(c,a).premultiply();
+    }
+    inline rgba16 rgba16_pre(const rgba8& c)
+    {
+        return rgba16(c).premultiply();
+    }
+    inline rgba16 rgba16_pre(const rgba8& c, unsigned a)
+    {
+        return rgba16(c,a).premultiply();
+    }
+
+}
+
+
+
+#endif
diff --git a/agg/inc/agg_config.h b/agg/inc/agg_config.h
new file mode 100755
index 000000000000..b412a6dff178
--- /dev/null
+++ b/agg/inc/agg_config.h
@@ -0,0 +1,31 @@
+#ifndef AGG_CONFIG_INCLUDED
+#define AGG_CONFIG_INCLUDED
+
+// This file can be used to redefine the default basic types such as:
+//
+// AGG_INT8
+// AGG_INT8U
+// AGG_INT16
+// AGG_INT16U
+// AGG_INT32
+// AGG_INT32U
+// AGG_INT64
+// AGG_INT64U
+//
+// Just replace this file with new defines if necessary.
+// For example, if your compiler doesn't have a 64 bit integer type
+// you can still use AGG if you define the follows:
+//
+// #define AGG_INT64  int
+// #define AGG_INT64U unsigned
+//
+// It will result in overflow in 16 bit-per-component image/pattern resampling
+// but it won't result any crash and the rest of the library will remain
+// fully functional.
+
+// #i65318# Passing agg version on to clients
+#ifndef AGG_VERSION
+# define AGG_VERSION 2300
+#endif
+
+#endif
diff --git a/agg/inc/agg_conv_adaptor_vcgen.h b/agg/inc/agg_conv_adaptor_vcgen.h
new file mode 100755
index 000000000000..f8233a388357
--- /dev/null
+++ b/agg/inc/agg_conv_adaptor_vcgen.h
@@ -0,0 +1,169 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_ADAPTOR_VCGEN_INCLUDED
+#define AGG_CONV_ADAPTOR_VCGEN_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+    //------------------------------------------------------------null_markers
+    struct null_markers
+    {
+        void remove_all() {}
+        void add_vertex(double, double, unsigned) {}
+        void prepare_src() {}
+
+        void rewind(unsigned) {}
+        unsigned vertex(double*, double*) { return path_cmd_stop; }
+
+        typedef null_markers source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+    };
+
+
+    //------------------------------------------------------conv_adaptor_vcgen
+    template<class VertexSource,
+             class Generator,
+             class Markers=null_markers> class conv_adaptor_vcgen
+    {
+        enum status
+        {
+            initial,
+            accumulate,
+            generate
+        };
+
+    public:
+        conv_adaptor_vcgen(VertexSource& source) :
+            m_source(&source),
+            m_status(initial)
+        {}
+
+        void set_source(VertexSource& source) { m_source = &source; }
+
+        Generator& generator() { return m_generator; }
+        const Generator& generator() const { return m_generator; }
+
+        Markers& markers() { return m_markers; }
+        const Markers& markers() const { return m_markers; }
+
+        void rewind(unsigned id)
+        {
+            m_source->rewind(id);
+            m_status = initial;
+        }
+
+        unsigned vertex(double* x, double* y);
+
+        typedef conv_adaptor_vcgen<VertexSource, Generator, Markers> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        // Prohibit copying
+        conv_adaptor_vcgen(const conv_adaptor_vcgen<VertexSource, Generator, Markers>&);
+        const conv_adaptor_vcgen<VertexSource, Generator, Markers>&
+            operator = (const conv_adaptor_vcgen<VertexSource, Generator, Markers>&);
+
+        VertexSource* m_source;
+        Generator     m_generator;
+        Markers       m_markers;
+        status        m_status;
+        unsigned      m_last_cmd;
+        double        m_start_x;
+        double        m_start_y;
+    };
+
+
+
+
+
+    //------------------------------------------------------------------------
+    template<class VertexSource, class Generator, class Markers>
+    unsigned conv_adaptor_vcgen<VertexSource, Generator, Markers>::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_stop;
+        bool done = false;
+        while(!done)
+        {
+            switch(m_status)
+            {
+            case initial:
+                m_markers.remove_all();
+                m_last_cmd = m_source->vertex(&m_start_x, &m_start_y);
+                m_status = accumulate;
+
+            case accumulate:
+                if(is_stop(m_last_cmd)) return path_cmd_stop;
+
+                m_generator.remove_all();
+                m_generator.add_vertex(m_start_x, m_start_y, path_cmd_move_to);
+                m_markers.add_vertex(m_start_x, m_start_y, path_cmd_move_to);
+
+                for(;;)
+                {
+                    cmd = m_source->vertex(x, y);
+                    if(is_vertex(cmd))
+                    {
+                        m_last_cmd = cmd;
+                        if(is_move_to(cmd))
+                        {
+                            m_start_x = *x;
+                            m_start_y = *y;
+                            break;
+                        }
+                        m_generator.add_vertex(*x, *y, cmd);
+                        m_markers.add_vertex(*x, *y, path_cmd_line_to);
+                    }
+                    else
+                    {
+                        if(is_stop(cmd))
+                        {
+                            m_last_cmd = path_cmd_stop;
+                            break;
+                        }
+                        if(is_end_poly(cmd))
+                        {
+                            m_generator.add_vertex(*x, *y, cmd);
+                            break;
+                        }
+                    }
+                }
+                m_generator.rewind(0);
+                m_status = generate;
+
+            case generate:
+                cmd = m_generator.vertex(x, y);
+                if(is_stop(cmd))
+                {
+                    m_status = accumulate;
+                    break;
+                }
+                done = true;
+                break;
+            }
+        }
+        return cmd;
+    }
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_adaptor_vpgen.h b/agg/inc/agg_conv_adaptor_vpgen.h
new file mode 100755
index 000000000000..f6afdb4d7f12
--- /dev/null
+++ b/agg/inc/agg_conv_adaptor_vpgen.h
@@ -0,0 +1,166 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_ADAPTOR_VPGEN_INCLUDED
+#define AGG_CONV_ADAPTOR_VPGEN_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //======================================================conv_adaptor_vpgen
+    template<class VertexSource, class VPGen> class conv_adaptor_vpgen
+    {
+    public:
+        conv_adaptor_vpgen(VertexSource& source) : m_source(&source) {}
+
+        void set_source(VertexSource& source) { m_source = &source; }
+
+        VPGen& vpgen() { return m_vpgen; }
+        const VPGen& vpgen() const { return m_vpgen; }
+
+        void rewind(unsigned path_id);
+        unsigned vertex(double* x, double* y);
+
+        typedef conv_adaptor_vpgen<VertexSource, VPGen> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_adaptor_vpgen(const conv_adaptor_vpgen<VertexSource, VPGen>&);
+        const conv_adaptor_vpgen<VertexSource, VPGen>&
+            operator = (const conv_adaptor_vpgen<VertexSource, VPGen>&);
+
+        VertexSource* m_source;
+        VPGen         m_vpgen;
+        double        m_start_x;
+        double        m_start_y;
+        unsigned      m_poly_flags;
+        int           m_vertices;
+    };
+
+
+
+    //------------------------------------------------------------------------
+    template<class VertexSource, class VPGen>
+    void conv_adaptor_vpgen<VertexSource, VPGen>::rewind(unsigned path_id)
+    {
+        m_source->rewind(path_id);
+        m_vpgen.reset();
+        m_start_x    = 0;
+        m_start_y    = 0;
+        m_poly_flags = 0;
+        m_vertices   = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VertexSource, class VPGen>
+    unsigned conv_adaptor_vpgen<VertexSource, VPGen>::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_stop;
+        for(;;)
+        {
+            cmd = m_vpgen.vertex(x, y);
+            if(!is_stop(cmd)) break;
+
+            if(m_poly_flags && !m_vpgen.auto_unclose())
+            {
+                *x = 0.0;
+                *y = 0.0;
+                cmd = m_poly_flags;
+                m_poly_flags = 0;
+                break;
+            }
+
+            if(m_vertices < 0)
+            {
+                if(m_vertices < -1)
+                {
+                    m_vertices = 0;
+                    return path_cmd_stop;
+                }
+                m_vpgen.move_to(m_start_x, m_start_y);
+                m_vertices = 1;
+                continue;
+            }
+
+            double tx, ty;
+            cmd = m_source->vertex(&tx, &ty);
+            if(is_vertex(cmd))
+            {
+                if(is_move_to(cmd))
+                {
+                    if(m_vpgen.auto_close() && m_vertices > 2)
+                    {
+                        m_vpgen.line_to(m_start_x, m_start_y);
+                        m_poly_flags = path_cmd_end_poly | path_flags_close;
+                        m_start_x    = tx;
+                        m_start_y    = ty;
+                        m_vertices   = -1;
+                        continue;
+                    }
+                    m_vpgen.move_to(tx, ty);
+                    m_start_x  = tx;
+                    m_start_y  = ty;
+                    m_vertices = 1;
+                }
+                else
+                {
+                    m_vpgen.line_to(tx, ty);
+                    ++m_vertices;
+                }
+            }
+            else
+            {
+                if(is_end_poly(cmd))
+                {
+                    m_poly_flags = cmd;
+                    if(is_closed(cmd) || m_vpgen.auto_close())
+                    {
+                        if(m_vpgen.auto_close()) m_poly_flags |= path_flags_close;
+                        if(m_vertices > 2)
+                        {
+                            m_vpgen.line_to(m_start_x, m_start_y);
+                        }
+                        m_vertices = 0;
+                    }
+                }
+                else
+                {
+                    // path_cmd_stop
+                    if(m_vpgen.auto_close() && m_vertices > 2)
+                    {
+                        m_vpgen.line_to(m_start_x, m_start_y);
+                        m_poly_flags = path_cmd_end_poly | path_flags_close;
+                        m_vertices   = -2;
+                        continue;
+                    }
+                    break;
+                }
+            }
+        }
+        return cmd;
+    }
+
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_conv_bspline.h b/agg/inc/agg_conv_bspline.h
new file mode 100755
index 000000000000..9c504daff209
--- /dev/null
+++ b/agg/inc/agg_conv_bspline.h
@@ -0,0 +1,48 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_BSPLINE_INCLUDED
+#define AGG_CONV_BSPLINE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vcgen_bspline.h"
+#include "agg_conv_adaptor_vcgen.h"
+
+
+namespace agg
+{
+
+    //---------------------------------------------------------conv_bspline
+    template<class VertexSource>
+    struct conv_bspline : public conv_adaptor_vcgen<VertexSource, vcgen_bspline>
+    {
+        typedef conv_adaptor_vcgen<VertexSource, vcgen_bspline> base_type;
+
+        conv_bspline(VertexSource& vs) :
+            conv_adaptor_vcgen<VertexSource, vcgen_bspline>(vs) {}
+
+        void   interpolation_step(double v) { base_type::generator().interpolation_step(v); }
+        double interpolation_step() const { return base_type::generator().interpolation_step(); }
+
+    private:
+        conv_bspline(const conv_bspline<VertexSource>&);
+        const conv_bspline<VertexSource>&
+            operator = (const conv_bspline<VertexSource>&);
+    };
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_conv_clip_polygon.h b/agg/inc/agg_conv_clip_polygon.h
new file mode 100755
index 000000000000..cbecc51fbdd5
--- /dev/null
+++ b/agg/inc/agg_conv_clip_polygon.h
@@ -0,0 +1,69 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Polygon clipping converter
+// There an optimized Liang-Basky algorithm is used.
+// The algorithm doesn't optimize the degenerate edges, i.e. it will never
+// break a closed polygon into two or more ones, instead, there will be
+// degenerate edges coinciding with the respective clipping boundaries.
+// This is a sub-optimal solution, because that optimization would require
+// extra, rather expensive math while the rasterizer tolerates it quite well,
+// without any considerable overhead.
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_CLIP_POLYGON_INCLUDED
+#define AGG_CONV_CLIP_POLYGON_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_conv_adaptor_vpgen.h"
+#include "agg_vpgen_clip_polygon.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //=======================================================conv_clip_polygon
+    template<class VertexSource>
+    struct conv_clip_polygon : public conv_adaptor_vpgen<VertexSource, vpgen_clip_polygon>
+    {
+        typedef conv_adaptor_vpgen<VertexSource, vpgen_clip_polygon> base_type;
+
+        conv_clip_polygon(VertexSource& vs) :
+            conv_adaptor_vpgen<VertexSource, vpgen_clip_polygon>(vs) {}
+
+        void clip_box(double x1, double y1, double x2, double y2)
+        {
+            base_type::vpgen().clip_box(x1, y1, x2, y2);
+        }
+
+        double x1() const { return base_type::vpgen().x1(); }
+        double y1() const { return base_type::vpgen().y1(); }
+        double x2() const { return base_type::vpgen().x2(); }
+        double y2() const { return base_type::vpgen().y2(); }
+
+        typedef conv_clip_polygon<VertexSource> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_clip_polygon(const conv_clip_polygon<VertexSource>&);
+        const conv_clip_polygon<VertexSource>&
+            operator = (const conv_clip_polygon<VertexSource>&);
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_clip_polyline.h b/agg/inc/agg_conv_clip_polyline.h
new file mode 100755
index 000000000000..4ac66276891c
--- /dev/null
+++ b/agg/inc/agg_conv_clip_polyline.h
@@ -0,0 +1,69 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// polyline clipping converter
+// There an optimized Liang-Basky algorithm is used.
+// The algorithm doesn't optimize the degenerate edges, i.e. it will never
+// break a closed polyline into two or more ones, instead, there will be
+// degenerate edges coinciding with the respective clipping boundaries.
+// This is a sub-optimal solution, because that optimization would require
+// extra, rather expensive math while the rasterizer tolerates it quite well,
+// without any considerable overhead.
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_CLIP_polyline_INCLUDED
+#define AGG_CONV_CLIP_polyline_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_conv_adaptor_vpgen.h"
+#include "agg_vpgen_clip_polyline.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //=======================================================conv_clip_polyline
+    template<class VertexSource>
+    struct conv_clip_polyline : public conv_adaptor_vpgen<VertexSource, vpgen_clip_polyline>
+    {
+        typedef conv_adaptor_vpgen<VertexSource, vpgen_clip_polyline> base_type;
+
+        conv_clip_polyline(VertexSource& vs) :
+            conv_adaptor_vpgen<VertexSource, vpgen_clip_polyline>(vs) {}
+
+        void clip_box(double x1, double y1, double x2, double y2)
+        {
+            base_type::vpgen().clip_box(x1, y1, x2, y2);
+        }
+
+        double x1() const { return base_type::vpgen().x1(); }
+        double y1() const { return base_type::vpgen().y1(); }
+        double x2() const { return base_type::vpgen().x2(); }
+        double y2() const { return base_type::vpgen().y2(); }
+
+        typedef conv_clip_polyline<VertexSource> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_clip_polyline(const conv_clip_polyline<VertexSource>&);
+        const conv_clip_polyline<VertexSource>&
+            operator = (const conv_clip_polyline<VertexSource>&);
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_close_polygon.h b/agg/inc/agg_conv_close_polygon.h
new file mode 100755
index 000000000000..60a756a7408a
--- /dev/null
+++ b/agg/inc/agg_conv_close_polygon.h
@@ -0,0 +1,132 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_CLOSE_POLYGON_INCLUDED
+#define AGG_CONV_CLOSE_POLYGON_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //======================================================conv_close_polygon
+    template<class VertexSource> class conv_close_polygon
+    {
+    public:
+        conv_close_polygon(VertexSource& vs) : m_source(&vs) {}
+
+        void set_source(VertexSource& source) { m_source = &source; }
+
+        void rewind(unsigned path_id);
+        unsigned vertex(double* x, double* y);
+
+        typedef conv_close_polygon<VertexSource> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_close_polygon(const conv_close_polygon<VertexSource>&);
+        const conv_close_polygon<VertexSource>&
+            operator = (const conv_close_polygon<VertexSource>&);
+
+        VertexSource* m_source;
+        unsigned      m_cmd[2];
+        double        m_x[2];
+        double        m_y[2];
+        unsigned      m_vertex;
+        bool          m_line_to;
+    };
+
+
+
+    //------------------------------------------------------------------------
+    template<class VertexSource>
+    void conv_close_polygon<VertexSource>::rewind(unsigned path_id)
+    {
+        m_source->rewind(path_id);
+        m_vertex = 2;
+        m_line_to = false;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    template<class VertexSource>
+    unsigned conv_close_polygon<VertexSource>::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_stop;
+        for(;;)
+        {
+            if(m_vertex < 2)
+            {
+                *x = m_x[m_vertex];
+                *y = m_y[m_vertex];
+                cmd = m_cmd[m_vertex];
+                ++m_vertex;
+                break;
+            }
+
+            cmd = m_source->vertex(x, y);
+
+            if(is_end_poly(cmd))
+            {
+                cmd |= path_flags_close;
+                break;
+            }
+
+            if(is_stop(cmd))
+            {
+                if(m_line_to)
+                {
+                    m_cmd[0]  = path_cmd_end_poly | path_flags_close;
+                    m_cmd[1]  = path_cmd_stop;
+                    m_vertex  = 0;
+                    m_line_to = false;
+                    continue;
+                }
+                break;
+            }
+
+            if(is_move_to(cmd))
+            {
+                if(m_line_to)
+                {
+                    m_x[0]    = 0.0;
+                    m_y[0]    = 0.0;
+                    m_cmd[0]  = path_cmd_end_poly | path_flags_close;
+                    m_x[1]    = *x;
+                    m_y[1]    = *y;
+                    m_cmd[1]  = cmd;
+                    m_vertex  = 0;
+                    m_line_to = false;
+                    continue;
+                }
+                break;
+            }
+
+            if(is_vertex(cmd))
+            {
+                m_line_to = true;
+                break;
+            }
+        }
+        return cmd;
+    }
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_concat.h b/agg/inc/agg_conv_concat.h
new file mode 100755
index 000000000000..2b9886a1be46
--- /dev/null
+++ b/agg/inc/agg_conv_concat.h
@@ -0,0 +1,80 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_CONCAT_INCLUDED
+#define AGG_CONV_CONCAT_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+    //=============================================================conv_concat
+    // Concatenation of two paths. Usually used to combine lines or curves
+    // with markers such as arrowheads
+    template<class VS1, class VS2> class conv_concat
+    {
+    public:
+        conv_concat(VS1& source1, VS2& source2) :
+            m_source1(&source1), m_source2(&source2), m_status(2) {}
+
+        void set_source1(VS1& source) { m_source1 = &source; }
+        void set_source2(VS2& source) { m_source2 = &source; }
+
+
+        void rewind(unsigned id)
+        {
+            m_source1->rewind(id);
+            m_source2->rewind(0);
+            m_status = 0;
+        }
+
+        unsigned vertex(double* x, double* y)
+        {
+            unsigned cmd;
+            if(m_status == 0)
+            {
+                cmd = m_source1->vertex(x, y);
+                if(!is_stop(cmd)) return cmd;
+                m_status = 1;
+            }
+            if(m_status == 1)
+            {
+                cmd = m_source2->vertex(x, y);
+                if(!is_stop(cmd)) return cmd;
+                m_status = 2;
+            }
+            return path_cmd_stop;
+        }
+
+        typedef conv_concat<VS1, VS2> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_concat(const conv_concat<VS1, VS2>&);
+        const conv_concat<VS1, VS2>&
+            operator = (const conv_concat<VS1, VS2>&);
+
+        VS1* m_source1;
+        VS2* m_source2;
+        int  m_status;
+
+    };
+}
+
+
+#endif
diff --git a/agg/inc/agg_conv_contour.h b/agg/inc/agg_conv_contour.h
new file mode 100755
index 000000000000..652a8e1fa4f3
--- /dev/null
+++ b/agg/inc/agg_conv_contour.h
@@ -0,0 +1,65 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// conv_stroke
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_CONTOUR_INCLUDED
+#define AGG_CONV_CONTOUR_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vcgen_contour.h"
+#include "agg_conv_adaptor_vcgen.h"
+
+namespace agg
+{
+
+    //-----------------------------------------------------------conv_contour
+    template<class VertexSource>
+    struct conv_contour : public conv_adaptor_vcgen<VertexSource, vcgen_contour>
+    {
+        typedef conv_adaptor_vcgen<VertexSource, vcgen_contour> base_type;
+
+        conv_contour(VertexSource& vs) :
+            conv_adaptor_vcgen<VertexSource, vcgen_contour>(vs)
+        {
+        }
+
+        void line_join(line_join_e lj) { base_type::generator().line_join(lj); }
+        void inner_line_join(line_join_e lj) { base_type::generator().inner_line_join(lj); }
+        void width(double w) { base_type::generator().width(w); }
+        void miter_limit(double ml) { base_type::generator().miter_limit(ml); }
+        void miter_limit_theta(double t) { base_type::generator().miter_limit_theta(t); }
+        void inner_miter_limit(double ml) { base_type::generator().inner_miter_limit(ml); }
+        void approximation_scale(double as) { base_type::generator().approximation_scale(as); }
+        void auto_detect_orientation(bool v) { base_type::generator().auto_detect_orientation(v); }
+
+        line_join_e line_join() const { return base_type::generator().line_join(); }
+        line_join_e inner_line_join() const { return base_type::generator().inner_line_join(); }
+        double width() const { return base_type::generator().width(); }
+        double miter_limit() const { return base_type::generator().miter_limit(); }
+        double inner_miter_limit() const { return base_type::generator().inner_miter_limit(); }
+        double approximation_scale() const { return base_type::generator().approximation_scale(); }
+        bool auto_detect_orientation() const { return base_type::generator().auto_detect_orientation(); }
+
+    private:
+        conv_contour(const conv_contour<VertexSource>&);
+        const conv_contour<VertexSource>&
+            operator = (const conv_contour<VertexSource>&);
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_curve.h b/agg/inc/agg_conv_curve.h
new file mode 100755
index 000000000000..3b8e6cff2e2e
--- /dev/null
+++ b/agg/inc/agg_conv_curve.h
@@ -0,0 +1,174 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// classes conv_curve
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_CURVE_INCLUDED
+#define AGG_CONV_CURVE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_curves.h"
+
+namespace agg
+{
+
+
+    //---------------------------------------------------------------conv_curve
+    // Curve converter class. Any path storage can have Bezier curves defined
+    // by their control points. There're two types of curves supported: curve3
+    // and curve4. Curve3 is a conic Bezier curve with 2 endpoints and 1 control
+    // point. Curve4 has 2 control points (4 points in total) and can be used
+    // to interpolate more complicated curves. Curve4, unlike curve3 can be used
+    // to approximate arcs, both curcular and elliptical. Curves are approximated
+    // with straight lines and one of the approaches is just to store the whole
+    // sequence of vertices that approximate our curve. It takes additional
+    // memory, and at the same time the consecutive vertices can be calculated
+    // on demand.
+    //
+    // Initially, path storages are not suppose to keep all the vertices of the
+    // curves (although, nothig prevents us from doing so). Instead, path_storage
+    // keeps only vertices, needed to calculate a curve on demand. Those vertices
+    // are marked with special commands. So, if the path_storage contains curves
+    // (which are not real curves yet), and we render this storage directly,
+    // all we will see is only 2 or 3 straight line segments (for curve3 and
+    // curve4 respectively). If we need to see real curves drawn we need to
+    // include this class into the conversion pipeline.
+    //
+    // Class conv_curve recognizes commands path_cmd_curve3 and path_cmd_curve4
+    // and converts these vertices into a move_to/line_to sequence.
+    //-----------------------------------------------------------------------
+    template<class VertexSource> class conv_curve
+    {
+    public:
+        conv_curve(VertexSource& source) :
+          m_source(&source), m_last_x(0.0), m_last_y(0.0) {}
+
+        void set_source(VertexSource& source) { m_source = &source; }
+
+        void approximation_scale(double s)
+        {
+            m_curve3.approximation_scale(s);
+            m_curve4.approximation_scale(s);
+        }
+
+        double approximation_scale() const
+        {
+            return m_curve3.approximation_scale();
+        }
+
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        typedef conv_curve<VertexSource> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_curve(const conv_curve<VertexSource>&);
+        const conv_curve<VertexSource>&
+           operator = (const conv_curve<VertexSource>&);
+
+        VertexSource* m_source;
+        double        m_last_x;
+        double        m_last_y;
+        curve3        m_curve3;
+        curve4        m_curve4;
+    };
+
+
+
+    //------------------------------------------------------------------------
+    template<class VertexSource>
+    void conv_curve<VertexSource>::rewind(unsigned id)
+    {
+        m_source->rewind(id);
+        m_last_x = 0.0;
+        m_last_y = 0.0;
+        m_curve3.reset();
+        m_curve4.reset();
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VertexSource>
+    unsigned conv_curve<VertexSource>::vertex(double* x, double* y)
+    {
+        if(!is_stop(m_curve3.vertex(x, y)))
+        {
+            m_last_x = *x;
+            m_last_y = *y;
+            return path_cmd_line_to;
+        }
+
+        if(!is_stop(m_curve4.vertex(x, y)))
+        {
+            m_last_x = *x;
+            m_last_y = *y;
+            return path_cmd_line_to;
+        }
+
+        double ct2_x = 0;
+        double ct2_y = 0;
+        double end_x = 0;
+        double end_y = 0;
+
+        unsigned cmd = m_source->vertex(x, y);
+        switch(cmd)
+        {
+        case path_cmd_move_to:
+        case path_cmd_line_to:
+            m_last_x = *x;
+            m_last_y = *y;
+        default:
+            break;
+
+        case path_cmd_curve3:
+            m_source->vertex(&end_x, &end_y);
+
+            m_curve3.init(m_last_x, m_last_y,
+                          *x,       *y,
+                          end_x,     end_y);
+
+            m_curve3.vertex(x, y);    // First call returns path_cmd_move_to
+            m_curve3.vertex(x, y);    // This is the first vertex of the curve
+            cmd = path_cmd_line_to;
+            break;
+
+        case path_cmd_curve4:
+            m_source->vertex(&ct2_x, &ct2_y);
+            m_source->vertex(&end_x, &end_y);
+
+            m_curve4.init(m_last_x, m_last_y,
+                          *x,       *y,
+                          ct2_x,    ct2_y,
+                          end_x,    end_y);
+
+            m_curve4.vertex(x, y);    // First call returns path_cmd_move_to
+            m_curve4.vertex(x, y);    // This is the first vertex of the curve
+            cmd = path_cmd_line_to;
+            break;
+        }
+        return cmd;
+    }
+
+
+}
+
+
+
+#endif
diff --git a/agg/inc/agg_conv_dash.h b/agg/inc/agg_conv_dash.h
new file mode 100755
index 000000000000..0520276bbb96
--- /dev/null
+++ b/agg/inc/agg_conv_dash.h
@@ -0,0 +1,68 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// conv_dash
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_DASH_INCLUDED
+#define AGG_CONV_DASH_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vcgen_dash.h"
+#include "agg_conv_adaptor_vcgen.h"
+
+namespace agg
+{
+
+    //---------------------------------------------------------------conv_dash
+    template<class VertexSource, class Markers=null_markers>
+    struct conv_dash : public conv_adaptor_vcgen<VertexSource, vcgen_dash, Markers>
+    {
+        typedef Markers marker_type;
+        typedef conv_adaptor_vcgen<VertexSource, vcgen_dash, Markers> base_type;
+
+        conv_dash(VertexSource& vs) :
+            conv_adaptor_vcgen<VertexSource, vcgen_dash, Markers>(vs)
+        {
+        }
+
+        void remove_all_dashes()
+        {
+            base_type::generator().remove_all_dashes();
+        }
+
+        void add_dash(double dash_len, double gap_len)
+        {
+            base_type::generator().add_dash(dash_len, gap_len);
+        }
+
+        void dash_start(double ds)
+        {
+            base_type::generator().dash_start(ds);
+        }
+
+        void shorten(double s) { base_type::generator().shorten(s); }
+        double shorten() const { return base_type::generator().shorten(); }
+
+    private:
+        conv_dash(const conv_dash<VertexSource, Markers>&);
+        const conv_dash<VertexSource, Markers>&
+            operator = (const conv_dash<VertexSource, Markers>&);
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_gpc.h b/agg/inc/agg_conv_gpc.h
new file mode 100755
index 000000000000..1810309d208a
--- /dev/null
+++ b/agg/inc/agg_conv_gpc.h
@@ -0,0 +1,443 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// General Polygon Clipper based on the GPC library by Alan Murta
+// Union, Intersection, XOR, A-B, B-A
+// Contact the author if you intend to use it in commercial applications!
+// http://www.cs.man.ac.uk/aig/staff/alan/software/
+// Alan Murta (email: gpc@cs.man.ac.uk)
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_GPC_INCLUDED
+#define AGG_CONV_GPC_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+#include "agg_array.h"
+#include "agg_vertex_iterator.h"
+
+extern "C"
+{
+#include "gpc.h"
+}
+
+namespace agg
+{
+    enum gpc_op_e
+    {
+        gpc_or,
+        gpc_and,
+        gpc_xor,
+        gpc_a_minus_b,
+        gpc_b_minus_a
+    };
+
+
+    //================================================================conv_gpc
+    template<class VSA, class VSB> class conv_gpc
+    {
+        enum status
+        {
+            status_move_to,
+            status_line_to,
+            status_stop
+        };
+
+        struct contour_header_type
+        {
+            int num_vertices;
+            int hole_flag;
+            gpc_vertex* vertices;
+        };
+
+        typedef pod_deque<gpc_vertex, 8>          vertex_array_type;
+        typedef pod_deque<contour_header_type, 6> contour_header_array_type;
+
+
+    public:
+        typedef VSA source_a_type;
+        typedef VSB source_b_type;
+        typedef conv_gpc<source_a_type, source_b_type> self_type;
+
+        ~conv_gpc()
+        {
+            free_gpc_data();
+        }
+
+        conv_gpc(source_a_type& a, source_b_type& b, gpc_op_e op = gpc_or) :
+            m_src_a(&a),
+            m_src_b(&b),
+            m_status(status_move_to),
+            m_vertex(-1),
+            m_contour(-1),
+            m_operation(op)
+        {
+            memset(&m_poly_a, 0, sizeof(m_poly_a));
+            memset(&m_poly_b, 0, sizeof(m_poly_b));
+            memset(&m_result, 0, sizeof(m_result));
+        }
+
+        void set_source1(VSA& source) { m_src_a = &source; }
+        void set_source2(VSB& source) { m_src_b = &source; }
+
+        void operation(gpc_op_e v) { m_operation = v; }
+
+        // Vertex Source Interface
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        // Iterator
+        typedef vertex_iterator<self_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_gpc(const conv_gpc<VSA, VSB>&);
+        const conv_gpc<VSA, VSB>& operator = (const conv_gpc<VSA, VSB>&);
+
+        //--------------------------------------------------------------------
+        void free_polygon(gpc_polygon& p);
+        void free_result();
+        void free_gpc_data();
+        void start_contour();
+        void add_vertex(double x, double y);
+        void end_contour(unsigned orientation);
+        void make_polygon(gpc_polygon& p);
+        void start_extracting();
+        bool next_contour();
+        bool next_vertex(double* x, double* y);
+
+
+        //--------------------------------------------------------------------
+        template<class VS> void add(VS& src, gpc_polygon& p)
+        {
+            unsigned cmd;
+            double x, y;
+            double start_x = 0.0;
+            double start_y = 0.0;
+            bool line_to = false;
+            unsigned orientation = 0;
+
+            m_contour_accumulator.remove_all();
+
+            while(!is_stop(cmd = src.vertex(&x, &y)))
+            {
+                if(is_vertex(cmd))
+                {
+                    if(is_move_to(cmd))
+                    {
+                        if(line_to)
+                        {
+                            end_contour(orientation);
+                            orientation = 0;
+                        }
+                        start_contour();
+                        start_x = x;
+                        start_y = y;
+                    }
+                    add_vertex(x, y);
+                    line_to = true;
+                }
+                else
+                {
+                    if(is_end_poly(cmd))
+                    {
+                        orientation = get_orientation(cmd);
+                        if(line_to && is_closed(cmd))
+                        {
+                            add_vertex(start_x, start_y);
+                        }
+                    }
+                }
+            }
+            if(line_to)
+            {
+                end_contour(orientation);
+            }
+            make_polygon(p);
+        }
+
+
+    private:
+        //--------------------------------------------------------------------
+        source_a_type*             m_src_a;
+        source_b_type*             m_src_b;
+        status                     m_status;
+        int                        m_vertex;
+        int                        m_contour;
+        gpc_op_e                   m_operation;
+        vertex_array_type          m_vertex_accumulator;
+        contour_header_array_type  m_contour_accumulator;
+        gpc_polygon                m_poly_a;
+        gpc_polygon                m_poly_b;
+        gpc_polygon                m_result;
+    };
+
+
+
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::free_polygon(gpc_polygon& p)
+    {
+        int i;
+        for(i = 0; i < p.num_contours; i++)
+        {
+            delete [] p.contour[i].vertex;
+        }
+        delete [] p.hole;
+        delete [] p.contour;
+        memset(&p, 0, sizeof(gpc_polygon));
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::free_result()
+    {
+        if(m_result.contour)
+        {
+            gpc_free_polygon(&m_result);
+        }
+        memset(&m_result, 0, sizeof(m_result));
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::free_gpc_data()
+    {
+        free_polygon(m_poly_a);
+        free_polygon(m_poly_b);
+        free_result();
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::start_contour()
+    {
+        contour_header_type h;
+        memset(&h, 0, sizeof(h));
+        m_contour_accumulator.add(h);
+        m_vertex_accumulator.remove_all();
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    inline void conv_gpc<VSA, VSB>::add_vertex(double x, double y)
+    {
+        gpc_vertex v;
+        v.x = x;
+        v.y = y;
+        m_vertex_accumulator.add(v);
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::end_contour(unsigned orientation)
+    {
+        if(m_contour_accumulator.size())
+        {
+            if(m_vertex_accumulator.size() > 2)
+            {
+                contour_header_type& h =
+                    m_contour_accumulator[m_contour_accumulator.size() - 1];
+
+                h.num_vertices = m_vertex_accumulator.size();
+                h.hole_flag = 0;
+
+                // TO DO: Clarify the "holes"
+                //if(is_cw(orientation)) h.hole_flag = 1;
+
+                h.vertices = new gpc_vertex [h.num_vertices];
+                gpc_vertex* d = h.vertices;
+                int i;
+                for(i = 0; i < h.num_vertices; i++)
+                {
+                    const gpc_vertex& s = m_vertex_accumulator[i];
+                    d->x = s.x;
+                    d->y = s.y;
+                    ++d;
+                }
+            }
+            else
+            {
+                m_vertex_accumulator.remove_last();
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::make_polygon(gpc_polygon& p)
+    {
+        free_polygon(p);
+        if(m_contour_accumulator.size())
+        {
+            p.num_contours = m_contour_accumulator.size();
+
+            // TO DO: Clarify the "holes"
+            //p.hole = new int[p.num_contours];
+            p.hole = 0;
+
+            p.contour = new gpc_vertex_list[p.num_contours];
+
+            int i;
+            //int* ph = p.hole;
+            gpc_vertex_list* pv = p.contour;
+            for(i = 0; i < p.num_contours; i++)
+            {
+                const contour_header_type& h = m_contour_accumulator[i];
+                // *ph++ = h.hole_flag;
+                pv->num_vertices = h.num_vertices;
+                pv->vertex = h.vertices;
+                ++pv;
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::start_extracting()
+    {
+        m_status = status_move_to;
+        m_contour = -1;
+        m_vertex = -1;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    bool conv_gpc<VSA, VSB>::next_contour()
+    {
+        if(++m_contour < m_result.num_contours)
+        {
+            m_vertex = -1;
+            return true;
+        }
+        return false;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    inline bool conv_gpc<VSA, VSB>::next_vertex(double* x, double* y)
+    {
+        const gpc_vertex_list& vlist = m_result.contour[m_contour];
+        if(++m_vertex < vlist.num_vertices)
+        {
+            const gpc_vertex& v = vlist.vertex[m_vertex];
+            *x = v.x;
+            *y = v.y;
+            return true;
+        }
+        return false;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    void conv_gpc<VSA, VSB>::rewind(unsigned id)
+    {
+        free_result();
+        m_src_a->rewind(id);
+        m_src_b->rewind(id);
+        add(*m_src_a, m_poly_a);
+        add(*m_src_b, m_poly_b);
+        switch(m_operation)
+        {
+           case gpc_or:
+                gpc_polygon_clip(GPC_UNION,
+                                 &m_poly_a,
+                                 &m_poly_b,
+                                 &m_result);
+               break;
+
+           case gpc_and:
+                gpc_polygon_clip(GPC_INT,
+                                 &m_poly_a,
+                                 &m_poly_b,
+                                 &m_result);
+               break;
+
+           case gpc_xor:
+                gpc_polygon_clip(GPC_XOR,
+                                 &m_poly_a,
+                                 &m_poly_b,
+                                 &m_result);
+               break;
+
+           case gpc_a_minus_b:
+                gpc_polygon_clip(GPC_DIFF,
+                                 &m_poly_a,
+                                 &m_poly_b,
+                                 &m_result);
+               break;
+
+           case gpc_b_minus_a:
+                gpc_polygon_clip(GPC_DIFF,
+                                 &m_poly_b,
+                                 &m_poly_a,
+                                 &m_result);
+               break;
+        }
+        start_extracting();
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class VSA, class VSB>
+    unsigned conv_gpc<VSA, VSB>::vertex(double* x, double* y)
+    {
+        if(m_status == status_move_to)
+        {
+            if(next_contour())
+            {
+                if(next_vertex(x, y))
+                {
+                    m_status = status_line_to;
+                    return path_cmd_move_to;
+                }
+                m_status = status_stop;
+                return path_cmd_end_poly | path_flags_close;
+            }
+        }
+        else
+        {
+            if(next_vertex(x, y))
+            {
+                return path_cmd_line_to;
+            }
+            else
+            {
+                m_status = status_move_to;
+            }
+            return path_cmd_end_poly | path_flags_close;
+        }
+        return path_cmd_stop;
+    }
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_conv_marker.h b/agg/inc/agg_conv_marker.h
new file mode 100755
index 000000000000..1ae7fc92307b
--- /dev/null
+++ b/agg/inc/agg_conv_marker.h
@@ -0,0 +1,154 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// conv_marker
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_MARKER_INCLUDED
+#define AGG_CONV_MARKER_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_trans_affine.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+    //-------------------------------------------------------------conv_marker
+    template<class MarkerLocator, class MarkerShapes>
+    class conv_marker
+    {
+    public:
+        conv_marker(MarkerLocator& ml, MarkerShapes& ms);
+
+        trans_affine& transform() { return m_transform; }
+        const trans_affine& transform() const { return m_transform; }
+
+        void rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        typedef conv_marker<MarkerLocator, MarkerShapes> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_marker(const conv_marker<MarkerLocator, MarkerShapes>&);
+        const conv_marker<MarkerLocator, MarkerShapes>&
+            operator = (const conv_marker<MarkerLocator, MarkerShapes>&);
+
+        enum status_e
+        {
+            initial,
+            markers,
+            polygon,
+            stop
+        };
+
+        MarkerLocator* m_marker_locator;
+        MarkerShapes*  m_marker_shapes;
+        trans_affine   m_transform;
+        trans_affine   m_mtx;
+        status_e       m_status;
+        unsigned       m_marker;
+        unsigned       m_num_markers;
+    };
+
+
+    //------------------------------------------------------------------------
+    template<class MarkerLocator, class MarkerShapes>
+    conv_marker<MarkerLocator, MarkerShapes>::conv_marker(MarkerLocator& ml, MarkerShapes& ms) :
+        m_marker_locator(&ml),
+        m_marker_shapes(&ms),
+        m_status(initial),
+        m_marker(0),
+        m_num_markers(1)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class MarkerLocator, class MarkerShapes>
+    void conv_marker<MarkerLocator, MarkerShapes>::rewind(unsigned)
+    {
+        m_status = initial;
+        m_marker = 0;
+        m_num_markers = 1;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class MarkerLocator, class MarkerShapes>
+    unsigned conv_marker<MarkerLocator, MarkerShapes>::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_move_to;
+        double x1, y1, x2, y2;
+
+        while(!is_stop(cmd))
+        {
+            switch(m_status)
+            {
+            case initial:
+                if(m_num_markers == 0)
+                {
+                   cmd = path_cmd_stop;
+                   break;
+                }
+                m_marker_locator->rewind(m_marker);
+                ++m_marker;
+                m_num_markers = 0;
+                m_status = markers;
+
+            case markers:
+                if(is_stop(m_marker_locator->vertex(&x1, &y1)))
+                {
+                    m_status = initial;
+                    break;
+                }
+                if(is_stop(m_marker_locator->vertex(&x2, &y2)))
+                {
+                    m_status = initial;
+                    break;
+                }
+                ++m_num_markers;
+                m_mtx = m_transform;
+                m_mtx *= trans_affine_rotation(atan2(y2 - y1, x2 - x1));
+                m_mtx *= trans_affine_translation(x1, y1);
+                m_marker_shapes->rewind(m_marker - 1);
+                m_status = polygon;
+
+            case polygon:
+                cmd = m_marker_shapes->vertex(x, y);
+                if(is_stop(cmd))
+                {
+                    cmd = path_cmd_move_to;
+                    m_status = markers;
+                    break;
+                }
+                m_mtx.transform(x, y);
+                return cmd;
+
+            case stop:
+                cmd = path_cmd_stop;
+                break;
+            }
+        }
+        return cmd;
+    }
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_conv_marker_adaptor.h b/agg/inc/agg_conv_marker_adaptor.h
new file mode 100755
index 000000000000..282d26eb5afc
--- /dev/null
+++ b/agg/inc/agg_conv_marker_adaptor.h
@@ -0,0 +1,51 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_MARKER_ADAPTOR_INCLUDED
+#define AGG_CONV_MARKER_ADAPTOR_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_conv_adaptor_vcgen.h"
+#include "agg_vcgen_vertex_sequence.h"
+
+namespace agg
+{
+
+    //=====================================================conv_marker_adaptor
+    template<class VertexSource, class Markers=null_markers>
+    struct conv_marker_adaptor :
+    public conv_adaptor_vcgen<VertexSource, vcgen_vertex_sequence, Markers>
+    {
+        typedef Markers marker_type;
+        typedef conv_adaptor_vcgen<VertexSource, vcgen_vertex_sequence, Markers> base_type;
+
+        conv_marker_adaptor(VertexSource& vs) :
+            conv_adaptor_vcgen<VertexSource, vcgen_vertex_sequence, Markers>(vs)
+        {
+        }
+
+        void shorten(double s) { base_type::generator().shorten(s); }
+        double shorten() const { return base_type::generator().shorten(); }
+
+    private:
+        conv_marker_adaptor(const conv_marker_adaptor<VertexSource, Markers>&);
+        const conv_marker_adaptor<VertexSource, Markers>&
+            operator = (const conv_marker_adaptor<VertexSource, Markers>&);
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_segmentator.h b/agg/inc/agg_conv_segmentator.h
new file mode 100755
index 000000000000..df81fea9b276
--- /dev/null
+++ b/agg/inc/agg_conv_segmentator.h
@@ -0,0 +1,48 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_SEGMENTATOR_INCLUDED
+#define AGG_CONV_SEGMENTATOR_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_conv_adaptor_vpgen.h"
+#include "agg_vpgen_segmentator.h"
+
+namespace agg
+{
+
+    //========================================================conv_segmentator
+    template<class VertexSource>
+    struct conv_segmentator : public conv_adaptor_vpgen<VertexSource, vpgen_segmentator>
+    {
+        typedef conv_adaptor_vpgen<VertexSource, vpgen_segmentator> base_type;
+
+        conv_segmentator(VertexSource& vs) :
+            conv_adaptor_vpgen<VertexSource, vpgen_segmentator>(vs) {}
+
+        void approximation_scale(double s) { base_type::vpgen().approximation_scale(s);        }
+        double approximation_scale() const { return base_type::vpgen().approximation_scale();  }
+
+    private:
+        conv_segmentator(const conv_segmentator<VertexSource>&);
+        const conv_segmentator<VertexSource>&
+            operator = (const conv_segmentator<VertexSource>&);
+    };
+
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_conv_shorten_path.h b/agg/inc/agg_conv_shorten_path.h
new file mode 100755
index 000000000000..07bc9357d6ca
--- /dev/null
+++ b/agg/inc/agg_conv_shorten_path.h
@@ -0,0 +1,50 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_SHORTEN_PATH_INCLUDED
+#define AGG_CONV_SHORTEN_PATH_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_conv_adaptor_vcgen.h"
+#include "agg_vcgen_vertex_sequence.h"
+
+namespace agg
+{
+
+    //=======================================================conv_shorten_path
+    template<class VertexSource>  class conv_shorten_path :
+    public conv_adaptor_vcgen<VertexSource, vcgen_vertex_sequence>
+    {
+    public:
+        typedef conv_adaptor_vcgen<VertexSource, vcgen_vertex_sequence> base_type;
+
+        conv_shorten_path(VertexSource& vs) :
+            conv_adaptor_vcgen<VertexSource, vcgen_vertex_sequence>(vs)
+        {
+        }
+
+        void shorten(double s) { base_type::generator().shorten(s); }
+        double shorten() const { return base_type::generator().shorten(); }
+
+    private:
+        conv_shorten_path(const conv_shorten_path<VertexSource>&);
+        const conv_shorten_path<VertexSource>&
+            operator = (const conv_shorten_path<VertexSource>&);
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_smooth_poly1.h b/agg/inc/agg_conv_smooth_poly1.h
new file mode 100755
index 000000000000..f50a48747f9a
--- /dev/null
+++ b/agg/inc/agg_conv_smooth_poly1.h
@@ -0,0 +1,80 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Smooth polygon generator
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_SMOOTH_POLY1_INCLUDED
+#define AGG_CONV_SMOOTH_POLY1_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vcgen_smooth_poly1.h"
+#include "agg_conv_adaptor_vcgen.h"
+#include "agg_conv_curve.h"
+
+
+namespace agg
+{
+
+    //-------------------------------------------------------conv_smooth_poly1
+    template<class VertexSource>
+    struct conv_smooth_poly1 :
+    public conv_adaptor_vcgen<VertexSource, vcgen_smooth_poly1>
+    {
+        typedef conv_adaptor_vcgen<VertexSource, vcgen_smooth_poly1> base_type;
+
+        conv_smooth_poly1(VertexSource& vs) :
+            conv_adaptor_vcgen<VertexSource, vcgen_smooth_poly1>(vs)
+        {
+        }
+
+        void   smooth_value(double v) { base_type::generator().smooth_value(v); }
+        double smooth_value() const { return base_type::generator().smooth_value(); }
+
+    private:
+        conv_smooth_poly1(const conv_smooth_poly1<VertexSource>&);
+        const conv_smooth_poly1<VertexSource>&
+            operator = (const conv_smooth_poly1<VertexSource>&);
+    };
+
+
+
+    //-------------------------------------------------conv_smooth_poly1_curve
+    template<class VertexSource>
+    struct conv_smooth_poly1_curve :
+    public conv_curve<conv_smooth_poly1<VertexSource> >
+    {
+        conv_smooth_poly1_curve(VertexSource& vs) :
+            conv_curve<conv_smooth_poly1<VertexSource> >(m_smooth),
+            m_smooth(vs)
+        {
+        }
+
+        void   smooth_value(double v) { m_smooth.generator().smooth_value(v); }
+        double smooth_value() const { return m_smooth.generator().smooth_value(); }
+
+    private:
+        conv_smooth_poly1_curve(const conv_smooth_poly1_curve<VertexSource>&);
+        const conv_smooth_poly1_curve<VertexSource>&
+            operator = (const conv_smooth_poly1_curve<VertexSource>&);
+
+        conv_smooth_poly1<VertexSource> m_smooth;
+    };
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_conv_stroke.h b/agg/inc/agg_conv_stroke.h
new file mode 100755
index 000000000000..cbdce446b7be
--- /dev/null
+++ b/agg/inc/agg_conv_stroke.h
@@ -0,0 +1,73 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// conv_stroke
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_STROKE_INCLUDED
+#define AGG_CONV_STROKE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vcgen_stroke.h"
+#include "agg_conv_adaptor_vcgen.h"
+
+namespace agg
+{
+
+    //-------------------------------------------------------------conv_stroke
+    template<class VertexSource, class Markers=null_markers>
+    struct conv_stroke :
+    public conv_adaptor_vcgen<VertexSource, vcgen_stroke, Markers>
+    {
+        typedef Markers marker_type;
+        typedef conv_adaptor_vcgen<VertexSource, vcgen_stroke, Markers> base_type;
+
+        conv_stroke(VertexSource& vs) :
+            conv_adaptor_vcgen<VertexSource, vcgen_stroke, Markers>(vs)
+        {
+        }
+
+        void line_cap(line_cap_e lc)         { base_type::generator().line_cap(lc);  }
+        void line_join(line_join_e lj)       { base_type::generator().line_join(lj); }
+        void inner_line_join(line_join_e lj) { base_type::generator().inner_line_join(lj); }
+
+        line_cap_e  line_cap()        const { return base_type::generator().line_cap();  }
+        line_join_e line_join()       const { return base_type::generator().line_join(); }
+        line_join_e inner_line_join() const { return base_type::generator().inner_line_join(); }
+
+        void width(double w) { base_type::generator().width(w); }
+        void miter_limit(double ml) { base_type::generator().miter_limit(ml); }
+        void miter_limit_theta(double t) { base_type::generator().miter_limit_theta(t); }
+        void inner_miter_limit(double ml) { base_type::generator().inner_miter_limit(ml); }
+        void approximation_scale(double as) { base_type::generator().approximation_scale(as); }
+
+        double width() const { return base_type::generator().width(); }
+        double miter_limit() const { return base_type::generator().miter_limit(); }
+        double inner_miter_limit() const { return base_type::generator().inner_miter_limit(); }
+        double approximation_scale() const { return base_type::generator().approximation_scale(); }
+
+        void shorten(double s) { base_type::generator().shorten(s); }
+        double shorten() const { return base_type::generator().shorten(); }
+
+    private:
+       conv_stroke(const conv_stroke<VertexSource, Markers>&);
+       const conv_stroke<VertexSource, Markers>&
+           operator = (const conv_stroke<VertexSource, Markers>&);
+
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_transform.h b/agg/inc/agg_conv_transform.h
new file mode 100755
index 000000000000..fb2dddcef617
--- /dev/null
+++ b/agg/inc/agg_conv_transform.h
@@ -0,0 +1,75 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class conv_transform
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_CONV_TRANSFORM_INCLUDED
+#define AGG_CONV_TRANSFORM_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_trans_affine.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //----------------------------------------------------------conv_transform
+    template<class VertexSource, class Transformer=trans_affine> class conv_transform
+    {
+    public:
+        conv_transform(VertexSource& source, const Transformer& tr) :
+            m_source(&source), m_trans(&tr) {}
+
+        void set_source(VertexSource& source) { m_source = &source; }
+
+        void rewind(unsigned id)
+        {
+            m_source->rewind(id);
+        }
+
+        unsigned vertex(double* x, double* y)
+        {
+            unsigned cmd = m_source->vertex(x, y);
+            if(is_vertex(cmd))
+            {
+                m_trans->transform(x, y);
+            }
+            return cmd;
+        }
+
+        void transformer(const Transformer& tr)
+        {
+            m_trans = &tr;
+        }
+
+        typedef conv_transform<VertexSource, Transformer> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_transform(const conv_transform<VertexSource>&);
+        const conv_transform<VertexSource>&
+            operator = (const conv_transform<VertexSource>&);
+
+        VertexSource*      m_source;
+        const Transformer* m_trans;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_conv_unclose_polygon.h b/agg/inc/agg_conv_unclose_polygon.h
new file mode 100755
index 000000000000..a6ba30a1119e
--- /dev/null
+++ b/agg/inc/agg_conv_unclose_polygon.h
@@ -0,0 +1,59 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CONV_UNCLOSE_POLYGON_INCLUDED
+#define AGG_CONV_UNCLOSE_POLYGON_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+    //====================================================conv_unclose_polygon
+    template<class VertexSource> class conv_unclose_polygon
+    {
+    public:
+        conv_unclose_polygon(VertexSource& vs) : m_source(&vs) {}
+
+        void set_source(VertexSource& source) { m_source = &source; }
+
+        void rewind(unsigned path_id)
+        {
+            m_source->rewind(path_id);
+        }
+
+        unsigned vertex(double* x, double* y)
+        {
+            unsigned cmd = m_source->vertex(x, y);
+            if(is_end_poly(cmd)) cmd &= ~path_flags_close;
+            return cmd;
+        }
+
+        typedef conv_unclose_polygon<VertexSource> source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        conv_unclose_polygon(const conv_unclose_polygon<VertexSource>&);
+        const conv_unclose_polygon<VertexSource>&
+            operator = (const conv_unclose_polygon<VertexSource>&);
+
+        VertexSource* m_source;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_curves.h b/agg/inc/agg_curves.h
new file mode 100755
index 000000000000..bfb02e91ab96
--- /dev/null
+++ b/agg/inc/agg_curves.h
@@ -0,0 +1,150 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// classes curve3 and curve4
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_CURVES_INCLUDED
+#define AGG_CURVES_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    // See Implemantation agg_curves.cpp
+
+
+    //------------------------------------------------------------------curve3
+    class curve3
+    {
+    public:
+        curve3() :
+          m_num_steps(0), m_step(0), m_scale(1.0) { }
+
+        curve3(double x1, double y1,
+               double x2, double y2,
+               double x3, double y3) :
+          m_num_steps(0), m_step(0), m_scale(1.0)
+        {
+            init(x1, y1, x2, y2, x3, y3);
+        }
+
+        void reset() { m_num_steps = 0; m_step = -1; }
+        void init(double x1, double y1,
+                  double x2, double y2,
+                  double x3, double y3);
+        void approximation_scale(double s) { m_scale = s; }
+        double approximation_scale() const { return m_scale;  }
+
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        typedef curve3 source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        int      m_num_steps;
+        int      m_step;
+        double   m_scale;
+        double   m_start_x;
+        double   m_start_y;
+        double   m_end_x;
+        double   m_end_y;
+        double   m_fx;
+        double   m_fy;
+        double   m_dfx;
+        double   m_dfy;
+        double   m_ddfx;
+        double   m_ddfy;
+        double   m_saved_fx;
+        double   m_saved_fy;
+        double   m_saved_dfx;
+        double   m_saved_dfy;
+    };
+
+
+
+
+
+
+
+    //-----------------------------------------------------------------curve4
+    class curve4
+    {
+    public:
+        curve4() :
+          m_num_steps(0), m_step(0), m_scale(1.0) { }
+
+        curve4(double x1, double y1,
+               double x2, double y2,
+               double x3, double y3,
+               double x4, double y4) :
+          m_num_steps(0), m_step(0), m_scale(1.0)
+        {
+            init(x1, y1, x2, y2, x3, y3, x4, y4);
+        }
+
+        void reset() { m_num_steps = 0; m_step = -1; }
+        void init(double x1, double y1,
+                  double x2, double y2,
+                  double x3, double y3,
+                  double x4, double y4);
+
+        void approximation_scale(double s) { m_scale = s; }
+        double approximation_scale() const { return m_scale;  }
+
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        typedef curve4 source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        int      m_num_steps;
+        int      m_step;
+        double   m_scale;
+        double   m_start_x;
+        double   m_start_y;
+        double   m_end_x;
+        double   m_end_y;
+        double   m_fx;
+        double   m_fy;
+        double   m_dfx;
+        double   m_dfy;
+        double   m_ddfx;
+        double   m_ddfy;
+        double   m_dddfx;
+        double   m_dddfy;
+        double   m_saved_fx;
+        double   m_saved_fy;
+        double   m_saved_dfx;
+        double   m_saved_dfy;
+        double   m_saved_ddfx;
+        double   m_saved_ddfy;
+    };
+
+
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_dda_line.h b/agg/inc/agg_dda_line.h
new file mode 100755
index 000000000000..6e7335c6dfec
--- /dev/null
+++ b/agg/inc/agg_dda_line.h
@@ -0,0 +1,290 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// classes dda_line_interpolator, dda2_line_interpolator
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_DDA_LINE_INCLUDED
+#define AGG_DDA_LINE_INCLUDED
+
+#include <stdlib.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //===================================================dda_line_interpolator
+    template<int FractionShift, int YShift=0> class dda_line_interpolator
+    {
+    public:
+        //--------------------------------------------------------------------
+        dda_line_interpolator() {}
+
+        //--------------------------------------------------------------------
+        dda_line_interpolator(int y1, int y2, unsigned count) :
+            m_y(y1),
+            m_inc(((y2 - y1) << FractionShift) / int(count)),
+            m_dy(0)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void operator ++ ()
+        {
+            m_dy += m_inc;
+        }
+
+        //--------------------------------------------------------------------
+        void operator -- ()
+        {
+            m_dy -= m_inc;
+        }
+
+        //--------------------------------------------------------------------
+        void operator += (unsigned n)
+        {
+            m_dy += m_inc * n;
+        }
+
+        //--------------------------------------------------------------------
+        void operator -= (unsigned n)
+        {
+            m_dy -= m_inc * n;
+        }
+
+
+        //--------------------------------------------------------------------
+        int y()  const { return m_y + (m_dy >> (FractionShift-YShift)); }
+        int dy() const { return m_dy; }
+
+
+    private:
+        int m_y;
+        int m_inc;
+        int m_dy;
+    };
+
+
+
+
+
+    //=================================================dda2_line_interpolator
+    class dda2_line_interpolator
+    {
+    public:
+        typedef int save_data_type;
+        enum { save_size = 2 };
+
+        //--------------------------------------------------------------------
+        dda2_line_interpolator() {}
+
+        //-------------------------------------------- Forward-adjusted line
+        dda2_line_interpolator(int y1, int y2, int count) :
+            m_cnt(count <= 0 ? 1 : count),
+            m_lft((y2 - y1) / m_cnt),
+            m_rem((y2 - y1) % m_cnt),
+            m_mod(m_rem),
+            m_y(y1)
+        {
+            if(m_mod <= 0)
+            {
+                m_mod += count;
+                m_rem += count;
+                m_lft--;
+            }
+            m_mod -= count;
+        }
+
+        //-------------------------------------------- Backward-adjusted line
+        dda2_line_interpolator(int y1, int y2, int count, int) :
+            m_cnt(count <= 0 ? 1 : count),
+            m_lft((y2 - y1) / m_cnt),
+            m_rem((y2 - y1) % m_cnt),
+            m_mod(m_rem),
+            m_y(y1)
+        {
+            if(m_mod <= 0)
+            {
+                m_mod += count;
+                m_rem += count;
+                m_lft--;
+            }
+        }
+
+        //-------------------------------------------- Backward-adjusted line
+        dda2_line_interpolator(int _y, int count) :
+            m_cnt(count <= 0 ? 1 : count),
+            m_lft(_y / m_cnt),
+            m_rem(_y % m_cnt),
+            m_mod(m_rem),
+            m_y(0)
+        {
+            if(m_mod <= 0)
+            {
+                m_mod += count;
+                m_rem += count;
+                m_lft--;
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void save(save_data_type* data) const
+        {
+            data[0] = m_mod;
+            data[1] = m_y;
+        }
+
+        //--------------------------------------------------------------------
+        void load(const save_data_type* data)
+        {
+            m_mod = data[0];
+            m_y   = data[1];
+        }
+
+        //--------------------------------------------------------------------
+        void operator++()
+        {
+            m_mod += m_rem;
+            m_y += m_lft;
+            if(m_mod > 0)
+            {
+                m_mod -= m_cnt;
+                m_y++;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void operator--()
+        {
+            if(m_mod <= m_rem)
+            {
+                m_mod += m_cnt;
+                m_y--;
+            }
+            m_mod -= m_rem;
+            m_y -= m_lft;
+        }
+
+        //--------------------------------------------------------------------
+        void adjust_forward()
+        {
+            m_mod -= m_cnt;
+        }
+
+        //--------------------------------------------------------------------
+        void adjust_backward()
+        {
+            m_mod += m_cnt;
+        }
+
+        //--------------------------------------------------------------------
+        int mod() const { return m_mod; }
+        int rem() const { return m_rem; }
+        int lft() const { return m_lft; }
+
+        //--------------------------------------------------------------------
+        int y() const { return m_y; }
+
+    private:
+        int m_cnt;
+        int m_lft;
+        int m_rem;
+        int m_mod;
+        int m_y;
+    };
+
+
+
+
+
+
+
+    //---------------------------------------------line_bresenham_interpolator
+    class line_bresenham_interpolator
+    {
+    public:
+        enum
+        {
+            subpixel_shift = 8,
+            subpixel_size  = 1 << subpixel_shift,
+            subpixel_mask  = subpixel_size - 1
+        };
+
+        //--------------------------------------------------------------------
+        static int line_lr(int v) { return v >> subpixel_shift; }
+
+        //--------------------------------------------------------------------
+        line_bresenham_interpolator(int _x1, int _y1, int _x2, int _y2) :
+            m_x1_lr(line_lr(_x1)),
+            m_y1_lr(line_lr(_y1)),
+            m_x2_lr(line_lr(_x2)),
+            m_y2_lr(line_lr(_y2)),
+            m_ver(abs(m_x2_lr - m_x1_lr) < abs(m_y2_lr - m_y1_lr)),
+            m_len(m_ver ? abs(m_y2_lr - m_y1_lr) :
+                          abs(m_x2_lr - m_x1_lr)),
+            m_inc(m_ver ? ((_y2 > _y1) ? 1 : -1) : ((_x2 > _x1) ? 1 : -1)),
+            m_interpolator(m_ver ? _x1 : _y1,
+                           m_ver ? _x2 : _y2,
+                           m_len)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        bool     is_ver() const { return m_ver; }
+        unsigned len()    const { return m_len; }
+        int      inc()    const { return m_inc; }
+
+        //--------------------------------------------------------------------
+        void hstep()
+        {
+            ++m_interpolator;
+            m_x1_lr += m_inc;
+        }
+
+        //--------------------------------------------------------------------
+        void vstep()
+        {
+            ++m_interpolator;
+            m_y1_lr += m_inc;
+        }
+
+        //--------------------------------------------------------------------
+        int x1() const { return m_x1_lr; }
+        int y1() const { return m_y1_lr; }
+        int x2() const { return line_lr(m_interpolator.y()); }
+        int y2() const { return line_lr(m_interpolator.y()); }
+        int x2_hr() const { return m_interpolator.y(); }
+        int y2_hr() const { return m_interpolator.y(); }
+
+    private:
+        int                    m_x1_lr;
+        int                    m_y1_lr;
+        int                    m_x2_lr;
+        int                    m_y2_lr;
+        bool                   m_ver;
+        unsigned               m_len;
+        int                    m_inc;
+        dda2_line_interpolator m_interpolator;
+
+    };
+
+
+}
+
+
+
+#endif
diff --git a/agg/inc/agg_ellipse.h b/agg/inc/agg_ellipse.h
new file mode 100755
index 000000000000..158ecf8b55ed
--- /dev/null
+++ b/agg/inc/agg_ellipse.h
@@ -0,0 +1,98 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class ellipse
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_ELLIPSE_INCLUDED
+#define AGG_ELLIPSE_INCLUDED
+
+#include "agg_basics.h"
+#include <math.h>
+
+namespace agg
+{
+
+    //----------------------------------------------------------------ellipse
+    class ellipse
+    {
+    public:
+        ellipse() : m_x(0.0), m_y(0.0), m_rx(1.0), m_ry(1.0), m_num(4), m_step(0) {}
+        ellipse(double x, double y, double rx, double ry, unsigned num_steps)
+            : m_x(x), m_y(y), m_rx(rx), m_ry(ry), m_num(num_steps), m_step(0) {}
+
+        void init(double x, double y, double rx, double ry, unsigned num_steps);
+        void approximation_scale(double scale);
+        void rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        double m_x;
+        double m_y;
+        double m_rx;
+        double m_ry;
+        unsigned m_num;
+        unsigned m_step;
+    };
+
+
+    //------------------------------------------------------------------------
+    inline void ellipse::init(double x, double y, double rx, double ry, unsigned num_steps)
+    {
+        m_x = x;
+        m_y = y;
+        m_rx = rx;
+        m_ry = ry;
+        m_num = num_steps;
+        m_step = 0;
+    }
+
+    //------------------------------------------------------------------------
+    inline void ellipse::approximation_scale(double scale)
+    {
+       m_num = unsigned((fabs(m_rx) + fabs(m_ry) + 6.0) * scale);
+       if(m_num < 6) m_num = 6;
+    }
+
+    //------------------------------------------------------------------------
+    inline void ellipse::rewind(unsigned)
+    {
+        m_step = 0;
+    }
+
+    //------------------------------------------------------------------------
+    inline unsigned ellipse::vertex(double* x, double* y)
+    {
+        if(m_step == m_num)
+        {
+            ++m_step;
+            return path_cmd_end_poly | path_flags_close | path_flags_ccw;
+        }
+        if(m_step > m_num) return path_cmd_stop;
+        double angle = double(m_step) / double(m_num) * 2.0 * pi;
+        *x = m_x + cos(angle) * m_rx;
+        *y = m_y + sin(angle) * m_ry;
+        m_step++;
+        return ((m_step == 1) ? path_cmd_move_to : path_cmd_line_to);
+    }
+
+}
+
+
+
+#endif
+
+
diff --git a/agg/inc/agg_ellipse_bresenham.h b/agg/inc/agg_ellipse_bresenham.h
new file mode 100755
index 000000000000..41133a473d9e
--- /dev/null
+++ b/agg/inc/agg_ellipse_bresenham.h
@@ -0,0 +1,113 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Simple Bresenham interpolator for ellipsees
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_ELLIPSE_BRESENHAM_INCLUDED
+#define AGG_ELLIPSE_BRESENHAM_INCLUDED
+
+
+#include "agg_basics.h"
+
+
+namespace agg
+{
+
+    //------------------------------------------ellipse_bresenham_interpolator
+    class ellipse_bresenham_interpolator
+    {
+    public:
+        ellipse_bresenham_interpolator(int rx, int ry) :
+            m_rx2(rx * rx),
+            m_ry2(ry * ry),
+            m_two_rx2(m_rx2 << 1),
+            m_two_ry2(m_ry2 << 1),
+            m_dx(0),
+            m_dy(0),
+            m_inc_x(0),
+            m_inc_y(-ry * m_two_rx2),
+            m_cur_f(0)
+        {}
+
+        int dx() const { return m_dx; }
+        int dy() const { return m_dy; }
+
+        void operator++ ()
+        {
+            int  mx, my, mxy, min_m;
+            int  fx, fy, fxy;
+
+            mx = fx = m_cur_f + m_inc_x + m_ry2;
+            if(mx < 0) mx = -mx;
+
+            my = fy = m_cur_f + m_inc_y + m_rx2;
+            if(my < 0) my = -my;
+
+            mxy = fxy = m_cur_f + m_inc_x + m_ry2 + m_inc_y + m_rx2;
+            if(mxy < 0) mxy = -mxy;
+
+            min_m = mx;
+            bool flag = true;
+
+            if(min_m > my)
+            {
+                min_m = my;
+                flag = false;
+            }
+
+            m_dx = m_dy = 0;
+
+            if(min_m > mxy)
+            {
+                m_inc_x += m_two_ry2;
+                m_inc_y += m_two_rx2;
+                m_cur_f = fxy;
+                m_dx = 1;
+                m_dy = 1;
+                return;
+            }
+
+            if(flag)
+            {
+                m_inc_x += m_two_ry2;
+                m_cur_f = fx;
+                m_dx = 1;
+                return;
+            }
+
+            m_inc_y += m_two_rx2;
+            m_cur_f = fy;
+            m_dy = 1;
+        }
+
+    private:
+        int m_rx2;
+        int m_ry2;
+        int m_two_rx2;
+        int m_two_ry2;
+        int m_dx;
+        int m_dy;
+        int m_inc_x;
+        int m_inc_y;
+        int m_cur_f;
+
+    };
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_embedded_raster_fonts.h b/agg/inc/agg_embedded_raster_fonts.h
new file mode 100755
index 000000000000..f30fedfebe39
--- /dev/null
+++ b/agg/inc/agg_embedded_raster_fonts.h
@@ -0,0 +1,59 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_EMBEDDED_RASTER_FONTS_INCLUDED
+#define AGG_EMBEDDED_RASTER_FONTS_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    extern const int8u gse4x6[];
+    extern const int8u gse4x8[];
+    extern const int8u gse5x7[];
+    extern const int8u gse5x9[];
+    extern const int8u gse6x12[];
+    extern const int8u gse6x9[];
+    extern const int8u gse7x11[];
+    extern const int8u gse7x11_bold[];
+    extern const int8u gse7x15[];
+    extern const int8u gse7x15_bold[];
+    extern const int8u gse8x16[];
+    extern const int8u gse8x16_bold[];
+    extern const int8u mcs11_prop[];
+    extern const int8u mcs11_prop_condensed[];
+    extern const int8u mcs12_prop[];
+    extern const int8u mcs13_prop[];
+    extern const int8u mcs5x10_mono[];
+    extern const int8u mcs5x11_mono[];
+    extern const int8u mcs6x10_mono[];
+    extern const int8u mcs6x11_mono[];
+    extern const int8u mcs7x12_mono_high[];
+    extern const int8u mcs7x12_mono_low[];
+    extern const int8u verdana12[];
+    extern const int8u verdana12_bold[];
+    extern const int8u verdana13[];
+    extern const int8u verdana13_bold[];
+    extern const int8u verdana14[];
+    extern const int8u verdana14_bold[];
+    extern const int8u verdana16[];
+    extern const int8u verdana16_bold[];
+    extern const int8u verdana17[];
+    extern const int8u verdana17_bold[];
+    extern const int8u verdana18[];
+    extern const int8u verdana18_bold[];
+}
+
+#endif
diff --git a/agg/inc/agg_font_cache_manager.h b/agg/inc/agg_font_cache_manager.h
new file mode 100755
index 000000000000..55c4d39db75d
--- /dev/null
+++ b/agg/inc/agg_font_cache_manager.h
@@ -0,0 +1,397 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_FONT_CACHE_MANAGER_INCLUDED
+#define AGG_FONT_CACHE_MANAGER_INCLUDED
+
+#include <string.h>
+#include "agg_array.h"
+
+namespace agg
+{
+
+    //---------------------------------------------------------glyph_data_type
+    enum glyph_data_type
+    {
+        glyph_data_invalid = 0,
+        glyph_data_mono    = 1,
+        glyph_data_gray8   = 2,
+        glyph_data_outline = 3
+    };
+
+
+    //-------------------------------------------------------------glyph_cache
+    struct glyph_cache
+    {
+        unsigned        glyph_index;
+        int8u*          data;
+        unsigned        data_size;
+        glyph_data_type data_type;
+        rect            bounds;
+        double          advance_x;
+        double          advance_y;
+    };
+
+
+    //--------------------------------------------------------------font_cache
+    class font_cache
+    {
+    public:
+        enum { block_size = 16384-16 };
+
+        //--------------------------------------------------------------------
+        font_cache(const char* font_signature) :
+            m_allocator(block_size),
+            m_font_signature(0)
+        {
+            m_font_signature = (char*)m_allocator.allocate(strlen(font_signature) + 1);
+            strcpy(m_font_signature, font_signature);
+            memset(m_glyphs, 0, sizeof(m_glyphs));
+        }
+
+        //--------------------------------------------------------------------
+        bool font_is(const char* font_signature) const
+        {
+            return strcmp(font_signature, m_font_signature) == 0;
+        }
+
+        //--------------------------------------------------------------------
+        const glyph_cache* find_glyph(unsigned glyph_code) const
+        {
+            unsigned msb = (glyph_code >> 8) & 0xFF;
+            if(m_glyphs[msb])
+            {
+                return m_glyphs[msb][glyph_code & 0xFF];
+            }
+            return 0;
+        }
+
+        //--------------------------------------------------------------------
+        glyph_cache* cache_glyph(unsigned        glyph_code,
+                                 unsigned        glyph_index,
+                                 unsigned        data_size,
+                                 glyph_data_type data_type,
+                                 const rect&     bounds,
+                                 double          advance_x,
+                                 double          advance_y)
+        {
+            unsigned msb = (glyph_code >> 8) & 0xFF;
+            if(m_glyphs[msb] == 0)
+            {
+                m_glyphs[msb] =
+                    (glyph_cache**)m_allocator.allocate(sizeof(glyph_cache*) * 256,
+                                                        sizeof(glyph_cache*));
+                memset(m_glyphs[msb], 0, sizeof(glyph_cache*) * 256);
+            }
+
+            unsigned lsb = glyph_code & 0xFF;
+            if(m_glyphs[msb][lsb]) return 0; // Already exists, do not overwrite
+
+            glyph_cache* glyph =
+                (glyph_cache*)m_allocator.allocate(sizeof(glyph_cache),
+                                                   sizeof(double));
+
+            glyph->glyph_index = glyph_index;
+            glyph->data        = m_allocator.allocate(data_size);
+            glyph->data_size   = data_size;
+            glyph->data_type   = data_type;
+            glyph->bounds      = bounds;
+            glyph->advance_x   = advance_x;
+            glyph->advance_y   = advance_y;
+            return m_glyphs[msb][lsb] = glyph;
+        }
+
+    private:
+        pod_allocator   m_allocator;
+        glyph_cache**   m_glyphs[256];
+        char*           m_font_signature;
+    };
+
+
+
+
+
+
+
+    //---------------------------------------------------------font_cache_pool
+    class font_cache_pool
+    {
+    public:
+        //--------------------------------------------------------------------
+        ~font_cache_pool()
+        {
+            unsigned i;
+            for(i = 0; i < m_num_fonts; ++i)
+            {
+                delete m_fonts[i];
+            }
+            delete [] m_fonts;
+        }
+
+        //--------------------------------------------------------------------
+        font_cache_pool(unsigned max_fonts=32) :
+            m_fonts(new font_cache* [max_fonts]),
+            m_max_fonts(max_fonts),
+            m_num_fonts(0),
+            m_cur_font(0)
+        {}
+
+
+        //--------------------------------------------------------------------
+        void font(const char* font_signature, bool reset_cache = false)
+        {
+            int idx = find_font(font_signature);
+            if(idx >= 0)
+            {
+                if(reset_cache)
+                {
+                    delete m_fonts[idx];
+                    m_fonts[idx] = new font_cache(font_signature);
+                }
+                m_cur_font = m_fonts[idx];
+            }
+            else
+            {
+                if(m_num_fonts >= m_max_fonts)
+                {
+                    delete m_fonts[0];
+                    memcpy(m_fonts,
+                           m_fonts + 1,
+                           (m_max_fonts - 1) * sizeof(font_cache*));
+                    m_num_fonts = m_max_fonts - 1;
+                }
+                m_fonts[m_num_fonts] = new font_cache(font_signature);
+                m_cur_font = m_fonts[m_num_fonts];
+                ++m_num_fonts;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        const font_cache* font() const
+        {
+            return m_cur_font;
+        }
+
+        //--------------------------------------------------------------------
+        const glyph_cache* find_glyph(unsigned glyph_code) const
+        {
+            if(m_cur_font) return m_cur_font->find_glyph(glyph_code);
+            return 0;
+        }
+
+        //--------------------------------------------------------------------
+        glyph_cache* cache_glyph(unsigned        glyph_code,
+                                 unsigned        glyph_index,
+                                 unsigned        data_size,
+                                 glyph_data_type data_type,
+                                 const rect&     bounds,
+                                 double          advance_x,
+                                 double          advance_y)
+        {
+            if(m_cur_font)
+            {
+                return m_cur_font->cache_glyph(glyph_code,
+                                               glyph_index,
+                                               data_size,
+                                               data_type,
+                                               bounds,
+                                               advance_x,
+                                               advance_y);
+            }
+            return 0;
+        }
+
+
+        //--------------------------------------------------------------------
+        int find_font(const char* font_signature)
+        {
+            unsigned i;
+            for(i = 0; i < m_num_fonts; i++)
+            {
+                if(m_fonts[i]->font_is(font_signature)) return int(i);
+            }
+            return -1;
+        }
+
+    private:
+        font_cache** m_fonts;
+        unsigned     m_max_fonts;
+        unsigned     m_num_fonts;
+        font_cache*  m_cur_font;
+    };
+
+
+
+
+    //------------------------------------------------------------------------
+    enum glyph_rendering
+    {
+        glyph_ren_native_mono,
+        glyph_ren_native_gray8,
+        glyph_ren_outline,
+        glyph_ren_agg_mono,
+        glyph_ren_agg_gray8
+    };
+
+
+
+
+    //------------------------------------------------------font_cache_manager
+    template<class FontEngine> class font_cache_manager
+    {
+    public:
+        typedef FontEngine font_engine_type;
+        typedef font_cache_manager<FontEngine> self_type;
+        typedef typename font_engine_type::path_adaptor_type   path_adaptor_type;
+        typedef typename font_engine_type::gray8_adaptor_type  gray8_adaptor_type;
+        typedef typename gray8_adaptor_type::embedded_scanline gray8_scanline_type;
+        typedef typename font_engine_type::mono_adaptor_type   mono_adaptor_type;
+        typedef typename mono_adaptor_type::embedded_scanline  mono_scanline_type;
+
+        //--------------------------------------------------------------------
+        font_cache_manager(font_engine_type& engine, unsigned max_fonts=32) :
+            m_fonts(max_fonts),
+            m_engine(engine),
+            m_change_stamp(-1),
+            m_prev_glyph(0),
+            m_last_glyph(0)
+        {}
+
+        //--------------------------------------------------------------------
+        const glyph_cache* glyph(unsigned glyph_code)
+        {
+            synchronize();
+            const glyph_cache* gl = m_fonts.find_glyph(glyph_code);
+            if(gl)
+            {
+                m_prev_glyph = m_last_glyph;
+                return m_last_glyph = gl;
+            }
+            else
+            {
+                if(m_engine.prepare_glyph(glyph_code))
+                {
+                    m_prev_glyph = m_last_glyph;
+                    m_last_glyph = m_fonts.cache_glyph(glyph_code,
+                                                       m_engine.glyph_index(),
+                                                       m_engine.data_size(),
+                                                       m_engine.data_type(),
+                                                       m_engine.bounds(),
+                                                       m_engine.advance_x(),
+                                                       m_engine.advance_y());
+                    m_engine.write_glyph_to(m_last_glyph->data);
+                    return m_last_glyph;
+                }
+            }
+            return 0;
+        }
+
+        //--------------------------------------------------------------------
+        void init_embedded_adaptors(const glyph_cache* gl,
+                                    double x, double y,
+                                    double scale=1.0)
+        {
+            if(gl)
+            {
+                switch(gl->data_type)
+                {
+                default: return;
+                case glyph_data_mono:
+                    m_mono_adaptor.init(gl->data, gl->data_size, x, y);
+                    break;
+
+                case glyph_data_gray8:
+                    m_gray8_adaptor.init(gl->data, gl->data_size, x, y);
+                    break;
+
+                case glyph_data_outline:
+                    m_path_adaptor.init(gl->data, gl->data_size, x, y, scale);
+                    break;
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        path_adaptor_type&   path_adaptor()   { return m_path_adaptor;   }
+        gray8_adaptor_type&  gray8_adaptor()  { return m_gray8_adaptor;  }
+        gray8_scanline_type& gray8_scanline() { return m_gray8_scanline; }
+        mono_adaptor_type&   mono_adaptor()   { return m_mono_adaptor;   }
+        mono_scanline_type&  mono_scanline()  { return m_mono_scanline;  }
+
+        //--------------------------------------------------------------------
+        const glyph_cache* perv_glyph() const { return m_prev_glyph; }
+        const glyph_cache* last_glyph() const { return m_last_glyph; }
+
+        //--------------------------------------------------------------------
+        bool add_kerning(double* x, double* y)
+        {
+            if(m_prev_glyph && m_last_glyph)
+            {
+                return m_engine.add_kerning(m_prev_glyph->glyph_index,
+                                            m_last_glyph->glyph_index,
+                                            x, y);
+            }
+            return false;
+        }
+
+        //--------------------------------------------------------------------
+        void precache(unsigned from, unsigned to)
+        {
+            for(; from <= to; ++from) glyph(from);
+        }
+
+        //--------------------------------------------------------------------
+        void reset_cache()
+        {
+            m_fonts.font(m_engine.font_signature(), true);
+            m_change_stamp = m_engine.change_stamp();
+            m_prev_glyph = m_last_glyph = 0;
+        }
+
+    private:
+        //--------------------------------------------------------------------
+        font_cache_manager(const self_type&);
+        const self_type& operator = (const self_type&);
+
+        //--------------------------------------------------------------------
+        void synchronize()
+        {
+            if(m_change_stamp != m_engine.change_stamp())
+            {
+                m_fonts.font(m_engine.font_signature());
+                m_change_stamp = m_engine.change_stamp();
+                m_prev_glyph = m_last_glyph = 0;
+            }
+        }
+
+        font_cache_pool     m_fonts;
+        font_engine_type&   m_engine;
+        int                 m_change_stamp;
+        double              m_dx;
+        double              m_dy;
+        const glyph_cache*  m_prev_glyph;
+        const glyph_cache*  m_last_glyph;
+        path_adaptor_type   m_path_adaptor;
+        gray8_adaptor_type  m_gray8_adaptor;
+        gray8_scanline_type m_gray8_scanline;
+        mono_adaptor_type   m_mono_adaptor;
+        mono_scanline_type  m_mono_scanline;
+    };
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_gamma_functions.h b/agg/inc/agg_gamma_functions.h
new file mode 100755
index 000000000000..09a8305faedb
--- /dev/null
+++ b/agg/inc/agg_gamma_functions.h
@@ -0,0 +1,123 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_GAMMA_FUNCTIONS_INCLUDED
+#define AGG_GAMMA_FUNCTIONS_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+    //===============================================================gamma_none
+    struct gamma_none
+    {
+        double operator()(double x) const { return x; }
+    };
+
+
+    //==============================================================gamma_power
+    class gamma_power
+    {
+    public:
+        gamma_power() : m_gamma(1.0) {}
+        gamma_power(double g) : m_gamma(g) {}
+
+        void gamma(double g) { m_gamma = g; }
+        double gamma() const { return m_gamma; }
+
+        double operator() (double x) const
+        {
+            return pow(x, m_gamma);
+        }
+
+    private:
+        double m_gamma;
+    };
+
+
+    //==========================================================gamma_threshold
+    class gamma_threshold
+    {
+    public:
+        gamma_threshold() : m_threshold(0.5) {}
+        gamma_threshold(double t) : m_threshold(t) {}
+
+        void threshold(double t) { m_threshold = t; }
+        double threshold() const { return m_threshold; }
+
+        double operator() (double x) const
+        {
+            return (x < m_threshold) ? 0.0 : 1.0;
+        }
+
+    private:
+        double m_threshold;
+    };
+
+
+    //============================================================gamma_linear
+    class gamma_linear
+    {
+    public:
+        gamma_linear() : m_start(0.0), m_end(1.0) {}
+        gamma_linear(double s, double e) : m_start(s), m_end(e) {}
+
+        void set(double s, double e) { m_start = s; m_end = e; }
+        void start(double s) { m_start = s; }
+        void end(double e) { m_end = e; }
+        double start() const { return m_start; }
+        double end() const { return m_end; }
+
+        double operator() (double x) const
+        {
+            if(x < m_start) return 0.0;
+            if(x > m_end) return 1.0;
+            return (x - m_start) / (m_end - m_start);
+        }
+
+    private:
+        double m_start;
+        double m_end;
+    };
+
+
+    //==========================================================gamma_multiply
+    class gamma_multiply
+    {
+    public:
+        gamma_multiply() : m_mul(1.0) {}
+        gamma_multiply(double v) : m_mul(v) {}
+
+        void value(double v) { m_mul = v; }
+        double value() const { return m_mul; }
+
+        double operator() (double x) const
+        {
+            double y = x * m_mul;
+            if(y > 1.0) y = 1.0;
+            return y;
+        }
+
+    private:
+        double m_mul;
+    };
+
+}
+
+#endif
+
+
+
diff --git a/agg/inc/agg_gamma_lut.h b/agg/inc/agg_gamma_lut.h
new file mode 100755
index 000000000000..30e3b3c89d04
--- /dev/null
+++ b/agg/inc/agg_gamma_lut.h
@@ -0,0 +1,114 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_GAMMA_LUT_INCLUDED
+#define AGG_GAMMA_LUT_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+    template<class LoResT=int8u,
+             class HiResT=int8u,
+             unsigned GammaShift=8,
+             unsigned HiResShift=8> class gamma_lut
+    {
+    public:
+        enum
+        {
+            gamma_shift = GammaShift,
+            gamma_size  = 1 << gamma_shift,
+            gamma_mask  = gamma_size - 1
+        };
+
+        enum
+        {
+            hi_res_shift = HiResShift,
+            hi_res_size  = 1 << hi_res_shift,
+            hi_res_mask  = hi_res_size - 1
+        };
+
+        ~gamma_lut()
+        {
+            delete [] m_inv_gamma;
+            delete [] m_dir_gamma;
+        }
+
+        gamma_lut() :
+            m_gamma(1.0),
+            m_dir_gamma(new HiResT[gamma_size]),
+            m_inv_gamma(new LoResT[hi_res_size])
+        {
+            unsigned i;
+            for(i = 0; i < gamma_size; i++)
+            {
+                m_dir_gamma[i] = HiResT(i << (hi_res_shift - gamma_shift));
+            }
+
+            for(i = 0; i < hi_res_size; i++)
+            {
+                m_inv_gamma[i] = LoResT(i >> (hi_res_shift - gamma_shift));
+            }
+        }
+
+        gamma_lut(double g) :
+            m_gamma(1.0),
+            m_dir_gamma(new HiResT[gamma_size]),
+            m_inv_gamma(new LoResT[hi_res_size])
+        {
+            gamma(g);
+        }
+
+        void gamma(double g)
+        {
+            m_gamma = g;
+
+            unsigned i;
+            for(i = 0; i < gamma_size; i++)
+            {
+                m_dir_gamma[i] = (HiResT)(pow(double(i) / double(gamma_mask), m_gamma) * double(hi_res_mask) + 0.5);
+            }
+
+            double inv_g = 1.0 / g;
+            for(i = 0; i < hi_res_size; i++)
+            {
+                m_inv_gamma[i] = (LoResT)(pow(double(i) / double(hi_res_mask), inv_g) * double(gamma_mask) + 0.5);
+            }
+        }
+
+        double gamma() const
+        {
+            return m_gamma;
+        }
+
+        HiResT dir(LoResT v) const
+        {
+            return m_dir_gamma[unsigned(v)];
+        }
+
+        LoResT inv(HiResT v) const
+        {
+            return m_inv_gamma[unsigned(v)];
+        }
+
+    private:
+        double m_gamma;
+        HiResT* m_dir_gamma;
+        LoResT* m_inv_gamma;
+    };
+}
+
+#endif
diff --git a/agg/inc/agg_glyph_raster_bin.h b/agg/inc/agg_glyph_raster_bin.h
new file mode 100755
index 000000000000..851d9f94bd72
--- /dev/null
+++ b/agg/inc/agg_glyph_raster_bin.h
@@ -0,0 +1,155 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_GLYPH_RASTER_BIN_INCLUDED
+#define AGG_GLYPH_RASTER_BIN_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //========================================================glyph_raster_bin
+    template<class ColorT> class glyph_raster_bin
+    {
+    public:
+        typedef ColorT color_type;
+
+        //--------------------------------------------------------------------
+        struct glyph_rect
+        {
+            int x1,y1,x2,y2;
+            double dx, dy;
+        };
+
+        //--------------------------------------------------------------------
+        glyph_raster_bin(const int8u* font) :
+            m_font(font),
+            m_big_endian(false)
+        {
+            int t = 1;
+            if(*(char*)&t == 0) m_big_endian = true;
+            memset(m_span, 0, sizeof(m_span));
+        }
+
+        //--------------------------------------------------------------------
+        const int8u* font() const { return m_font; }
+        void font(const int8u* f) { m_font = f; }
+
+        //--------------------------------------------------------------------
+        double height()    const { return m_font[0]; }
+        double base_line() const { return m_font[1]; }
+
+        //--------------------------------------------------------------------
+        template<class CharT>
+        double width(const CharT* str) const
+        {
+            unsigned start_char = m_font[2];
+            unsigned num_chars = m_font[3];
+
+            unsigned w = 0;
+            while(*str)
+            {
+                unsigned glyph = *str;
+                const int8u* bits = m_font + 4 + num_chars * 2 +
+                                    value(m_font + 4 + (glyph - start_char) * 2);
+                w += *bits;
+                ++str;
+            }
+            return w;
+        }
+
+        //--------------------------------------------------------------------
+        void prepare(glyph_rect* r, double x, double y, unsigned glyph, bool flip)
+        {
+            unsigned start_char = m_font[2];
+            unsigned num_chars = m_font[3];
+
+            m_bits = m_font + 4 + num_chars * 2 +
+                     value(m_font + 4 + (glyph - start_char) * 2);
+
+            m_glyph_width = *m_bits++;
+            m_glyph_byte_width = (m_glyph_width + 7) >> 3;
+
+            r->x1 = int(x);
+            r->x2 = r->x1 + m_glyph_width - 1;
+            if(flip)
+            {
+                r->y1 = int(y) - m_font[0] + m_font[1];
+                r->y2 = r->y1 + m_font[0] - 1;
+            }
+            else
+            {
+                r->y1 = int(y) - m_font[1] + 1;
+                r->y2 = r->y1 + m_font[0] - 1;
+            }
+            r->dx = m_glyph_width;
+            r->dy = 0;
+        }
+
+        //--------------------------------------------------------------------
+        const cover_type* span(unsigned i)
+        {
+            i = m_font[0] - i - 1;
+            const int8u* bits = m_bits + i * m_glyph_byte_width;
+            unsigned j;
+            unsigned val = *bits;
+            unsigned nb = 0;
+            for(j = 0; j < m_glyph_width; ++j)
+            {
+                m_span[j] = (cover_type)((val & 0x80) ? cover_full : cover_none);
+                val <<= 1;
+                if(++nb >= 8)
+                {
+                    val = *++bits;
+                    nb = 0;
+                }
+            }
+            return m_span;
+        }
+
+    private:
+        //--------------------------------------------------------------------
+        int16u value(const int8u* p) const
+        {
+            int16u v;
+            if(m_big_endian)
+            {
+                 *(int8u*)&v      = p[1];
+                *((int8u*)&v + 1) = p[0];
+            }
+            else
+            {
+                 *(int8u*)&v      = p[0];
+                *((int8u*)&v + 1) = p[1];
+            }
+            return v;
+        }
+
+
+        //--------------------------------------------------------------------
+        const int8u* m_font;
+        bool m_big_endian;
+        cover_type m_span[32];
+        const int8u* m_bits;
+        unsigned m_glyph_width;
+        unsigned m_glyph_byte_width;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_gsv_text.h b/agg/inc/agg_gsv_text.h
new file mode 100755
index 000000000000..5d8e1cf63bab
--- /dev/null
+++ b/agg/inc/agg_gsv_text.h
@@ -0,0 +1,154 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Class gsv_text
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_GSV_TEXT_INCLUDED
+#define AGG_GSV_TEXT_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_conv_stroke.h"
+#include "agg_conv_transform.h"
+
+namespace agg
+{
+
+
+    //---------------------------------------------------------------gsv_text
+    //
+    // See Implementation agg_gsv_text.cpp
+    //
+    class gsv_text
+    {
+        enum status
+        {
+            initial,
+            next_char,
+            start_glyph,
+            glyph
+        };
+
+    public:
+        ~gsv_text();
+        gsv_text();
+
+        void font(const void* font);
+        void flip(bool flip_y) { m_flip = flip_y; }
+        void load_font(const char* file);
+        void size(double height, double width=0.0);
+        void space(double space);
+        void line_space(double line_space);
+        void start_point(double x, double y);
+        void text(const char* text);
+
+        void rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        // not supposed to be copied
+        gsv_text(const gsv_text&);
+        const gsv_text& operator = (const gsv_text&);
+
+        int16u value(const int8u* p) const
+        {
+            int16u v;
+            if(m_big_endian)
+            {
+                 *(int8u*)&v      = p[1];
+                *((int8u*)&v + 1) = p[0];
+            }
+            else
+            {
+                 *(int8u*)&v      = p[0];
+                *((int8u*)&v + 1) = p[1];
+            }
+            return v;
+        }
+
+    private:
+        double      m_x;
+        double      m_y;
+        double      m_start_x;
+        double      m_width;
+        double      m_height;
+        double      m_space;
+        double      m_line_space;
+        char        m_chr[2];
+        char*       m_text;
+        char*       m_text_buf;
+        unsigned    m_buf_size;
+        char*       m_cur_chr;
+        const void* m_font;
+        char*       m_loaded_font;
+        status      m_status;
+        bool        m_big_endian;
+        bool        m_flip;
+
+        int8u*      m_indices;
+        int8*       m_glyphs;
+        int8*       m_bglyph;
+        int8*       m_eglyph;
+        double      m_w;
+        double      m_h;
+    };
+
+
+
+
+    //--------------------------------------------------------gsv_text_outline
+    template<class Transformer = trans_affine> class gsv_text_outline
+    {
+    public:
+        gsv_text_outline(gsv_text& text, const Transformer& trans) :
+          m_polyline(text),
+          m_trans(m_polyline, trans)
+        {
+        }
+
+        void width(double w)
+        {
+            m_polyline.width(w);
+        }
+
+        void transformer(const Transformer* trans)
+        {
+            m_trans->transformer(trans);
+        }
+
+        void rewind(unsigned id)
+        {
+            m_trans.rewind(id);
+            m_polyline.line_join(round_join);
+            m_polyline.line_cap(round_cap);
+        }
+
+        unsigned vertex(double* x, double* y)
+        {
+            return m_trans.vertex(x, y);
+        }
+
+    private:
+        conv_stroke<gsv_text> m_polyline;
+        conv_transform<conv_stroke<gsv_text>, Transformer> m_trans;
+    };
+
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_image_filters.h b/agg/inc/agg_image_filters.h
new file mode 100755
index 000000000000..a2037fe0eff1
--- /dev/null
+++ b/agg/inc/agg_image_filters.h
@@ -0,0 +1,449 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Image transformation filters,
+// Filtering classes (image_filter_lut, image_filter),
+// Basic filter shape classes
+//----------------------------------------------------------------------------
+#ifndef AGG_IMAGE_FILTERS_INCLUDED
+#define AGG_IMAGE_FILTERS_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    // See Implementation agg_image_filters.cpp
+
+    enum
+    {
+        image_filter_shift = 14,                      //----image_filter_shift
+        image_filter_size  = 1 << image_filter_shift, //----image_filter_size
+        image_filter_mask  = image_filter_size - 1,   //----image_filter_mask
+
+        image_subpixel_shift = 8,                         //----image_subpixel_shift
+        image_subpixel_size  = 1 << image_subpixel_shift, //----image_subpixel_size
+        image_subpixel_mask  = image_subpixel_size - 1    //----image_subpixel_mask
+    };
+
+
+    //-----------------------------------------------------image_filter_lut
+    class image_filter_lut
+    {
+    public:
+        ~image_filter_lut();
+        image_filter_lut();
+
+        template<class FilterF> void calculate(const FilterF& filter,
+                                               bool normalization=true)
+        {
+            double r = filter.radius();
+            realloc(r);
+            unsigned i;
+            unsigned pivot = diameter() << (image_subpixel_shift - 1);
+            for(i = 0; i < pivot; i++)
+            {
+                double x = double(i) / double(image_subpixel_size);
+                double y = filter.calc_weight(x);
+                m_weight_array[pivot + i] =
+                m_weight_array[pivot - i] = int16(y * image_filter_size + 0.5);
+            }
+            unsigned end = (diameter() << image_subpixel_shift) - 1;
+            m_weight_array[0] = m_weight_array[end];
+            if(normalization)
+            {
+                normalize();
+            }
+        }
+
+        template<class FilterF> image_filter_lut(const FilterF& filter,
+                                                 bool normalization=true) :
+            m_weight_array(0),
+            m_max_size(0)
+        {
+            calculate(filter, normalization);
+        }
+
+        double       radius()       const { return m_radius;       }
+        unsigned     diameter()     const { return m_diameter;     }
+        int          start()        const { return m_start;        }
+        const int16* weight_array() const { return m_weight_array; }
+        void         normalize();
+
+    private:
+        void realloc(double radius);
+        image_filter_lut(const image_filter_lut&);
+        const image_filter_lut& operator = (const image_filter_lut&);
+
+        double   m_radius;
+        unsigned m_diameter;
+        int      m_start;
+        int16*   m_weight_array;
+        unsigned m_max_size;
+    };
+
+
+
+    //--------------------------------------------------------image_filter
+    template<class FilterF> class image_filter : public image_filter_lut
+    {
+    public:
+        image_filter()
+        {
+            calculate(m_filter_function);
+        }
+    private:
+        FilterF m_filter_function;
+    };
+
+
+    //-----------------------------------------------image_filter_bilinear
+    struct image_filter_bilinear
+    {
+        static double radius() { return 1.0; }
+        static double calc_weight(double x)
+        {
+            return 1.0 - x;
+        }
+    };
+
+
+    //-----------------------------------------------image_filter_hanning
+    struct image_filter_hanning
+    {
+        static double radius() { return 1.0; }
+        static double calc_weight(double x)
+        {
+            return 0.5 + 0.5 * cos(pi * x);
+        }
+    };
+
+
+    //-----------------------------------------------image_filter_hamming
+    struct image_filter_hamming
+    {
+        static double radius() { return 1.0; }
+        static double calc_weight(double x)
+        {
+            return 0.54 + 0.46 * cos(pi * x);
+        }
+    };
+
+    //-----------------------------------------------image_filter_hermite
+    struct image_filter_hermite
+    {
+        static double radius() { return 1.0; }
+        static double calc_weight(double x)
+        {
+            return (2.0 * x - 3.0) * x * x + 1.0;
+        }
+    };
+
+    //------------------------------------------------image_filter_quadric
+    struct image_filter_quadric
+    {
+        static double radius() { return 1.5; }
+        static double calc_weight(double x)
+        {
+            double t;
+            if(x <  0.5) return 0.75 - x * x;
+            if(x <  1.5) {t = x - 1.5; return 0.5 * t * t;}
+            return 0.0;
+        }
+    };
+
+    //------------------------------------------------image_filter_bicubic
+    class image_filter_bicubic
+    {
+        static double pow3(double x)
+        {
+            return (x <= 0.0) ? 0.0 : x * x * x;
+        }
+
+    public:
+        static double radius() { return 2.0; }
+        static double calc_weight(double x)
+        {
+            return
+                (1.0/6.0) *
+                (pow3(x + 2) - 4 * pow3(x + 1) + 6 * pow3(x) - 4 * pow3(x - 1));
+        }
+    };
+
+    //-------------------------------------------------image_filter_kaiser
+    class image_filter_kaiser
+    {
+        double a;
+        double i0a;
+        double epsilon;
+
+    public:
+        image_filter_kaiser(double b = 6.33) :
+            a(b), epsilon(1e-12)
+        {
+            i0a = 1.0 / bessel_i0(b);
+        }
+
+        static double radius() { return 1.0; }
+        double calc_weight(double x) const
+        {
+            return bessel_i0(a * sqrt(1. - x * x)) * i0a;
+        }
+
+    private:
+        double bessel_i0(double x) const
+        {
+            int i;
+            double sum, y, t;
+
+            sum = 1.;
+            y = x * x / 4.;
+            t = y;
+
+            for(i = 2; t > epsilon; i++)
+            {
+                sum += t;
+                t *= (double)y / (i * i);
+            }
+            return sum;
+        }
+    };
+
+    //----------------------------------------------image_filter_catrom
+    struct image_filter_catrom
+    {
+        static double radius() { return 2.0; }
+        static double calc_weight(double x)
+        {
+            if(x <  1.0) return 0.5 * (2.0 + x * x * (-5.0 + x * 3.0));
+            if(x <  2.0) return 0.5 * (4.0 + x * (-8.0 + x * (5.0 - x)));
+            return 0.;
+        }
+    };
+
+    //---------------------------------------------image_filter_mitchell
+    class image_filter_mitchell
+    {
+        double p0, p2, p3;
+        double q0, q1, q2, q3;
+
+    public:
+        image_filter_mitchell(double b = 1.0/3.0, double c = 1.0/3.0) :
+            p0((6.0 - 2.0 * b) / 6.0),
+            p2((-18.0 + 12.0 * b + 6.0 * c) / 6.0),
+            p3((12.0 - 9.0 * b - 6.0 * c) / 6.0),
+            q0((8.0 * b + 24.0 * c) / 6.0),
+            q1((-12.0 * b - 48.0 * c) / 6.0),
+            q2((6.0 * b + 30.0 * c) / 6.0),
+            q3((-b - 6.0 * c) / 6.0)
+        {}
+
+        static double radius() { return 2.0; }
+        double calc_weight(double x) const
+        {
+            if(x < 1.0) return p0 + x * x * (p2 + x * p3);
+            if(x < 2.0) return q0 + x * (q1 + x * (q2 + x * q3));
+            return 0.0;
+        }
+    };
+
+
+    //----------------------------------------------image_filter_spline16
+    struct image_filter_spline16
+    {
+        static double radius() { return 2.0; }
+        static double calc_weight(double x)
+        {
+            if(x < 1.0)
+            {
+                return ((x - 9.0/5.0 ) * x - 1.0/5.0 ) * x + 1.0;
+            }
+            return ((-1.0/3.0 * (x-1) + 4.0/5.0) * (x-1) - 7.0/15.0 ) * (x-1);
+        }
+    };
+
+
+    //---------------------------------------------image_filter_spline36
+    struct image_filter_spline36
+    {
+        static double radius() { return 3.0; }
+        static double calc_weight(double x)
+        {
+           if(x < 1.0)
+           {
+              return ((13.0/11.0 * x - 453.0/209.0) * x - 3.0/209.0) * x + 1.0;
+           }
+           if(x < 2.0)
+           {
+              return ((-6.0/11.0 * (x-1) + 270.0/209.0) * (x-1) - 156.0/ 209.0) * (x-1);
+           }
+           return ((1.0/11.0 * (x-2) - 45.0/209.0) * (x-2) +  26.0/209.0) * (x-2);
+        }
+    };
+
+
+    //----------------------------------------------image_filter_gaussian
+    struct image_filter_gaussian
+    {
+        static double radius() { return 2.0; }
+        static double calc_weight(double x)
+        {
+            return exp(-2.0 * x * x) * sqrt(2.0 / pi);
+        }
+    };
+
+
+    //------------------------------------------------image_filter_bessel
+    struct image_filter_bessel
+    {
+        static double radius() { return 3.2383; }
+        static double calc_weight(double x)
+        {
+            return (x == 0.0) ? pi / 4.0 : j1(pi * x) / (2.0 * x);
+        }
+    };
+
+
+    //-------------------------------------------------image_filter_sinc
+    class image_filter_sinc
+    {
+    public:
+        image_filter_sinc(double r) : m_radius(r < 2.0 ? 2.0 : r) {}
+        double radius() const { return m_radius; }
+        double calc_weight(double x) const
+        {
+            if(x == 0.0) return 1.0;
+            x *= pi;
+            return sin(x) / x;
+        }
+    private:
+        double m_radius;
+    };
+
+
+    //-----------------------------------------------image_filter_lanczos
+    class image_filter_lanczos
+    {
+    public:
+        image_filter_lanczos(double r) : m_radius(r < 2.0 ? 2.0 : r) {}
+        double radius() const { return m_radius; }
+        double calc_weight(double x) const
+        {
+           if(x == 0.0) return 1.0;
+           if(x > m_radius) return 0.0;
+           x *= pi;
+           double xr = x / m_radius;
+           return (sin(x) / x) * (sin(xr) / xr);
+        }
+    private:
+        double m_radius;
+    };
+
+
+    //----------------------------------------------image_filter_blackman
+    class image_filter_blackman
+    {
+    public:
+        image_filter_blackman(double r) : m_radius(r < 2.0 ? 2.0 : r) {}
+        double radius() const { return m_radius; }
+        double calc_weight(double x) const
+        {
+           if(x == 0.0) return 1.0;
+           if(x > m_radius) return 0.0;
+           x *= pi;
+           double xr = x / m_radius;
+           return (sin(x) / x) * (0.42 + 0.5*cos(xr) + 0.08*cos(2*xr));
+        }
+    private:
+        double m_radius;
+    };
+
+    //------------------------------------------------image_filter_sinc36
+    class image_filter_sinc36 : public image_filter_sinc
+    { public: image_filter_sinc36() : image_filter_sinc(3.0){} };
+
+    //------------------------------------------------image_filter_sinc64
+    class image_filter_sinc64 : public image_filter_sinc
+    { public: image_filter_sinc64() : image_filter_sinc(4.0){} };
+
+    //-----------------------------------------------image_filter_sinc100
+    class image_filter_sinc100 : public image_filter_sinc
+    { public: image_filter_sinc100() : image_filter_sinc(5.0){} };
+
+    //-----------------------------------------------image_filter_sinc144
+    class image_filter_sinc144 : public image_filter_sinc
+    { public: image_filter_sinc144() : image_filter_sinc(6.0){} };
+
+    //-----------------------------------------------image_filter_sinc196
+    class image_filter_sinc196 : public image_filter_sinc
+    { public: image_filter_sinc196() : image_filter_sinc(7.0){} };
+
+    //-----------------------------------------------image_filter_sinc256
+    class image_filter_sinc256 : public image_filter_sinc
+    { public: image_filter_sinc256() : image_filter_sinc(8.0){} };
+
+    //---------------------------------------------image_filter_lanczos36
+    class image_filter_lanczos36 : public image_filter_lanczos
+    { public: image_filter_lanczos36() : image_filter_lanczos(3.0){} };
+
+    //---------------------------------------------image_filter_lanczos64
+    class image_filter_lanczos64 : public image_filter_lanczos
+    { public: image_filter_lanczos64() : image_filter_lanczos(4.0){} };
+
+    //--------------------------------------------image_filter_lanczos100
+    class image_filter_lanczos100 : public image_filter_lanczos
+    { public: image_filter_lanczos100() : image_filter_lanczos(5.0){} };
+
+    //--------------------------------------------image_filter_lanczos144
+    class image_filter_lanczos144 : public image_filter_lanczos
+    { public: image_filter_lanczos144() : image_filter_lanczos(6.0){} };
+
+    //--------------------------------------------image_filter_lanczos196
+    class image_filter_lanczos196 : public image_filter_lanczos
+    { public: image_filter_lanczos196() : image_filter_lanczos(7.0){} };
+
+    //--------------------------------------------image_filter_lanczos256
+    class image_filter_lanczos256 : public image_filter_lanczos
+    { public: image_filter_lanczos256() : image_filter_lanczos(8.0){} };
+
+    //--------------------------------------------image_filter_blackman36
+    class image_filter_blackman36 : public image_filter_blackman
+    { public: image_filter_blackman36() : image_filter_blackman(3.0){} };
+
+    //--------------------------------------------image_filter_blackman64
+    class image_filter_blackman64 : public image_filter_blackman
+    { public: image_filter_blackman64() : image_filter_blackman(4.0){} };
+
+    //-------------------------------------------image_filter_blackman100
+    class image_filter_blackman100 : public image_filter_blackman
+    { public: image_filter_blackman100() : image_filter_blackman(5.0){} };
+
+    //-------------------------------------------image_filter_blackman144
+    class image_filter_blackman144 : public image_filter_blackman
+    { public: image_filter_blackman144() : image_filter_blackman(6.0){} };
+
+    //-------------------------------------------image_filter_blackman196
+    class image_filter_blackman196 : public image_filter_blackman
+    { public: image_filter_blackman196() : image_filter_blackman(7.0){} };
+
+    //-------------------------------------------image_filter_blackman256
+    class image_filter_blackman256 : public image_filter_blackman
+    { public: image_filter_blackman256() : image_filter_blackman(8.0){} };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_line_aa_basics.h b/agg/inc/agg_line_aa_basics.h
new file mode 100755
index 000000000000..ab8e94715019
--- /dev/null
+++ b/agg/inc/agg_line_aa_basics.h
@@ -0,0 +1,152 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_LINE_AA_BASICS_INCLUDED
+#define AGG_LINE_AA_BASICS_INCLUDED
+
+#include <stdlib.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    // See Implementation agg_line_aa_basics.cpp
+
+    //-------------------------------------------------------------------------
+    enum
+    {
+        line_subpixel_shift = 8,                        //----line_subpixel_shift
+        line_subpixel_size  = 1 << line_subpixel_shift, //----line_subpixel_size
+        line_subpixel_mask  = line_subpixel_size - 1    //----line_subpixel_mask
+    };
+
+    //-------------------------------------------------------------------------
+    enum
+    {
+        line_mr_subpixel_shift = 4,                           //----line_mr_subpixel_shift
+        line_mr_subpixel_size  = 1 << line_mr_subpixel_shift, //----line_mr_subpixel_size
+        line_mr_subpixel_mask  = line_mr_subpixel_size - 1    //----line_mr_subpixel_mask
+    };
+
+    //------------------------------------------------------------------line_mr
+    inline int line_mr(int x)
+    {
+        return x >> ((int)line_subpixel_shift - (int)line_mr_subpixel_shift);
+    }
+
+    //-------------------------------------------------------------------line_hr
+    inline int line_hr(int x)
+    {
+        return x << ((int)line_subpixel_shift - (int)line_mr_subpixel_shift);
+    }
+
+    //---------------------------------------------------------------line_dbl_hr
+    inline int line_dbl_hr(int x)
+    {
+        return x << line_subpixel_shift;
+    }
+
+    //---------------------------------------------------------------line_coord
+    inline int line_coord(double x)
+    {
+        return int(x * line_subpixel_size);
+    }
+
+    //==========================================================line_parameters
+    struct line_parameters
+    {
+        //---------------------------------------------------------------------
+        line_parameters() {}
+        line_parameters(int x1_, int y1_, int x2_, int y2_, int len_) :
+            x1(x1_), y1(y1_), x2(x2_), y2(y2_),
+            dx(abs(x2_ - x1_)),
+            dy(abs(y2_ - y1_)),
+            sx((x2_ > x1_) ? 1 : -1),
+            sy((y2_ > y1_) ? 1 : -1),
+            vertical(dy >= dx),
+            inc(vertical ? sy : sx),
+            len(len_),
+            octant((sy & 4) | (sx & 2) | int(vertical))
+        {
+        }
+
+        //---------------------------------------------------------------------
+        unsigned orthogonal_quadrant() const { return s_orthogonal_quadrant[octant]; }
+        unsigned diagonal_quadrant()   const { return s_diagonal_quadrant[octant];   }
+
+        //---------------------------------------------------------------------
+        bool same_orthogonal_quadrant(const line_parameters& lp) const
+        {
+            return s_orthogonal_quadrant[octant] == s_orthogonal_quadrant[lp.octant];
+        }
+
+        //---------------------------------------------------------------------
+        bool same_diagonal_quadrant(const line_parameters& lp) const
+        {
+            return s_diagonal_quadrant[octant] == s_diagonal_quadrant[lp.octant];
+        }
+
+        //---------------------------------------------------------------------
+        int x1, y1, x2, y2, dx, dy, sx, sy;
+        bool vertical;
+        int inc;
+        int len;
+        int octant;
+
+        //---------------------------------------------------------------------
+        static int8u s_orthogonal_quadrant[8];
+        static int8u s_diagonal_quadrant[8];
+    };
+
+
+
+    // See Implementation agg_line_aa_basics.cpp
+
+    //----------------------------------------------------------------bisectrix
+    void bisectrix(const line_parameters& l1,
+                   const line_parameters& l2,
+                   int* x, int* y);
+
+
+    //-------------------------------------------fix_degenerate_bisectrix_start
+    void inline fix_degenerate_bisectrix_start(const line_parameters& lp,
+                                               int* x, int* y)
+    {
+        int d = int((double(*x - lp.x2) * double(lp.y2 - lp.y1) -
+                     double(*y - lp.y2) * double(lp.x2 - lp.x1)) / lp.len);
+        if(d < line_subpixel_size)
+        {
+            *x = lp.x1 + (lp.y2 - lp.y1);
+            *y = lp.y1 - (lp.x2 - lp.x1);
+        }
+    }
+
+
+    //---------------------------------------------fix_degenerate_bisectrix_end
+    void inline fix_degenerate_bisectrix_end(const line_parameters& lp,
+                                             int* x, int* y)
+    {
+        int d = int((double(*x - lp.x2) * double(lp.y2 - lp.y1) -
+                     double(*y - lp.y2) * double(lp.x2 - lp.x1)) / lp.len);
+        if(d < line_subpixel_size)
+        {
+            *x = lp.x2 + (lp.y2 - lp.y1);
+            *y = lp.y2 - (lp.x2 - lp.x1);
+        }
+    }
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_math.h b/agg/inc/agg_math.h
new file mode 100755
index 000000000000..4aef4df9638e
--- /dev/null
+++ b/agg/inc/agg_math.h
@@ -0,0 +1,247 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_MATH_INCLUDED
+#define AGG_MATH_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    const double intersection_epsilon = 1.0e-8;
+
+    //------------------------------------------------------calc_point_location
+    AGG_INLINE double calc_point_location(double x1, double y1,
+                                          double x2, double y2,
+                                          double x,  double y)
+    {
+        return (x - x2) * (y2 - y1) - (y - y2) * (x2 - x1);
+    }
+
+
+    //--------------------------------------------------------point_in_triangle
+    AGG_INLINE bool point_in_triangle(double x1, double y1,
+                                      double x2, double y2,
+                                      double x3, double y3,
+                                      double x,  double y)
+    {
+        bool cp1 = calc_point_location(x1, y1, x2, y2, x, y) < 0.0;
+        bool cp2 = calc_point_location(x2, y2, x3, y3, x, y) < 0.0;
+        bool cp3 = calc_point_location(x3, y3, x1, y1, x, y) < 0.0;
+        return cp1 == cp2 && cp2 == cp3 && cp3 == cp1;
+    }
+
+
+    //-----------------------------------------------------------calc_distance
+    AGG_INLINE double calc_distance(double x1, double y1, double x2, double y2)
+    {
+        double dx = x2-x1;
+        double dy = y2-y1;
+        return sqrt(dx * dx + dy * dy);
+    }
+
+
+    //------------------------------------------------calc_point_line_distance
+    AGG_INLINE double calc_point_line_distance(double x1, double y1,
+                                               double x2, double y2,
+                                               double x,  double y)
+    {
+        double dx = x2-x1;
+        double dy = y2-y1;
+        return ((x - x2) * dy - (y - y2) * dx) / sqrt(dx * dx + dy * dy);
+    }
+
+
+    //-------------------------------------------------------calc_intersection
+    AGG_INLINE bool calc_intersection(double ax, double ay, double bx, double by,
+                                      double cx, double cy, double dx, double dy,
+                                      double* x, double* y)
+    {
+        double num = (ay-cy) * (dx-cx) - (ax-cx) * (dy-cy);
+        double den = (bx-ax) * (dy-cy) - (by-ay) * (dx-cx);
+        if(fabs(den) < intersection_epsilon) return false;
+        double r = num / den;
+        *x = ax + r * (bx-ax);
+        *y = ay + r * (by-ay);
+        return true;
+    }
+
+
+    //--------------------------------------------------------calc_orthogonal
+    AGG_INLINE void calc_orthogonal(double thickness,
+                                    double x1, double y1,
+                                    double x2, double y2,
+                                    double* x, double* y)
+    {
+        double dx = x2 - x1;
+        double dy = y2 - y1;
+        double d = sqrt(dx*dx + dy*dy);
+        *x = thickness * dy / d;
+        *y = thickness * dx / d;
+    }
+
+
+    //--------------------------------------------------------dilate_triangle
+    AGG_INLINE void dilate_triangle(double x1, double y1,
+                                    double x2, double y2,
+                                    double x3, double y3,
+                                    double *x, double* y,
+                                    double d)
+    {
+        double dx1=0.0;
+        double dy1=0.0;
+        double dx2=0.0;
+        double dy2=0.0;
+        double dx3=0.0;
+        double dy3=0.0;
+        double loc = calc_point_location(x1, y1, x2, y2, x3, y3);
+        if(fabs(loc) > intersection_epsilon)
+        {
+            if(calc_point_location(x1, y1, x2, y2, x3, y3) > 0.0)
+            {
+                d = -d;
+            }
+            calc_orthogonal(d, x1, y1, x2, y2, &dx1, &dy1);
+            calc_orthogonal(d, x2, y2, x3, y3, &dx2, &dy2);
+            calc_orthogonal(d, x3, y3, x1, y1, &dx3, &dy3);
+        }
+        *x++ = x1 + dx1;  *y++ = y1 - dy1;
+        *x++ = x2 + dx1;  *y++ = y2 - dy1;
+        *x++ = x2 + dx2;  *y++ = y2 - dy2;
+        *x++ = x3 + dx2;  *y++ = y3 - dy2;
+        *x++ = x3 + dx3;  *y++ = y3 - dy3;
+        *x++ = x1 + dx3;  *y++ = y1 - dy3;
+    }
+
+    //-------------------------------------------------------calc_polygon_area
+    template<class Storage> double calc_polygon_area(const Storage& st)
+    {
+        unsigned i;
+        double sum = 0.0;
+        double x  = st[0].x;
+        double y  = st[0].y;
+        double xs = x;
+        double ys = y;
+
+        for(i = 1; i < st.size(); i++)
+        {
+            const typename Storage::value_type& v = st[i];
+            sum += x * v.y - y * v.x;
+            x = v.x;
+            y = v.y;
+        }
+        return (sum + x * ys - y * xs) * 0.5;
+    }
+
+    //------------------------------------------------------------------------
+    // Tables for fast sqrt
+    extern int16u g_sqrt_table[1024];
+    extern int8   g_elder_bit_table[256];
+
+
+    //---------------------------------------------------------------fast_sqrt
+    //Fast integer Sqrt - really fast: no cycles, divisions or multiplications
+    #if defined(_MSC_VER)
+    #pragma warning(push)
+    #pragma warning(disable : 4035) //Disable warning "no return value"
+    #endif
+    AGG_INLINE unsigned fast_sqrt(unsigned val)
+    {
+    #if defined(_M_IX86) && defined(_MSC_VER) && !defined(AGG_NO_ASM)
+        //For Ix86 family processors this assembler code is used.
+        //The key command here is bsr - determination the number of the most
+        //significant bit of the value. For other processors
+        //(and maybe compilers) the pure C "#else" section is used.
+        __asm
+        {
+            mov ebx, val
+            mov edx, 11
+            bsr ecx, ebx
+            sub ecx, 9
+            jle less_than_9_bits
+            shr ecx, 1
+            adc ecx, 0
+            sub edx, ecx
+            shl ecx, 1
+            shr ebx, cl
+    less_than_9_bits:
+            xor eax, eax
+            mov  ax, g_sqrt_table[ebx*2]
+            mov ecx, edx
+            shr eax, cl
+        }
+    #else
+
+        //This code is actually pure C and portable to most
+        //arcitectures including 64bit ones.
+        unsigned t = val;
+        int bit=0;
+        unsigned shift = 11;
+
+        //The following piece of code is just an emulation of the
+        //Ix86 assembler command "bsr" (see above). However on old
+        //Intels (like Intel MMX 233MHz) this code is about twice
+        //faster (sic!) then just one "bsr". On PIII and PIV the
+        //bsr is optimized quite well.
+        bit = t >> 24;
+        if(bit)
+        {
+            bit = g_elder_bit_table[bit] + 24;
+        }
+        else
+        {
+            bit = (t >> 16) & 0xFF;
+            if(bit)
+            {
+                bit = g_elder_bit_table[bit] + 16;
+            }
+            else
+            {
+                bit = (t >> 8) & 0xFF;
+                if(bit)
+                {
+                    bit = g_elder_bit_table[bit] + 8;
+                }
+                else
+                {
+                    bit = g_elder_bit_table[t];
+                }
+            }
+        }
+
+        //This is calculation sqrt itself.
+        bit -= 9;
+        if(bit > 0)
+        {
+            bit = (bit >> 1) + (bit & 1);
+            shift -= bit;
+            val >>= (bit << 1);
+        }
+        return g_sqrt_table[val] >> shift;
+    #endif
+    }
+    #if defined(_MSC_VER)
+    #pragma warning(pop)
+    #endif
+
+
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_math_stroke.h b/agg/inc/agg_math_stroke.h
new file mode 100755
index 000000000000..84d83738a9cd
--- /dev/null
+++ b/agg/inc/agg_math_stroke.h
@@ -0,0 +1,340 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Stroke math
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_STROKE_MATH_INCLUDED
+#define AGG_STROKE_MATH_INCLUDED
+
+#include "agg_math.h"
+#include "agg_vertex_sequence.h"
+
+namespace agg
+{
+    //-------------------------------------------------------------line_cap_e
+    enum line_cap_e
+    {
+        butt_cap,
+        square_cap,
+        round_cap
+    };
+
+    //------------------------------------------------------------line_join_e
+    enum line_join_e
+    {
+        miter_join,
+        miter_join_revert,
+        round_join,
+        bevel_join
+    };
+
+    // Minimal angle to calculate round joins, less than 0.1 degree.
+    const double stroke_theta = 0.001; //----stroke_theta
+
+
+    //--------------------------------------------------------stroke_calc_arc
+    template<class VertexConsumer>
+    void stroke_calc_arc(VertexConsumer& out_vertices,
+                         double x,   double y,
+                         double dx1, double dy1,
+                         double dx2, double dy2,
+                         double width,
+                         double approximation_scale)
+    {
+        typedef typename VertexConsumer::value_type coord_type;
+
+        //// Check if we actually need the arc (this optimization works bad)
+        ////-----------------
+        //double dd = calc_distance(dx1, dy1, dx2, dy2);
+        //if(dd < 1.0/approximation_scale)
+        //{
+        //    out_vertices.add(coord_type(x + dx1, y + dy1));
+        //    if(dd > 0.25/approximation_scale)
+        //    {
+        //        out_vertices.add(coord_type(x + dx2, y + dy2));
+        //    }
+        //    return;
+        //}
+
+        double a1 = atan2(dy1, dx1);
+        double a2 = atan2(dy2, dx2);
+        double da = a1 - a2;
+
+        if(fabs(da) < stroke_theta)
+        {
+            out_vertices.add(coord_type((x + x + dx1 + dx2) * 0.5,
+                                        (y + y + dy1 + dy2) * 0.5));
+            return;
+        }
+
+        bool ccw = da > 0.0 && da < pi;
+
+        if(width < 0) width = -width;
+        da = fabs(1.0 / (width * approximation_scale));
+        if(!ccw)
+        {
+            if(a1 > a2) a2 += 2 * pi;
+            while(a1 < a2)
+            {
+                out_vertices.add(coord_type(x + cos(a1) * width, y + sin(a1) * width));
+                a1 += da;
+            }
+        }
+        else
+        {
+            if(a1 < a2) a2 -= 2 * pi;
+            while(a1 > a2)
+            {
+                out_vertices.add(coord_type(x + cos(a1) * width, y + sin(a1) * width));
+                a1 -= da;
+            }
+        }
+        out_vertices.add(coord_type(x + dx2, y + dy2));
+    }
+
+
+
+    //-------------------------------------------------------stroke_calc_miter
+    template<class VertexConsumer>
+    void stroke_calc_miter(VertexConsumer& out_vertices,
+                           const vertex_dist& v0,
+                           const vertex_dist& v1,
+                           const vertex_dist& v2,
+                           double dx1, double dy1,
+                           double dx2, double dy2,
+                           double width,
+                           bool revert_flag,
+                           double miter_limit)
+    {
+        typedef typename VertexConsumer::value_type coord_type;
+
+        double xi = v1.x;
+        double yi = v1.y;
+
+        if(!calc_intersection(v0.x + dx1, v0.y - dy1,
+                              v1.x + dx1, v1.y - dy1,
+                              v1.x + dx2, v1.y - dy2,
+                              v2.x + dx2, v2.y - dy2,
+                              &xi, &yi))
+        {
+            // The calculation didn't succeed, most probaly
+            // the three points lie one straight line
+            //----------------
+            if(calc_distance(dx1, -dy1, dx2, -dy2) < width * 0.025)
+            {
+                // This case means that the next segment continues
+                // the previous one (straight line)
+                //-----------------
+                out_vertices.add(coord_type(v1.x + dx1, v1.y - dy1));
+            }
+            else
+            {
+                // This case means that the next segment goes back
+                //-----------------
+                if(revert_flag)
+                {
+                    out_vertices.add(coord_type(v1.x + dx1, v1.y - dy1));
+                    out_vertices.add(coord_type(v1.x + dx2, v1.y - dy2));
+                }
+                else
+                {
+                    // If no miter-revert, calcuate new dx1, dy1, dx2, dy2
+                    out_vertices.add(coord_type(v1.x + dx1 + dy1 * miter_limit,
+                                                v1.y - dy1 + dx1 * miter_limit));
+                    out_vertices.add(coord_type(v1.x + dx2 - dy2 * miter_limit,
+                                                v1.y - dy2 - dx2 * miter_limit));
+                }
+            }
+        }
+        else
+        {
+            double d1 = calc_distance(v1.x, v1.y, xi, yi);
+            double lim = width * miter_limit;
+            if(d1 > lim)
+            {
+                // Miter limit exceeded
+                //------------------------
+                if(revert_flag)
+                {
+                    // For the compatibility with SVG, PDF, etc,
+                    // we use a simple bevel join instead of
+                    // "smart" bevel
+                    //-------------------
+                    out_vertices.add(coord_type(v1.x + dx1, v1.y - dy1));
+                    out_vertices.add(coord_type(v1.x + dx2, v1.y - dy2));
+                }
+                else
+                {
+                    // Smart bevel that cuts the miter at the limit point
+                    //-------------------
+                    d1  = lim / d1;
+                    double x1 = v1.x + dx1;
+                    double y1 = v1.y - dy1;
+                    double x2 = v1.x + dx2;
+                    double y2 = v1.y - dy2;
+
+                    x1 += (xi - x1) * d1;
+                    y1 += (yi - y1) * d1;
+                    x2 += (xi - x2) * d1;
+                    y2 += (yi - y2) * d1;
+                    out_vertices.add(coord_type(x1, y1));
+                    out_vertices.add(coord_type(x2, y2));
+                }
+            }
+            else
+            {
+                // Inside the miter limit
+                //---------------------
+                out_vertices.add(coord_type(xi, yi));
+            }
+        }
+    }
+
+
+
+
+
+
+    //--------------------------------------------------------stroke_calc_cap
+    template<class VertexConsumer>
+    void stroke_calc_cap(VertexConsumer& out_vertices,
+                         const vertex_dist& v0,
+                         const vertex_dist& v1,
+                         double len,
+                         line_cap_e line_cap,
+                         double width,
+                         double approximation_scale)
+    {
+        typedef typename VertexConsumer::value_type coord_type;
+
+        out_vertices.remove_all();
+
+        double dx1 = width * (v1.y - v0.y) / len;
+        double dy1 = width * (v1.x - v0.x) / len;
+        double dx2 = 0;
+        double dy2 = 0;
+
+        if(line_cap == square_cap)
+        {
+            dx2 = dy1;
+            dy2 = dx1;
+        }
+
+        if(line_cap == round_cap)
+        {
+            double a1 = atan2(dy1, -dx1);
+            double a2 = a1 + pi;
+            double da = fabs(1.0 / (width * approximation_scale));
+            while(a1 < a2)
+            {
+                out_vertices.add(coord_type(v0.x + cos(a1) * width,
+                                            v0.y + sin(a1) * width));
+                a1 += da;
+            }
+            out_vertices.add(coord_type(v0.x + dx1, v0.y - dy1));
+        }
+        else
+        {
+            out_vertices.add(coord_type(v0.x - dx1 - dx2, v0.y + dy1 - dy2));
+            out_vertices.add(coord_type(v0.x + dx1 - dx2, v0.y - dy1 - dy2));
+        }
+    }
+
+
+
+    //-------------------------------------------------------stroke_calc_join
+    template<class VertexConsumer>
+    void stroke_calc_join(VertexConsumer& out_vertices,
+                          const vertex_dist& v0,
+                          const vertex_dist& v1,
+                          const vertex_dist& v2,
+                          double len1,
+                          double len2,
+                          double width,
+                          line_join_e line_join,
+                          line_join_e inner_line_join,
+                          double miter_limit,
+                          double inner_miter_limit,
+                          double approximation_scale)
+    {
+        typedef typename VertexConsumer::value_type coord_type;
+
+        double dx1, dy1, dx2, dy2;
+
+        dx1 = width * (v1.y - v0.y) / len1;
+        dy1 = width * (v1.x - v0.x) / len1;
+
+        dx2 = width * (v2.y - v1.y) / len2;
+        dy2 = width * (v2.x - v1.x) / len2;
+
+        out_vertices.remove_all();
+
+        if(calc_point_location(v0.x, v0.y, v1.x, v1.y, v2.x, v2.y) > 0.0)
+        {
+            // Inner join
+            //---------------
+            stroke_calc_miter(out_vertices,
+                              v0, v1, v2, dx1, dy1, dx2, dy2,
+                              width,
+                              inner_line_join == miter_join_revert,
+                              inner_miter_limit);
+        }
+        else
+        {
+            // Outer join
+            //---------------
+            switch(line_join)
+            {
+            case miter_join:
+                stroke_calc_miter(out_vertices,
+                                  v0, v1, v2, dx1, dy1, dx2, dy2,
+                                  width,
+                                  false,
+                                  miter_limit);
+                break;
+
+            case miter_join_revert:
+                stroke_calc_miter(out_vertices,
+                                  v0, v1, v2, dx1, dy1, dx2, dy2,
+                                  width,
+                                  true,
+                                  miter_limit);
+                break;
+
+            case round_join:
+                stroke_calc_arc(out_vertices,
+                                v1.x, v1.y, dx1, -dy1, dx2, -dy2,
+                                width, approximation_scale);
+                break;
+
+            default: // Bevel join
+                out_vertices.add(coord_type(v1.x + dx1, v1.y - dy1));
+                if(calc_distance(dx1, dy1, dx2, dy2) > approximation_scale * 0.25)
+                {
+                    out_vertices.add(coord_type(v1.x + dx2, v1.y - dy2));
+                }
+                break;
+            }
+        }
+    }
+
+
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_path_storage.h b/agg/inc/agg_path_storage.h
new file mode 100755
index 000000000000..8cdb9b9bbeb6
--- /dev/null
+++ b/agg/inc/agg_path_storage.h
@@ -0,0 +1,364 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_PATH_STORAGE_INCLUDED
+#define AGG_PATH_STORAGE_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------path_storage
+    // A container to store vertices with their flags.
+    // A path consists of a number of contours separated with "move_to"
+    // commands. The path storage can keep and maintain more than one
+    // path.
+    // To navigate to the beginning of a particular path, use rewind(path_id);
+    // Where path_id is what start_new_path() returns. So, when you call
+    // start_new_path() you need to store its return value somewhere else
+    // to navigate to the path afterwards.
+    //
+    // See Implementation: agg_path_storage.cpp
+    // See also: vertex_source concept
+    //------------------------------------------------------------------------
+    class path_storage
+    {
+        // Allocation parameters
+        enum
+        {
+            block_shift = 8,
+            block_size  = 1 << block_shift,
+            block_mask  = block_size - 1,
+            block_pool  = 256
+        };
+
+    public:
+
+        //--------------------------------------------------------------------
+        class const_iterator
+        {
+            void vertex()
+            {
+                if(m_vertex_idx < m_path->total_vertices())
+                {
+                    m_vertex.cmd = m_path->vertex(m_vertex_idx, &m_vertex.x, &m_vertex.y);
+                }
+                else
+                {
+                    m_vertex.cmd = path_cmd_stop;
+                    m_vertex.x = m_vertex.y = 0.0;
+                }
+            }
+
+        public:
+            const_iterator() {}
+            const_iterator(unsigned cmd) { m_vertex.cmd = cmd; }
+            const_iterator(const const_iterator& i) :
+                m_path(i.m_path),
+                m_vertex_idx(i.m_vertex_idx),
+                m_vertex(i.m_vertex)
+            {
+            }
+
+            const_iterator(const path_storage& p, unsigned id) :
+                m_path(&p),
+                m_vertex_idx(id)
+            {
+                vertex();
+            }
+
+            const_iterator& operator++()
+            {
+                ++m_vertex_idx;
+                vertex();
+                return *this;
+            }
+
+            const vertex_type& operator*() const { return m_vertex; }
+            const vertex_type* operator->() const { return &m_vertex; }
+
+            bool operator != (const const_iterator& i)
+            {
+                return m_vertex.cmd != i.m_vertex.cmd;
+            }
+
+        private:
+            const path_storage* m_path;
+            unsigned            m_vertex_idx;
+            vertex_type         m_vertex;
+        };
+
+        ~path_storage();
+        path_storage();
+        path_storage(const path_storage& ps);
+
+        void remove_all();
+
+        unsigned last_vertex(double* x, double* y) const;
+        unsigned prev_vertex(double* x, double* y) const;
+
+        void rel_to_abs(double* x, double* y) const;
+
+        void move_to(double x, double y);
+        void move_rel(double dx, double dy);
+
+        void line_to(double x, double y);
+        void line_rel(double dx, double dy);
+
+        void arc_to(double rx, double ry,
+                    double angle,
+                    bool large_arc_flag,
+                    bool sweep_flag,
+                    double x, double y);
+
+        void arc_rel(double rx, double ry,
+                     double angle,
+                     bool large_arc_flag,
+                     bool sweep_flag,
+                     double dx, double dy);
+
+        void curve3(double x_ctrl, double y_ctrl,
+                    double x_to,   double y_to);
+
+        void curve3_rel(double dx_ctrl, double dy_ctrl,
+                        double dx_to,   double dy_to);
+
+        void curve3(double x_to, double y_to);
+
+        void curve3_rel(double dx_to, double dy_to);
+
+        void curve4(double x_ctrl1, double y_ctrl1,
+                    double x_ctrl2, double y_ctrl2,
+                    double x_to,    double y_to);
+
+        void curve4_rel(double dx_ctrl1, double dy_ctrl1,
+                        double dx_ctrl2, double dy_ctrl2,
+                        double dx_to,    double dy_to);
+
+        void curve4(double x_ctrl2, double y_ctrl2,
+                    double x_to,    double y_to);
+
+        void curve4_rel(double x_ctrl2, double y_ctrl2,
+                        double x_to,    double y_to);
+
+
+        void end_poly(unsigned flags = path_flags_close);
+
+        void close_polygon(unsigned flags = path_flags_none)
+        {
+            end_poly(path_flags_close | flags);
+        }
+
+        void add_poly(const double* vertices, unsigned num,
+                      bool solid_path = false,
+                      unsigned end_flags = path_flags_none);
+
+        template<class VertexSource>
+        void add_path(VertexSource& vs,
+                      unsigned path_id = 0,
+                      bool solid_path = true)
+        {
+            double x, y;
+            unsigned cmd;
+            vs.rewind(path_id);
+            while(!is_stop(cmd = vs.vertex(&x, &y)))
+            {
+                if(is_move_to(cmd) && solid_path && m_total_vertices)
+                {
+                    cmd = path_cmd_line_to;
+                }
+                add_vertex(x, y, cmd);
+            }
+        }
+
+        unsigned start_new_path();
+
+        void copy_from(const path_storage& ps);
+        const path_storage& operator = (const path_storage& ps)
+        {
+            copy_from(ps);
+            return *this;
+        }
+
+
+        unsigned total_vertices() const { return m_total_vertices; }
+        unsigned vertex(unsigned idx, double* x, double* y) const
+        {
+            unsigned nb = idx >> block_shift;
+            const double* pv = m_coord_blocks[nb] + ((idx & block_mask) << 1);
+            *x = *pv++;
+            *y = *pv;
+            return m_cmd_blocks[nb][idx & block_mask];
+        }
+        unsigned command(unsigned idx) const
+        {
+            return m_cmd_blocks[idx >> block_shift][idx & block_mask];
+        }
+
+        void     rewind(unsigned path_id);
+        unsigned vertex(double* x, double* y);
+
+        const_iterator begin(unsigned id) const { return const_iterator(*this, id); }
+        const_iterator begin()            const { return const_iterator(*this, 0); }
+        const_iterator end()              const { return const_iterator(path_cmd_stop); }
+
+        // Arrange the orientation of all the polygons. After calling this
+        // method all the polygons will have the same orientation
+        // determined by the new_orientation flag, i.e.,
+        // path_flags_cw or path_flags_ccw
+        unsigned arrange_orientations(unsigned path_id, path_flags_e new_orientation);
+        void arrange_orientations_all_paths(path_flags_e new_orientation);
+
+        // Flip all the vertices horizontally or vertically
+        void flip_x(double x1, double x2);
+        void flip_y(double y1, double y2);
+
+        // This function adds a vertex with its flags directly. Since there's no
+        // checking for errors, keeping proper path integrity is the responsibility
+        // of the caller. It can be said the function is "not very public".
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Allows you to modify vertex coordinates. The caller must know
+        // the index of the vertex.
+        void modify_vertex(unsigned idx, double x, double y)
+        {
+            double* pv = m_coord_blocks[idx >> block_shift] + ((idx & block_mask) << 1);
+            *pv++ = x;
+            *pv   = y;
+        }
+
+        // Allows you to modify vertex command. The caller must know
+        // the index of the vertex.
+        void modify_command(unsigned idx, unsigned cmd)
+        {
+            m_cmd_blocks[idx >> block_shift][idx & block_mask] = (unsigned char)cmd;
+        }
+
+
+    private:
+        void allocate_block(unsigned nb);
+        unsigned char* storage_ptrs(double** xy_ptr);
+        unsigned perceive_polygon_orientation(unsigned idx,
+                                              double xs, double ys,
+                                              unsigned* orientation);
+        void reverse_polygon(unsigned start, unsigned end);
+
+    private:
+        unsigned        m_total_vertices;
+        unsigned        m_total_blocks;
+        unsigned        m_max_blocks;
+        double**        m_coord_blocks;
+        unsigned char** m_cmd_blocks;
+        unsigned        m_iterator;
+    };
+
+
+    //------------------------------------------------------------------------
+    inline unsigned path_storage::vertex(double* x, double* y)
+    {
+        if(m_iterator >= m_total_vertices) return path_cmd_stop;
+        return vertex(m_iterator++, x, y);
+    }
+
+    //------------------------------------------------------------------------
+    inline unsigned path_storage::prev_vertex(double* x, double* y) const
+    {
+        if(m_total_vertices > 1)
+        {
+            return vertex(m_total_vertices - 2, x, y);
+        }
+        return path_cmd_stop;
+    }
+
+    //------------------------------------------------------------------------
+    inline unsigned path_storage::last_vertex(double* x, double* y) const
+    {
+        if(m_total_vertices)
+        {
+            return vertex(m_total_vertices - 1, x, y);
+        }
+        return path_cmd_stop;
+    }
+
+    //------------------------------------------------------------------------
+    inline void path_storage::rel_to_abs(double* x, double* y) const
+    {
+        if(m_total_vertices)
+        {
+            double x2;
+            double y2;
+            if(is_vertex(vertex(m_total_vertices - 1, &x2, &y2)))
+            {
+                *x += x2;
+                *y += y2;
+            }
+        }
+    }
+
+    //------------------------------------------------------------------------
+    inline unsigned char* path_storage::storage_ptrs(double** xy_ptr)
+    {
+        unsigned nb = m_total_vertices >> block_shift;
+        if(nb >= m_total_blocks)
+        {
+            allocate_block(nb);
+        }
+        *xy_ptr = m_coord_blocks[nb] + ((m_total_vertices & block_mask) << 1);
+        return m_cmd_blocks[nb] + (m_total_vertices & block_mask);
+    }
+
+
+    //------------------------------------------------------------------------
+    inline void path_storage::add_vertex(double x, double y, unsigned cmd)
+    {
+        double* coord_ptr = 0;
+        unsigned char* cmd_ptr = storage_ptrs(&coord_ptr);
+        *cmd_ptr = (unsigned char)cmd;
+        *coord_ptr++ = x;
+        *coord_ptr   = y;
+        m_total_vertices++;
+    }
+
+    //------------------------------------------------------------------------
+    inline void path_storage::move_to(double x, double y)
+    {
+        add_vertex(x, y, path_cmd_move_to);
+    }
+
+    //------------------------------------------------------------------------
+    inline void path_storage::move_rel(double dx, double dy)
+    {
+        rel_to_abs(&dx, &dy);
+        add_vertex(dx, dy, path_cmd_move_to);
+    }
+
+    //------------------------------------------------------------------------
+    inline void path_storage::line_to(double x, double y)
+    {
+        add_vertex(x, y, path_cmd_line_to);
+    }
+
+    //------------------------------------------------------------------------
+    inline void path_storage::line_rel(double dx, double dy)
+    {
+        rel_to_abs(&dx, &dy);
+        add_vertex(dx, dy, path_cmd_line_to);
+    }
+}
+
+
+
+#endif
diff --git a/agg/inc/agg_path_storage_integer.h b/agg/inc/agg_path_storage_integer.h
new file mode 100755
index 000000000000..841bd10aa27a
--- /dev/null
+++ b/agg/inc/agg_path_storage_integer.h
@@ -0,0 +1,300 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_PATH_STORAGE_INTEGER_INCLUDED
+#define AGG_PATH_STORAGE_INTEGER_INCLUDED
+
+#include <string.h>
+#include "agg_array.h"
+
+namespace agg
+{
+
+    //---------------------------------------------------------vertex_integer
+    template<class T, unsigned CoordShift=6> struct vertex_integer
+    {
+        enum path_cmd
+        {
+            cmd_move_to = 0,
+            cmd_line_to = 1,
+            cmd_curve3  = 2,
+            cmd_curve4  = 3
+        };
+
+        enum
+        {
+            coord_shift = CoordShift,
+            coord_mult  = 1 << coord_shift
+        };
+
+        T x,y;
+        vertex_integer() {}
+        vertex_integer(T x_, T y_, unsigned flag) :
+            x(((x_ << 1) & ~1) | (flag &  1)),
+            y(((y_ << 1) & ~1) | (flag >> 1)) {}
+
+        unsigned vertex(double* x_, double* y_,
+                        double dx=0, double dy=0,
+                        double scale=1.0) const
+        {
+            *x_ = dx + (double(x >> 1) / coord_mult) * scale;
+            *y_ = dy + (double(y >> 1) / coord_mult) * scale;
+            switch(((y & 1) << 1) | (x & 1))
+            {
+                case cmd_move_to: return path_cmd_move_to;
+                case cmd_line_to: return path_cmd_line_to;
+                case cmd_curve3:  return path_cmd_curve3;
+                case cmd_curve4:  return path_cmd_curve4;
+            }
+            return path_cmd_stop;
+        }
+    };
+
+
+    //---------------------------------------------------path_storage_integer
+    template<class T, unsigned CoordShift=6> class path_storage_integer
+    {
+    public:
+        typedef vertex_integer<T, CoordShift> vertex_integer_type;
+
+        //--------------------------------------------------------------------
+        path_storage_integer() : m_storage(), m_vertex_idx(0), m_closed(true) {}
+
+        //--------------------------------------------------------------------
+        void remove_all() { m_storage.remove_all(); }
+
+        //--------------------------------------------------------------------
+        void move_to(T x, T y)
+        {
+            m_storage.add(vertex_integer_type(x, y, vertex_integer_type::cmd_move_to));
+        }
+
+        //--------------------------------------------------------------------
+        void line_to(T x, T y)
+        {
+            m_storage.add(vertex_integer_type(x, y, vertex_integer_type::cmd_line_to));
+        }
+
+        //--------------------------------------------------------------------
+        void curve3(T x_ctrl,  T y_ctrl,
+                    T x_to,    T y_to)
+        {
+            m_storage.add(vertex_integer_type(x_ctrl, y_ctrl, vertex_integer_type::cmd_curve3));
+            m_storage.add(vertex_integer_type(x_to,   y_to,   vertex_integer_type::cmd_curve3));
+        }
+
+        //--------------------------------------------------------------------
+        void curve4(T x_ctrl1, T y_ctrl1,
+                    T x_ctrl2, T y_ctrl2,
+                    T x_to,    T y_to)
+        {
+            m_storage.add(vertex_integer_type(x_ctrl1, y_ctrl1, vertex_integer_type::cmd_curve4));
+            m_storage.add(vertex_integer_type(x_ctrl2, y_ctrl2, vertex_integer_type::cmd_curve4));
+            m_storage.add(vertex_integer_type(x_to,    y_to,    vertex_integer_type::cmd_curve4));
+        }
+
+        //--------------------------------------------------------------------
+        void close_polygon() {}
+
+        //--------------------------------------------------------------------
+        unsigned size() const { return m_storage.size(); }
+        unsigned vertex(unsigned idx, T* x, T* y) const
+        {
+            const vertex_integer_type& v = m_storage[idx];
+            *x = v.x >> 1;
+            *y = v.y >> 1;
+            return ((v.y & 1) << 1) | (v.x & 1);
+        }
+
+        //--------------------------------------------------------------------
+        unsigned byte_size() const { return m_storage.size() * sizeof(vertex_integer_type); }
+        void serialize(int8u* ptr) const
+        {
+            unsigned i;
+            for(i = 0; i < m_storage.size(); i++)
+            {
+                memcpy(ptr, &m_storage[i], sizeof(vertex_integer_type));
+                ptr += sizeof(vertex_integer_type);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void rewind(unsigned)
+        {
+            m_vertex_idx = 0;
+            m_closed = true;
+        }
+
+        //--------------------------------------------------------------------
+        unsigned vertex(double* x, double* y)
+        {
+            if(m_storage.size() < 2 || m_vertex_idx > m_storage.size())
+            {
+                *x = 0;
+                *y = 0;
+                return path_cmd_stop;
+            }
+            if(m_vertex_idx == m_storage.size())
+            {
+                *x = 0;
+                *y = 0;
+                ++m_vertex_idx;
+                return path_cmd_end_poly | path_flags_close;
+            }
+            unsigned cmd = m_storage[m_vertex_idx].vertex(x, y);
+            if(is_move_to(cmd) && !m_closed)
+            {
+                *x = 0;
+                *y = 0;
+                m_closed = true;
+                return path_cmd_end_poly | path_flags_close;
+            }
+            m_closed = false;
+            ++m_vertex_idx;
+            return cmd;
+        }
+
+        //--------------------------------------------------------------------
+        rect_d bounding_rect() const
+        {
+            rect_d bounds(1e100, 1e100, -1e100, -1e100);
+            if(m_storage.size() == 0)
+            {
+                bounds.x1 = bounds.y1 = bounds.x2 = bounds.y2 = 0.0;
+            }
+            else
+            {
+                unsigned i;
+                for(i = 0; i < m_storage.size(); i++)
+                {
+                    double x, y;
+                    m_storage[i].vertex(&x, &y);
+                    if(x < bounds.x1) bounds.x1 = x;
+                    if(y < bounds.y1) bounds.y1 = y;
+                    if(x > bounds.x2) bounds.x2 = x;
+                    if(y > bounds.y2) bounds.y2 = y;
+                }
+            }
+            return bounds;
+        }
+
+
+    private:
+        pod_deque<vertex_integer_type, 6> m_storage;
+        unsigned                          m_vertex_idx;
+        bool                              m_closed;
+    };
+
+
+
+
+    //-----------------------------------------serialized_integer_path_adaptor
+    template<class T, unsigned CoordShift=6> class serialized_integer_path_adaptor
+    {
+    public:
+        typedef vertex_integer<T, CoordShift> vertex_integer_type;
+
+        //--------------------------------------------------------------------
+        serialized_integer_path_adaptor() :
+            m_data(0),
+            m_end(0),
+            m_ptr(0),
+            m_dx(0.0),
+            m_dy(0.0),
+            m_scale(1.0),
+            m_vertices(0)
+        {}
+
+        //--------------------------------------------------------------------
+        serialized_integer_path_adaptor(const int8u* data, unsigned size,
+                                        double dx, double dy) :
+            m_data(data),
+            m_end(data + size),
+            m_ptr(data),
+            m_dx(dx),
+            m_dy(dy),
+            m_vertices(0)
+        {}
+
+        //--------------------------------------------------------------------
+        void init(const int8u* data, unsigned size,
+                  double dx, double dy, double scale=1.0)
+        {
+            m_data     = data;
+            m_end      = data + size;
+            m_ptr      = data;
+            m_dx       = dx;
+            m_dy       = dy;
+            m_scale    = scale;
+            m_vertices = 0;
+        }
+
+
+        //--------------------------------------------------------------------
+        void rewind(unsigned)
+        {
+            m_ptr      = m_data;
+            m_vertices = 0;
+        }
+
+        //--------------------------------------------------------------------
+        unsigned vertex(double* x, double* y)
+        {
+            if(m_data == 0 || m_ptr > m_end)
+            {
+                *x = 0;
+                *y = 0;
+                return path_cmd_stop;
+            }
+
+            if(m_ptr == m_end)
+            {
+                *x = 0;
+                *y = 0;
+                m_ptr += sizeof(vertex_integer_type);
+                return path_cmd_end_poly | path_flags_close;
+            }
+
+            vertex_integer_type v;
+            memcpy(&v, m_ptr, sizeof(vertex_integer_type));
+            unsigned cmd = v.vertex(x, y, m_dx, m_dy, m_scale);
+            if(is_move_to(cmd) && m_vertices > 2)
+            {
+                *x = 0;
+                *y = 0;
+                m_vertices = 0;
+                return path_cmd_end_poly | path_flags_close;
+            }
+            ++m_vertices;
+            m_ptr += sizeof(vertex_integer_type);
+            return cmd;
+        }
+
+    private:
+        const int8u* m_data;
+        const int8u* m_end;
+        const int8u* m_ptr;
+        double       m_dx;
+        double       m_dy;
+        double       m_scale;
+        unsigned     m_vertices;
+    };
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_pattern_filters_rgba.h b/agg/inc/agg_pattern_filters_rgba.h
new file mode 100755
index 000000000000..5d194b2e39ba
--- /dev/null
+++ b/agg/inc/agg_pattern_filters_rgba.h
@@ -0,0 +1,122 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_PATTERN_FILTERS_RGBA8_INCLUDED
+#define AGG_PATTERN_FILTERS_RGBA8_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_line_aa_basics.h"
+#include "agg_color_rgba.h"
+
+
+namespace agg
+{
+
+    //=======================================================pattern_filter_nn
+    template<class ColorT> struct pattern_filter_nn
+    {
+        typedef ColorT color_type;
+        static unsigned dilation() { return 0; }
+
+        static void AGG_INLINE pixel_low_res(color_type const* const* buf,
+                                             color_type* p, int x, int y)
+        {
+            *p = buf[y][x];
+        }
+
+        static void AGG_INLINE pixel_high_res(color_type const* const* buf,
+                                              color_type* p, int x, int y)
+        {
+            *p = buf[y >> line_subpixel_shift]
+                    [x >> line_subpixel_shift];
+        }
+    };
+
+    typedef pattern_filter_nn<rgba8>  pattern_filter_nn_rgba8;
+    typedef pattern_filter_nn<rgba16> pattern_filter_nn_rgba16;
+
+
+    //===========================================pattern_filter_bilinear_rgba
+    template<class ColorT> struct pattern_filter_bilinear_rgba
+    {
+        typedef ColorT color_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+
+
+        static unsigned dilation() { return 1; }
+
+        static AGG_INLINE void pixel_low_res(color_type const* const* buf,
+                                             color_type* p, int x, int y)
+        {
+            *p = buf[y][x];
+        }
+
+        static AGG_INLINE void pixel_high_res(color_type const* const* buf,
+                                              color_type* p, int x, int y)
+        {
+            calc_type r, g, b, a;
+            r = g = b = a = line_subpixel_size * line_subpixel_size / 2;
+
+            calc_type weight;
+            int x_lr = x >> line_subpixel_shift;
+            int y_lr = y >> line_subpixel_shift;
+
+            x &= line_subpixel_mask;
+            y &= line_subpixel_mask;
+            const color_type* ptr = buf[y_lr] + x_lr;
+
+            weight = (line_subpixel_size - x) *
+                     (line_subpixel_size - y);
+            r += weight * ptr->r;
+            g += weight * ptr->g;
+            b += weight * ptr->b;
+            a += weight * ptr->a;
+
+            ++ptr;
+
+            weight = x * (line_subpixel_size - y);
+            r += weight * ptr->r;
+            g += weight * ptr->g;
+            b += weight * ptr->b;
+            a += weight * ptr->a;
+
+            ptr = buf[y_lr + 1] + x_lr;
+
+            weight = (line_subpixel_size - x) * y;
+            r += weight * ptr->r;
+            g += weight * ptr->g;
+            b += weight * ptr->b;
+            a += weight * ptr->a;
+
+            ++ptr;
+
+            weight = x * y;
+            r += weight * ptr->r;
+            g += weight * ptr->g;
+            b += weight * ptr->b;
+            a += weight * ptr->a;
+
+            p->r = (value_type)(r >> line_subpixel_shift * 2);
+            p->g = (value_type)(g >> line_subpixel_shift * 2);
+            p->b = (value_type)(b >> line_subpixel_shift * 2);
+            p->a = (value_type)(a >> line_subpixel_shift * 2);
+        }
+    };
+
+    typedef pattern_filter_bilinear_rgba<rgba8>  pattern_filter_bilinear_rgba8;
+    typedef pattern_filter_bilinear_rgba<rgba16> pattern_filter_bilinear_rgba16;
+}
+
+#endif
diff --git a/agg/inc/agg_pixfmt_amask_adaptor.h b/agg/inc/agg_pixfmt_amask_adaptor.h
new file mode 100755
index 000000000000..7f3d5899b1c6
--- /dev/null
+++ b/agg/inc/agg_pixfmt_amask_adaptor.h
@@ -0,0 +1,265 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_PIXFMT_AMASK_ADAPTOR_INCLUDED
+#define AGG_PIXFMT_AMASK_ADAPTOR_INCLUDED
+
+
+#include <string.h>
+#include "agg_rendering_buffer.h"
+
+
+namespace agg
+{
+    //==================================================pixfmt_amask_adaptor
+    template<class PixFmt, class AlphaMask> class pixfmt_amask_adaptor
+    {
+    public:
+        typedef PixFmt pixfmt_type;
+        typedef typename pixfmt_type::color_type color_type;
+        typedef AlphaMask amask_type;
+        typedef typename amask_type::cover_type cover_type;
+
+    private:
+        enum { span_extra_tail = 256 };
+
+        void realloc_span(unsigned len)
+        {
+            if(len > m_max_len)
+            {
+                delete [] m_span;
+                m_span = new cover_type[m_max_len = len + span_extra_tail];
+            }
+        }
+
+        void init_span(unsigned len)
+        {
+            realloc_span(len);
+
+            // ATTN! May work incorrectly if cover_type is more that one byte
+            memset(m_span, amask_type::cover_full, len * sizeof(cover_type));
+        }
+
+        void init_span(unsigned len, const cover_type* covers)
+        {
+            realloc_span(len);
+            memcpy(m_span, covers, len * sizeof(cover_type));
+        }
+
+
+    public:
+        ~pixfmt_amask_adaptor() { delete [] m_span; }
+
+        pixfmt_amask_adaptor(pixfmt_type& pixf, const amask_type& mask) :
+            m_pixf(&pixf), m_mask(&mask), m_span(0), m_max_len(0)
+        {}
+
+        void attach_pixfmt(pixfmt_type& pixf)          { m_pixf = &pixf; }
+        void attach_alpha_mask(const amask_type& mask) { m_mask = &mask; }
+
+        //--------------------------------------------------------------------
+        unsigned width()  const { return m_pixf->width();  }
+        unsigned height() const { return m_pixf->height(); }
+
+        //--------------------------------------------------------------------
+        color_type pixel(int x, int y)
+        {
+            return m_pixf->pixel(x, y);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_pixel(int x, int y, const color_type& c)
+        {
+            m_pixf->blend_pixel(x, y, c, m_mask->pixel(x, y));
+        }
+
+        //--------------------------------------------------------------------
+        void blend_pixel(int x, int y, const color_type& c, cover_type cover)
+        {
+            m_pixf->blend_pixel(x, y, c, m_mask->combine_pixel(x, y, cover));
+        }
+
+        //--------------------------------------------------------------------
+        void copy_hline(int x, int y,
+                        unsigned len,
+                        const color_type& c)
+        {
+            realloc_span(len);
+            m_mask->fill_hspan(x, y, m_span, len);
+            m_pixf->blend_solid_hspan(x, y, len, c, m_span);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         cover_type cover)
+        {
+            init_span(len);
+            m_mask->combine_hspan(x, y, m_span, len);
+            m_pixf->blend_solid_hspan(x, y, len, c, m_span);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_vline(int x, int y,
+                        unsigned len,
+                        const color_type& c)
+        {
+            realloc_span(len);
+            m_mask->fill_vspan(x, y, m_span, len);
+            m_pixf->blend_solid_vspan(x, y, len, c, m_span);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         cover_type cover)
+        {
+            init_span(len);
+            m_mask->combine_vspan(x, y, m_span, len);
+            m_pixf->blend_solid_vspan(x, y, len, c, m_span);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_from(const rendering_buffer& from,
+                       int xdst, int ydst,
+                       int xsrc, int ysrc,
+                       unsigned len)
+        {
+            m_pixf->copy_from(from, xdst, ydst, xsrc, ysrc, len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const cover_type* covers)
+        {
+            init_span(len, covers);
+            m_mask->combine_hspan(x, y, m_span, len);
+            m_pixf->blend_solid_hspan(x, y, len, c, m_span);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const cover_type* covers)
+        {
+            init_span(len, covers);
+            m_mask->combine_vspan(x, y, m_span, len);
+            m_pixf->blend_solid_vspan(x, y, len, c, m_span);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const cover_type* covers,
+                               cover_type cover = cover_full)
+        {
+            if(covers)
+            {
+                init_span(len, covers);
+                m_mask->combine_hspan(x, y, m_span, len);
+            }
+            else
+            {
+                realloc_span(len);
+                m_mask->fill_hspan(x, y, m_span, len);
+            }
+            m_pixf->blend_color_hspan(x, y, len, colors, m_span, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const cover_type* covers,
+                               cover_type cover = cover_full)
+        {
+            if(covers)
+            {
+                init_span(len, covers);
+                m_mask->combine_vspan(x, y, m_span, len);
+            }
+            else
+            {
+                realloc_span(len);
+                m_mask->fill_vspan(x, y, m_span, len);
+            }
+            m_pixf->blend_color_vspan(x, y, len, colors, m_span, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const cover_type* covers,
+                                      cover_type cover = cover_full)
+        {
+            if(covers)
+            {
+                init_span(len, covers);
+                m_mask->combine_hspan(x, y, m_span, len);
+            }
+            else
+            {
+                realloc_span(len);
+                m_mask->fill_hspan(x, y, m_span, len);
+            }
+            m_pixf->blend_opaque_color_hspan(x, y, len, colors, m_span, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const cover_type* covers,
+                                      cover_type cover = cover_full)
+        {
+            if(covers)
+            {
+                init_span(len, covers);
+                m_mask->combine_vspan(x, y, m_span, len);
+            }
+            else
+            {
+                realloc_span(len);
+                m_mask->fill_vspan(x, y, m_span, len);
+            }
+            m_pixf->blend_opaque_color_vspan(x, y, len, colors, m_span, cover);
+        }
+
+
+    private:
+        pixfmt_type*      m_pixf;
+        const amask_type* m_mask;
+
+        cover_type*       m_span;
+        unsigned          m_max_len;
+    };
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_pixfmt_gray.h b/agg/inc/agg_pixfmt_gray.h
new file mode 100755
index 000000000000..48f47d1de32e
--- /dev/null
+++ b/agg/inc/agg_pixfmt_gray.h
@@ -0,0 +1,703 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_PIXFMT_GRAY_INCLUDED
+#define AGG_PIXFMT_GRAY_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+#include "agg_color_gray.h"
+#include "agg_rendering_buffer.h"
+
+namespace agg
+{
+
+    //============================================================blender_gray
+    template<class ColorT> struct blender_gray
+    {
+        typedef ColorT color_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum { base_shift = color_type::base_shift };
+
+        static AGG_INLINE void blend_pix(value_type* p, unsigned cv,
+                                         unsigned alpha, unsigned)
+        {
+            *p = (value_type)((((cv - calc_type(*p)) * alpha) + (calc_type(*p) << base_shift)) >> base_shift);
+        }
+    };
+
+
+    //======================================================blender_gray_pre
+    template<class ColorT> struct blender_gray_pre
+    {
+        typedef ColorT color_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum { base_shift = color_type::base_shift };
+
+        static AGG_INLINE void blend_pix(value_type* p, unsigned cv,
+                                         unsigned alpha, unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            cover = (cover + 1) << (base_shift - 8);
+            *p = (value_type)((*p * alpha + cv * cover) >> base_shift);
+        }
+    };
+
+
+
+    //=====================================================apply_gamma_dir_gray
+    template<class ColorT, class GammaLut> class apply_gamma_dir_gray
+    {
+    public:
+        typedef typename ColorT::value_type value_type;
+
+        apply_gamma_dir_gray(const GammaLut& gamma) : m_gamma(gamma) {}
+
+        AGG_INLINE void operator () (value_type* p)
+        {
+            *p = m_gamma.dir(*p);
+        }
+
+    private:
+        const GammaLut& m_gamma;
+    };
+
+
+
+    //=====================================================apply_gamma_inv_gray
+    template<class ColorT, class GammaLut> class apply_gamma_inv_gray
+    {
+    public:
+        typedef typename ColorT::value_type value_type;
+
+        apply_gamma_inv_gray(const GammaLut& gamma) : m_gamma(gamma) {}
+
+        AGG_INLINE void operator () (value_type* p)
+        {
+            *p = m_gamma.inv(*p);
+        }
+
+    private:
+        const GammaLut& m_gamma;
+    };
+
+
+
+    //======================================================pixel_formats_gray
+    template<class Blender, unsigned Step=1, unsigned Offset=0>
+    class pixel_formats_gray
+    {
+    public:
+        typedef rendering_buffer::row_data row_data;
+        typedef typename Blender::color_type color_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_size  = color_type::base_size,
+            base_mask  = color_type::base_mask
+        };
+
+    private:
+        //--------------------------------------------------------------------
+        static AGG_INLINE void copy_or_blend_pix(value_type* p,
+                                                 const color_type& c,
+                                                 unsigned cover)
+        {
+            if (c.a)
+            {
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    *p = c.v;
+                }
+                else
+                {
+                    Blender::blend_pix(p, c.v, alpha, cover);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void copy_or_blend_opaque_pix(value_type* p,
+                                                        const color_type& c,
+                                                        unsigned cover)
+        {
+            if(cover == 255)
+            {
+                *p = c.v;
+            }
+            else
+            {
+                Blender::blend_pix(p, c.v, (cover + 1) << (base_shift - 8), cover);
+            }
+        }
+
+    public:
+        //--------------------------------------------------------------------
+        pixel_formats_gray(rendering_buffer& rb) :
+            m_rbuf(&rb)
+        {}
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE unsigned width()  const { return m_rbuf->width();  }
+        AGG_INLINE unsigned height() const { return m_rbuf->height(); }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE color_type pixel(int x, int y) const
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+            return color_type(*p);
+        }
+
+        //--------------------------------------------------------------------
+        row_data span(int x, int y) const
+        {
+            return row_data(x,
+                            width() - 1,
+                            m_rbuf->row(y) +
+                                x * Step * sizeof(value_type) +
+                                Offset * sizeof(value_type));
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_pixel(int x, int y, const color_type& c)
+        {
+            *((value_type*)m_rbuf->row(y) + x * Step + Offset) = c.v;
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void blend_pixel(int x, int y, const color_type& c, int8u cover)
+        {
+            copy_or_blend_pix((value_type*)m_rbuf->row(y) + x * Step + Offset, c, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_hline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *p = c.v;
+                p += Step;
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_vline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+            do
+            {
+                *p = c.v;
+                p = (value_type*)m_rbuf->next_row(p);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    do
+                    {
+                        *p = c.v;
+                        p += Step;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        Blender::blend_pix(p, c.v, alpha, cover);
+                        p += Step;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    do
+                    {
+                        *p = c.v;
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        Blender::blend_pix(p, c.v, alpha, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+                do
+                {
+                    calc_type alpha = (calc_type(c.a) * (calc_type(*covers) + 1)) >> 8;
+                    if(alpha == base_mask)
+                    {
+                        *p = c.v;
+                    }
+                    else
+                    {
+                        Blender::blend_pix(p, c.v, alpha, *covers);
+                    }
+                    p += Step;
+                    ++covers;
+                }
+                while(--len);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+                do
+                {
+                    calc_type alpha = (calc_type(c.a) * (calc_type(*covers) + 1)) >> 8;
+                    if(alpha == base_mask)
+                    {
+                        *p = c.v;
+                    }
+                    else
+                    {
+                        Blender::blend_pix(p, c.v, alpha, *covers);
+                    }
+                    p = (value_type*)m_rbuf->next_row(p);
+                    ++covers;
+                }
+                while(--len);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_pix(p, *colors++, *covers++);
+                    p += Step;
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        if(colors->a == base_mask)
+                        {
+                            *p = colors->v;
+                        }
+                        else
+                        {
+                            copy_or_blend_pix(p, *colors, 255);
+                        }
+                        p += Step;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_pix(p, *colors++, cover);
+                        p += Step;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_pix(p, *colors++, *covers++);
+                    p = (value_type*)m_rbuf->next_row(p);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        if(colors->a == base_mask)
+                        {
+                            *p = colors->v;
+                        }
+                        else
+                        {
+                            copy_or_blend_pix(p, *colors, 255);
+                        }
+                        p = (value_type*)m_rbuf->next_row(p);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_pix(p, *colors++, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p += Step;
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        *p = colors->v;
+                        p += Step;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p += Step;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x * Step + Offset;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p = (value_type*)m_rbuf->next_row(p);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        *p = colors->v;
+                        p = (value_type*)m_rbuf->next_row(p);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        template<class Function> void for_each_pixel(Function f)
+        {
+            unsigned y;
+            for(y = 0; y < height(); ++y)
+            {
+                unsigned len = width();
+                value_type* p = (value_type*)m_rbuf->row(y) + Offset;
+                do
+                {
+                    f(p);
+                    p += Step;
+                }
+                while(--len);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_dir(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_dir_gray<color_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_inv(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_inv_gray<color_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        void copy_from(const rendering_buffer& from,
+                       int xdst, int ydst,
+                       int xsrc, int ysrc,
+                       unsigned len)
+        {
+            memmove((value_type*)m_rbuf->row(ydst) + xdst,
+                    (value_type*)from.row(ysrc) + xsrc,
+                    sizeof(value_type) * len);
+        }
+
+    private:
+        rendering_buffer* m_rbuf;
+    };
+
+    typedef blender_gray<gray8>      blender_gray8;
+    typedef blender_gray_pre<gray8>  blender_gray8_pre;
+    typedef blender_gray<gray16>     blender_gray16;
+    typedef blender_gray_pre<gray16> blender_gray16_pre;
+
+    typedef pixel_formats_gray<blender_gray8, 1, 0> pixfmt_gray8;         //----pixfmt_gray8
+
+    typedef pixel_formats_gray<blender_gray8, 3, 0> pixfmt_gray8_rgb24r;  //----pixfmt_gray8_rgb24r
+    typedef pixel_formats_gray<blender_gray8, 3, 1> pixfmt_gray8_rgb24g;  //----pixfmt_gray8_rgb24g
+    typedef pixel_formats_gray<blender_gray8, 3, 2> pixfmt_gray8_rgb24b;  //----pixfmt_gray8_rgb24b
+
+    typedef pixel_formats_gray<blender_gray8, 3, 2> pixfmt_gray8_bgr24r;  //----pixfmt_gray8_bgr24r
+    typedef pixel_formats_gray<blender_gray8, 3, 1> pixfmt_gray8_bgr24g;  //----pixfmt_gray8_bgr24g
+    typedef pixel_formats_gray<blender_gray8, 3, 0> pixfmt_gray8_bgr24b;  //----pixfmt_gray8_bgr24b
+
+    typedef pixel_formats_gray<blender_gray8, 4, 0> pixfmt_gray8_rgba32r; //----pixfmt_gray8_rgba32r
+    typedef pixel_formats_gray<blender_gray8, 4, 1> pixfmt_gray8_rgba32g; //----pixfmt_gray8_rgba32g
+    typedef pixel_formats_gray<blender_gray8, 4, 2> pixfmt_gray8_rgba32b; //----pixfmt_gray8_rgba32b
+    typedef pixel_formats_gray<blender_gray8, 4, 3> pixfmt_gray8_rgba32a; //----pixfmt_gray8_rgba32a
+
+    typedef pixel_formats_gray<blender_gray8, 4, 1> pixfmt_gray8_argb32r; //----pixfmt_gray8_argb32r
+    typedef pixel_formats_gray<blender_gray8, 4, 2> pixfmt_gray8_argb32g; //----pixfmt_gray8_argb32g
+    typedef pixel_formats_gray<blender_gray8, 4, 3> pixfmt_gray8_argb32b; //----pixfmt_gray8_argb32b
+    typedef pixel_formats_gray<blender_gray8, 4, 0> pixfmt_gray8_argb32a; //----pixfmt_gray8_argb32a
+
+    typedef pixel_formats_gray<blender_gray8, 4, 2> pixfmt_gray8_bgra32r; //----pixfmt_gray8_bgra32r
+    typedef pixel_formats_gray<blender_gray8, 4, 1> pixfmt_gray8_bgra32g; //----pixfmt_gray8_bgra32g
+    typedef pixel_formats_gray<blender_gray8, 4, 0> pixfmt_gray8_bgra32b; //----pixfmt_gray8_bgra32b
+    typedef pixel_formats_gray<blender_gray8, 4, 3> pixfmt_gray8_bgra32a; //----pixfmt_gray8_bgra32a
+
+    typedef pixel_formats_gray<blender_gray8, 4, 3> pixfmt_gray8_abgr32r; //----pixfmt_gray8_abgr32r
+    typedef pixel_formats_gray<blender_gray8, 4, 2> pixfmt_gray8_abgr32g; //----pixfmt_gray8_abgr32g
+    typedef pixel_formats_gray<blender_gray8, 4, 1> pixfmt_gray8_abgr32b; //----pixfmt_gray8_abgr32b
+    typedef pixel_formats_gray<blender_gray8, 4, 0> pixfmt_gray8_abgr32a; //----pixfmt_gray8_abgr32a
+
+    typedef pixel_formats_gray<blender_gray8_pre, 1, 0> pixfmt_gray8_pre;         //----pixfmt_gray8_pre
+
+    typedef pixel_formats_gray<blender_gray8_pre, 3, 0> pixfmt_gray8_pre_rgb24r;  //----pixfmt_gray8_pre_rgb24r
+    typedef pixel_formats_gray<blender_gray8_pre, 3, 1> pixfmt_gray8_pre_rgb24g;  //----pixfmt_gray8_pre_rgb24g
+    typedef pixel_formats_gray<blender_gray8_pre, 3, 2> pixfmt_gray8_pre_rgb24b;  //----pixfmt_gray8_pre_rgb24b
+
+    typedef pixel_formats_gray<blender_gray8_pre, 3, 2> pixfmt_gray8_pre_bgr24r;  //----pixfmt_gray8_pre_bgr24r
+    typedef pixel_formats_gray<blender_gray8_pre, 3, 1> pixfmt_gray8_pre_bgr24g;  //----pixfmt_gray8_pre_bgr24g
+    typedef pixel_formats_gray<blender_gray8_pre, 3, 0> pixfmt_gray8_pre_bgr24b;  //----pixfmt_gray8_pre_bgr24b
+
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 0> pixfmt_gray8_pre_rgba32r; //----pixfmt_gray8_pre_rgba32r
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 1> pixfmt_gray8_pre_rgba32g; //----pixfmt_gray8_pre_rgba32g
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 2> pixfmt_gray8_pre_rgba32b; //----pixfmt_gray8_pre_rgba32b
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 3> pixfmt_gray8_pre_rgba32a; //----pixfmt_gray8_pre_rgba32a
+
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 1> pixfmt_gray8_pre_argb32r; //----pixfmt_gray8_pre_argb32r
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 2> pixfmt_gray8_pre_argb32g; //----pixfmt_gray8_pre_argb32g
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 3> pixfmt_gray8_pre_argb32b; //----pixfmt_gray8_pre_argb32b
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 0> pixfmt_gray8_pre_argb32a; //----pixfmt_gray8_pre_argb32a
+
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 2> pixfmt_gray8_pre_bgra32r; //----pixfmt_gray8_pre_bgra32r
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 1> pixfmt_gray8_pre_bgra32g; //----pixfmt_gray8_pre_bgra32g
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 0> pixfmt_gray8_pre_bgra32b; //----pixfmt_gray8_pre_bgra32b
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 3> pixfmt_gray8_pre_bgra32a; //----pixfmt_gray8_pre_bgra32a
+
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 3> pixfmt_gray8_pre_abgr32r; //----pixfmt_gray8_pre_abgr32r
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 2> pixfmt_gray8_pre_abgr32g; //----pixfmt_gray8_pre_abgr32g
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 1> pixfmt_gray8_pre_abgr32b; //----pixfmt_gray8_pre_abgr32b
+    typedef pixel_formats_gray<blender_gray8_pre, 4, 0> pixfmt_gray8_pre_abgr32a; //----pixfmt_gray8_pre_abgr32a
+
+    typedef pixel_formats_gray<blender_gray16, 1, 0> pixfmt_gray16;         //----pixfmt_gray16
+
+    typedef pixel_formats_gray<blender_gray16, 3, 0> pixfmt_gray16_rgb48r;  //----pixfmt_gray16_rgb48r
+    typedef pixel_formats_gray<blender_gray16, 3, 1> pixfmt_gray16_rgb48g;  //----pixfmt_gray16_rgb48g
+    typedef pixel_formats_gray<blender_gray16, 3, 2> pixfmt_gray16_rgb48b;  //----pixfmt_gray16_rgb48b
+
+    typedef pixel_formats_gray<blender_gray16, 3, 2> pixfmt_gray16_bgr48r;  //----pixfmt_gray16_bgr48r
+    typedef pixel_formats_gray<blender_gray16, 3, 1> pixfmt_gray16_bgr48g;  //----pixfmt_gray16_bgr48g
+    typedef pixel_formats_gray<blender_gray16, 3, 0> pixfmt_gray16_bgr48b;  //----pixfmt_gray16_bgr48b
+
+    typedef pixel_formats_gray<blender_gray16, 4, 0> pixfmt_gray16_rgba64r; //----pixfmt_gray16_rgba64r
+    typedef pixel_formats_gray<blender_gray16, 4, 1> pixfmt_gray16_rgba64g; //----pixfmt_gray16_rgba64g
+    typedef pixel_formats_gray<blender_gray16, 4, 2> pixfmt_gray16_rgba64b; //----pixfmt_gray16_rgba64b
+    typedef pixel_formats_gray<blender_gray16, 4, 3> pixfmt_gray16_rgba64a; //----pixfmt_gray16_rgba64a
+
+    typedef pixel_formats_gray<blender_gray16, 4, 1> pixfmt_gray16_argb64r; //----pixfmt_gray16_argb64r
+    typedef pixel_formats_gray<blender_gray16, 4, 2> pixfmt_gray16_argb64g; //----pixfmt_gray16_argb64g
+    typedef pixel_formats_gray<blender_gray16, 4, 3> pixfmt_gray16_argb64b; //----pixfmt_gray16_argb64b
+    typedef pixel_formats_gray<blender_gray16, 4, 0> pixfmt_gray16_argb64a; //----pixfmt_gray16_argb64a
+
+    typedef pixel_formats_gray<blender_gray16, 4, 2> pixfmt_gray16_bgra64r; //----pixfmt_gray16_bgra64r
+    typedef pixel_formats_gray<blender_gray16, 4, 1> pixfmt_gray16_bgra64g; //----pixfmt_gray16_bgra64g
+    typedef pixel_formats_gray<blender_gray16, 4, 0> pixfmt_gray16_bgra64b; //----pixfmt_gray16_bgra64b
+    typedef pixel_formats_gray<blender_gray16, 4, 3> pixfmt_gray16_bgra64a; //----pixfmt_gray16_bgra64a
+
+    typedef pixel_formats_gray<blender_gray16, 4, 3> pixfmt_gray16_abgr64r; //----pixfmt_gray16_abgr64r
+    typedef pixel_formats_gray<blender_gray16, 4, 2> pixfmt_gray16_abgr64g; //----pixfmt_gray16_abgr64g
+    typedef pixel_formats_gray<blender_gray16, 4, 1> pixfmt_gray16_abgr64b; //----pixfmt_gray16_abgr64b
+    typedef pixel_formats_gray<blender_gray16, 4, 0> pixfmt_gray16_abgr64a; //----pixfmt_gray16_abgr64a
+
+    typedef pixel_formats_gray<blender_gray16_pre, 1, 0> pixfmt_gray16_pre;         //----pixfmt_gray16_pre
+
+    typedef pixel_formats_gray<blender_gray16_pre, 3, 0> pixfmt_gray16_pre_rgb48r;  //----pixfmt_gray16_pre_rgb48r
+    typedef pixel_formats_gray<blender_gray16_pre, 3, 1> pixfmt_gray16_pre_rgb48g;  //----pixfmt_gray16_pre_rgb48g
+    typedef pixel_formats_gray<blender_gray16_pre, 3, 2> pixfmt_gray16_pre_rgb48b;  //----pixfmt_gray16_pre_rgb48b
+
+    typedef pixel_formats_gray<blender_gray16_pre, 3, 2> pixfmt_gray16_pre_bgr48r;  //----pixfmt_gray16_pre_bgr48r
+    typedef pixel_formats_gray<blender_gray16_pre, 3, 1> pixfmt_gray16_pre_bgr48g;  //----pixfmt_gray16_pre_bgr48g
+    typedef pixel_formats_gray<blender_gray16_pre, 3, 0> pixfmt_gray16_pre_bgr48b;  //----pixfmt_gray16_pre_bgr48b
+
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 0> pixfmt_gray16_pre_rgba64r; //----pixfmt_gray16_pre_rgba64r
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 1> pixfmt_gray16_pre_rgba64g; //----pixfmt_gray16_pre_rgba64g
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 2> pixfmt_gray16_pre_rgba64b; //----pixfmt_gray16_pre_rgba64b
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 3> pixfmt_gray16_pre_rgba64a; //----pixfmt_gray16_pre_rgba64a
+
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 1> pixfmt_gray16_pre_argb64r; //----pixfmt_gray16_pre_argb64r
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 2> pixfmt_gray16_pre_argb64g; //----pixfmt_gray16_pre_argb64g
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 3> pixfmt_gray16_pre_argb64b; //----pixfmt_gray16_pre_argb64b
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 0> pixfmt_gray16_pre_argb64a; //----pixfmt_gray16_pre_argb64a
+
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 2> pixfmt_gray16_pre_bgra64r; //----pixfmt_gray16_pre_bgra64r
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 1> pixfmt_gray16_pre_bgra64g; //----pixfmt_gray16_pre_bgra64g
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 0> pixfmt_gray16_pre_bgra64b; //----pixfmt_gray16_pre_bgra64b
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 3> pixfmt_gray16_pre_bgra64a; //----pixfmt_gray16_pre_bgra64a
+
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 3> pixfmt_gray16_pre_abgr64r; //----pixfmt_gray16_pre_abgr64r
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 2> pixfmt_gray16_pre_abgr64g; //----pixfmt_gray16_pre_abgr64g
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 1> pixfmt_gray16_pre_abgr64b; //----pixfmt_gray16_pre_abgr64b
+    typedef pixel_formats_gray<blender_gray16_pre, 4, 0> pixfmt_gray16_pre_abgr64a; //----pixfmt_gray16_pre_abgr64a
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_pixfmt_rgb.h b/agg/inc/agg_pixfmt_rgb.h
new file mode 100755
index 000000000000..436dfa4b284f
--- /dev/null
+++ b/agg/inc/agg_pixfmt_rgb.h
@@ -0,0 +1,760 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_PIXFMT_RGB_INCLUDED
+#define AGG_PIXFMT_RGB_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_rendering_buffer.h"
+
+namespace agg
+{
+
+    //=====================================================apply_gamma_dir_rgb
+    template<class ColorT, class Order, class GammaLut> class apply_gamma_dir_rgb
+    {
+    public:
+        typedef typename ColorT::value_type value_type;
+
+        apply_gamma_dir_rgb(const GammaLut& gamma) : m_gamma(gamma) {}
+
+        AGG_INLINE void operator () (value_type* p)
+        {
+            p[Order::R] = m_gamma.dir(p[Order::R]);
+            p[Order::G] = m_gamma.dir(p[Order::G]);
+            p[Order::B] = m_gamma.dir(p[Order::B]);
+        }
+
+    private:
+        const GammaLut& m_gamma;
+    };
+
+
+
+    //=====================================================apply_gamma_inv_rgb
+    template<class ColorT, class Order, class GammaLut> class apply_gamma_inv_rgb
+    {
+    public:
+        typedef typename ColorT::value_type value_type;
+
+        apply_gamma_inv_rgb(const GammaLut& gamma) : m_gamma(gamma) {}
+
+        AGG_INLINE void operator () (value_type* p)
+        {
+            p[Order::R] = m_gamma.inv(p[Order::R]);
+            p[Order::G] = m_gamma.inv(p[Order::G]);
+            p[Order::B] = m_gamma.inv(p[Order::B]);
+        }
+
+    private:
+        const GammaLut& m_gamma;
+    };
+
+
+    //=========================================================blender_rgb
+    template<class ColorT, class Order> struct blender_rgb
+    {
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum { base_shift = color_type::base_shift };
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void blend_pix(value_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            p[Order::R] += (value_type)(((cr - p[Order::R]) * alpha) >> base_shift);
+            p[Order::G] += (value_type)(((cg - p[Order::G]) * alpha) >> base_shift);
+            p[Order::B] += (value_type)(((cb - p[Order::B]) * alpha) >> base_shift);
+        }
+    };
+
+
+    //======================================================blender_rgb_pre
+    template<class ColorT, class Order> struct blender_rgb_pre
+    {
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum { base_shift = color_type::base_shift };
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void blend_pix(value_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            cover = (cover + 1) << (base_shift - 8);
+            p[Order::R] = (value_type)((p[Order::R] * alpha + cr * cover) >> base_shift);
+            p[Order::G] = (value_type)((p[Order::G] * alpha + cg * cover) >> base_shift);
+            p[Order::B] = (value_type)((p[Order::B] * alpha + cb * cover) >> base_shift);
+        }
+    };
+
+
+
+    //===================================================blender_rgb_gamma
+    template<class ColorT, class Order, class Gamma> class blender_rgb_gamma
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Gamma gamma_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum { base_shift = color_type::base_shift };
+
+        //--------------------------------------------------------------------
+        blender_rgb_gamma() : m_gamma(0) {}
+        void gamma(const gamma_type& g) { m_gamma = &g; }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void blend_pix(value_type* p,
+                                  unsigned cr, unsigned cg, unsigned cb,
+                                  unsigned alpha,
+                                  unsigned)
+        {
+            calc_type r = m_gamma->dir(p[Order::R]);
+            calc_type g = m_gamma->dir(p[Order::G]);
+            calc_type b = m_gamma->dir(p[Order::B]);
+            p[Order::R] = m_gamma->inv((((m_gamma->dir(cr) - r) * alpha) >> base_shift) + r);
+            p[Order::G] = m_gamma->inv((((m_gamma->dir(cg) - g) * alpha) >> base_shift) + g);
+            p[Order::B] = m_gamma->inv((((m_gamma->dir(cb) - b) * alpha) >> base_shift) + b);
+        }
+
+    private:
+        const gamma_type* m_gamma;
+    };
+
+
+
+
+    //==================================================pixel_formats_rgb
+    template<class Blender> class pixel_formats_rgb
+    {
+    public:
+        typedef rendering_buffer::row_data row_data;
+        typedef typename Blender::color_type color_type;
+        typedef typename Blender::order_type order_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_size  = color_type::base_size,
+            base_mask  = color_type::base_mask
+        };
+
+    private:
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_or_blend_pix(value_type* p,
+                                          const color_type& c,
+                                          unsigned cover)
+        {
+            if (c.a)
+            {
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    p[order_type::R] = c.r;
+                    p[order_type::G] = c.g;
+                    p[order_type::B] = c.b;
+                }
+                else
+                {
+                    m_blender.blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_or_blend_opaque_pix(value_type* p,
+                                                 const color_type& c,
+                                                 unsigned cover)
+        {
+            if(cover == 255)
+            {
+                p[order_type::R] = c.r;
+                p[order_type::G] = c.g;
+                p[order_type::B] = c.b;
+            }
+            else
+            {
+                m_blender.blend_pix(p, c.r, c.g, c.b, (cover + 1) << (base_shift - 8), cover);
+            }
+        }
+
+
+    public:
+        //--------------------------------------------------------------------
+        pixel_formats_rgb(rendering_buffer& rb) :
+            m_rbuf(&rb)
+        {}
+
+        //--------------------------------------------------------------------
+        Blender& blender() { return m_blender; }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE unsigned width()  const { return m_rbuf->width();  }
+        AGG_INLINE unsigned height() const { return m_rbuf->height(); }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE color_type pixel(int x, int y) const
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            return color_type(p[order_type::R],
+                              p[order_type::G],
+                              p[order_type::B]);
+        }
+
+        //--------------------------------------------------------------------
+        row_data span(int x, int y) const
+        {
+            return row_data(x,
+                            width() - 1,
+                            m_rbuf->row(y) + x * 3 * sizeof(value_type));
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_pixel(int x, int y, const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            p[order_type::R] = c.r;
+            p[order_type::G] = c.g;
+            p[order_type::B] = c.b;
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void blend_pixel(int x, int y, const color_type& c, int8u cover)
+        {
+            copy_or_blend_pix((value_type*)m_rbuf->row(y) + x + x + x, c, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_hline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            do
+            {
+                p[order_type::R] = c.r;
+                p[order_type::G] = c.g;
+                p[order_type::B] = c.b;
+                p += 3;
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_vline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            do
+            {
+                p[order_type::R] = c.r;
+                p[order_type::G] = c.g;
+                p[order_type::B] = c.b;
+                p = (value_type*)m_rbuf->next_row(p);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+                calc_type alpha = (calc_type(c.a) * (calc_type(cover) + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    do
+                    {
+                        p[order_type::R] = c.r;
+                        p[order_type::G] = c.g;
+                        p[order_type::B] = c.b;
+                        p += 3;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        m_blender.blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                        p += 3;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    do
+                    {
+                        p[order_type::R] = c.r;
+                        p[order_type::G] = c.g;
+                        p[order_type::B] = c.b;
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        m_blender.blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+                do
+                {
+                    calc_type alpha = (calc_type(c.a) * (calc_type(*covers) + 1)) >> 8;
+                    if(alpha == base_mask)
+                    {
+                        p[order_type::R] = c.r;
+                        p[order_type::G] = c.g;
+                        p[order_type::B] = c.b;
+                    }
+                    else
+                    {
+                        m_blender.blend_pix(p, c.r, c.g, c.b, alpha, *covers);
+                    }
+                    p += 3;
+                    ++covers;
+                }
+                while(--len);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+                do
+                {
+                    calc_type alpha = (calc_type(c.a) * (calc_type(*covers) + 1)) >> 8;
+                    if(alpha == base_mask)
+                    {
+                        p[order_type::R] = c.r;
+                        p[order_type::G] = c.g;
+                        p[order_type::B] = c.b;
+                    }
+                    else
+                    {
+                        m_blender.blend_pix(p, c.r, c.g, c.b, alpha, *covers);
+                    }
+                    p = (value_type*)m_rbuf->next_row(p);
+                    ++covers;
+                }
+                while(--len);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_pix(p, *colors++, *covers++);
+                    p += 3;
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        if(colors->a == base_mask)
+                        {
+                            p[order_type::R] = colors->r;
+                            p[order_type::G] = colors->g;
+                            p[order_type::B] = colors->b;
+                        }
+                        else
+                        {
+                            copy_or_blend_pix(p, *colors, 255);
+                        }
+                        p += 3;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_pix(p, *colors++, cover);
+                        p += 3;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_pix(p, *colors++, *covers++);
+                    p = (value_type*)m_rbuf->next_row(p);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        if(colors->a == base_mask)
+                        {
+                            p[order_type::R] = colors->r;
+                            p[order_type::G] = colors->g;
+                            p[order_type::B] = colors->b;
+                        }
+                        else
+                        {
+                            copy_or_blend_pix(p, *colors, 255);
+                        }
+                        p = (value_type*)m_rbuf->next_row(p);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_pix(p, *colors++, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p += 3;
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        p[order_type::R] = colors->r;
+                        p[order_type::G] = colors->g;
+                        p[order_type::B] = colors->b;
+                        p += 3;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p += 3;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + x + x + x;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p = (value_type*)m_rbuf->next_row(p);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        p[order_type::R] = colors->r;
+                        p[order_type::G] = colors->g;
+                        p[order_type::B] = colors->b;
+                        p = (value_type*)m_rbuf->next_row(p);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        template<class Function> void for_each_pixel(Function f)
+        {
+            unsigned y;
+            for(y = 0; y < height(); ++y)
+            {
+                unsigned len = width();
+                value_type* p = (value_type*)m_rbuf->row(y);
+                do
+                {
+                    f(p);
+                    p += 3;
+                }
+                while(--len);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_dir(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_dir_rgb<color_type, order_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_inv(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_inv_rgb<color_type, order_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        void copy_from(const rendering_buffer& from,
+                       int xdst, int ydst,
+                       int xsrc, int ysrc,
+                       unsigned len)
+        {
+            memmove((value_type*)m_rbuf->row(ydst) + xdst * 3,
+                    (const value_type*)from.row(ysrc) + xsrc * 3,
+                    sizeof(value_type) * 3 * len);
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class SrcPixelFormatRenderer>
+        void blend_from(const SrcPixelFormatRenderer& from,
+                        const int8u* psrc_,
+                        int xdst, int ydst,
+                        int xsrc, int ysrc,
+                        unsigned len)
+        {
+            typedef typename SrcPixelFormatRenderer::order_type src_order;
+
+            const value_type* psrc = (const value_type*)psrc_;
+            value_type* pdst = (value_type*)m_rbuf->row(ydst) + xdst * 3;
+            do
+            {
+                value_type alpha = psrc[src_order::A];
+                if(alpha)
+                {
+                    if(alpha == base_mask)
+                    {
+                        pdst[order_type::R] = psrc[src_order::R];
+                        pdst[order_type::G] = psrc[src_order::G];
+                        pdst[order_type::B] = psrc[src_order::B];
+                    }
+                    else
+                    {
+                        m_blender.blend_pix(pdst,
+                                            psrc[src_order::R],
+                                            psrc[src_order::G],
+                                            psrc[src_order::B],
+                                            alpha,
+                                            255);
+                    }
+                }
+                psrc += 4;
+                pdst += 3;
+            }
+            while(--len);
+        }
+
+    private:
+        rendering_buffer* m_rbuf;
+        Blender           m_blender;
+    };
+
+    typedef pixel_formats_rgb<blender_rgb<rgba8,  order_rgb> > pixfmt_rgb24;    //----pixfmt_rgb24
+    typedef pixel_formats_rgb<blender_rgb<rgba8,  order_bgr> > pixfmt_bgr24;    //----pixfmt_bgr24
+    typedef pixel_formats_rgb<blender_rgb<rgba16, order_rgb> > pixfmt_rgb48;    //----pixfmt_rgb48
+    typedef pixel_formats_rgb<blender_rgb<rgba16, order_bgr> > pixfmt_bgr48;    //----pixfmt_bgr48
+
+    typedef pixel_formats_rgb<blender_rgb_pre<rgba8,  order_rgb> > pixfmt_rgb24_pre; //----pixfmt_rgb24_pre
+    typedef pixel_formats_rgb<blender_rgb_pre<rgba8,  order_bgr> > pixfmt_bgr24_pre; //----pixfmt_bgr24_pre
+    typedef pixel_formats_rgb<blender_rgb_pre<rgba16, order_rgb> > pixfmt_rgb48_pre; //----pixfmt_rgb48_pre
+    typedef pixel_formats_rgb<blender_rgb_pre<rgba16, order_bgr> > pixfmt_bgr48_pre; //----pixfmt_bgr48_pre
+
+    //-----------------------------------------------------pixfmt_rgb24_gamma
+    template<class Gamma> class pixfmt_rgb24_gamma :
+    public pixel_formats_rgb<blender_rgb_gamma<rgba8, order_rgb, Gamma> >
+    {
+    public:
+        pixfmt_rgb24_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb<blender_rgb_gamma<rgba8, order_rgb, Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+    //-----------------------------------------------------pixfmt_bgr24_gamma
+    template<class Gamma> class pixfmt_bgr24_gamma :
+    public pixel_formats_rgb<blender_rgb_gamma<rgba8, order_bgr, Gamma> >
+    {
+    public:
+        pixfmt_bgr24_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb<blender_rgb_gamma<rgba8, order_bgr, Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+    //-----------------------------------------------------pixfmt_rgb48_gamma
+    template<class Gamma> class pixfmt_rgb48_gamma :
+    public pixel_formats_rgb<blender_rgb_gamma<rgba16, order_rgb, Gamma> >
+    {
+    public:
+        pixfmt_rgb48_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb<blender_rgb_gamma<rgba16, order_rgb, Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+    //-----------------------------------------------------pixfmt_bgr48_gamma
+    template<class Gamma> class pixfmt_bgr48_gamma :
+    public pixel_formats_rgb<blender_rgb_gamma<rgba16, order_bgr, Gamma> >
+    {
+    public:
+        pixfmt_bgr48_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb<blender_rgb_gamma<rgba16, order_bgr, Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_pixfmt_rgb_packed.h b/agg/inc/agg_pixfmt_rgb_packed.h
new file mode 100755
index 000000000000..4f582ed59847
--- /dev/null
+++ b/agg/inc/agg_pixfmt_rgb_packed.h
@@ -0,0 +1,1277 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_PIXFMT_RGB_PACKED_INCLUDED
+#define AGG_PIXFMT_RGB_PACKED_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_rendering_buffer.h"
+
+namespace agg
+{
+    //=========================================================blender_rgb555
+    struct blender_rgb555
+    {
+        typedef rgba8 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int16u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 7) & 0xF8;
+            calc_type g = (rgb >> 2) & 0xF8;
+            calc_type b = (rgb << 3) & 0xF8;
+            *p = (pixel_type)
+               (((((cr - r) * alpha + (r << 8)) >> 1)  & 0x7C00) |
+                ((((cg - g) * alpha + (g << 8)) >> 6)  & 0x03E0) |
+                 (((cb - b) * alpha + (b << 8)) >> 11) | 0x8000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xF8) << 7) |
+                                ((g & 0xF8) << 2) |
+                                 (b >> 3) | 0x8000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 7) & 0xF8,
+                              (p >> 2) & 0xF8,
+                              (p << 3) & 0xF8);
+        }
+    };
+
+
+    //=====================================================blender_rgb555_pre
+    struct blender_rgb555_pre
+    {
+        typedef rgba8 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int16u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 7) & 0xF8;
+            calc_type g = (rgb >> 2) & 0xF8;
+            calc_type b = (rgb << 3) & 0xF8;
+            *p = (pixel_type)
+               ((((r * alpha + cr * cover) >> 1)  & 0x7C00) |
+                (((g * alpha + cg * cover) >> 6)  & 0x03E0) |
+                 ((b * alpha + cb * cover) >> 11) | 0x8000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xF8) << 7) |
+                                ((g & 0xF8) << 2) |
+                                 (b >> 3) | 0x8000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 7) & 0xF8,
+                              (p >> 2) & 0xF8,
+                              (p << 3) & 0xF8);
+        }
+    };
+
+
+
+
+    //=====================================================blender_rgb555_gamma
+    template<class Gamma> class blender_rgb555_gamma
+    {
+    public:
+        typedef rgba8 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int16u pixel_type;
+        typedef Gamma gamma_type;
+
+        blender_rgb555_gamma() : m_gamma(0) {}
+        void gamma(const gamma_type& g) { m_gamma = &g; }
+
+        AGG_INLINE void blend_pix(pixel_type* p,
+                                  unsigned cr, unsigned cg, unsigned cb,
+                                  unsigned alpha,
+                                  unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = m_gamma->dir((rgb >> 7) & 0xF8);
+            calc_type g = m_gamma->dir((rgb >> 2) & 0xF8);
+            calc_type b = m_gamma->dir((rgb << 3) & 0xF8);
+            *p = (pixel_type)
+               (((m_gamma->inv(((m_gamma->dir(cr) - r) * alpha + (r << 8)) >> 8) << 7) & 0x7C00) |
+                ((m_gamma->inv(((m_gamma->dir(cg) - g) * alpha + (g << 8)) >> 8) << 2) & 0x03E0) |
+                 (m_gamma->inv(((m_gamma->dir(cb) - b) * alpha + (b << 8)) >> 8) >> 3) | 0x8000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xF8) << 7) |
+                                ((g & 0xF8) << 2) |
+                                 (b >> 3) | 0x8000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 7) & 0xF8,
+                              (p >> 2) & 0xF8,
+                              (p << 3) & 0xF8);
+        }
+
+    private:
+        const Gamma* m_gamma;
+    };
+
+
+
+
+
+    //=========================================================blender_rgb565
+    struct blender_rgb565
+    {
+        typedef rgba8 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int16u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 8) & 0xF8;
+            calc_type g = (rgb >> 3) & 0xFC;
+            calc_type b = (rgb << 3) & 0xF8;
+            *p = (pixel_type)
+               (((((cr - r) * alpha + (r << 8))     ) & 0xF800) |
+                ((((cg - g) * alpha + (g << 8)) >> 5) & 0x07E0) |
+                 (((cb - b) * alpha + (b << 8)) >> 11));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 8) & 0xF8,
+                              (p >> 3) & 0xFC,
+                              (p << 3) & 0xF8);
+        }
+    };
+
+
+
+    //=====================================================blender_rgb565_pre
+    struct blender_rgb565_pre
+    {
+        typedef rgba8 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int16u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 8) & 0xF8;
+            calc_type g = (rgb >> 3) & 0xFC;
+            calc_type b = (rgb << 3) & 0xF8;
+            *p = (pixel_type)
+               ((((r * alpha + cr * cover)      ) & 0xF800) |
+                (((g * alpha + cg * cover) >> 5 ) & 0x07E0) |
+                 ((b * alpha + cb * cover) >> 11));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 8) & 0xF8,
+                              (p >> 3) & 0xFC,
+                              (p << 3) & 0xF8);
+        }
+    };
+
+
+
+    //=====================================================blender_rgb565_gamma
+    template<class Gamma> class blender_rgb565_gamma
+    {
+    public:
+        typedef rgba8 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int16u pixel_type;
+        typedef Gamma gamma_type;
+
+        blender_rgb565_gamma() : m_gamma(0) {}
+        void gamma(const gamma_type& g) { m_gamma = &g; }
+
+        AGG_INLINE void blend_pix(pixel_type* p,
+                                  unsigned cr, unsigned cg, unsigned cb,
+                                  unsigned alpha,
+                                  unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = m_gamma->dir((rgb >> 8) & 0xF8);
+            calc_type g = m_gamma->dir((rgb >> 3) & 0xFC);
+            calc_type b = m_gamma->dir((rgb << 3) & 0xF8);
+            *p = (pixel_type)
+               (((m_gamma->inv(((m_gamma->dir(cr) - r) * alpha + (r << 8)) >> 8) << 8) & 0xF800) |
+                ((m_gamma->inv(((m_gamma->dir(cg) - g) * alpha + (g << 8)) >> 8) << 3) & 0x07E0) |
+                 (m_gamma->inv(((m_gamma->dir(cb) - b) * alpha + (b << 8)) >> 8) >> 3));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 8) & 0xF8,
+                              (p >> 3) & 0xFC,
+                              (p << 3) & 0xF8);
+        }
+
+    private:
+        const Gamma* m_gamma;
+    };
+
+
+
+    //=====================================================blender_rgbAAA
+    struct blender_rgbAAA
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 14) & 0xFFC0;
+            calc_type g = (rgb >> 4)  & 0xFFC0;
+            calc_type b = (rgb << 6)  & 0xFFC0;
+            *p = (pixel_type)
+               (((((cr - r) * alpha + (r << 16)) >> 2)  & 0x3FF00000) |
+                ((((cg - g) * alpha + (g << 16)) >> 12) & 0x000FFC00) |
+                 (((cb - b) * alpha + (b << 16)) >> 22) | 0xC0000000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xFFC0) << 14) |
+                                ((g & 0xFFC0) << 4) |
+                                 (b >> 6) | 0xC0000000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 14) & 0xFFC0,
+                              (p >> 4)  & 0xFFC0,
+                              (p << 6)  & 0xFFC0);
+        }
+    };
+
+
+
+    //==================================================blender_rgbAAA_pre
+    struct blender_rgbAAA_pre
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            cover = (cover + 1) << (color_type::base_shift - 8);
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 14) & 0xFFC0;
+            calc_type g = (rgb >> 4)  & 0xFFC0;
+            calc_type b = (rgb << 6)  & 0xFFC0;
+            *p = (pixel_type)
+               ((((r * alpha + cr * cover) >> 2)  & 0x3FF00000) |
+                (((g * alpha + cg * cover) >> 12) & 0x000FFC00) |
+                 ((b * alpha + cb * cover) >> 22) | 0xC0000000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xFFC0) << 14) |
+                                ((g & 0xFFC0) << 4) |
+                                 (b >> 6) | 0xC0000000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 14) & 0xFFC0,
+                              (p >> 4)  & 0xFFC0,
+                              (p << 6)  & 0xFFC0);
+        }
+    };
+
+
+
+    //=================================================blender_rgbAAA_gamma
+    template<class Gamma> class blender_rgbAAA_gamma
+    {
+    public:
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+        typedef Gamma gamma_type;
+
+        blender_rgbAAA_gamma() : m_gamma(0) {}
+        void gamma(const gamma_type& g) { m_gamma = &g; }
+
+        AGG_INLINE void blend_pix(pixel_type* p,
+                                  unsigned cr, unsigned cg, unsigned cb,
+                                  unsigned alpha,
+                                  unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = m_gamma->dir((rgb >> 14) & 0xFFC0);
+            calc_type g = m_gamma->dir((rgb >> 4)  & 0xFFC0);
+            calc_type b = m_gamma->dir((rgb << 6)  & 0xFFC0);
+            *p = (pixel_type)
+               (((m_gamma->inv(((m_gamma->dir(cr) - r) * alpha + (r << 16)) >> 16) << 14) & 0x3FF00000) |
+                ((m_gamma->inv(((m_gamma->dir(cg) - g) * alpha + (g << 16)) >> 16) << 4 ) & 0x000FFC00) |
+                 (m_gamma->inv(((m_gamma->dir(cb) - b) * alpha + (b << 16)) >> 16) >> 6 ) | 0xC0000000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xFFC0) << 14) |
+                                ((g & 0xFFC0) << 4) |
+                                 (b >> 6) | 0xC0000000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 14) & 0xFFC0,
+                              (p >> 4)  & 0xFFC0,
+                              (p << 6)  & 0xFFC0);
+        }
+    private:
+        const Gamma* m_gamma;
+    };
+
+
+    //=====================================================blender_bgrAAA
+    struct blender_bgrAAA
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            pixel_type bgr = *p;
+            calc_type b = (bgr >> 14) & 0xFFC0;
+            calc_type g = (bgr >> 4)  & 0xFFC0;
+            calc_type r = (bgr << 6)  & 0xFFC0;
+            *p = (pixel_type)
+               (((((cb - b) * alpha + (b << 16)) >> 2)  & 0x3FF00000) |
+                ((((cg - g) * alpha + (g << 16)) >> 12) & 0x000FFC00) |
+                 (((cr - r) * alpha + (r << 16)) >> 22) | 0xC0000000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((b & 0xFFC0) << 14) |
+                                ((g & 0xFFC0) << 4) |
+                                 (r >> 6) | 0xC0000000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p << 6)  & 0xFFC0,
+                              (p >> 4)  & 0xFFC0,
+                              (p >> 14) & 0xFFC0);
+        }
+    };
+
+
+
+    //=================================================blender_bgrAAA_pre
+    struct blender_bgrAAA_pre
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            cover = (cover + 1) << (color_type::base_shift - 8);
+            pixel_type bgr = *p;
+            calc_type b = (bgr >> 14) & 0xFFC0;
+            calc_type g = (bgr >> 4)  & 0xFFC0;
+            calc_type r = (bgr << 6)  & 0xFFC0;
+            *p = (pixel_type)
+               ((((b * alpha + cb * cover) >> 2)  & 0x3FF00000) |
+                (((g * alpha + cg * cover) >> 12) & 0x000FFC00) |
+                 ((r * alpha + cr * cover) >> 22) | 0xC0000000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((b & 0xFFC0) << 14) |
+                                ((g & 0xFFC0) << 4) |
+                                 (r >> 6) | 0xC0000000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p << 6)  & 0xFFC0,
+                              (p >> 4)  & 0xFFC0,
+                              (p >> 14) & 0xFFC0);
+        }
+    };
+
+
+
+    //=================================================blender_bgrAAA_gamma
+    template<class Gamma> class blender_bgrAAA_gamma
+    {
+    public:
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+        typedef Gamma gamma_type;
+
+        blender_bgrAAA_gamma() : m_gamma(0) {}
+        void gamma(const gamma_type& g) { m_gamma = &g; }
+
+        AGG_INLINE void blend_pix(pixel_type* p,
+                                  unsigned cr, unsigned cg, unsigned cb,
+                                  unsigned alpha,
+                                  unsigned)
+        {
+            pixel_type bgr = *p;
+            calc_type b = m_gamma->dir((bgr >> 14) & 0xFFC0);
+            calc_type g = m_gamma->dir((bgr >> 4)  & 0xFFC0);
+            calc_type r = m_gamma->dir((bgr << 6)  & 0xFFC0);
+            *p = (pixel_type)
+               (((m_gamma->inv(((m_gamma->dir(cb) - b) * alpha + (b << 16)) >> 16) << 14) & 0x3FF00000) |
+                ((m_gamma->inv(((m_gamma->dir(cg) - g) * alpha + (g << 16)) >> 16) << 4 ) & 0x000FFC00) |
+                 (m_gamma->inv(((m_gamma->dir(cr) - r) * alpha + (r << 16)) >> 16) >> 6 ) | 0xC0000000);
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((b & 0xFFC0) << 14) |
+                                ((g & 0xFFC0) << 4) |
+                                 (r >> 6) | 0xC0000000);
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p << 6)  & 0xFFC0,
+                              (p >> 4)  & 0xFFC0,
+                              (p >> 14) & 0xFFC0);
+        }
+
+    private:
+        const Gamma* m_gamma;
+    };
+
+
+
+    //=====================================================blender_rgbBBA
+    struct blender_rgbBBA
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 16) & 0xFFE0;
+            calc_type g = (rgb >> 5)  & 0xFFE0;
+            calc_type b = (rgb << 6)  & 0xFFC0;
+            *p = (pixel_type)
+               (((((cr - r) * alpha + (r << 16))      ) & 0xFFE00000) |
+                ((((cg - g) * alpha + (g << 16)) >> 11) & 0x001FFC00) |
+                 (((cb - b) * alpha + (b << 16)) >> 22));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xFFE0) << 16) | ((g & 0xFFE0) << 5) | (b >> 6));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 16) & 0xFFE0,
+                              (p >> 5)  & 0xFFE0,
+                              (p << 6)  & 0xFFC0);
+        }
+    };
+
+
+    //=================================================blender_rgbBBA_pre
+    struct blender_rgbBBA_pre
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            cover = (cover + 1) << (color_type::base_shift - 8);
+            pixel_type rgb = *p;
+            calc_type r = (rgb >> 16) & 0xFFE0;
+            calc_type g = (rgb >> 5)  & 0xFFE0;
+            calc_type b = (rgb << 6)  & 0xFFC0;
+            *p = (pixel_type)
+               ((((r * alpha + cr * cover)      ) & 0xFFE00000) |
+                (((g * alpha + cg * cover) >> 11) & 0x001FFC00) |
+                 ((b * alpha + cb * cover) >> 22));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xFFE0) << 16) | ((g & 0xFFE0) << 5) | (b >> 6));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 16) & 0xFFE0,
+                              (p >> 5)  & 0xFFE0,
+                              (p << 6)  & 0xFFC0);
+        }
+    };
+
+
+
+    //=================================================blender_rgbBBA_gamma
+    template<class Gamma> class blender_rgbBBA_gamma
+    {
+    public:
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+        typedef Gamma gamma_type;
+
+        blender_rgbBBA_gamma() : m_gamma(0) {}
+        void gamma(const gamma_type& g) { m_gamma = &g; }
+
+        AGG_INLINE void blend_pix(pixel_type* p,
+                                  unsigned cr, unsigned cg, unsigned cb,
+                                  unsigned alpha,
+                                  unsigned)
+        {
+            pixel_type rgb = *p;
+            calc_type r = m_gamma->dir((rgb >> 16) & 0xFFE0);
+            calc_type g = m_gamma->dir((rgb >> 5)  & 0xFFE0);
+            calc_type b = m_gamma->dir((rgb << 6)  & 0xFFC0);
+            *p = (pixel_type)
+               (((m_gamma->inv(((m_gamma->dir(cr) - r) * alpha + (r << 16)) >> 16) << 16) & 0xFFE00000) |
+                ((m_gamma->inv(((m_gamma->dir(cg) - g) * alpha + (g << 16)) >> 16) << 5 ) & 0x001FFC00) |
+                 (m_gamma->inv(((m_gamma->dir(cb) - b) * alpha + (b << 16)) >> 16) >> 6 ));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((r & 0xFFE0) << 16) | ((g & 0xFFE0) << 5) | (b >> 6));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p >> 16) & 0xFFE0,
+                              (p >> 5)  & 0xFFE0,
+                              (p << 6)  & 0xFFC0);
+        }
+
+    private:
+        const Gamma* m_gamma;
+    };
+
+
+    //=====================================================blender_bgrABB
+    struct blender_bgrABB
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            pixel_type bgr = *p;
+            calc_type b = (bgr >> 16) & 0xFFC0;
+            calc_type g = (bgr >> 6)  & 0xFFE0;
+            calc_type r = (bgr << 5)  & 0xFFE0;
+            *p = (pixel_type)
+               (((((cb - b) * alpha + (b << 16))      ) & 0xFFC00000) |
+                ((((cg - g) * alpha + (g << 16)) >> 10) & 0x003FF800) |
+                 (((cr - r) * alpha + (r << 16)) >> 21));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((b & 0xFFC0) << 16) | ((g & 0xFFE0) << 6) | (r >> 5));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p << 5)  & 0xFFE0,
+                              (p >> 6)  & 0xFFE0,
+                              (p >> 16) & 0xFFC0);
+        }
+    };
+
+
+    //=================================================blender_bgrABB_pre
+    struct blender_bgrABB_pre
+    {
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+
+        static AGG_INLINE void blend_pix(pixel_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            cover = (cover + 1) << (color_type::base_shift - 8);
+            pixel_type bgr = *p;
+            calc_type b = (bgr >> 16) & 0xFFC0;
+            calc_type g = (bgr >> 6)  & 0xFFE0;
+            calc_type r = (bgr << 5)  & 0xFFE0;
+            *p = (pixel_type)
+               ((((b * alpha + cb * cover)      ) & 0xFFC00000) |
+                (((g * alpha + cg * cover) >> 10) & 0x003FF800) |
+                 ((r * alpha + cr * cover) >> 21));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((b & 0xFFC0) << 16) | ((g & 0xFFE0) << 6) | (r >> 5));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p << 5)  & 0xFFE0,
+                              (p >> 6)  & 0xFFE0,
+                              (p >> 16) & 0xFFC0);
+        }
+    };
+
+
+
+    //=================================================blender_bgrABB_gamma
+    template<class Gamma> class blender_bgrABB_gamma
+    {
+    public:
+        typedef rgba16 color_type;
+        typedef color_type::value_type value_type;
+        typedef color_type::calc_type calc_type;
+        typedef int32u pixel_type;
+        typedef Gamma gamma_type;
+
+        blender_bgrABB_gamma() : m_gamma(0) {}
+        void gamma(const gamma_type& g) { m_gamma = &g; }
+
+        AGG_INLINE void blend_pix(pixel_type* p,
+                                  unsigned cr, unsigned cg, unsigned cb,
+                                  unsigned alpha,
+                                  unsigned)
+        {
+            pixel_type bgr = *p;
+            calc_type b = m_gamma->dir((bgr >> 16) & 0xFFC0);
+            calc_type g = m_gamma->dir((bgr >> 6)  & 0xFFE0);
+            calc_type r = m_gamma->dir((bgr << 5)  & 0xFFE0);
+            *p = (pixel_type)
+               (((m_gamma->inv(((m_gamma->dir(cb) - b) * alpha + (b << 16)) >> 16) << 16) & 0xFFC00000) |
+                ((m_gamma->inv(((m_gamma->dir(cg) - g) * alpha + (g << 16)) >> 16) << 6 ) & 0x003FF800) |
+                 (m_gamma->inv(((m_gamma->dir(cr) - r) * alpha + (r << 16)) >> 16) >> 5 ));
+        }
+
+        static AGG_INLINE pixel_type make_pix(unsigned r, unsigned g, unsigned b)
+        {
+            return (pixel_type)(((b & 0xFFC0) << 16) | ((g & 0xFFE0) << 6) | (r >> 5));
+        }
+
+        static AGG_INLINE color_type make_color(pixel_type p)
+        {
+            return color_type((p << 5)  & 0xFFE0,
+                              (p >> 6)  & 0xFFE0,
+                              (p >> 16) & 0xFFC0);
+        }
+
+    private:
+        const Gamma* m_gamma;
+    };
+
+
+
+    //===============================================pixel_formats_rgb_packed
+    template<class Blender> class pixel_formats_rgb_packed
+    {
+    public:
+        typedef rendering_buffer::row_data row_data;
+        typedef typename Blender::color_type color_type;
+        typedef typename Blender::pixel_type pixel_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_size  = color_type::base_size,
+            base_mask  = color_type::base_mask
+        };
+
+    private:
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_or_blend_pix(pixel_type* p, const color_type& c, unsigned cover)
+        {
+            if (c.a)
+            {
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    *p = m_blender.make_pix(c.r, c.g, c.b);
+                }
+                else
+                {
+                    m_blender.blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_or_blend_opaque_pix(pixel_type* p, const color_type& c, unsigned cover)
+        {
+            if(cover == 255)
+            {
+                *p = m_blender.make_pix(c.r, c.g, c.b);
+            }
+            else
+            {
+                m_blender.blend_pix(p, c.r, c.g, c.b, (cover + 1) << (base_shift - 8), cover);
+            }
+        }
+
+
+    public:
+        //--------------------------------------------------------------------
+        pixel_formats_rgb_packed(rendering_buffer& rb) :
+            m_rbuf(&rb)
+        {}
+
+        //--------------------------------------------------------------------
+        Blender& blender() { return m_blender; }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE unsigned width()  const { return m_rbuf->width();  }
+        AGG_INLINE unsigned height() const { return m_rbuf->height(); }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE color_type pixel(int x, int y) const
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            return m_blender.make_color(((pixel_type*)m_rbuf->row(y))[x]);
+        }
+
+        //--------------------------------------------------------------------
+        row_data span(int x, int y) const
+        {
+            return row_data(x,
+                            width() - 1,
+                            m_rbuf->row(y) + x * sizeof(pixel_type));
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_pixel(int x, int y, const color_type& c)
+        {
+            ((pixel_type*)m_rbuf->row(y))[x] = m_blender.make_pix(c.r, c.g, c.b);
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void blend_pixel(int x, int y, const color_type& c, int8u cover)
+        {
+            copy_or_blend_pix((pixel_type*)m_rbuf->row(y) + x, c, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_hline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            pixel_type v = m_blender.make_pix(c.r, c.g, c.b);
+            do
+            {
+                *p++ = v;
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_vline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            pixel_type v = m_blender.make_pix(c.r, c.g, c.b);
+            do
+            {
+                *p = v;
+                p = (pixel_type*)m_rbuf->next_row(p);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    pixel_type v = m_blender.make_pix(c.r, c.g, c.b);
+                    do
+                    {
+                        *p++ = v;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        m_blender.blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                        ++p;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    pixel_type v = m_blender.make_pix(c.r, c.g, c.b);
+                    do
+                    {
+                        *p = v;
+                        p = (pixel_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        m_blender.blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                        p = (pixel_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            do
+            {
+                copy_or_blend_pix(p, c, *covers++);
+                ++p;
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            do
+            {
+                copy_or_blend_pix(p, c, *covers++);
+                p = (pixel_type*)m_rbuf->next_row(p);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            do
+            {
+                copy_or_blend_pix(p++, *colors++, covers ? *covers++ : cover);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            do
+            {
+                copy_or_blend_pix(p, *colors++, covers ? *covers++ : cover);
+                p = (pixel_type*)m_rbuf->next_row(p);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_opaque_pix(p++, *colors++, *covers++);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        *p++ = m_blender.make_pix(colors->r, colors->g, colors->b);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_opaque_pix(p++, *colors++, cover);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            pixel_type* p = (pixel_type*)m_rbuf->row(y) + x;
+            if(covers)
+            {
+                do
+                {
+                    copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p = (pixel_type*)m_rbuf->next_row(p);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        *p = m_blender.make_pix(colors->r, colors->g, colors->b);
+                        p = (value_type*)m_rbuf->next_row(p);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void copy_from(const rendering_buffer& from,
+                       int xdst, int ydst,
+                       int xsrc, int ysrc,
+                       unsigned len)
+        {
+            memmove((pixel_type*)m_rbuf->row(ydst) + xdst,
+                    (pixel_type*)from.row(ysrc) + xsrc,
+                    sizeof(pixel_type) * len);
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class SrcPixelFormatRenderer>
+        void blend_from(const SrcPixelFormatRenderer& from,
+                        const int8u* psrc_,
+                        int xdst, int ydst,
+                        int xsrc, int ysrc,
+                        unsigned len)
+        {
+            typedef typename SrcPixelFormatRenderer::order_type src_order;
+
+            const value_type* psrc = (const value_type*)psrc_;
+            pixel_type* pdst = (pixel_type*)m_rbuf->row(ydst) + xdst;
+            do
+            {
+                value_type alpha = psrc[src_order::A];
+                if(alpha)
+                {
+                    if(alpha == base_mask)
+                    {
+                        *pdst = m_blender.make_pix(psrc[src_order::R],
+                                                   psrc[src_order::G],
+                                                   psrc[src_order::B]);
+                    }
+                    else
+                    {
+                        m_blender.blend_pix(pdst,
+                                            psrc[src_order::R],
+                                            psrc[src_order::G],
+                                            psrc[src_order::B],
+                                            alpha,
+                                            255);
+                    }
+                }
+                psrc += 4;
+                ++pdst;
+            }
+            while(--len);
+        }
+
+
+    private:
+        rendering_buffer* m_rbuf;
+        Blender           m_blender;
+    };
+
+    typedef pixel_formats_rgb_packed<blender_rgb555> pixfmt_rgb555; //----pixfmt_rgb555
+    typedef pixel_formats_rgb_packed<blender_rgb565> pixfmt_rgb565; //----pixfmt_rgb565
+
+    typedef pixel_formats_rgb_packed<blender_rgb555_pre> pixfmt_rgb555_pre; //----pixfmt_rgb555_pre
+    typedef pixel_formats_rgb_packed<blender_rgb565_pre> pixfmt_rgb565_pre; //----pixfmt_rgb565_pre
+
+    typedef pixel_formats_rgb_packed<blender_rgbAAA> pixfmt_rgbAAA; //----pixfmt_rgbAAA
+    typedef pixel_formats_rgb_packed<blender_bgrAAA> pixfmt_bgrAAA; //----pixfmt_bgrAAA
+    typedef pixel_formats_rgb_packed<blender_rgbBBA> pixfmt_rgbBBA; //----pixfmt_rgbBBA
+    typedef pixel_formats_rgb_packed<blender_bgrABB> pixfmt_bgrABB; //----pixfmt_bgrABB
+
+    typedef pixel_formats_rgb_packed<blender_rgbAAA_pre> pixfmt_rgbAAA_pre; //----pixfmt_rgbAAA_pre
+    typedef pixel_formats_rgb_packed<blender_bgrAAA_pre> pixfmt_bgrAAA_pre; //----pixfmt_bgrAAA_pre
+    typedef pixel_formats_rgb_packed<blender_rgbBBA_pre> pixfmt_rgbBBA_pre; //----pixfmt_rgbBBA_pre
+    typedef pixel_formats_rgb_packed<blender_bgrABB_pre> pixfmt_bgrABB_pre; //----pixfmt_bgrABB_pre
+
+
+    //-----------------------------------------------------pixfmt_rgb555_gamma
+    template<class Gamma> class pixfmt_rgb555_gamma :
+    public pixel_formats_rgb_packed<blender_rgb555_gamma<Gamma> >
+    {
+    public:
+        pixfmt_rgb555_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb_packed<blender_rgb555_gamma<Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+
+    //-----------------------------------------------------pixfmt_rgb565_gamma
+    template<class Gamma> class pixfmt_rgb565_gamma :
+    public pixel_formats_rgb_packed<blender_rgb565_gamma<Gamma> >
+    {
+    public:
+        pixfmt_rgb565_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb_packed<blender_rgb565_gamma<Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+
+    //-----------------------------------------------------pixfmt_rgbAAA_gamma
+    template<class Gamma> class pixfmt_rgbAAA_gamma :
+    public pixel_formats_rgb_packed<blender_rgbAAA_gamma<Gamma> >
+    {
+    public:
+        pixfmt_rgbAAA_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb_packed<blender_rgbAAA_gamma<Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+
+    //-----------------------------------------------------pixfmt_bgrAAA_gamma
+    template<class Gamma> class pixfmt_bgrAAA_gamma :
+    public pixel_formats_rgb_packed<blender_bgrAAA_gamma<Gamma> >
+    {
+    public:
+        pixfmt_bgrAAA_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb_packed<blender_bgrAAA_gamma<Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+
+    //-----------------------------------------------------pixfmt_rgbBBA_gamma
+    template<class Gamma> class pixfmt_rgbBBA_gamma :
+    public pixel_formats_rgb_packed<blender_rgbBBA_gamma<Gamma> >
+    {
+    public:
+        pixfmt_rgbBBA_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb_packed<blender_rgbBBA_gamma<Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+
+    //-----------------------------------------------------pixfmt_bgrABB_gamma
+    template<class Gamma> class pixfmt_bgrABB_gamma :
+    public pixel_formats_rgb_packed<blender_bgrABB_gamma<Gamma> >
+    {
+    public:
+        pixfmt_bgrABB_gamma(rendering_buffer& rb, const Gamma& g) :
+            pixel_formats_rgb_packed<blender_bgrABB_gamma<Gamma> >(rb)
+        {
+            this->blender().gamma(g);
+        }
+    };
+
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_pixfmt_rgba.h b/agg/inc/agg_pixfmt_rgba.h
new file mode 100755
index 000000000000..3716877e04f7
--- /dev/null
+++ b/agg/inc/agg_pixfmt_rgba.h
@@ -0,0 +1,1312 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_PIXFMT_RGBA_INCLUDED
+#define AGG_PIXFMT_RGBA_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_rendering_buffer.h"
+
+namespace agg
+{
+
+    //=========================================================multiplier_rgba
+    template<class ColorT, class Order> struct multiplier_rgba
+    {
+        typedef typename ColorT::value_type value_type;
+        typedef typename ColorT::calc_type calc_type;
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void premultiply(value_type* p)
+        {
+            calc_type a = p[Order::A];
+            if(a < ColorT::base_mask)
+            {
+                if(a == 0)
+                {
+                    p[Order::R] = p[Order::G] = p[Order::B] = 0;
+                    return;
+                }
+                p[Order::R] = value_type((p[Order::R] * a) >> ColorT::base_shift);
+                p[Order::G] = value_type((p[Order::G] * a) >> ColorT::base_shift);
+                p[Order::B] = value_type((p[Order::B] * a) >> ColorT::base_shift);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void demultiply(value_type* p)
+        {
+            calc_type a = p[Order::A];
+            if(a < ColorT::base_mask)
+            {
+                if(a == 0)
+                {
+                    p[Order::R] = p[Order::G] = p[Order::B] = 0;
+                    return;
+                }
+                calc_type r = (calc_type(p[Order::R]) * ColorT::base_mask) / a;
+                calc_type g = (calc_type(p[Order::G]) * ColorT::base_mask) / a;
+                calc_type b = (calc_type(p[Order::B]) * ColorT::base_mask) / a;
+                p[Order::R] = value_type((r > ColorT::base_mask) ? ColorT::base_mask : r);
+                p[Order::G] = value_type((g > ColorT::base_mask) ? ColorT::base_mask : g);
+                p[Order::B] = value_type((b > ColorT::base_mask) ? ColorT::base_mask : b);
+            }
+        }
+    };
+
+
+    //=====================================================apply_gamma_dir_rgba
+    template<class ColorT, class Order, class GammaLut> class apply_gamma_dir_rgba
+    {
+    public:
+        typedef typename ColorT::value_type value_type;
+
+        apply_gamma_dir_rgba(const GammaLut& gamma) : m_gamma(gamma) {}
+
+        AGG_INLINE void operator () (value_type* p)
+        {
+            p[Order::R] = m_gamma.dir(p[Order::R]);
+            p[Order::G] = m_gamma.dir(p[Order::G]);
+            p[Order::B] = m_gamma.dir(p[Order::B]);
+        }
+
+    private:
+        const GammaLut& m_gamma;
+    };
+
+
+
+    //=====================================================apply_gamma_inv_rgba
+    template<class ColorT, class Order, class GammaLut> class apply_gamma_inv_rgba
+    {
+    public:
+        typedef typename ColorT::value_type value_type;
+
+        apply_gamma_inv_rgba(const GammaLut& gamma) : m_gamma(gamma) {}
+
+        AGG_INLINE void operator () (value_type* p)
+        {
+            p[Order::R] = m_gamma.inv(p[Order::R]);
+            p[Order::G] = m_gamma.inv(p[Order::G]);
+            p[Order::B] = m_gamma.inv(p[Order::B]);
+        }
+
+    private:
+        const GammaLut& m_gamma;
+    };
+
+
+
+    //=============================================================blender_rgba
+    template<class ColorT, class Order, class PixelT> struct blender_rgba
+    {
+        typedef ColorT color_type;
+        typedef PixelT pixel_type;
+        typedef Order order_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void blend_pix(value_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            calc_type r = p[Order::R];
+            calc_type g = p[Order::G];
+            calc_type b = p[Order::B];
+            calc_type a = p[Order::A];
+            p[Order::R] = (value_type)(((cr - r) * alpha + (r << base_shift)) >> base_shift);
+            p[Order::G] = (value_type)(((cg - g) * alpha + (g << base_shift)) >> base_shift);
+            p[Order::B] = (value_type)(((cb - b) * alpha + (b << base_shift)) >> base_shift);
+            p[Order::A] = (value_type)((alpha + a) - ((alpha * a + base_mask) >> base_shift));
+        }
+    };
+
+
+    //=========================================================blender_rgba_pre
+    template<class ColorT, class Order, class PixelT> struct blender_rgba_pre
+    {
+        typedef ColorT color_type;
+        typedef PixelT pixel_type;
+        typedef Order order_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void blend_pix(value_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            alpha = color_type::base_mask - alpha;
+            cover = (cover + 1) << (base_shift - 8);
+            p[Order::R] = (value_type)((p[Order::R] * alpha + cr * cover) >> base_shift);
+            p[Order::G] = (value_type)((p[Order::G] * alpha + cg * cover) >> base_shift);
+            p[Order::B] = (value_type)((p[Order::B] * alpha + cb * cover) >> base_shift);
+            p[Order::A] = (value_type)(base_mask - ((alpha * (base_mask - p[Order::A])) >> base_shift));
+        }
+    };
+
+
+
+    //======================================================blender_rgba_plain
+    template<class ColorT, class Order, class PixelT> struct blender_rgba_plain
+    {
+        typedef ColorT color_type;
+        typedef PixelT pixel_type;
+        typedef Order order_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum { base_shift = color_type::base_shift };
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void blend_pix(value_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned)
+        {
+            if(alpha == 0) return;
+            calc_type a = p[Order::A];
+            calc_type r = p[Order::R] * a;
+            calc_type g = p[Order::G] * a;
+            calc_type b = p[Order::B] * a;
+            a = ((alpha + a) << base_shift) - alpha * a;
+            p[Order::A] = (value_type)(a >> base_shift);
+            p[Order::R] = (value_type)((((cr << base_shift) - r) * alpha + (r << base_shift)) / a);
+            p[Order::G] = (value_type)((((cg << base_shift) - g) * alpha + (g << base_shift)) / a);
+            p[Order::B] = (value_type)((((cb << base_shift) - b) * alpha + (b << base_shift)) / a);
+        }
+    };
+
+
+    //====================================================blender_rgba_wrapper
+    template<class Blender> struct blender_rgba_wrapper
+    {
+        typedef typename Blender::color_type color_type;
+        typedef typename Blender::order_type order_type;
+        typedef typename Blender::pixel_type pixel_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_size  = color_type::base_size,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void blend_pix(value_type* p,
+                                         unsigned cr, unsigned cg, unsigned cb,
+                                         unsigned alpha,
+                                         unsigned cover)
+        {
+            Blender::blend_pix(p, cr, cg, cb, alpha, cover);
+        }
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void copy_or_blend_pix(value_type* p,
+                                                 const color_type& c,
+                                                 unsigned cover)
+        {
+            if (c.a)
+            {
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    p[order_type::R] = c.r;
+                    p[order_type::G] = c.g;
+                    p[order_type::B] = c.b;
+                    p[order_type::A] = c.a;
+                }
+                else
+                {
+                    Blender::blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        static AGG_INLINE void copy_or_blend_opaque_pix(value_type* p,
+                                                        const color_type& c,
+                                                        unsigned cover)
+        {
+            if(cover == 255)
+            {
+                p[order_type::R] = c.r;
+                p[order_type::G] = c.g;
+                p[order_type::B] = c.b;
+                p[order_type::A] = base_mask;
+            }
+            else
+            {
+                Blender::blend_pix(p, c.r, c.g, c.b, (cover + 1) << (base_shift - 8), cover);
+            }
+        }
+    };
+
+
+
+
+    //=======================================================pixel_formats_rgba
+    template<class Blender> class pixel_formats_rgba
+    {
+    public:
+        typedef rendering_buffer::row_data row_data;
+        typedef typename Blender::color_type color_type;
+        typedef typename Blender::order_type order_type;
+        typedef typename Blender::pixel_type pixel_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        typedef blender_rgba_wrapper<Blender> blender_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_size  = color_type::base_size,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        pixel_formats_rgba(rendering_buffer& rb) :
+            m_rbuf(&rb)
+        {}
+
+        //--------------------------------------------------------------------
+        AGG_INLINE unsigned width()  const { return m_rbuf->width();  }
+        AGG_INLINE unsigned height() const { return m_rbuf->height(); }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE color_type pixel(int x, int y) const
+        {
+            const value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            return color_type(p[order_type::R],
+                              p[order_type::G],
+                              p[order_type::B],
+                              p[order_type::A]);
+        }
+
+        //--------------------------------------------------------------------
+        row_data span(int x, int y) const
+        {
+            return row_data(x,
+                            width() - 1,
+                            m_rbuf->row(y) + x * 4 * sizeof(value_type));
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_pixel(int x, int y, const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            p[order_type::R] = c.r;
+            p[order_type::G] = c.g;
+            p[order_type::B] = c.b;
+            p[order_type::A] = c.a;
+        }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void blend_pixel(int x, int y, const color_type& c, int8u cover)
+        {
+            blender_type::copy_or_blend_pix((value_type*)m_rbuf->row(y) + (x << 2), c, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_hline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            pixel_type v;
+            ((value_type*)&v)[order_type::R] = c.r;
+            ((value_type*)&v)[order_type::G] = c.g;
+            ((value_type*)&v)[order_type::B] = c.b;
+            ((value_type*)&v)[order_type::A] = c.a;
+            do
+            {
+                *(pixel_type*)p = v;
+                p += 4;
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        AGG_INLINE void copy_vline(int x, int y,
+                                   unsigned len,
+                                   const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            pixel_type v;
+            ((value_type*)&v)[order_type::R] = c.r;
+            ((value_type*)&v)[order_type::G] = c.g;
+            ((value_type*)&v)[order_type::B] = c.b;
+            ((value_type*)&v)[order_type::A] = c.a;
+            do
+            {
+                *(pixel_type*)p = v;
+                p = (value_type*)m_rbuf->next_row(p);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    pixel_type v;
+                    ((value_type*)&v)[order_type::R] = c.r;
+                    ((value_type*)&v)[order_type::G] = c.g;
+                    ((value_type*)&v)[order_type::B] = c.b;
+                    ((value_type*)&v)[order_type::A] = c.a;
+                    do
+                    {
+                        *(pixel_type*)p = v;
+                        p += 4;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                        p += 4;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y,
+                         unsigned len,
+                         const color_type& c,
+                         int8u cover)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    pixel_type v;
+                    ((value_type*)&v)[order_type::R] = c.r;
+                    ((value_type*)&v)[order_type::G] = c.g;
+                    ((value_type*)&v)[order_type::B] = c.b;
+                    ((value_type*)&v)[order_type::A] = c.a;
+                    do
+                    {
+                        *(pixel_type*)p = v;
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+                do
+                {
+                    calc_type alpha = (calc_type(c.a) * (calc_type(*covers) + 1)) >> 8;
+                    if(alpha == base_mask)
+                    {
+                        p[order_type::R] = c.r;
+                        p[order_type::G] = c.g;
+                        p[order_type::B] = c.b;
+                        p[order_type::A] = base_mask;
+                    }
+                    else
+                    {
+                        blender_type::blend_pix(p, c.r, c.g, c.b, alpha, *covers);
+                    }
+                    p += 4;
+                    ++covers;
+                }
+                while(--len);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y,
+                               unsigned len,
+                               const color_type& c,
+                               const int8u* covers)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+                do
+                {
+                    calc_type alpha = (calc_type(c.a) * (calc_type(*covers) + 1)) >> 8;
+                    if(alpha == base_mask)
+                    {
+                        p[order_type::R] = c.r;
+                        p[order_type::G] = c.g;
+                        p[order_type::B] = c.b;
+                        p[order_type::A] = base_mask;
+                    }
+                    else
+                    {
+                        blender_type::blend_pix(p, c.r, c.g, c.b, alpha, *covers);
+                    }
+                    p = (value_type*)m_rbuf->next_row(p);
+                    ++covers;
+                }
+                while(--len);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            if(covers)
+            {
+                do
+                {
+                    blender_type::copy_or_blend_pix(p, *colors++, *covers++);
+                    p += 4;
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        if(colors->a == base_mask)
+                        {
+                            p[order_type::R] = colors->r;
+                            p[order_type::G] = colors->g;
+                            p[order_type::B] = colors->b;
+                            p[order_type::A] = base_mask;
+                        }
+                        else
+                        {
+                            blender_type::copy_or_blend_pix(p, *colors, 255);
+                        }
+                        p += 4;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::copy_or_blend_pix(p, *colors++, cover);
+                        p += 4;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y,
+                               unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            if(covers)
+            {
+                do
+                {
+                    blender_type::copy_or_blend_pix(p, *colors++, *covers++);
+                    p = (value_type*)m_rbuf->next_row(p);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        if(colors->a == base_mask)
+                        {
+                            p[order_type::R] = colors->r;
+                            p[order_type::G] = colors->g;
+                            p[order_type::B] = colors->b;
+                            p[order_type::A] = base_mask;
+                        }
+                        else
+                        {
+                            blender_type::copy_or_blend_pix(p, *colors, 255);
+                        }
+                        p = (value_type*)m_rbuf->next_row(p);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::copy_or_blend_pix(p, *colors++, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            if(covers)
+            {
+                do
+                {
+                    blender_type::copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p += 4;
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        p[order_type::R] = colors->r;
+                        p[order_type::G] = colors->g;
+                        p[order_type::B] = colors->b;
+                        p[order_type::A] = base_mask;
+                        p += 4;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p += 4;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->row(y) + (x << 2);
+            if(covers)
+            {
+                do
+                {
+                    blender_type::copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p = (value_type*)m_rbuf->next_row(p);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        p[order_type::R] = colors->r;
+                        p[order_type::G] = colors->g;
+                        p[order_type::B] = colors->b;
+                        p[order_type::A] = base_mask;
+                        p = (value_type*)m_rbuf->next_row(p);
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p = (value_type*)m_rbuf->next_row(p);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class Function> void for_each_pixel(Function f)
+        {
+            unsigned y;
+            for(y = 0; y < height(); ++y)
+            {
+                unsigned len = width();
+                value_type* p = (value_type*)m_rbuf->row(y);
+                do
+                {
+                    f(p);
+                    p += 4;
+                }
+                while(--len);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void premultiply()
+        {
+            for_each_pixel(multiplier_rgba<color_type, order_type>::premultiply);
+        }
+
+        //--------------------------------------------------------------------
+        void demultiply()
+        {
+            for_each_pixel(multiplier_rgba<color_type, order_type>::demultiply);
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_dir(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_dir_rgba<color_type, order_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_inv(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_inv_rgba<color_type, order_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        void copy_from(const rendering_buffer& from,
+                       int xdst, int ydst,
+                       int xsrc, int ysrc,
+                       unsigned len)
+        {
+            memmove((value_type*)m_rbuf->row(ydst) + xdst * 4,
+                    (value_type*)from.row(ysrc) + xsrc * 4,
+                    sizeof(value_type) * 4 * len);
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class SrcPixelFormatRenderer>
+        void blend_from(const SrcPixelFormatRenderer& from,
+                        const int8u* psrc_,
+                        int xdst, int ydst,
+                        int xsrc, int ysrc,
+                        unsigned len)
+        {
+            typedef typename SrcPixelFormatRenderer::order_type src_order;
+
+            const value_type* psrc = (const value_type*)psrc_;
+            value_type* pdst = (value_type*)m_rbuf->row(ydst) + (xdst << 2);
+            int incp = 4;
+            if(xdst > xsrc)
+            {
+                psrc += (len-1) << 2;
+                pdst += (len-1) << 2;
+                incp = -4;
+            }
+            do
+            {
+                value_type alpha = psrc[src_order::A];
+
+                if(alpha)
+                {
+                    if(alpha == base_mask)
+                    {
+                        pdst[order_type::R] = psrc[src_order::R];
+                        pdst[order_type::G] = psrc[src_order::G];
+                        pdst[order_type::B] = psrc[src_order::B];
+                        pdst[order_type::A] = psrc[src_order::A];
+                    }
+                    else
+                    {
+                        blender_type::blend_pix(pdst,
+                                                psrc[src_order::R],
+                                                psrc[src_order::G],
+                                                psrc[src_order::B],
+                                                alpha,
+                                                255);
+                    }
+                }
+                psrc += incp;
+                pdst += incp;
+            }
+            while(--len);
+        }
+
+    private:
+        rendering_buffer* m_rbuf;
+    };
+
+
+
+
+    //================================================pixfmt_custom_rbuf_rgba
+    template<class Blender, class RenBuf> class pixfmt_custom_rbuf_rgba
+    {
+    public:
+        typedef typename Blender::color_type color_type;
+        typedef typename Blender::order_type order_type;
+        typedef typename Blender::pixel_type pixel_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        typedef blender_rgba_wrapper<Blender> blender_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_size  = color_type::base_size,
+            base_mask  = color_type::base_mask
+        };
+
+        typedef RenBuf rbuf_type;
+        typedef typename rbuf_type::row_data row_data;
+
+        //--------------------------------------------------------------------
+        pixfmt_custom_rbuf_rgba(rbuf_type& rb) : m_rbuf(&rb) {}
+
+        //--------------------------------------------------------------------
+        unsigned width()  const { return m_rbuf->width();  }
+        unsigned height() const { return m_rbuf->height(); }
+
+        //--------------------------------------------------------------------
+        color_type pixel(int x, int y) const
+        {
+            const value_type* p = m_rbuf->span_ptr(x, y, 1);
+            return p ? color_type(p[order_type::R],
+                                  p[order_type::G],
+                                  p[order_type::B],
+                                  p[order_type::A]) :
+                       color_type::no_color();
+        }
+
+        //--------------------------------------------------------------------
+        row_data span(int x, int y) const
+        {
+            return m_rbuf->span(x, y);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_pixel(int x, int y, const color_type& c)
+        {
+            int8u* p = m_rbuf->span_ptr(x, y, 1);
+            p[order_type::R] = c.r;
+            p[order_type::G] = c.g;
+            p[order_type::B] = c.b;
+            p[order_type::A] = c.b;
+        }
+
+        //--------------------------------------------------------------------
+        void blend_pixel(int x, int y, const color_type& c, int8u cover)
+        {
+            blender_type::copy_or_blend_pix((value_type*)m_rbuf->span_ptr(x, y, 1), c, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_hline(int x, int y, unsigned len, const color_type& c)
+        {
+            value_type* p = (value_type*)m_rbuf->span_ptr(x, y, len);
+            pixel_type v;
+            ((value_type*)&v)[order_type::R] = c.r;
+            ((value_type*)&v)[order_type::G] = c.g;
+            ((value_type*)&v)[order_type::B] = c.b;
+            ((value_type*)&v)[order_type::A] = c.a;
+            do
+            {
+                *(pixel_type*)p = v;
+                p += 4;
+            }
+            while(--len);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_vline(int x, int y, unsigned len, const color_type& c)
+        {
+            pixel_type v;
+            ((value_type*)&v)[order_type::R] = c.r;
+            ((value_type*)&v)[order_type::G] = c.g;
+            ((value_type*)&v)[order_type::B] = c.b;
+            ((value_type*)&v)[order_type::A] = c.a;
+            do
+            {
+                *(pixel_type*)(m_rbuf->span_ptr(x, y++, 1)) = v;
+            }
+            while(--len);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x, int y, unsigned len,
+                         const color_type& c, int8u cover)
+        {
+            if (c.a)
+            {
+                value_type* p = (value_type*)m_rbuf->span_ptr(x, y, len);
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    pixel_type v;
+                    ((value_type*)&v)[order_type::R] = c.r;
+                    ((value_type*)&v)[order_type::G] = c.g;
+                    ((value_type*)&v)[order_type::B] = c.b;
+                    ((value_type*)&v)[order_type::A] = c.a;
+                    do
+                    {
+                        *(pixel_type*)p = v;
+                        p += 4;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::blend_pix(p, c.r, c.g, c.b, alpha, cover);
+                        p += 4;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y, unsigned len,
+                         const color_type& c, int8u cover)
+        {
+            if (c.a)
+            {
+                calc_type alpha = (calc_type(c.a) * (cover + 1)) >> 8;
+                if(alpha == base_mask)
+                {
+                    pixel_type v;
+                    ((value_type*)&v)[order_type::R] = c.r;
+                    ((value_type*)&v)[order_type::G] = c.g;
+                    ((value_type*)&v)[order_type::B] = c.b;
+                    ((value_type*)&v)[order_type::A] = c.a;
+                    do
+                    {
+                        *(pixel_type*)(m_rbuf->span_ptr(x, y++, 1)) = v;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::blend_pix(*(pixel_type*)m_rbuf->span_ptr(x, y++, 1),
+                                                c.r, c.g, c.b, alpha, cover);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y, unsigned len,
+                               const color_type& c, const int8u* covers)
+        {
+            value_type* p = (value_type*)m_rbuf->span_ptr(x, y, len);
+            do
+            {
+                blender_type::copy_or_blend_pix(p, c, *covers++);
+                p += 4;
+            }
+            while(--len);
+        }
+
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y, unsigned len,
+                               const color_type& c, const int8u* covers)
+        {
+            do
+            {
+                blender_type::copy_or_blend_pix((value_type*)m_rbuf->span_ptr(x, y++, 1),
+                                                c,
+                                                *covers++);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y, unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->span_ptr(x, y, len);
+            do
+            {
+                blender_type::copy_or_blend_pix(p, *colors++, covers ? *covers++ : cover);
+                p += 4;
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y, unsigned len,
+                               const color_type* colors,
+                               const int8u* covers,
+                               int8u cover)
+        {
+            do
+            {
+                blender_type::copy_or_blend_pix((value_type*)m_rbuf->span_ptr(x, y++, 1),
+                                                *colors++, covers ? *covers++ : cover);
+            }
+            while(--len);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            value_type* p = (value_type*)m_rbuf->span_ptr(x, y, len);
+            if(covers)
+            {
+                do
+                {
+                    blender_type::copy_or_blend_opaque_pix(p, *colors++, *covers++);
+                    p += 4;
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        p[order_type::R] = colors->r;
+                        p[order_type::G] = colors->g;
+                        p[order_type::B] = colors->b;
+                        p[order_type::A] = base_mask;
+                        p += 4;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::copy_or_blend_opaque_pix(p, *colors++, cover);
+                        p += 4;
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y,
+                                      unsigned len,
+                                      const color_type* colors,
+                                      const int8u* covers,
+                                      int8u cover)
+        {
+            if(covers)
+            {
+                do
+                {
+                    blender_type::copy_or_blend_opaque_pix((value_type*)m_rbuf->span_ptr(x, y++, 1),
+                                                           *colors++, *covers++);
+                }
+                while(--len);
+            }
+            else
+            {
+                if(cover == 255)
+                {
+                    do
+                    {
+                        value_type* p = (value_type*)m_rbuf->span_ptr(x, y++, 1);
+                        p[order_type::R] = colors->r;
+                        p[order_type::G] = colors->g;
+                        p[order_type::B] = colors->b;
+                        p[order_type::A] = base_mask;
+                        ++colors;
+                    }
+                    while(--len);
+                }
+                else
+                {
+                    do
+                    {
+                        blender_type::copy_or_blend_opaque_pix((value_type*)m_rbuf->span_ptr(x, y++, 1),
+                                                               *colors++, cover);
+                    }
+                    while(--len);
+                }
+            }
+        }
+
+
+
+        //--------------------------------------------------------------------
+        template<class Function> void for_each_pixel(Function f)
+        {
+            unsigned y;
+            for(y = 0; y < height(); ++y)
+            {
+                row_data sp = span(0, y);
+                if(sp.ptr)
+                {
+                    value_type* p = (value_type*)sp.ptr;
+                    while(sp.x1 <= sp.x2)
+                    {
+                        f(p);
+                        p += 4;
+                        ++sp.x1;
+                    }
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void premultiply()
+        {
+            for_each_pixel(multiplier_rgba<color_type, order_type>::premultiply);
+        }
+
+        //--------------------------------------------------------------------
+        void demultiply()
+        {
+            for_each_pixel(multiplier_rgba<color_type, order_type>::demultiply);
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_dir(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_dir_rgba<color_type, order_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaLut> void apply_gamma_inv(const GammaLut& g)
+        {
+            for_each_pixel(apply_gamma_inv_rgba<color_type, order_type, GammaLut>(g));
+        }
+
+        //--------------------------------------------------------------------
+        template<class RenBuf2> void copy_from(const RenBuf2& from,
+                                               int xdst, int ydst,
+                                               int xsrc, int ysrc,
+                                               unsigned len)
+        {
+            const int8u* p = from.row(ysrc);
+            if(p)
+            {
+                p += xsrc * 4 * sizeof(value_type);
+                memmove(m_rbuf->span_ptr(xdst, ydst, len),
+                        p,
+                        len * 4 * sizeof(value_type));
+            }
+        }
+
+
+
+        //--------------------------------------------------------------------
+        template<class SrcPixelFormatRenderer>
+        void blend_from(const SrcPixelFormatRenderer& from,
+                        const int8u* psrc_,
+                        int xdst, int ydst,
+                        int xsrc, int ysrc,
+                        unsigned len)
+        {
+            typedef typename SrcPixelFormatRenderer::order_type src_order;
+            const value_type* psrc = (const value_type*)psrc_;
+            value_type* pdst = (value_type*)m_rbuf->span_ptr(xdst, ydst, len);
+
+            int incp = 4;
+            if(xdst > xsrc)
+            {
+                psrc += (len-1) << 2;
+                pdst += (len-1) << 2;
+                incp = -4;
+            }
+            do
+            {
+                value_type alpha = psrc[src_order::A];
+
+                if(alpha)
+                {
+                    if(alpha == base_mask)
+                    {
+                        pdst[order_type::R] = psrc[src_order::R];
+                        pdst[order_type::G] = psrc[src_order::G];
+                        pdst[order_type::B] = psrc[src_order::B];
+                        pdst[order_type::A] = psrc[src_order::A];
+                    }
+                    else
+                    {
+                        blender_type::blend_pix(pdst,
+                                                psrc[src_order::R],
+                                                psrc[src_order::G],
+                                                psrc[src_order::B],
+                                                alpha,
+                                                255);
+                    }
+                }
+                psrc += incp;
+                pdst += incp;
+            }
+            while(--len);
+        }
+
+
+    private:
+        rbuf_type* m_rbuf;
+    };
+
+
+
+
+
+
+
+    //-----------------------------------------------------------------------
+    typedef blender_rgba<rgba8, order_rgba, int32u> blender_rgba32; //----blender_rgba32
+    typedef blender_rgba<rgba8, order_argb, int32u> blender_argb32; //----blender_argb32
+    typedef blender_rgba<rgba8, order_abgr, int32u> blender_abgr32; //----blender_abgr32
+    typedef blender_rgba<rgba8, order_bgra, int32u> blender_bgra32; //----blender_bgra32
+
+    typedef blender_rgba_pre<rgba8, order_rgba, int32u> blender_rgba32_pre; //----blender_rgba32_pre
+    typedef blender_rgba_pre<rgba8, order_argb, int32u> blender_argb32_pre; //----blender_argb32_pre
+    typedef blender_rgba_pre<rgba8, order_abgr, int32u> blender_abgr32_pre; //----blender_abgr32_pre
+    typedef blender_rgba_pre<rgba8, order_bgra, int32u> blender_bgra32_pre; //----blender_bgra32_pre
+
+    typedef blender_rgba_plain<rgba8, order_rgba, int32u> blender_rgba32_plain; //----blender_rgba32_plain
+    typedef blender_rgba_plain<rgba8, order_argb, int32u> blender_argb32_plain; //----blender_argb32_plain
+    typedef blender_rgba_plain<rgba8, order_abgr, int32u> blender_abgr32_plain; //----blender_abgr32_plain
+    typedef blender_rgba_plain<rgba8, order_bgra, int32u> blender_bgra32_plain; //----blender_bgra32_plain
+
+    struct  pixel64_type { int16u c[4]; };
+    typedef blender_rgba<rgba16, order_rgba, pixel64_type> blender_rgba64; //----blender_rgba64
+    typedef blender_rgba<rgba16, order_argb, pixel64_type> blender_argb64; //----blender_argb64
+    typedef blender_rgba<rgba16, order_abgr, pixel64_type> blender_abgr64; //----blender_abgr64
+    typedef blender_rgba<rgba16, order_bgra, pixel64_type> blender_bgra64; //----blender_bgra64
+
+    typedef blender_rgba_pre<rgba16, order_rgba, pixel64_type> blender_rgba64_pre; //----blender_rgba64_pre
+    typedef blender_rgba_pre<rgba16, order_argb, pixel64_type> blender_argb64_pre; //----blender_argb64_pre
+    typedef blender_rgba_pre<rgba16, order_abgr, pixel64_type> blender_abgr64_pre; //----blender_abgr64_pre
+    typedef blender_rgba_pre<rgba16, order_bgra, pixel64_type> blender_bgra64_pre; //----blender_bgra64_pre
+
+
+    //-----------------------------------------------------------------------
+    typedef pixel_formats_rgba<blender_rgba32> pixfmt_rgba32; //----pixfmt_rgba32
+    typedef pixel_formats_rgba<blender_argb32> pixfmt_argb32; //----pixfmt_argb32
+    typedef pixel_formats_rgba<blender_abgr32> pixfmt_abgr32; //----pixfmt_abgr32
+    typedef pixel_formats_rgba<blender_bgra32> pixfmt_bgra32; //----pixfmt_bgra32
+
+    typedef pixel_formats_rgba<blender_rgba32_pre> pixfmt_rgba32_pre; //----pixfmt_rgba32_pre
+    typedef pixel_formats_rgba<blender_argb32_pre> pixfmt_argb32_pre; //----pixfmt_argb32_pre
+    typedef pixel_formats_rgba<blender_abgr32_pre> pixfmt_abgr32_pre; //----pixfmt_abgr32_pre
+    typedef pixel_formats_rgba<blender_bgra32_pre> pixfmt_bgra32_pre; //----pixfmt_bgra32_pre
+
+    typedef pixel_formats_rgba<blender_rgba32_plain> pixfmt_rgba32_plain; //----pixfmt_rgba32_plain
+    typedef pixel_formats_rgba<blender_argb32_plain> pixfmt_argb32_plain; //----pixfmt_argb32_plain
+    typedef pixel_formats_rgba<blender_abgr32_plain> pixfmt_abgr32_plain; //----pixfmt_abgr32_plain
+    typedef pixel_formats_rgba<blender_bgra32_plain> pixfmt_bgra32_plain; //----pixfmt_bgra32_plain
+
+    typedef pixel_formats_rgba<blender_rgba64> pixfmt_rgba64; //----pixfmt_rgba64
+    typedef pixel_formats_rgba<blender_argb64> pixfmt_argb64; //----pixfmt_argb64
+    typedef pixel_formats_rgba<blender_abgr64> pixfmt_abgr64; //----pixfmt_abgr64
+    typedef pixel_formats_rgba<blender_bgra64> pixfmt_bgra64; //----pixfmt_bgra64
+
+    typedef pixel_formats_rgba<blender_rgba64_pre> pixfmt_rgba64_pre; //----pixfmt_rgba64_pre
+    typedef pixel_formats_rgba<blender_argb64_pre> pixfmt_argb64_pre; //----pixfmt_argb64_pre
+    typedef pixel_formats_rgba<blender_abgr64_pre> pixfmt_abgr64_pre; //----pixfmt_abgr64_pre
+    typedef pixel_formats_rgba<blender_bgra64_pre> pixfmt_bgra64_pre; //----pixfmt_bgra64_pre
+}
+
+#endif
+
diff --git a/agg/inc/agg_rasterizer_outline.h b/agg/inc/agg_rasterizer_outline.h
new file mode 100755
index 000000000000..18512e76a1ad
--- /dev/null
+++ b/agg/inc/agg_rasterizer_outline.h
@@ -0,0 +1,146 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_RASTERIZER_OUTLINE_INCLUDED
+#define AGG_RASTERIZER_OUTLINE_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    //======================================================rasterizer_outline
+    template<class Renderer> class rasterizer_outline
+    {
+    public:
+        rasterizer_outline(Renderer& ren) :
+            m_ren(&ren),
+            m_start_x(0),
+            m_start_y(0),
+            m_vertices(0)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void move_to(int x, int y)
+        {
+            m_vertices = 1;
+            m_ren->move_to(m_start_x = x, m_start_y = y);
+        }
+
+        //--------------------------------------------------------------------
+        void line_to(int x, int y)
+        {
+            ++m_vertices;
+            m_ren->line_to(x, y);
+        }
+
+        //--------------------------------------------------------------------
+        void move_to_d(double x, double y)
+        {
+            move_to(m_ren->coord(x), m_ren->coord(y));
+        }
+
+        //--------------------------------------------------------------------
+        void line_to_d(double x, double y)
+        {
+            line_to(m_ren->coord(x), m_ren->coord(y));
+        }
+
+        //--------------------------------------------------------------------
+        void close()
+        {
+            if(m_vertices > 2)
+            {
+                line_to(m_start_x, m_start_y);
+            }
+            m_vertices = 0;
+        }
+
+        //--------------------------------------------------------------------
+        void add_vertex(double x, double y, unsigned cmd)
+        {
+            if(is_move_to(cmd))
+            {
+                move_to_d(x, y);
+            }
+            else
+            {
+                if(is_end_poly(cmd))
+                {
+                    if(is_closed(cmd)) close();
+                }
+                else
+                {
+                    line_to_d(x, y);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class VertexSource>
+        void add_path(VertexSource& vs, unsigned id=0)
+        {
+            double x;
+            double y;
+
+            unsigned cmd;
+            vs.rewind(id);
+            while(!is_stop(cmd = vs.vertex(&x, &y)))
+            {
+                add_vertex(x, y, cmd);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class VertexSource, class ColorStorage, class PathId>
+        void render_all_paths(VertexSource& vs,
+                              const ColorStorage& colors,
+                              const PathId& id,
+                              unsigned num_paths)
+        {
+            for(unsigned i = 0; i < num_paths; i++)
+            {
+                m_ren->line_color(colors[i]);
+                add_path(vs, id[i]);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class Ctrl> void render_ctrl(Ctrl& c)
+        {
+            unsigned i;
+            for(i = 0; i < c.num_paths(); i++)
+            {
+                m_ren->line_color(c.color(i));
+                add_path(c, i);
+            }
+        }
+
+
+    private:
+        Renderer* m_ren;
+        int       m_start_x;
+        int       m_start_y;
+        unsigned  m_vertices;
+    };
+
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_rasterizer_outline_aa.h b/agg/inc/agg_rasterizer_outline_aa.h
new file mode 100755
index 000000000000..3f4d6395fafa
--- /dev/null
+++ b/agg/inc/agg_rasterizer_outline_aa.h
@@ -0,0 +1,516 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_RASTERIZER_OUTLINE_AA_INCLUDED
+#define AGG_RASTERIZER_OUTLINE_AA_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_line_aa_basics.h"
+#include "agg_vertex_sequence.h"
+
+namespace agg
+{
+
+    //-------------------------------------------------------------------------
+    inline bool cmp_dist_start(int d) { return d > 0;  }
+    inline bool cmp_dist_end(int d)   { return d <= 0; }
+
+
+
+    //-----------------------------------------------------------line_aa_vertex
+    // Vertex (x, y) with the distance to the next one. The last vertex has
+    // the distance between the last and the first points
+    struct line_aa_vertex
+    {
+        int x;
+        int y;
+        int len;
+
+        line_aa_vertex() {}
+        line_aa_vertex(int x_, int y_) :
+            x(x_),
+            y(y_),
+            len(0)
+        {
+        }
+
+        bool operator () (const line_aa_vertex& val)
+        {
+            double dx = val.x - x;
+            double dy = val.y - y;
+            return (len = int(sqrt(dx * dx + dy * dy))) >
+                   (line_subpixel_size + line_subpixel_size / 2);
+        }
+    };
+
+
+
+
+    //=======================================================rasterizer_outline_aa
+    template<class Renderer> class rasterizer_outline_aa
+    {
+    private:
+        //------------------------------------------------------------------------
+        struct draw_vars
+        {
+            unsigned idx;
+            int x1, y1, x2, y2;
+            line_parameters curr, next;
+            int lcurr, lnext;
+            int xb1, yb1, xb2, yb2;
+            unsigned flags;
+        };
+
+        void draw(draw_vars& dv, unsigned start, unsigned end);
+
+    public:
+        typedef line_aa_vertex                  vertex_type;
+        typedef vertex_sequence<vertex_type, 6> vertex_storage_type;
+
+        rasterizer_outline_aa(Renderer& ren) :
+            m_ren(ren),
+            m_accurate_join(m_ren.accurate_join_only()),
+            m_round_cap(false),
+            m_start_x(0),
+            m_start_y(0)
+        {
+        }
+
+        //------------------------------------------------------------------------
+        void accurate_join(bool v)
+        {
+            m_accurate_join = m_ren.accurate_join_only() ? true : v;
+        }
+        bool accurate_join() const { return m_accurate_join; }
+
+        //------------------------------------------------------------------------
+        void round_cap(bool v) { m_round_cap = v; }
+        bool round_cap() const { return m_round_cap; }
+
+        //------------------------------------------------------------------------
+        void move_to(int x, int y)
+        {
+            m_src_vertices.modify_last(vertex_type(m_start_x = x, m_start_y = y));
+        }
+
+        //------------------------------------------------------------------------
+        void line_to(int x, int y)
+        {
+            m_src_vertices.add(vertex_type(x, y));
+        }
+
+        //------------------------------------------------------------------------
+        void move_to_d(double x, double y)
+        {
+            move_to(line_coord(x), line_coord(y));
+        }
+
+        //------------------------------------------------------------------------
+        void line_to_d(double x, double y)
+        {
+            line_to(line_coord(x), line_coord(y));
+        }
+
+        //------------------------------------------------------------------------
+        void render(bool close_polygon);
+
+        //------------------------------------------------------------------------
+        void add_vertex(double x, double y, unsigned cmd)
+        {
+            if(is_move_to(cmd))
+            {
+                render(false);
+                move_to_d(x, y);
+            }
+            else
+            {
+                if(is_end_poly(cmd))
+                {
+                    render(is_closed(cmd));
+                    if(is_closed(cmd))
+                    {
+                        move_to(m_start_x, m_start_y);
+                    }
+                }
+                else
+                {
+                    line_to_d(x, y);
+                }
+            }
+        }
+
+        //------------------------------------------------------------------------
+        template<class VertexSource>
+        void add_path(VertexSource& vs, unsigned id=0)
+        {
+            double x;
+            double y;
+
+            unsigned cmd;
+            vs.rewind(id);
+            while(!is_stop(cmd = vs.vertex(&x, &y)))
+            {
+                add_vertex(x, y, cmd);
+            }
+            render(false);
+        }
+
+
+        //------------------------------------------------------------------------
+        template<class VertexSource, class ColorStorage, class PathId>
+        void render_all_paths(VertexSource& vs,
+                              const ColorStorage& colors,
+                              const PathId& id,
+                              unsigned num_paths)
+        {
+            for(unsigned i = 0; i < num_paths; i++)
+            {
+                m_ren.color(colors[i]);
+                add_path(vs, id[i]);
+            }
+        }
+
+
+        //------------------------------------------------------------------------
+        template<class Ctrl> void render_ctrl(Ctrl& c)
+        {
+            unsigned i;
+            for(i = 0; i < c.num_paths(); i++)
+            {
+                m_ren.color(c.color(i));
+                add_path(c, i);
+            }
+        }
+
+    private:
+        rasterizer_outline_aa(const rasterizer_outline_aa<Renderer>&);
+        const rasterizer_outline_aa<Renderer>& operator =
+            (const rasterizer_outline_aa<Renderer>&);
+
+        Renderer& m_ren;
+        vertex_storage_type m_src_vertices;
+        bool m_accurate_join;
+        bool m_round_cap;
+        int  m_start_x;
+        int  m_start_y;
+    };
+
+
+
+
+
+
+
+
+    //----------------------------------------------------------------------------
+    template<class Renderer>
+    void rasterizer_outline_aa<Renderer>::draw(draw_vars& dv, unsigned start, unsigned end)
+    {
+        unsigned i;
+        const vertex_storage_type::value_type* v;
+
+        for(i = start; i < end; i++)
+        {
+            switch(dv.flags)
+            {
+            case 0: m_ren.line3(dv.curr, dv.xb1, dv.yb1, dv.xb2, dv.yb2); break;
+            case 1: m_ren.line2(dv.curr, dv.xb2, dv.yb2); break;
+            case 2: m_ren.line1(dv.curr, dv.xb1, dv.yb1); break;
+            case 3: m_ren.line0(dv.curr); break;
+            }
+
+            dv.x1 = dv.x2;
+            dv.y1 = dv.y2;
+            dv.lcurr = dv.lnext;
+            dv.lnext = m_src_vertices[dv.idx].len;
+
+            ++dv.idx;
+            if(dv.idx >= m_src_vertices.size()) dv.idx = 0;
+
+            v = &m_src_vertices[dv.idx];
+            dv.x2 = v->x;
+            dv.y2 = v->y;
+
+            dv.curr = dv.next;
+            dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext);
+            dv.xb1 = dv.xb2;
+            dv.yb1 = dv.yb2;
+
+            if(m_accurate_join)
+            {
+                dv.flags = 0;
+            }
+            else
+            {
+                dv.flags >>= 1;
+                dv.flags |= ((dv.curr.diagonal_quadrant() ==
+                              dv.next.diagonal_quadrant()) << 1);
+            }
+
+            if((dv.flags & 2) == 0)
+            {
+                bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2);
+            }
+        }
+    }
+
+
+
+
+    //----------------------------------------------------------------------------
+    template<class Renderer>
+    void rasterizer_outline_aa<Renderer>::render(bool close_polygon)
+    {
+        m_src_vertices.close(close_polygon);
+        draw_vars dv;
+        const vertex_storage_type::value_type* v;
+        int x1;
+        int y1;
+        int x2;
+        int y2;
+        int lprev;
+
+        if(close_polygon)
+        {
+            if(m_src_vertices.size() >= 3)
+            {
+                dv.idx = 2;
+
+                v     = &m_src_vertices[m_src_vertices.size() - 1];
+                x1    = v->x;
+                y1    = v->y;
+                lprev = v->len;
+
+                v  = &m_src_vertices[0];
+                x2 = v->x;
+                y2 = v->y;
+                dv.lcurr = v->len;
+                line_parameters prev(x1, y1, x2, y2, lprev);
+
+                v = &m_src_vertices[1];
+                dv.x1    = v->x;
+                dv.y1    = v->y;
+                dv.lnext = v->len;
+                dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr);
+
+                v = &m_src_vertices[dv.idx];
+                dv.x2 = v->x;
+                dv.y2 = v->y;
+                dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext);
+
+                dv.xb1 = 0;
+                dv.yb1 = 0;
+                dv.xb2 = 0;
+                dv.yb2 = 0;
+
+                if(m_accurate_join)
+                {
+                    dv.flags = 0;
+                }
+                else
+                {
+                    dv.flags =
+                            (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) |
+                        ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1);
+                }
+
+                if((dv.flags & 1) == 0)
+                {
+                    bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1);
+                }
+
+                if((dv.flags & 2) == 0)
+                {
+                    bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2);
+                }
+                draw(dv, 0, m_src_vertices.size());
+            }
+        }
+        else
+        {
+            switch(m_src_vertices.size())
+            {
+                case 0:
+                case 1:
+                    break;
+
+                case 2:
+                {
+                    v     = &m_src_vertices[0];
+                    x1    = v->x;
+                    y1    = v->y;
+                    lprev = v->len;
+                    v     = &m_src_vertices[1];
+                    x2    = v->x;
+                    y2    = v->y;
+                    line_parameters lp(x1, y1, x2, y2, lprev);
+                    if(m_round_cap)
+                    {
+                        m_ren.semidot(cmp_dist_start, x1, y1, x1 + (y2 - y1), y1 - (x2 - x1));
+                    }
+                    m_ren.line3(lp,
+                                x1 + (y2 - y1),
+                                y1 - (x2 - x1),
+                                x2 + (y2 - y1),
+                                y2 - (x2 - x1));
+                    if(m_round_cap)
+                    {
+                        m_ren.semidot(cmp_dist_end, x2, y2, x2 + (y2 - y1), y2 - (x2 - x1));
+                    }
+                }
+                break;
+
+                case 3:
+                {
+                    int x3, y3;
+                    int lnext;
+                    v     = &m_src_vertices[0];
+                    x1    = v->x;
+                    y1    = v->y;
+                    lprev = v->len;
+                    v     = &m_src_vertices[1];
+                    x2    = v->x;
+                    y2    = v->y;
+                    lnext = v->len;
+                    v     = &m_src_vertices[2];
+                    x3    = v->x;
+                    y3    = v->y;
+                    line_parameters lp1(x1, y1, x2, y2, lprev);
+                    line_parameters lp2(x2, y2, x3, y3, lnext);
+                    bisectrix(lp1, lp2, &dv.xb1, &dv.yb1);
+
+                    if(m_round_cap)
+                    {
+                        m_ren.semidot(cmp_dist_start, x1, y1, x1 + (y2 - y1), y1 - (x2 - x1));
+                    }
+                    m_ren.line3(lp1,
+                                x1 + (y2 - y1),
+                                y1 - (x2 - x1),
+                                dv.xb1,
+                                dv.yb1);
+
+                    m_ren.line3(lp2,
+                                dv.xb1,
+                                dv.yb1,
+                                x3 + (y3 - y2),
+                                y3 - (x3 - x2));
+                    if(m_round_cap)
+                    {
+                        m_ren.semidot(cmp_dist_end, x3, y3, x3 + (y3 - y2), y3 - (x3 - x2));
+                    }
+                }
+                break;
+
+                default:
+                {
+                    dv.idx = 3;
+
+                    v     = &m_src_vertices[0];
+                    x1    = v->x;
+                    y1    = v->y;
+                    lprev = v->len;
+
+                    v  = &m_src_vertices[1];
+                    x2 = v->x;
+                    y2 = v->y;
+                    dv.lcurr = v->len;
+                    line_parameters prev(x1, y1, x2, y2, lprev);
+
+                    v = &m_src_vertices[2];
+                    dv.x1    = v->x;
+                    dv.y1    = v->y;
+                    dv.lnext = v->len;
+                    dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr);
+
+                    v = &m_src_vertices[dv.idx];
+                    dv.x2 = v->x;
+                    dv.y2 = v->y;
+                    dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext);
+
+                    dv.xb1 = 0;
+                    dv.yb1 = 0;
+                    dv.xb2 = 0;
+                    dv.yb2 = 0;
+
+                    if(m_accurate_join)
+                    {
+                        dv.flags = 0;
+                    }
+                    else
+                    {
+                        dv.flags =
+                                (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) |
+                            ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1);
+                    }
+
+                    if((dv.flags & 1) == 0)
+                    {
+                        bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1);
+                        m_ren.line3(prev,
+                                    x1 + (y2 - y1),
+                                    y1 - (x2 - x1),
+                                    dv.xb1,
+                                    dv.yb1);
+                    }
+                    else
+                    {
+                        m_ren.line1(prev,
+                                    x1 + (y2 - y1),
+                                    y1 - (x2 - x1));
+                    }
+                    if(m_round_cap)
+                    {
+                        m_ren.semidot(cmp_dist_start, x1, y1, x1 + (y2 - y1), y1 - (x2 - x1));
+                    }
+                    if((dv.flags & 2) == 0)
+                    {
+                        bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2);
+                    }
+
+                    draw(dv, 1, m_src_vertices.size() - 2);
+
+                    if((dv.flags & 1) == 0)
+                    {
+                        m_ren.line3(dv.curr,
+                                    dv.xb1,
+                                    dv.yb1,
+                                    dv.curr.x2 + (dv.curr.y2 - dv.curr.y1),
+                                    dv.curr.y2 - (dv.curr.x2 - dv.curr.x1));
+                    }
+                    else
+                    {
+                        m_ren.line2(dv.curr,
+                                    dv.curr.x2 + (dv.curr.y2 - dv.curr.y1),
+                                    dv.curr.y2 - (dv.curr.x2 - dv.curr.x1));
+                    }
+                    if(m_round_cap)
+                    {
+                        m_ren.semidot(cmp_dist_end, dv.curr.x2, dv.curr.y2,
+                                      dv.curr.x2 + (dv.curr.y2 - dv.curr.y1),
+                                      dv.curr.y2 - (dv.curr.x2 - dv.curr.x1));
+                    }
+
+                }
+                break;
+            }
+        }
+        m_src_vertices.remove_all();
+    }
+
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_rasterizer_scanline_aa.h b/agg/inc/agg_rasterizer_scanline_aa.h
new file mode 100755
index 000000000000..03be55dcc62a
--- /dev/null
+++ b/agg/inc/agg_rasterizer_scanline_aa.h
@@ -0,0 +1,743 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+// The author gratefully acknowleges the support of David Turner,
+// Robert Wilhelm, and Werner Lemberg - the authors of the FreeType
+// libray - in producing this work. See http://www.freetype.org for details.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Class rasterizer_scanline_aa
+//
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_RASTERIZER_SCANLINE_AA_INCLUDED
+#define AGG_RASTERIZER_SCANLINE_AA_INCLUDED
+
+#include <string.h>
+#include <math.h>
+#include "agg_basics.h"
+#include "agg_math.h"
+#include "agg_gamma_functions.h"
+#include "agg_clip_liang_barsky.h"
+#include "agg_render_scanlines.h"
+
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    // These constants determine the subpixel accuracy, to be more precise,
+    // the number of bits of the fractional part of the coordinates.
+    // The possible coordinate capacity in bits can be calculated by formula:
+    // sizeof(int) * 8 - poly_base_shift * 2, i.e, for 32-bit integers and
+    // 8-bits fractional part the capacity is 16 bits or [-32768...32767].
+    enum
+    {
+        poly_base_shift = 8,                       //----poly_base_shift
+        poly_base_size  = 1 << poly_base_shift,    //----poly_base_size
+        poly_base_mask  = poly_base_size - 1       //----poly_base_mask
+    };
+
+    //--------------------------------------------------------------poly_coord
+    inline int poly_coord(double c)
+    {
+        return int(c * poly_base_size);
+    }
+
+    //-----------------------------------------------------------------cell_aa
+    // A pixel cell. There're no constructors defined and it was done
+    // intentionally in order to avoid extra overhead when allocating an
+    // array of cells.
+    struct cell_aa
+    {
+        int16 x;
+        int16 y;
+        int   packed_coord;
+        int   cover;
+        int   area;
+
+        void set(int x, int y, int c, int a);
+        void set_coord(int x, int y);
+        void set_cover(int c, int a);
+        void add_cover(int c, int a);
+    };
+
+
+    //--------------------------------------------------------------outline_aa
+    // An internal class that implements the main rasterization algorithm.
+    // Used in the rasterizer. Should not be used direcly.
+    class outline_aa
+    {
+        enum
+        {
+            cell_block_shift = 12,
+            cell_block_size  = 1 << cell_block_shift,
+            cell_block_mask  = cell_block_size - 1,
+            cell_block_pool  = 256,
+            cell_block_limit = 1024
+        };
+
+    public:
+
+        ~outline_aa();
+        outline_aa();
+
+        void reset();
+
+        void move_to(int x, int y);
+        void line_to(int x, int y);
+
+        int min_x() const { return m_min_x; }
+        int min_y() const { return m_min_y; }
+        int max_x() const { return m_max_x; }
+        int max_y() const { return m_max_y; }
+
+        const cell_aa* const* cells();
+        unsigned num_cells() { cells(); return m_num_cells; }
+        bool sorted() const { return m_sorted; }
+
+    private:
+        outline_aa(const outline_aa&);
+        const outline_aa& operator = (const outline_aa&);
+
+        void set_cur_cell(int x, int y);
+        void add_cur_cell();
+        void sort_cells();
+        void render_hline(int ey, int x1, int y1, int x2, int y2);
+        void render_line(int x1, int y1, int x2, int y2);
+        void allocate_block();
+
+        static void qsort_cells(cell_aa** start, unsigned num);
+
+    private:
+        unsigned  m_num_blocks;
+        unsigned  m_max_blocks;
+        unsigned  m_cur_block;
+        unsigned  m_num_cells;
+        cell_aa** m_cells;
+        cell_aa*  m_cur_cell_ptr;
+        cell_aa** m_sorted_cells;
+        unsigned  m_sorted_size;
+        cell_aa   m_cur_cell;
+        int       m_cur_x;
+        int       m_cur_y;
+        int       m_min_x;
+        int       m_min_y;
+        int       m_max_x;
+        int       m_max_y;
+        bool      m_sorted;
+    };
+
+
+    //----------------------------------------------------------filling_rule_e
+    enum filling_rule_e
+    {
+        fill_non_zero,
+        fill_even_odd
+    };
+
+
+    //==================================================rasterizer_scanline_aa
+    // Polygon rasterizer that is used to render filled polygons with
+    // high-quality Anti-Aliasing. Internally, by default, the class uses
+    // integer coordinates in format 24.8, i.e. 24 bits for integer part
+    // and 8 bits for fractional - see poly_base_shift. This class can be
+    // used in the following  way:
+    //
+    // 1. filling_rule(filling_rule_e ft) - optional.
+    //
+    // 2. gamma() - optional.
+    //
+    // 3. reset()
+    //
+    // 4. move_to(x, y) / line_to(x, y) - make the polygon. One can create
+    //    more than one contour, but each contour must consist of at least 3
+    //    vertices, i.e. move_to(x1, y1); line_to(x2, y2); line_to(x3, y3);
+    //    is the absolute minimum of vertices that define a triangle.
+    //    The algorithm does not check either the number of vertices nor
+    //    coincidence of their coordinates, but in the worst case it just
+    //    won't draw anything.
+    //    The orger of the vertices (clockwise or counterclockwise)
+    //    is important when using the non-zero filling rule (fill_non_zero).
+    //    In this case the vertex order of all the contours must be the same
+    //    if you want your intersecting polygons to be without "holes".
+    //    You actually can use different vertices order. If the contours do not
+    //    intersect each other the order is not important anyway. If they do,
+    //    contours with the same vertex order will be rendered without "holes"
+    //    while the intersecting contours with different orders will have "holes".
+    //
+    // filling_rule() and gamma() can be called anytime before "sweeping".
+    //------------------------------------------------------------------------
+    template<unsigned XScale=1, unsigned AA_Shift=8> class rasterizer_scanline_aa
+    {
+        enum status
+        {
+            status_initial,
+            status_line_to,
+            status_closed
+        };
+
+        struct iterator
+        {
+            const cell_aa* const* cells;
+            int                   cover;
+            int                   last_y;
+        };
+
+    public:
+        enum
+        {
+            aa_shift = AA_Shift,
+            aa_num   = 1 << aa_shift,
+            aa_mask  = aa_num - 1,
+            aa_2num  = aa_num * 2,
+            aa_2mask = aa_2num - 1
+        };
+
+        //--------------------------------------------------------------------
+        rasterizer_scanline_aa() :
+            m_filling_rule(fill_non_zero),
+            m_clipped_start_x(0),
+            m_clipped_start_y(0),
+            m_start_x(0),
+            m_start_y(0),
+            m_prev_x(0),
+            m_prev_y(0),
+            m_prev_flags(0),
+            m_status(status_initial),
+            m_clipping(false)
+        {
+            int i;
+            for(i = 0; i < aa_num; i++) m_gamma[i] = i;
+        }
+
+        //--------------------------------------------------------------------
+        template<class GammaF>
+        rasterizer_scanline_aa(const GammaF& gamma_function) :
+            m_filling_rule(fill_non_zero),
+            m_clipped_start_x(0),
+            m_clipped_start_y(0),
+            m_start_x(0),
+            m_start_y(0),
+            m_prev_x(0),
+            m_prev_y(0),
+            m_prev_flags(0),
+            m_status(status_initial),
+            m_clipping(false)
+        {
+            gamma(gamma_function);
+        }
+
+        //--------------------------------------------------------------------
+        void reset();
+        void filling_rule(filling_rule_e filling_rule);
+        void clip_box(double x1, double y1, double x2, double y2);
+        void reset_clipping();
+
+        //--------------------------------------------------------------------
+        template<class GammaF> void gamma(const GammaF& gamma_function)
+        {
+            int i;
+            for(i = 0; i < aa_num; i++)
+            {
+                m_gamma[i] = int(floor(gamma_function(double(i) / aa_mask) * aa_mask + 0.5));
+            }
+        }
+
+        //--------------------------------------------------------------------
+        unsigned apply_gamma(unsigned cover) const
+        {
+            return m_gamma[cover];
+        }
+
+        //--------------------------------------------------------------------
+        void add_vertex(double x, double y, unsigned cmd);
+        void move_to(int x, int y);
+        void line_to(int x, int y);
+        void close_polygon();
+        void move_to_d(double x, double y);
+        void line_to_d(double x, double y);
+
+        //--------------------------------------------------------------------
+        int min_x() const { return m_outline.min_x(); }
+        int min_y() const { return m_outline.min_y(); }
+        int max_x() const { return m_outline.max_x(); }
+        int max_y() const { return m_outline.max_y(); }
+
+        //--------------------------------------------------------------------
+        AGG_INLINE unsigned calculate_alpha(int area) const
+        {
+            int cover = area >> (poly_base_shift*2 + 1 - aa_shift);
+
+            if(cover < 0) cover = -cover;
+            if(m_filling_rule == fill_even_odd)
+            {
+                cover &= aa_2mask;
+                if(cover > aa_num)
+                {
+                    cover = aa_2num - cover;
+                }
+            }
+            if(cover > aa_mask) cover = aa_mask;
+            return m_gamma[cover];
+        }
+
+        //--------------------------------------------------------------------
+        void sort()
+        {
+            m_outline.cells();
+        }
+
+
+        //--------------------------------------------------------------------
+        bool rewind_scanlines()
+        {
+            close_polygon();
+            m_iterator.cells = m_outline.cells();
+            if(m_outline.num_cells() == 0)
+            {
+                return false;
+            }
+            m_iterator.cover  = 0;
+            m_iterator.last_y = (*m_iterator.cells)->y;
+            return true;
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class Scanline> bool sweep_scanline(Scanline& sl)
+        {
+            sl.reset_spans();
+            for(;;)
+            {
+                const cell_aa* cur_cell = *m_iterator.cells;
+                if(cur_cell == 0) return false;
+                ++m_iterator.cells;
+                m_iterator.last_y = cur_cell->y;
+
+                for(;;)
+                {
+                    int coord  = cur_cell->packed_coord;
+                    int area   = cur_cell->area;
+                    int last_x = cur_cell->x;
+
+                    m_iterator.cover += cur_cell->cover;
+
+                    //accumulate all cells with the same coordinates
+                    for(; (cur_cell = *m_iterator.cells) != 0; ++m_iterator.cells)
+                    {
+                        if(cur_cell->packed_coord != coord) break;
+                        area             += cur_cell->area;
+                        m_iterator.cover += cur_cell->cover;
+                    }
+
+                    int alpha;
+                    if(cur_cell == 0 || cur_cell->y != m_iterator.last_y)
+                    {
+
+                        if(area)
+                        {
+                            alpha = calculate_alpha((m_iterator.cover << (poly_base_shift + 1)) - area);
+                            if(alpha)
+                            {
+                                sl.add_cell(last_x, alpha);
+                            }
+                            ++last_x;
+                        }
+                        break;
+                    }
+
+                    ++m_iterator.cells;
+
+                    if(area)
+                    {
+                        alpha = calculate_alpha((m_iterator.cover << (poly_base_shift + 1)) - area);
+                        if(alpha)
+                        {
+                            sl.add_cell(last_x, alpha);
+                        }
+                        ++last_x;
+                    }
+
+                    if(cur_cell->x > last_x)
+                    {
+                        alpha = calculate_alpha(m_iterator.cover << (poly_base_shift + 1));
+                        if(alpha)
+                        {
+                            sl.add_span(last_x, cur_cell->x - last_x, alpha);
+                        }
+                    }
+                }
+                if(sl.num_spans())
+                {
+                    sl.finalize(m_iterator.last_y);
+                    break;
+                }
+            }
+            return true;
+        }
+
+
+        //--------------------------------------------------------------------
+        bool hit_test(int tx, int ty);
+
+
+        //--------------------------------------------------------------------
+        void add_xy(const double* x, const double* y, unsigned n)
+        {
+            if(n > 2)
+            {
+                move_to_d(*x++, *y++);
+                --n;
+                do
+                {
+                    line_to_d(*x++, *y++);
+                }
+                while(--n);
+            }
+        }
+
+        //-------------------------------------------------------------------
+        template<class VertexSource>
+        void add_path(VertexSource& vs, unsigned id=0)
+        {
+            double x;
+            double y;
+
+            unsigned cmd;
+            vs.rewind(id);
+            while(!is_stop(cmd = vs.vertex(&x, &y)))
+            {
+                add_vertex(x, y, cmd);
+            }
+        }
+
+
+    private:
+        //--------------------------------------------------------------------
+        // Disable copying
+        rasterizer_scanline_aa(const rasterizer_scanline_aa<XScale, AA_Shift>&);
+        const rasterizer_scanline_aa<XScale, AA_Shift>&
+            operator = (const rasterizer_scanline_aa<XScale, AA_Shift>&);
+
+        //--------------------------------------------------------------------
+        void move_to_no_clip(int x, int y);
+        void line_to_no_clip(int x, int y);
+        void close_polygon_no_clip();
+        void clip_segment(int x, int y);
+
+    private:
+        outline_aa     m_outline;
+        int            m_gamma[aa_num];
+        filling_rule_e m_filling_rule;
+        int            m_clipped_start_x;
+        int            m_clipped_start_y;
+        int            m_start_x;
+        int            m_start_y;
+        int            m_prev_x;
+        int            m_prev_y;
+        unsigned       m_prev_flags;
+        unsigned       m_status;
+        rect           m_clip_box;
+        bool           m_clipping;
+        iterator       m_iterator;
+    };
+
+
+
+
+
+
+
+
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::reset()
+    {
+        m_outline.reset();
+        m_status = status_initial;
+    }
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::filling_rule(filling_rule_e _filling_rule)
+    {
+        m_filling_rule = _filling_rule;
+    }
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::clip_box(double x1, double y1, double x2, double y2)
+    {
+        reset();
+        m_clip_box = rect(poly_coord(x1), poly_coord(y1),
+                          poly_coord(x2), poly_coord(y2));
+        m_clip_box.normalize();
+        m_clipping = true;
+    }
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::reset_clipping()
+    {
+        reset();
+        m_clipping = false;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::move_to_no_clip(int x, int y)
+    {
+        if(m_status == status_line_to)
+        {
+            close_polygon_no_clip();
+        }
+        m_outline.move_to(x * XScale, y);
+        m_clipped_start_x = x;
+        m_clipped_start_y = y;
+        m_status = status_line_to;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::line_to_no_clip(int x, int y)
+    {
+        if(m_status != status_initial)
+        {
+            m_outline.line_to(x * XScale, y);
+            m_status = status_line_to;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::close_polygon_no_clip()
+    {
+        if(m_status == status_line_to)
+        {
+            m_outline.line_to(m_clipped_start_x * XScale, m_clipped_start_y);
+            m_status = status_closed;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::clip_segment(int x, int y)
+    {
+        unsigned flags = clipping_flags(x, y, m_clip_box);
+        if(m_prev_flags == flags)
+        {
+            if(flags == 0)
+            {
+                if(m_status == status_initial)
+                {
+                    move_to_no_clip(x, y);
+                }
+                else
+                {
+                    line_to_no_clip(x, y);
+                }
+            }
+        }
+        else
+        {
+            int cx[4];
+            int cy[4];
+            unsigned n = clip_liang_barsky(m_prev_x, m_prev_y,
+                                           x, y,
+                                           m_clip_box,
+                                           cx, cy);
+            const int* px = cx;
+            const int* py = cy;
+            while(n--)
+            {
+                if(m_status == status_initial)
+                {
+                    move_to_no_clip(*px++, *py++);
+                }
+                else
+                {
+                    line_to_no_clip(*px++, *py++);
+                }
+            }
+        }
+        m_prev_flags = flags;
+        m_prev_x = x;
+        m_prev_y = y;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::add_vertex(double x, double y, unsigned cmd)
+    {
+        if(is_close(cmd))
+        {
+            close_polygon();
+        }
+        else
+        {
+            if(is_move_to(cmd))
+            {
+                move_to(poly_coord(x), poly_coord(y));
+            }
+            else
+            {
+                if(is_vertex(cmd))
+                {
+                    line_to(poly_coord(x), poly_coord(y));
+                }
+            }
+        }
+    }
+
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::move_to(int x, int y)
+    {
+        if(m_clipping)
+        {
+            if(m_outline.sorted())
+            {
+                reset();
+            }
+            if(m_status == status_line_to)
+            {
+                close_polygon();
+            }
+            m_prev_x = m_start_x = x;
+            m_prev_y = m_start_y = y;
+            m_status = status_initial;
+            m_prev_flags = clipping_flags(x, y, m_clip_box);
+            if(m_prev_flags == 0)
+            {
+                move_to_no_clip(x, y);
+            }
+        }
+        else
+        {
+            move_to_no_clip(x, y);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::line_to(int x, int y)
+    {
+        if(m_clipping)
+        {
+            clip_segment(x, y);
+        }
+        else
+        {
+            line_to_no_clip(x, y);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::close_polygon()
+    {
+        if(m_clipping)
+        {
+            clip_segment(m_start_x, m_start_y);
+        }
+        close_polygon_no_clip();
+    }
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::move_to_d(double x, double y)
+    {
+        move_to(poly_coord(x), poly_coord(y));
+    }
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    void rasterizer_scanline_aa<XScale, AA_Shift>::line_to_d(double x, double y)
+    {
+        line_to(poly_coord(x), poly_coord(y));
+    }
+
+
+    //------------------------------------------------------------------------
+    template<unsigned XScale, unsigned AA_Shift>
+    bool rasterizer_scanline_aa<XScale, AA_Shift>::hit_test(int tx, int ty)
+    {
+        close_polygon();
+        const cell_aa* const* cells = m_outline.cells();
+        if(m_outline.num_cells() == 0) return false;
+
+        int cover = 0;
+
+        const cell_aa* cur_cell = *cells++;
+        for(;;)
+        {
+            int alpha;
+            int coord  = cur_cell->packed_coord;
+            int x = cur_cell->x;
+            int y = cur_cell->y;
+
+            if(y > ty) return false;
+
+            int area   = cur_cell->area;
+            cover     += cur_cell->cover;
+
+            while((cur_cell = *cells++) != 0)
+            {
+                if(cur_cell->packed_coord != coord) break;
+                area  += cur_cell->area;
+                cover += cur_cell->cover;
+            }
+
+            if(area)
+            {
+                alpha = calculate_alpha((cover << (poly_base_shift + 1)) - area);
+                if(alpha)
+                {
+                    if(tx == x && ty == y) return true;
+                }
+                x++;
+            }
+
+            if(!cur_cell) break;
+
+            if(cur_cell->x > x)
+            {
+                alpha = calculate_alpha(cover << (poly_base_shift + 1));
+                if(alpha)
+                {
+                    if(ty == y && tx >= x && tx <= cur_cell->x) return true;
+                }
+            }
+        }
+        return false;
+    }
+
+}
+
+
+
+#endif
+
diff --git a/agg/inc/agg_render_scanlines.h b/agg/inc/agg_render_scanlines.h
new file mode 100755
index 000000000000..60ddecf5c2d6
--- /dev/null
+++ b/agg/inc/agg_render_scanlines.h
@@ -0,0 +1,66 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDER_SCANLINES_INCLUDED
+#define AGG_RENDER_SCANLINES_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    //========================================================render_scanlines
+    template<class Rasterizer, class Scanline, class Renderer>
+    void render_scanlines(Rasterizer& ras, Scanline& sl, Renderer& ren)
+    {
+        if(ras.rewind_scanlines())
+        {
+            sl.reset(ras.min_x(), ras.max_x());
+            ren.prepare(unsigned(ras.max_x() - ras.min_x() + 2));
+
+            while(ras.sweep_scanline(sl))
+            {
+                ren.render(sl);
+            }
+        }
+    }
+
+
+    //========================================================render_all_paths
+    template<class Rasterizer, class Scanline, class Renderer,
+             class VertexSource, class ColorStorage, class PathId>
+    void render_all_paths(Rasterizer& ras,
+                          Scanline& sl,
+                          Renderer& r,
+                          VertexSource& vs,
+                          const ColorStorage& as,
+                          const PathId& id,
+                          unsigned num_paths)
+    {
+        for(unsigned i = 0; i < num_paths; i++)
+        {
+            ras.reset();
+            ras.add_path(vs, id[i]);
+            r.color(as[i]);
+            render_scanlines(ras, sl, r);
+        }
+    }
+
+
+}
+
+#endif
+
+
+
diff --git a/agg/inc/agg_renderer_base.h b/agg/inc/agg_renderer_base.h
new file mode 100755
index 000000000000..1ef44fecc6d2
--- /dev/null
+++ b/agg/inc/agg_renderer_base.h
@@ -0,0 +1,618 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class renderer_base
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERER_BASE_INCLUDED
+#define AGG_RENDERER_BASE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_rendering_buffer.h"
+
+namespace agg
+{
+
+    //-----------------------------------------------------------renderer_base
+    template<class PixelFormat> class renderer_base
+    {
+    public:
+        typedef PixelFormat pixfmt_type;
+        typedef typename pixfmt_type::color_type color_type;
+
+        //--------------------------------------------------------------------
+        renderer_base(pixfmt_type& _ren) :
+            m_ren(&_ren),
+            m_clip_box(0, 0, _ren.width() - 1, _ren.height() - 1)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        const pixfmt_type& ren() const { return *m_ren;  }
+        pixfmt_type& ren() { return *m_ren;  }
+
+        //--------------------------------------------------------------------
+        unsigned width()  const { return m_ren->width();  }
+        unsigned height() const { return m_ren->height(); }
+
+        //--------------------------------------------------------------------
+        bool clip_box(int x1, int y1, int x2, int y2)
+        {
+            rect cb(x1, y1, x2, y2);
+            cb.normalize();
+            if(cb.clip(rect(0, 0, width() - 1, height() - 1)))
+            {
+                m_clip_box = cb;
+                return true;
+            }
+            m_clip_box.x1 = 1;
+            m_clip_box.y1 = 1;
+            m_clip_box.x2 = 0;
+            m_clip_box.y2 = 0;
+            return false;
+        }
+
+        //--------------------------------------------------------------------
+        void reset_clipping(bool visibility)
+        {
+            if(visibility)
+            {
+                m_clip_box.x1 = 0;
+                m_clip_box.y1 = 0;
+                m_clip_box.x2 = width() - 1;
+                m_clip_box.y2 = height() - 1;
+            }
+            else
+            {
+                m_clip_box.x1 = 1;
+                m_clip_box.y1 = 1;
+                m_clip_box.x2 = 0;
+                m_clip_box.y2 = 0;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void clip_box_naked(int x1, int y1, int x2, int y2)
+        {
+            m_clip_box.x1 = x1;
+            m_clip_box.y1 = y1;
+            m_clip_box.x2 = x2;
+            m_clip_box.y2 = y2;
+        }
+
+        //--------------------------------------------------------------------
+        bool inbox(int x, int y) const
+        {
+            return x >= m_clip_box.x1 && y >= m_clip_box.y1 &&
+                   x <= m_clip_box.x2 && y <= m_clip_box.y2;
+        }
+
+        //--------------------------------------------------------------------
+        void first_clip_box() {}
+        bool next_clip_box() { return false; }
+
+        //--------------------------------------------------------------------
+        const rect& clip_box() const { return m_clip_box;    }
+        int         xmin()     const { return m_clip_box.x1; }
+        int         ymin()     const { return m_clip_box.y1; }
+        int         xmax()     const { return m_clip_box.x2; }
+        int         ymax()     const { return m_clip_box.y2; }
+
+        //--------------------------------------------------------------------
+        const rect& bounding_clip_box() const { return m_clip_box;    }
+        int         bounding_xmin()     const { return m_clip_box.x1; }
+        int         bounding_ymin()     const { return m_clip_box.y1; }
+        int         bounding_xmax()     const { return m_clip_box.x2; }
+        int         bounding_ymax()     const { return m_clip_box.y2; }
+
+        //--------------------------------------------------------------------
+        void clear(const color_type& c)
+        {
+            unsigned y;
+            if(width())
+            {
+                for(y = 0; y < height(); y++)
+                {
+                    m_ren->copy_hline(0, y, width(), c);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void copy_pixel(int x, int y, const color_type& c)
+        {
+            if(inbox(x, y))
+            {
+                m_ren->copy_pixel(x, y, c);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void blend_pixel(int x, int y, const color_type& c, cover_type cover)
+        {
+            if(inbox(x, y))
+            {
+                m_ren->blend_pixel(x, y, c, cover);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        color_type pixel(int x, int y) const
+        {
+            return inbox(x, y) ?
+                   m_ren->pixel(x, y) :
+                   color_type::no_color();
+        }
+
+        //--------------------------------------------------------------------
+        void copy_hline(int x1, int y, int x2, const color_type& c)
+        {
+            if(x1 > x2) { int t = x2; x2 = x1; x1 = t; }
+            if(y  > ymax()) return;
+            if(y  < ymin()) return;
+            if(x1 > xmax()) return;
+            if(x2 < xmin()) return;
+
+            if(x1 < xmin()) x1 = xmin();
+            if(x2 > xmax()) x2 = xmax();
+
+            m_ren->copy_hline(x1, y, x2 - x1 + 1, c);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_vline(int x, int y1, int y2, const color_type& c)
+        {
+            if(y1 > y2) { int t = y2; y2 = y1; y1 = t; }
+            if(x  > xmax()) return;
+            if(x  < xmin()) return;
+            if(y1 > ymax()) return;
+            if(y2 < ymin()) return;
+
+            if(y1 < ymin()) y1 = ymin();
+            if(y2 > ymax()) y2 = ymax();
+
+            m_ren->copy_vline(x, y1, y2 - y1 + 1, c);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x1, int y, int x2,
+                         const color_type& c, cover_type cover)
+        {
+            if(x1 > x2) { int t = x2; x2 = x1; x1 = t; }
+            if(y  > ymax()) return;
+            if(y  < ymin()) return;
+            if(x1 > xmax()) return;
+            if(x2 < xmin()) return;
+
+            if(x1 < xmin()) x1 = xmin();
+            if(x2 > xmax()) x2 = xmax();
+
+            m_ren->blend_hline(x1, y, x2 - x1 + 1, c, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y1, int y2,
+                         const color_type& c, cover_type cover)
+        {
+            if(y1 > y2) { int t = y2; y2 = y1; y1 = t; }
+            if(x  > xmax()) return;
+            if(x  < xmin()) return;
+            if(y1 > ymax()) return;
+            if(y2 < ymin()) return;
+
+            if(y1 < ymin()) y1 = ymin();
+            if(y2 > ymax()) y2 = ymax();
+
+            m_ren->blend_vline(x, y1, y2 - y1 + 1, c, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        void copy_bar(int x1, int y1, int x2, int y2, const color_type& c)
+        {
+            rect rc(x1, y1, x2, y2);
+            rc.normalize();
+            if(rc.clip(clip_box()))
+            {
+                int y;
+                for(y = rc.y1; y <= rc.y2; y++)
+                {
+                    m_ren->copy_hline(rc.x1, y, unsigned(rc.x2 - rc.x1 + 1), c);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void blend_bar(int x1, int y1, int x2, int y2,
+                       const color_type& c, cover_type cover)
+        {
+            rect rc(x1, y1, x2, y2);
+            rc.normalize();
+            if(rc.clip(clip_box()))
+            {
+                int y;
+                for(y = rc.y1; y <= rc.y2; y++)
+                {
+                    m_ren->blend_hline(rc.x1,
+                                       y,
+                                       unsigned(rc.x2 - rc.x1 + 1),
+                                       c,
+                                       cover);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y, int len,
+                               const color_type& c,
+                               const cover_type* covers)
+        {
+            if(y > ymax()) return;
+            if(y < ymin()) return;
+
+            if(x < xmin())
+            {
+                len -= xmin() - x;
+                if(len <= 0) return;
+                covers += xmin() - x;
+                x = xmin();
+            }
+            if(x + len > xmax())
+            {
+                len = xmax() - x + 1;
+                if(len <= 0) return;
+            }
+            m_ren->blend_solid_hspan(x, y, len, c, covers);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y, int len,
+                               const color_type& c,
+                               const cover_type* covers)
+        {
+            if(x > xmax()) return;
+            if(x < xmin()) return;
+
+            if(y < ymin())
+            {
+                len -= ymin() - y;
+                if(len <= 0) return;
+                covers += ymin() - y;
+                y = ymin();
+            }
+            if(y + len > ymax())
+            {
+                len = ymax() - y + 1;
+                if(len <= 0) return;
+            }
+            m_ren->blend_solid_vspan(x, y, len, c, covers);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y, int len,
+                               const color_type* colors,
+                               const cover_type* covers,
+                               cover_type cover = cover_full)
+        {
+            if(y > ymax()) return;
+            if(y < ymin()) return;
+
+            if(x < xmin())
+            {
+                int d = xmin() - x;
+                len -= d;
+                if(len <= 0) return;
+                if(covers) covers += d;
+                colors += d;
+                x = xmin();
+            }
+            if(x + len > xmax())
+            {
+                len = xmax() - x + 1;
+                if(len <= 0) return;
+            }
+            m_ren->blend_color_hspan(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y, int len,
+                               const color_type* colors,
+                               const cover_type* covers,
+                               cover_type cover = cover_full)
+        {
+            if(x > xmax()) return;
+            if(x < xmin()) return;
+
+            if(y < ymin())
+            {
+                int d = ymin() - y;
+                len -= d;
+                if(len <= 0) return;
+                if(covers) covers += d;
+                colors += d;
+                y = ymin();
+            }
+            if(y + len > ymax())
+            {
+                len = ymax() - y + 1;
+                if(len <= 0) return;
+            }
+            m_ren->blend_color_vspan(x, y, len, colors, covers, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan(int x, int y, int len,
+                                      const color_type* colors,
+                                      const cover_type* covers,
+                                      cover_type cover = cover_full)
+        {
+            if(y > ymax()) return;
+            if(y < ymin()) return;
+
+            if(x < xmin())
+            {
+                int d = xmin() - x;
+                len -= d;
+                if(len <= 0) return;
+                if(covers) covers += d;
+                colors += d;
+                x = xmin();
+            }
+            if(x + len > xmax())
+            {
+                len = xmax() - x + 1;
+                if(len <= 0) return;
+            }
+            m_ren->blend_opaque_color_hspan(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y, int len,
+                                      const color_type* colors,
+                                      const cover_type* covers,
+                                      cover_type cover = cover_full)
+        {
+            if(x > xmax()) return;
+            if(x < xmin()) return;
+
+            if(y < ymin())
+            {
+                int d = ymin() - y;
+                len -= d;
+                if(len <= 0) return;
+                if(covers) covers += d;
+                colors += d;
+                y = ymin();
+            }
+            if(y + len > ymax())
+            {
+                len = ymax() - y + 1;
+                if(len <= 0) return;
+            }
+            m_ren->blend_opaque_color_vspan(x, y, len, colors, covers, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan_no_clip(int x, int y, int len,
+                                       const color_type* colors,
+                                       const cover_type* covers,
+                                       cover_type cover = cover_full)
+        {
+            m_ren->blend_color_hspan(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan_no_clip(int x, int y, int len,
+                                       const color_type* colors,
+                                       const cover_type* covers,
+                                       cover_type cover = cover_full)
+        {
+            m_ren->blend_color_vspan(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan_no_clip(int x, int y, int len,
+                                              const color_type* colors,
+                                              const cover_type* covers,
+                                              cover_type cover = cover_full)
+        {
+            m_ren->blend_opaque_color_hspan(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan_no_clip(int x, int y, int len,
+                                              const color_type* colors,
+                                              const cover_type* covers,
+                                              cover_type cover = cover_full)
+        {
+            m_ren->blend_opaque_color_vspan(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        rect clip_rect_area(rect& dst, rect& src, int wsrc, int hsrc) const
+        {
+            rect rc(0,0,0,0);
+            rect cb = clip_box();
+            ++cb.x2;
+            ++cb.y2;
+
+            if(src.x1 < 0)
+            {
+                dst.x1 -= src.x1;
+                src.x1 = 0;
+            }
+            if(src.y1 < 0)
+            {
+                dst.y1 -= src.y1;
+                src.y1 = 0;
+            }
+
+            if(src.x2 > wsrc) src.x2 = wsrc;
+            if(src.y2 > hsrc) src.y2 = hsrc;
+
+            if(dst.x1 < cb.x1)
+            {
+                src.x1 += cb.x1 - dst.x1;
+                dst.x1 = cb.x1;
+            }
+            if(dst.y1 < cb.y1)
+            {
+                src.y1 += cb.y1 - dst.y1;
+                dst.y1 = cb.y1;
+            }
+
+            if(dst.x2 > cb.x2) dst.x2 = cb.x2;
+            if(dst.y2 > cb.y2) dst.y2 = cb.y2;
+
+            rc.x2 = dst.x2 - dst.x1;
+            rc.y2 = dst.y2 - dst.y1;
+
+            if(rc.x2 > src.x2 - src.x1) rc.x2 = src.x2 - src.x1;
+            if(rc.y2 > src.y2 - src.y1) rc.y2 = src.y2 - src.y1;
+            return rc;
+        }
+
+
+        //--------------------------------------------------------------------
+        void copy_from(const rendering_buffer& src,
+                       const rect* rect_src_ptr = 0,
+                       int dx = 0,
+                       int dy = 0)
+        {
+            rect rsrc(0, 0, src.width(), src.height());
+            if(rect_src_ptr)
+            {
+                rsrc.x1 = rect_src_ptr->x1;
+                rsrc.y1 = rect_src_ptr->y1;
+                rsrc.x2 = rect_src_ptr->x2 + 1;
+                rsrc.y2 = rect_src_ptr->y2 + 1;
+            }
+
+            // Version with xdst, ydst (absolute positioning)
+            //rect rdst(xdst, ydst, xdst + rsrc.x2 - rsrc.x1, ydst + rsrc.y2 - rsrc.y1);
+
+            // Version with dx, dy (relative positioning)
+            rect rdst(rsrc.x1 + dx, rsrc.y1 + dy, rsrc.x2 + dx, rsrc.y2 + dy);
+
+            rect rc = clip_rect_area(rdst, rsrc, src.width(), src.height());
+
+            if(rc.x2 > 0)
+            {
+                int incy = 1;
+                if(rdst.y1 > rsrc.y1)
+                {
+                    rsrc.y1 += rc.y2 - 1;
+                    rdst.y1 += rc.y2 - 1;
+                    incy = -1;
+                }
+                while(rc.y2 > 0)
+                {
+                    m_ren->copy_from(src,
+                                     rdst.x1, rdst.y1,
+                                     rsrc.x1, rsrc.y1,
+                                     rc.x2);
+                    rdst.y1 += incy;
+                    rsrc.y1 += incy;
+                    --rc.y2;
+                }
+            }
+        }
+
+
+
+        //--------------------------------------------------------------------
+        template<class SrcPixelFormatRenderer>
+        void blend_from(const SrcPixelFormatRenderer& src,
+                       const rect* rect_src_ptr = 0,
+                       int dx = 0,
+                       int dy = 0)
+        {
+            rect rsrc(0, 0, src.width(), src.height());
+            if(rect_src_ptr)
+            {
+                rsrc.x1 = rect_src_ptr->x1;
+                rsrc.y1 = rect_src_ptr->y1;
+                rsrc.x2 = rect_src_ptr->x2 + 1;
+                rsrc.y2 = rect_src_ptr->y2 + 1;
+            }
+
+            // Version with xdst, ydst (absolute positioning)
+            //rect rdst(xdst, ydst, xdst + rsrc.x2 - rsrc.x1, ydst + rsrc.y2 - rsrc.y1);
+
+            // Version with dx, dy (relative positioning)
+            rect rdst(rsrc.x1 + dx, rsrc.y1 + dy, rsrc.x2 + dx, rsrc.y2 + dy);
+
+            rect rc = clip_rect_area(rdst, rsrc, src.width(), src.height());
+
+            if(rc.x2 > 0)
+            {
+                int incy = 1;
+                if(rdst.y1 > rsrc.y1)
+                {
+                    rsrc.y1 += rc.y2 - 1;
+                    rdst.y1 += rc.y2 - 1;
+                    incy = -1;
+                }
+                while(rc.y2 > 0)
+                {
+                    typename SrcPixelFormatRenderer::row_data span = src.span(rsrc.x1, rsrc.y1);
+                    if(span.ptr)
+                    {
+                        int x1src = rsrc.x1;
+                        int x1dst = rdst.x1;
+                        int len   = rc.x2;
+                        if(span.x1 > x1src)
+                        {
+                            x1dst += span.x1 - x1src;
+                            len   -= span.x1 - x1src;
+                            x1src = span.x1;
+                        }
+                        if(len > 0)
+                        {
+                            if(x1src + len-1 > span.x2)
+                            {
+                                len -= x1src + len - span.x2 - 1;
+                            }
+                            if(len > 0)
+                            {
+                                m_ren->blend_from(src, span.ptr,
+                                                  x1dst, rdst.y1,
+                                                  x1src, rsrc.y1,
+                                                  len);
+                            }
+                        }
+                    }
+                    rdst.y1 += incy;
+                    rsrc.y1 += incy;
+                    --rc.y2;
+                }
+            }
+        }
+
+
+
+    private:
+        pixfmt_type* m_ren;
+        rect         m_clip_box;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_renderer_markers.h b/agg/inc/agg_renderer_markers.h
new file mode 100755
index 000000000000..ff47995554d9
--- /dev/null
+++ b/agg/inc/agg_renderer_markers.h
@@ -0,0 +1,707 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class renderer_markers
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERER_MARKERS_INCLUDED
+#define AGG_RENDERER_MARKERS_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_renderer_primitives.h"
+
+namespace agg
+{
+
+    //---------------------------------------------------------------marker_e
+    enum marker_e
+    {
+        marker_square,
+        marker_diamond,
+        marker_circle,
+        marker_crossed_circle,
+        marker_semiellipse_left,
+        marker_semiellipse_right,
+        marker_semiellipse_up,
+        marker_semiellipse_down,
+        marker_triangle_left,
+        marker_triangle_right,
+        marker_triangle_up,
+        marker_triangle_down,
+        marker_four_rays,
+        marker_cross,
+        marker_x,
+        marker_dash,
+        marker_dot,
+        marker_pixel,
+
+        end_of_markers
+    };
+
+
+
+    //--------------------------------------------------------renderer_markers
+    template<class BaseRenderer> class renderer_markers :
+    public renderer_primitives<BaseRenderer>
+    {
+    public:
+        typedef renderer_primitives<BaseRenderer> base_type;
+        typedef BaseRenderer base_ren_type;
+        typedef typename base_ren_type::color_type color_type;
+
+        //--------------------------------------------------------------------
+        renderer_markers(base_ren_type& rbuf) :
+            base_type(rbuf)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        bool visible(int x, int y, int r) const
+        {
+            rect rc(x-r, y-r, x+y, y+r);
+            return rc.clip(base_type::ren().bounding_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void square(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r) base_type::outlined_rectangle(x-r, y-r, x+r, y+r);
+                else  base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void diamond(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int dy = -r;
+                    int dx = 0;
+                    do
+                    {
+                        base_type::ren().blend_pixel(x - dx, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dx, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dx, y - dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dx, y - dy, base_type::line_color(), cover_full);
+
+                        if(dx)
+                        {
+                            base_type::ren().blend_hline(x-dx+1, y+dy, x+dx-1, base_type::fill_color(), cover_full);
+                            base_type::ren().blend_hline(x-dx+1, y-dy, x+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++dy;
+                        ++dx;
+                    }
+                    while(dy <= 0);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void circle(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r) base_type::outlined_ellipse(x, y, r, r);
+                else  base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+            }
+        }
+
+
+
+        //--------------------------------------------------------------------
+        void crossed_circle(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    base_type::outlined_ellipse(x, y, r, r);
+                    int r6 = r + (r >> 1);
+                    if(r <= 2) r6++;
+                    r >>= 1;
+                    base_type::ren().blend_hline(x-r6, y, x-r,  base_type::line_color(), cover_full);
+                    base_type::ren().blend_hline(x+r,  y, x+r6, base_type::line_color(), cover_full);
+                    base_type::ren().blend_vline(x, y-r6, y-r,  base_type::line_color(), cover_full);
+                    base_type::ren().blend_vline(x, y+r,  y+r6, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //------------------------------------------------------------------------
+        void semiellipse_left(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int r8 = r * 4 / 5;
+                    int dy = -r;
+                    int dx = 0;
+                    ellipse_bresenham_interpolator ei(r * 3 / 5, r+r8);
+                    do
+                    {
+                        dx += ei.dx();
+                        dy += ei.dy();
+
+                        base_type::ren().blend_pixel(x + dy, y + dx, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dy, y - dx, base_type::line_color(), cover_full);
+
+                        if(ei.dy() && dx)
+                        {
+                            base_type::ren().blend_vline(x+dy, y-dx+1, y+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++ei;
+                    }
+                    while(dy < r8);
+                    base_type::ren().blend_vline(x+dy, y-dx, y+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void semiellipse_right(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int r8 = r * 4 / 5;
+                    int dy = -r;
+                    int dx = 0;
+                    ellipse_bresenham_interpolator ei(r * 3 / 5, r+r8);
+                    do
+                    {
+                        dx += ei.dx();
+                        dy += ei.dy();
+
+                        base_type::ren().blend_pixel(x - dy, y + dx, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dy, y - dx, base_type::line_color(), cover_full);
+
+                        if(ei.dy() && dx)
+                        {
+                            base_type::ren().blend_vline(x-dy, y-dx+1, y+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++ei;
+                    }
+                    while(dy < r8);
+                    base_type::ren().blend_vline(x-dy, y-dx, y+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void semiellipse_up(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int r8 = r * 4 / 5;
+                    int dy = -r;
+                    int dx = 0;
+                    ellipse_bresenham_interpolator ei(r * 3 / 5, r+r8);
+                    do
+                    {
+                        dx += ei.dx();
+                        dy += ei.dy();
+
+                        base_type::ren().blend_pixel(x + dx, y - dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dx, y - dy, base_type::line_color(), cover_full);
+
+                        if(ei.dy() && dx)
+                        {
+                            base_type::ren().blend_hline(x-dx+1, y-dy, x+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++ei;
+                    }
+                    while(dy < r8);
+                    base_type::ren().blend_hline(x-dx, y-dy-1, x+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void semiellipse_down(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int r8 = r * 4 / 5;
+                    int dy = -r;
+                    int dx = 0;
+                    ellipse_bresenham_interpolator ei(r * 3 / 5, r+r8);
+                    do
+                    {
+                        dx += ei.dx();
+                        dy += ei.dy();
+
+                        base_type::ren().blend_pixel(x + dx, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dx, y + dy, base_type::line_color(), cover_full);
+
+                        if(ei.dy() && dx)
+                        {
+                            base_type::ren().blend_hline(x-dx+1, y+dy, x+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++ei;
+                    }
+                    while(dy < r8);
+                    base_type::ren().blend_hline(x-dx, y+dy+1, x+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void triangle_left(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int dy = -r;
+                    int dx = 0;
+                    int flip = 0;
+                    int r6 = r * 3 / 5;
+                    do
+                    {
+                        base_type::ren().blend_pixel(x + dy, y - dx, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dy, y + dx, base_type::line_color(), cover_full);
+
+                        if(dx)
+                        {
+                            base_type::ren().blend_vline(x+dy, y-dx+1, y+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++dy;
+                        dx += flip;
+                        flip ^= 1;
+                    }
+                    while(dy < r6);
+                    base_type::ren().blend_vline(x+dy, y-dx, y+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void triangle_right(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int dy = -r;
+                    int dx = 0;
+                    int flip = 0;
+                    int r6 = r * 3 / 5;
+                    do
+                    {
+                        base_type::ren().blend_pixel(x - dy, y - dx, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dy, y + dx, base_type::line_color(), cover_full);
+
+                        if(dx)
+                        {
+                            base_type::ren().blend_vline(x-dy, y-dx+1, y+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++dy;
+                        dx += flip;
+                        flip ^= 1;
+                    }
+                    while(dy < r6);
+                    base_type::ren().blend_vline(x-dy, y-dx, y+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void triangle_up(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int dy = -r;
+                    int dx = 0;
+                    int flip = 0;
+                    int r6 = r * 3 / 5;
+                    do
+                    {
+                        base_type::ren().blend_pixel(x - dx, y - dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dx, y - dy, base_type::line_color(), cover_full);
+
+                        if(dx)
+                        {
+                            base_type::ren().blend_hline(x-dx+1, y-dy, x+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++dy;
+                        dx += flip;
+                        flip ^= 1;
+                    }
+                    while(dy < r6);
+                    base_type::ren().blend_hline(x-dx, y-dy, x+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void triangle_down(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int dy = -r;
+                    int dx = 0;
+                    int flip = 0;
+                    int r6 = r * 3 / 5;
+                    do
+                    {
+                        base_type::ren().blend_pixel(x - dx, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dx, y + dy, base_type::line_color(), cover_full);
+
+                        if(dx)
+                        {
+                            base_type::ren().blend_hline(x-dx+1, y+dy, x+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++dy;
+                        dx += flip;
+                        flip ^= 1;
+                    }
+                    while(dy < r6);
+                    base_type::ren().blend_hline(x-dx, y+dy, x+dx, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void four_rays(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int dy = -r;
+                    int dx = 0;
+                    int flip = 0;
+                    int r3 = -(r / 3);
+                    do
+                    {
+                        base_type::ren().blend_pixel(x - dx, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dx, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dx, y - dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dx, y - dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dy, y - dx, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dy, y + dx, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dy, y - dx, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dy, y + dx, base_type::line_color(), cover_full);
+
+                        if(dx)
+                        {
+                            base_type::ren().blend_hline(x-dx+1, y+dy,   x+dx-1, base_type::fill_color(), cover_full);
+                            base_type::ren().blend_hline(x-dx+1, y-dy,   x+dx-1, base_type::fill_color(), cover_full);
+                            base_type::ren().blend_vline(x+dy,   y-dx+1, y+dx-1, base_type::fill_color(), cover_full);
+                            base_type::ren().blend_vline(x-dy,   y-dx+1, y+dx-1, base_type::fill_color(), cover_full);
+                        }
+                        ++dy;
+                        dx += flip;
+                        flip ^= 1;
+                    }
+                    while(dy <= r3);
+                    base_type::solid_rectangle(x+r3+1, y+r3+1, x-r3-1, y-r3-1);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void cross(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    base_type::ren().blend_vline(x, y-r, y+r, base_type::line_color(), cover_full);
+                    base_type::ren().blend_hline(x-r, y, x+r, base_type::line_color(), cover_full);
+                }
+                else
+                {
+                    base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+                }
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void xing(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r)
+                {
+                    int dy = -r * 7 / 10;
+                    do
+                    {
+                        base_type::ren().blend_pixel(x + dy, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dy, y + dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x + dy, y - dy, base_type::line_color(), cover_full);
+                        base_type::ren().blend_pixel(x - dy, y - dy, base_type::line_color(), cover_full);
+                        ++dy;
+                    }
+                    while(dy < 0);
+                }
+                base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void dash(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r) base_type::ren().blend_hline(x-r, y, x+r, base_type::line_color(), cover_full);
+                else  base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        void dot(int x, int y, int r)
+        {
+            if(visible(x, y, r))
+            {
+                if(r) base_type::solid_ellipse(x, y, r, r);
+                else  base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void pixel(int x, int y, int)
+        {
+            base_type::ren().blend_pixel(x, y, base_type::fill_color(), cover_full);
+        }
+
+        //--------------------------------------------------------------------
+        void marker(int x, int y, int r, marker_e type)
+        {
+            switch(type)
+            {
+                case marker_square:            square(x, y, r);            break;
+                case marker_diamond:           diamond(x, y, r);           break;
+                case marker_circle:            circle(x, y, r);            break;
+                case marker_crossed_circle:    crossed_circle(x, y, r);    break;
+                case marker_semiellipse_left:  semiellipse_left(x, y, r);  break;
+                case marker_semiellipse_right: semiellipse_right(x, y, r); break;
+                case marker_semiellipse_up:    semiellipse_up(x, y, r);    break;
+                case marker_semiellipse_down:  semiellipse_down(x, y, r);  break;
+                case marker_triangle_left:     triangle_left(x, y, r);     break;
+                case marker_triangle_right:    triangle_right(x, y, r);    break;
+                case marker_triangle_up:       triangle_up(x, y, r);       break;
+                case marker_triangle_down:     triangle_down(x, y, r);     break;
+                case marker_four_rays:         four_rays(x, y, r);         break;
+                case marker_cross:             cross(x, y, r);             break;
+                case marker_x:                 xing(x, y, r);              break;
+                case marker_dash:              dash(x, y, r);              break;
+                case marker_dot:               dot(x, y, r);               break;
+                case marker_pixel:             pixel(x, y, r);             break;
+            }
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class T>
+        void markers(int n, const T* x, const T* y, T r, marker_e type)
+        {
+            if(n <= 0) return;
+            if(r == 0)
+            {
+                do
+                {
+                    base_type::ren().blend_pixel(int(*x), int(*y), base_type::fill_color(), cover_full);
+                    ++x;
+                    ++y;
+                }
+                while(--n);
+                return;
+            }
+
+            switch(type)
+            {
+                case marker_square:            do { square           (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_diamond:           do { diamond          (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_circle:            do { circle           (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_crossed_circle:    do { crossed_circle   (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_semiellipse_left:  do { semiellipse_left (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_semiellipse_right: do { semiellipse_right(int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_semiellipse_up:    do { semiellipse_up   (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_semiellipse_down:  do { semiellipse_down (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_triangle_left:     do { triangle_left    (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_triangle_right:    do { triangle_right   (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_triangle_up:       do { triangle_up      (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_triangle_down:     do { triangle_down    (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_four_rays:         do { four_rays        (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_cross:             do { cross            (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_x:                 do { xing             (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_dash:              do { dash             (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_dot:               do { dot              (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+                case marker_pixel:             do { pixel            (int(*x), int(*y), int(r)); ++x; ++y; } while(--n); break;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        template<class T>
+        void markers(int n, const T* x, const T* y, const T* r, marker_e type)
+        {
+            if(n <= 0) return;
+            switch(type)
+            {
+                case marker_square:            do { square           (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_diamond:           do { diamond          (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_circle:            do { circle           (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_crossed_circle:    do { crossed_circle   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_semiellipse_left:  do { semiellipse_left (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_semiellipse_right: do { semiellipse_right(int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_semiellipse_up:    do { semiellipse_up   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_semiellipse_down:  do { semiellipse_down (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_triangle_left:     do { triangle_left    (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_triangle_right:    do { triangle_right   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_triangle_up:       do { triangle_up      (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_triangle_down:     do { triangle_down    (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_four_rays:         do { four_rays        (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_cross:             do { cross            (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_x:                 do { xing             (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_dash:              do { dash             (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_dot:               do { dot              (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+                case marker_pixel:             do { pixel            (int(*x), int(*y), int(*r)); ++x; ++y; ++r; } while(--n); break;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        template<class T>
+        void markers(int n, const T* x, const T* y, const T* r, const color_type* fc, marker_e type)
+        {
+            if(n <= 0) return;
+            switch(type)
+            {
+                case marker_square:            do { base_type::fill_color(*fc); square           (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_diamond:           do { base_type::fill_color(*fc); diamond          (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_circle:            do { base_type::fill_color(*fc); circle           (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_crossed_circle:    do { base_type::fill_color(*fc); crossed_circle   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_semiellipse_left:  do { base_type::fill_color(*fc); semiellipse_left (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_semiellipse_right: do { base_type::fill_color(*fc); semiellipse_right(int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_semiellipse_up:    do { base_type::fill_color(*fc); semiellipse_up   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_semiellipse_down:  do { base_type::fill_color(*fc); semiellipse_down (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_triangle_left:     do { base_type::fill_color(*fc); triangle_left    (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_triangle_right:    do { base_type::fill_color(*fc); triangle_right   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_triangle_up:       do { base_type::fill_color(*fc); triangle_up      (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_triangle_down:     do { base_type::fill_color(*fc); triangle_down    (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_four_rays:         do { base_type::fill_color(*fc); four_rays        (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_cross:             do { base_type::fill_color(*fc); cross            (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_x:                 do { base_type::fill_color(*fc); xing             (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_dash:              do { base_type::fill_color(*fc); dash             (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_dot:               do { base_type::fill_color(*fc); dot              (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+                case marker_pixel:             do { base_type::fill_color(*fc); pixel            (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; } while(--n); break;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        template<class T>
+        void markers(int n, const T* x, const T* y, const T* r, const color_type* fc, const color_type* lc, marker_e type)
+        {
+            if(n <= 0) return;
+            switch(type)
+            {
+                case marker_square:            do { base_type::fill_color(*fc); base_type::line_color(*lc); square           (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_diamond:           do { base_type::fill_color(*fc); base_type::line_color(*lc); diamond          (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_circle:            do { base_type::fill_color(*fc); base_type::line_color(*lc); circle           (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_crossed_circle:    do { base_type::fill_color(*fc); base_type::line_color(*lc); crossed_circle   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_semiellipse_left:  do { base_type::fill_color(*fc); base_type::line_color(*lc); semiellipse_left (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_semiellipse_right: do { base_type::fill_color(*fc); base_type::line_color(*lc); semiellipse_right(int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_semiellipse_up:    do { base_type::fill_color(*fc); base_type::line_color(*lc); semiellipse_up   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_semiellipse_down:  do { base_type::fill_color(*fc); base_type::line_color(*lc); semiellipse_down (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_triangle_left:     do { base_type::fill_color(*fc); base_type::line_color(*lc); triangle_left    (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_triangle_right:    do { base_type::fill_color(*fc); base_type::line_color(*lc); triangle_right   (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_triangle_up:       do { base_type::fill_color(*fc); base_type::line_color(*lc); triangle_up      (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_triangle_down:     do { base_type::fill_color(*fc); base_type::line_color(*lc); triangle_down    (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_four_rays:         do { base_type::fill_color(*fc); base_type::line_color(*lc); four_rays        (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_cross:             do { base_type::fill_color(*fc); base_type::line_color(*lc); cross            (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_x:                 do { base_type::fill_color(*fc); base_type::line_color(*lc); xing             (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_dash:              do { base_type::fill_color(*fc); base_type::line_color(*lc); dash             (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_dot:               do { base_type::fill_color(*fc); base_type::line_color(*lc); dot              (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+                case marker_pixel:             do { base_type::fill_color(*fc); base_type::line_color(*lc); pixel            (int(*x), int(*y), int(*r)); ++x; ++y; ++r; ++fc; ++lc; } while(--n); break;
+            }
+        }
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_renderer_mclip.h b/agg/inc/agg_renderer_mclip.h
new file mode 100755
index 000000000000..dc758b9ea72d
--- /dev/null
+++ b/agg/inc/agg_renderer_mclip.h
@@ -0,0 +1,383 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class renderer_mclip
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERER_MCLIP_INCLUDED
+#define AGG_RENDERER_MCLIP_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_array.h"
+#include "agg_renderer_base.h"
+
+namespace agg
+{
+
+    //----------------------------------------------------------renderer_mclip
+    template<class PixelFormat> class renderer_mclip
+    {
+    public:
+        typedef PixelFormat pixfmt_type;
+        typedef typename pixfmt_type::color_type color_type;
+        typedef renderer_base<pixfmt_type> base_ren_type;
+
+        //--------------------------------------------------------------------
+        renderer_mclip(pixfmt_type& ren) :
+            m_ren(ren),
+            m_curr_cb(0),
+            m_bounds(m_ren.xmin(), m_ren.ymin(), m_ren.xmax(), m_ren.ymax())
+        {
+        }
+
+        //--------------------------------------------------------------------
+        const pixfmt_type& ren() const { return m_ren.ren();  }
+        pixfmt_type& ren() { return m_ren.ren();  }
+
+        //--------------------------------------------------------------------
+        unsigned width()  const { return m_ren.width();  }
+        unsigned height() const { return m_ren.height(); }
+
+        //--------------------------------------------------------------------
+        const rect& clip_box() const { return m_ren.clip_box(); }
+        int         xmin()     const { return m_ren.xmin(); }
+        int         ymin()     const { return m_ren.ymin(); }
+        int         xmax()     const { return m_ren.xmax(); }
+        int         ymax()     const { return m_ren.ymax(); }
+
+        //--------------------------------------------------------------------
+        const rect& bounding_clip_box() const { return m_bounds;    }
+        int         bounding_xmin()     const { return m_bounds.x1; }
+        int         bounding_ymin()     const { return m_bounds.y1; }
+        int         bounding_xmax()     const { return m_bounds.x2; }
+        int         bounding_ymax()     const { return m_bounds.y2; }
+
+        //--------------------------------------------------------------------
+        void first_clip_box()
+        {
+            m_curr_cb = 0;
+            if(m_clip.size())
+            {
+                const rect& cb = m_clip[0];
+                m_ren.clip_box_naked(cb.x1, cb.y1, cb.x2, cb.y2);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        bool next_clip_box()
+        {
+            if(++m_curr_cb < m_clip.size())
+            {
+                const rect& cb = m_clip[m_curr_cb];
+                m_ren.clip_box_naked(cb.x1, cb.y1, cb.x2, cb.y2);
+                return true;
+            }
+            return false;
+        }
+
+        //--------------------------------------------------------------------
+        void reset_clipping(bool visibility)
+        {
+            m_ren.reset_clipping(visibility);
+            m_clip.remove_all();
+            m_curr_cb = 0;
+            m_bounds = m_ren.clip_box();
+        }
+
+        //--------------------------------------------------------------------
+        void add_clip_box(int x1, int y1, int x2, int y2)
+        {
+            rect cb(x1, y1, x2, y2);
+            cb.normalize();
+            if(cb.clip(rect(0, 0, width() - 1, height() - 1)))
+            {
+                m_clip.add(cb);
+                if(cb.x1 < m_bounds.x1) m_bounds.x1 = cb.x1;
+                if(cb.y1 < m_bounds.y1) m_bounds.y1 = cb.y1;
+                if(cb.x2 > m_bounds.x2) m_bounds.x2 = cb.x2;
+                if(cb.y2 > m_bounds.y2) m_bounds.y2 = cb.y2;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void clear(const color_type& c)
+        {
+            m_ren.clear(c);
+        }
+
+        //--------------------------------------------------------------------
+        void copy_pixel(int x, int y, const color_type& c)
+        {
+            first_clip_box();
+            do
+            {
+                if(m_ren.inbox(x, y))
+                {
+                    m_ren.ren().copy_pixel(x, y, c);
+                    break;
+                }
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_pixel(int x, int y, const color_type& c, cover_type cover)
+        {
+            first_clip_box();
+            do
+            {
+                if(m_ren.inbox(x, y))
+                {
+                    m_ren.ren().blend_pixel(x, y, c, cover);
+                    break;
+                }
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        color_type pixel(int x, int y) const
+        {
+            first_clip_box();
+            do
+            {
+                if(m_ren.inbox(x, y))
+                {
+                    return m_ren.ren().pixel(x, y);
+                }
+            }
+            while(next_clip_box());
+            return color_type::no_color();
+        }
+
+        //--------------------------------------------------------------------
+        void copy_hline(int x1, int y, int x2, const color_type& c)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.copy_hline(x1, y, x2, c);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void copy_vline(int x, int y1, int y2, const color_type& c)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.copy_vline(x, y1, y2, c);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_hline(int x1, int y, int x2,
+                         const color_type& c, cover_type cover)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_hline(x1, y, x2, c, cover);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_vline(int x, int y1, int y2,
+                         const color_type& c, cover_type cover)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_vline(x, y1, y2, c, cover);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void copy_bar(int x1, int y1, int x2, int y2, const color_type& c)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.copy_bar(x1, y1, x2, y2, c);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_bar(int x1, int y1, int x2, int y2,
+                       const color_type& c, cover_type cover)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_bar(x1, y1, x2, y2, c, cover);
+            }
+            while(next_clip_box());
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y, int len,
+                               const color_type& c, const cover_type* covers)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_solid_hspan(x, y, len, c, covers);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y, int len,
+                               const color_type& c, const cover_type* covers)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_solid_vspan(x, y, len, c, covers);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan(int x, int y, int len,
+                               const color_type* colors,
+                               const cover_type* covers,
+                               cover_type cover = cover_full)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_color_hspan(x, y, len, colors, covers, cover);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan(int x, int y, int len,
+                               const color_type* colors,
+                               const cover_type* covers,
+                               cover_type cover = cover_full)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_color_hspan(x, y, len, colors, covers, cover);
+            }
+            while(next_clip_box());
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_qpaque_color_hspan(int x, int y, int len,
+                                      const color_type* colors,
+                                      const cover_type* covers,
+                                      cover_type cover = cover_full)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_opaque_color_hspan(x, y, len, colors, covers, cover);
+            }
+            while(next_clip_box());
+        }
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan(int x, int y, int len,
+                                      const color_type* colors,
+                                      const cover_type* covers,
+                                      cover_type cover = cover_full)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.blend_opaque_color_hspan(x, y, len, colors, covers, cover);
+            }
+            while(next_clip_box());
+        }
+
+
+        //--------------------------------------------------------------------
+        void blend_color_hspan_no_clip(int x, int y, int len,
+                                       const color_type* colors,
+                                       const cover_type* covers,
+                                       cover_type cover = cover_full)
+        {
+            m_ren.blend_color_hspan_no_clip(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_color_vspan_no_clip(int x, int y, int len,
+                                       const color_type* colors,
+                                       const cover_type* covers,
+                                       cover_type cover = cover_full)
+        {
+            m_ren.blend_color_vspan_no_clip(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_hspan_no_clip(int x, int y, int len,
+                                              const color_type* colors,
+                                              const cover_type* covers,
+                                              cover_type cover = cover_full)
+        {
+            m_ren.blend_opaque_color_hspan_no_clip(x, y, len, colors, covers, cover);
+        }
+
+        //--------------------------------------------------------------------
+        void blend_opaque_color_vspan_no_clip(int x, int y, int len,
+                                              const color_type* colors,
+                                              const cover_type* covers,
+                                              cover_type cover = cover_full)
+        {
+            m_ren.blend_opaque_color_vspan_no_clip(x, y, len, colors, covers, cover);
+        }
+
+
+        //--------------------------------------------------------------------
+        void copy_from(const rendering_buffer& from,
+                       const rect* rc=0,
+                       int x_to=0,
+                       int y_to=0)
+        {
+            first_clip_box();
+            do
+            {
+                m_ren.copy_from(from, rc, x_to, y_to);
+            }
+            while(next_clip_box());
+        }
+
+    private:
+        renderer_mclip(const renderer_mclip<PixelFormat>&);
+        const renderer_mclip<PixelFormat>&
+            operator = (const renderer_mclip<PixelFormat>&);
+
+        base_ren_type      m_ren;
+        pod_deque<rect, 4> m_clip;
+        unsigned           m_curr_cb;
+        rect               m_bounds;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_renderer_outline_aa.h b/agg/inc/agg_renderer_outline_aa.h
new file mode 100755
index 000000000000..d2f9484c5a1d
--- /dev/null
+++ b/agg/inc/agg_renderer_outline_aa.h
@@ -0,0 +1,1545 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_RENDERER_OUTLINE_AA_INCLUDED
+#define AGG_RENDERER_OUTLINE_AA_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_math.h"
+#include "agg_line_aa_basics.h"
+#include "agg_dda_line.h"
+#include "agg_ellipse_bresenham.h"
+#include "agg_renderer_base.h"
+#include "agg_gamma_functions.h"
+
+namespace agg
+{
+
+    //===================================================distance_interpolator0
+    class distance_interpolator0
+    {
+    public:
+        //---------------------------------------------------------------------
+        distance_interpolator0() {}
+        distance_interpolator0(int x1, int y1, int x2, int y2, int x, int y) :
+            m_dx(line_mr(x2) - line_mr(x1)),
+            m_dy(line_mr(y2) - line_mr(y1)),
+            m_dist((line_mr(x + line_subpixel_size/2) - line_mr(x2)) * m_dy -
+                   (line_mr(y + line_subpixel_size/2) - line_mr(y2)) * m_dx)
+        {
+            m_dx <<= line_mr_subpixel_shift;
+            m_dy <<= line_mr_subpixel_shift;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_x() { m_dist += m_dy; }
+        void dec_x() { m_dist -= m_dy; }
+        void inc_y() { m_dist -= m_dx; }
+        void dec_y() { m_dist += m_dx; }
+
+        //---------------------------------------------------------------------
+        void inc_x(int _dy)
+        {
+            m_dist += m_dy;
+            if(_dy > 0) m_dist -= m_dx;
+            if(_dy < 0) m_dist += m_dx;
+        }
+
+        //---------------------------------------------------------------------
+        void dec_x(int _dy)
+        {
+            m_dist -= m_dy;
+            if(_dy > 0) m_dist -= m_dx;
+            if(_dy < 0) m_dist += m_dx;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_y(int _dx)
+        {
+            m_dist -= m_dx;
+            if(_dx > 0) m_dist += m_dy;
+            if(_dx < 0) m_dist -= m_dy;
+        }
+
+        void dec_y(int _dx)
+        //---------------------------------------------------------------------
+        {
+            m_dist += m_dx;
+            if(_dx > 0) m_dist += m_dy;
+            if(_dx < 0) m_dist -= m_dy;
+        }
+
+        //---------------------------------------------------------------------
+        int dist()     const { return m_dist; }
+        int dx()       const { return m_dx;   }
+        int dy()       const { return m_dy;   }
+
+    private:
+        //---------------------------------------------------------------------
+        int m_dx;
+        int m_dy;
+        int m_dist;
+    };
+
+
+
+    //===================================================distance_interpolator1
+    class distance_interpolator1
+    {
+    public:
+        //---------------------------------------------------------------------
+        distance_interpolator1() {}
+        distance_interpolator1(int x1, int y1, int x2, int y2, int x, int y) :
+            m_dx(x2 - x1),
+            m_dy(y2 - y1),
+            m_dist(int(double(x + line_subpixel_size/2 - x2) * double(m_dy) -
+                       double(y + line_subpixel_size/2 - y2) * double(m_dx)))
+        {
+            m_dx <<= line_subpixel_shift;
+            m_dy <<= line_subpixel_shift;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_x() { m_dist += m_dy; }
+        void dec_x() { m_dist -= m_dy; }
+        void inc_y() { m_dist -= m_dx; }
+        void dec_y() { m_dist += m_dx; }
+
+        //---------------------------------------------------------------------
+        void inc_x(int _dy)
+        {
+            m_dist += m_dy;
+            if(_dy > 0) m_dist -= m_dx;
+            if(_dy < 0) m_dist += m_dx;
+        }
+
+        //---------------------------------------------------------------------
+        void dec_x(int _dy)
+        {
+            m_dist -= m_dy;
+            if(_dy > 0) m_dist -= m_dx;
+            if(_dy < 0) m_dist += m_dx;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_y(int _dx)
+        {
+            m_dist -= m_dx;
+            if(_dx > 0) m_dist += m_dy;
+            if(_dx < 0) m_dist -= m_dy;
+        }
+
+        void dec_y(int _dx)
+        //---------------------------------------------------------------------
+        {
+            m_dist += m_dx;
+            if(_dx > 0) m_dist += m_dy;
+            if(_dx < 0) m_dist -= m_dy;
+        }
+
+        //---------------------------------------------------------------------
+        int dist() const { return m_dist; }
+        int dx()   const { return m_dx;   }
+        int dy()   const { return m_dy;   }
+
+    private:
+        //---------------------------------------------------------------------
+        int m_dx;
+        int m_dy;
+        int m_dist;
+    };
+
+
+
+
+
+    //===================================================distance_interpolator2
+    class distance_interpolator2
+    {
+    public:
+        //---------------------------------------------------------------------
+        distance_interpolator2() {}
+        distance_interpolator2(int x1, int y1, int x2, int y2,
+                               int sx, int sy, int x,  int y) :
+            m_dx(x2 - x1),
+            m_dy(y2 - y1),
+            m_dx_start(line_mr(sx) - line_mr(x1)),
+            m_dy_start(line_mr(sy) - line_mr(y1)),
+
+            m_dist(int(double(x + line_subpixel_size/2 - x2) * double(m_dy) -
+                       double(y + line_subpixel_size/2 - y2) * double(m_dx))),
+
+            m_dist_start((line_mr(x + line_subpixel_size/2) - line_mr(sx)) * m_dy_start -
+                         (line_mr(y + line_subpixel_size/2) - line_mr(sy)) * m_dx_start)
+        {
+            m_dx       <<= line_subpixel_shift;
+            m_dy       <<= line_subpixel_shift;
+            m_dx_start <<= line_mr_subpixel_shift;
+            m_dy_start <<= line_mr_subpixel_shift;
+        }
+
+        distance_interpolator2(int x1, int y1, int x2, int y2,
+                               int ex, int ey, int x,  int y, int) :
+            m_dx(x2 - x1),
+            m_dy(y2 - y1),
+            m_dx_start(line_mr(ex) - line_mr(x2)),
+            m_dy_start(line_mr(ey) - line_mr(y2)),
+
+            m_dist(int(double(x + line_subpixel_size/2 - x2) * double(m_dy) -
+                       double(y + line_subpixel_size/2 - y2) * double(m_dx))),
+
+            m_dist_start((line_mr(x + line_subpixel_size/2) - line_mr(ex)) * m_dy_start -
+                         (line_mr(y + line_subpixel_size/2) - line_mr(ey)) * m_dx_start)
+        {
+            m_dx       <<= line_subpixel_shift;
+            m_dy       <<= line_subpixel_shift;
+            m_dx_start <<= line_mr_subpixel_shift;
+            m_dy_start <<= line_mr_subpixel_shift;
+        }
+
+
+        //---------------------------------------------------------------------
+        void inc_x() { m_dist += m_dy; m_dist_start += m_dy_start; }
+        void dec_x() { m_dist -= m_dy; m_dist_start -= m_dy_start; }
+        void inc_y() { m_dist -= m_dx; m_dist_start -= m_dx_start; }
+        void dec_y() { m_dist += m_dx; m_dist_start += m_dx_start; }
+
+        //---------------------------------------------------------------------
+        void inc_x(int _dy)
+        {
+            m_dist       += m_dy;
+            m_dist_start += m_dy_start;
+            if(_dy > 0)
+            {
+                m_dist       -= m_dx;
+                m_dist_start -= m_dx_start;
+            }
+            if(_dy < 0)
+            {
+                m_dist       += m_dx;
+                m_dist_start += m_dx_start;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void dec_x(int _dy)
+        {
+            m_dist       -= m_dy;
+            m_dist_start -= m_dy_start;
+            if(_dy > 0)
+            {
+                m_dist       -= m_dx;
+                m_dist_start -= m_dx_start;
+            }
+            if(_dy < 0)
+            {
+                m_dist       += m_dx;
+                m_dist_start += m_dx_start;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void inc_y(int _dx)
+        {
+            m_dist       -= m_dx;
+            m_dist_start -= m_dx_start;
+            if(_dx > 0)
+            {
+                m_dist       += m_dy;
+                m_dist_start += m_dy_start;
+            }
+            if(_dx < 0)
+            {
+                m_dist       -= m_dy;
+                m_dist_start -= m_dy_start;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void dec_y(int _dx)
+        {
+            m_dist       += m_dx;
+            m_dist_start += m_dx_start;
+            if(_dx > 0)
+            {
+                m_dist       += m_dy;
+                m_dist_start += m_dy_start;
+            }
+            if(_dx < 0)
+            {
+                m_dist       -= m_dy;
+                m_dist_start -= m_dy_start;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        int dist()       const { return m_dist;       }
+        int dist_start() const { return m_dist_start; }
+        int dist_end()   const { return m_dist_start; }
+
+        //---------------------------------------------------------------------
+        int dx()       const { return m_dx;       }
+        int dy()       const { return m_dy;       }
+        int dx_start() const { return m_dx_start; }
+        int dy_start() const { return m_dy_start; }
+        int dx_end()   const { return m_dx_start; }
+        int dy_end()   const { return m_dy_start; }
+
+    private:
+        //---------------------------------------------------------------------
+        int m_dx;
+        int m_dy;
+        int m_dx_start;
+        int m_dy_start;
+
+        int m_dist;
+        int m_dist_start;
+    };
+
+
+
+
+
+    //===================================================distance_interpolator3
+    class distance_interpolator3
+    {
+    public:
+        //---------------------------------------------------------------------
+        distance_interpolator3() {}
+        distance_interpolator3(int x1, int y1, int x2, int y2,
+                               int sx, int sy, int ex, int ey,
+                               int x,  int y) :
+            m_dx(x2 - x1),
+            m_dy(y2 - y1),
+            m_dx_start(line_mr(sx) - line_mr(x1)),
+            m_dy_start(line_mr(sy) - line_mr(y1)),
+            m_dx_end(line_mr(ex) - line_mr(x2)),
+            m_dy_end(line_mr(ey) - line_mr(y2)),
+
+            m_dist(int(double(x + line_subpixel_size/2 - x2) * double(m_dy) -
+                       double(y + line_subpixel_size/2 - y2) * double(m_dx))),
+
+            m_dist_start((line_mr(x + line_subpixel_size/2) - line_mr(sx)) * m_dy_start -
+                         (line_mr(y + line_subpixel_size/2) - line_mr(sy)) * m_dx_start),
+
+            m_dist_end((line_mr(x + line_subpixel_size/2) - line_mr(ex)) * m_dy_end -
+                       (line_mr(y + line_subpixel_size/2) - line_mr(ey)) * m_dx_end)
+        {
+            m_dx       <<= line_subpixel_shift;
+            m_dy       <<= line_subpixel_shift;
+            m_dx_start <<= line_mr_subpixel_shift;
+            m_dy_start <<= line_mr_subpixel_shift;
+            m_dx_end   <<= line_mr_subpixel_shift;
+            m_dy_end   <<= line_mr_subpixel_shift;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_x() { m_dist += m_dy; m_dist_start += m_dy_start; m_dist_end += m_dy_end; }
+        void dec_x() { m_dist -= m_dy; m_dist_start -= m_dy_start; m_dist_end -= m_dy_end; }
+        void inc_y() { m_dist -= m_dx; m_dist_start -= m_dx_start; m_dist_end -= m_dx_end; }
+        void dec_y() { m_dist += m_dx; m_dist_start += m_dx_start; m_dist_end += m_dx_end; }
+
+        //---------------------------------------------------------------------
+        void inc_x(int _dy)
+        {
+            m_dist       += m_dy;
+            m_dist_start += m_dy_start;
+            m_dist_end   += m_dy_end;
+            if(_dy > 0)
+            {
+                m_dist       -= m_dx;
+                m_dist_start -= m_dx_start;
+                m_dist_end   -= m_dx_end;
+            }
+            if(_dy < 0)
+            {
+                m_dist       += m_dx;
+                m_dist_start += m_dx_start;
+                m_dist_end   += m_dx_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void dec_x(int _dy)
+        {
+            m_dist       -= m_dy;
+            m_dist_start -= m_dy_start;
+            m_dist_end   -= m_dy_end;
+            if(_dy > 0)
+            {
+                m_dist       -= m_dx;
+                m_dist_start -= m_dx_start;
+                m_dist_end   -= m_dx_end;
+            }
+            if(_dy < 0)
+            {
+                m_dist       += m_dx;
+                m_dist_start += m_dx_start;
+                m_dist_end   += m_dx_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void inc_y(int _dx)
+        {
+            m_dist       -= m_dx;
+            m_dist_start -= m_dx_start;
+            m_dist_end   -= m_dx_end;
+            if(_dx > 0)
+            {
+                m_dist       += m_dy;
+                m_dist_start += m_dy_start;
+                m_dist_end   += m_dy_end;
+            }
+            if(_dx < 0)
+            {
+                m_dist       -= m_dy;
+                m_dist_start -= m_dy_start;
+                m_dist_end   -= m_dy_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void dec_y(int _dx)
+        {
+            m_dist       += m_dx;
+            m_dist_start += m_dx_start;
+            m_dist_end   += m_dx_end;
+            if(_dx > 0)
+            {
+                m_dist       += m_dy;
+                m_dist_start += m_dy_start;
+                m_dist_end   += m_dy_end;
+            }
+            if(_dx < 0)
+            {
+                m_dist       -= m_dy;
+                m_dist_start -= m_dy_start;
+                m_dist_end   -= m_dy_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        int dist()       const { return m_dist;       }
+        int dist_start() const { return m_dist_start; }
+        int dist_end()   const { return m_dist_end;   }
+
+        //---------------------------------------------------------------------
+        int dx()       const { return m_dx;       }
+        int dy()       const { return m_dy;       }
+        int dx_start() const { return m_dx_start; }
+        int dy_start() const { return m_dy_start; }
+        int dx_end()   const { return m_dx_end;   }
+        int dy_end()   const { return m_dy_end;   }
+
+    private:
+        //---------------------------------------------------------------------
+        int m_dx;
+        int m_dy;
+        int m_dx_start;
+        int m_dy_start;
+        int m_dx_end;
+        int m_dy_end;
+
+        int m_dist;
+        int m_dist_start;
+        int m_dist_end;
+    };
+
+
+
+
+
+    //================================================line_interpolator_aa_base
+    template<class Renderer> class line_interpolator_aa_base
+    {
+    public:
+        typedef Renderer renderer_type;
+        typedef typename Renderer::color_type color_type;
+
+        //---------------------------------------------------------------------
+        enum
+        {
+            max_half_width = 64
+        };
+
+        //---------------------------------------------------------------------
+        line_interpolator_aa_base(renderer_type& ren, const line_parameters& lp) :
+            m_lp(&lp),
+            m_li(lp.vertical ? line_dbl_hr(lp.x2 - lp.x1) :
+                               line_dbl_hr(lp.y2 - lp.y1),
+                 lp.vertical ? abs(lp.y2 - lp.y1) :
+                               abs(lp.x2 - lp.x1) + 1),
+            m_ren(ren),
+            m_len((lp.vertical == (lp.inc > 0)) ? -lp.len : lp.len),
+            m_x(lp.x1 >> line_subpixel_shift),
+            m_y(lp.y1 >> line_subpixel_shift),
+            m_old_x(m_x),
+            m_old_y(m_y),
+            m_count((lp.vertical ? abs((lp.y2 >> line_subpixel_shift) - m_y) :
+                                   abs((lp.x2 >> line_subpixel_shift) - m_x))),
+            m_width(ren.subpixel_width()),
+            m_max_extent(m_width >> (line_subpixel_shift - 2)),
+            m_step(0)
+        {
+            agg::dda2_line_interpolator li(0, lp.vertical ?
+                                              (lp.dy << agg::line_subpixel_shift) :
+                                              (lp.dx << agg::line_subpixel_shift),
+                                           lp.len);
+
+            unsigned i;
+            int stop = m_width + line_subpixel_size * 2;
+            for(i = 0; i < max_half_width; ++i)
+            {
+                m_dist[i] = li.y();
+                if(m_dist[i] >= stop) break;
+                ++li;
+            }
+            m_dist[i++] = 0x7FFF0000;
+        }
+
+        //---------------------------------------------------------------------
+        template<class DI> int step_hor_base(DI& di)
+        {
+            ++m_li;
+            m_x += m_lp->inc;
+            m_y = (m_lp->y1 + m_li.y()) >> line_subpixel_shift;
+
+            if(m_lp->inc > 0) di.inc_x(m_y - m_old_y);
+            else              di.dec_x(m_y - m_old_y);
+
+            m_old_y = m_y;
+
+            return di.dist() / m_len;
+        }
+
+        //---------------------------------------------------------------------
+        template<class DI> int step_ver_base(DI& di)
+        {
+            ++m_li;
+            m_y += m_lp->inc;
+            m_x = (m_lp->x1 + m_li.y()) >> line_subpixel_shift;
+
+            if(m_lp->inc > 0) di.inc_y(m_x - m_old_x);
+            else              di.dec_y(m_x - m_old_x);
+
+            m_old_x = m_x;
+
+            return di.dist() / m_len;
+        }
+
+        //---------------------------------------------------------------------
+        bool vertical() const { return m_lp->vertical; }
+        int  width() const { return m_width; }
+        int  count() const { return m_count; }
+
+    private:
+        line_interpolator_aa_base(const line_interpolator_aa_base<Renderer>&);
+        const line_interpolator_aa_base<Renderer>&
+            operator = (const line_interpolator_aa_base<Renderer>&);
+
+    protected:
+        const line_parameters* m_lp;
+        dda2_line_interpolator m_li;
+        renderer_type&         m_ren;
+        int m_len;
+        int m_x;
+        int m_y;
+        int m_old_x;
+        int m_old_y;
+        int m_count;
+        int m_width;
+        int m_max_extent;
+        int m_step;
+        int m_dist[max_half_width + 1];
+        cover_type m_covers[max_half_width * 2 + 4];
+    };
+
+
+
+
+
+
+
+    //====================================================line_interpolator_aa0
+    template<class Renderer> class line_interpolator_aa0 :
+    public line_interpolator_aa_base<Renderer>
+    {
+    public:
+        typedef Renderer renderer_type;
+        typedef typename Renderer::color_type color_type;
+        typedef line_interpolator_aa_base<Renderer> base_type;
+
+        //---------------------------------------------------------------------
+        line_interpolator_aa0(renderer_type& ren, const line_parameters& lp) :
+            line_interpolator_aa_base<Renderer>(ren, lp),
+            m_di(lp.x1, lp.y1, lp.x2, lp.y2,
+                 lp.x1 & ~line_subpixel_mask, lp.y1 & ~line_subpixel_mask)
+        {
+            base_type::m_li.adjust_forward();
+        }
+
+        //---------------------------------------------------------------------
+        bool step_hor()
+        {
+            int dist;
+            int dy;
+            int s1 = base_type::step_hor_base(m_di);
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            *p1++ = (cover_type)base_type::m_ren.cover(s1);
+
+            dy = 1;
+            while((dist = base_type::m_dist[dy] - s1) <= base_type::m_width)
+            {
+                *p1++ = (cover_type)base_type::m_ren.cover(dist);
+                ++dy;
+            }
+
+            dy = 1;
+            while((dist = base_type::m_dist[dy] + s1) <= base_type::m_width)
+            {
+                *--p0 = (cover_type)base_type::m_ren.cover(dist);
+                ++dy;
+            }
+            base_type::m_ren.blend_solid_vspan(base_type::m_x,
+                                               base_type::m_y - dy + 1,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return ++base_type::m_step < base_type::m_count;
+        }
+
+        //---------------------------------------------------------------------
+        bool step_ver()
+        {
+            int dist;
+            int dx;
+            int s1 = base_type::step_ver_base(m_di);
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            *p1++ = (cover_type)base_type::m_ren.cover(s1);
+
+            dx = 1;
+            while((dist = base_type::m_dist[dx] - s1) <= base_type::m_width)
+            {
+                *p1++ = (cover_type)base_type::m_ren.cover(dist);
+                ++dx;
+            }
+
+            dx = 1;
+            while((dist = base_type::m_dist[dx] + s1) <= base_type::m_width)
+            {
+                *--p0 = (cover_type)base_type::m_ren.cover(dist);
+                ++dx;
+            }
+            base_type::m_ren.blend_solid_hspan(base_type::m_x - dx + 1,
+                                               base_type::m_y,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return ++base_type::m_step < base_type::m_count;
+        }
+
+    private:
+        line_interpolator_aa0(const line_interpolator_aa0<Renderer>&);
+        const line_interpolator_aa0<Renderer>&
+            operator = (const line_interpolator_aa0<Renderer>&);
+
+        //---------------------------------------------------------------------
+        distance_interpolator1 m_di;
+    };
+
+
+
+
+
+
+    //====================================================line_interpolator_aa1
+    template<class Renderer> class line_interpolator_aa1 :
+    public line_interpolator_aa_base<Renderer>
+    {
+    public:
+        typedef Renderer renderer_type;
+        typedef typename Renderer::color_type color_type;
+        typedef line_interpolator_aa_base<Renderer> base_type;
+
+        //---------------------------------------------------------------------
+        line_interpolator_aa1(renderer_type& ren, const line_parameters& lp,
+                              int sx, int sy) :
+            line_interpolator_aa_base<Renderer>(ren, lp),
+            m_di(lp.x1, lp.y1, lp.x2, lp.y2, sx, sy,
+                 lp.x1 & ~line_subpixel_mask, lp.y1 & ~line_subpixel_mask)
+        {
+            int dist1_start;
+            int dist2_start;
+
+            int npix = 1;
+
+            if(lp.vertical)
+            {
+                do
+                {
+                    --base_type::m_li;
+                    base_type::m_y -= lp.inc;
+                    base_type::m_x = (base_type::m_lp->x1 + base_type::m_li.y()) >> line_subpixel_shift;
+
+                    if(lp.inc > 0) m_di.dec_y(base_type::m_x - base_type::m_old_x);
+                    else           m_di.inc_y(base_type::m_x - base_type::m_old_x);
+
+                    base_type::m_old_x = base_type::m_x;
+
+                    dist1_start = dist2_start = m_di.dist_start();
+
+                    int dx = 0;
+                    if(dist1_start < 0) ++npix;
+                    do
+                    {
+                        dist1_start += m_di.dy_start();
+                        dist2_start -= m_di.dy_start();
+                        if(dist1_start < 0) ++npix;
+                        if(dist2_start < 0) ++npix;
+                        ++dx;
+                    }
+                    while(base_type::m_dist[dx] <= base_type::m_width);
+                    --base_type::m_step;
+                    if(npix == 0) break;
+                    npix = 0;
+                }
+                while(base_type::m_step >= -base_type::m_max_extent);
+            }
+            else
+            {
+                do
+                {
+                    --base_type::m_li;
+                    base_type::m_x -= lp.inc;
+                    base_type::m_y = (base_type::m_lp->y1 + base_type::m_li.y()) >> line_subpixel_shift;
+
+                    if(lp.inc > 0) m_di.dec_x(base_type::m_y - base_type::m_old_y);
+                    else           m_di.inc_x(base_type::m_y - base_type::m_old_y);
+
+                    base_type::m_old_y = base_type::m_y;
+
+                    dist1_start = dist2_start = m_di.dist_start();
+
+                    int dy = 0;
+                    if(dist1_start < 0) ++npix;
+                    do
+                    {
+                        dist1_start -= m_di.dx_start();
+                        dist2_start += m_di.dx_start();
+                        if(dist1_start < 0) ++npix;
+                        if(dist2_start < 0) ++npix;
+                        ++dy;
+                    }
+                    while(base_type::m_dist[dy] <= base_type::m_width);
+                    --base_type::m_step;
+                    if(npix == 0) break;
+                    npix = 0;
+                }
+                while(base_type::m_step >= -base_type::m_max_extent);
+            }
+            base_type::m_li.adjust_forward();
+        }
+
+        //---------------------------------------------------------------------
+        bool step_hor()
+        {
+            int dist_start;
+            int dist;
+            int dy;
+            int s1 = base_type::step_hor_base(m_di);
+
+            dist_start = m_di.dist_start();
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            *p1 = 0;
+            if(dist_start <= 0)
+            {
+                *p1 = (cover_type)base_type::m_ren.cover(s1);
+            }
+            ++p1;
+
+            dy = 1;
+            while((dist = base_type::m_dist[dy] - s1) <= base_type::m_width)
+            {
+                dist_start -= m_di.dx_start();
+                *p1 = 0;
+                if(dist_start <= 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(dist);
+                }
+                ++p1;
+                ++dy;
+            }
+
+            dy = 1;
+            dist_start = m_di.dist_start();
+            while((dist = base_type::m_dist[dy] + s1) <= base_type::m_width)
+            {
+                dist_start += m_di.dx_start();
+                *--p0 = 0;
+                if(dist_start <= 0)
+                {
+                    *p0 = (cover_type)base_type::m_ren.cover(dist);
+                }
+                ++dy;
+            }
+
+            base_type::m_ren.blend_solid_vspan(base_type::m_x,
+                                               base_type::m_y - dy + 1,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return ++base_type::m_step < base_type::m_count;
+        }
+
+        //---------------------------------------------------------------------
+        bool step_ver()
+        {
+            int dist_start;
+            int dist;
+            int dx;
+            int s1 = base_type::step_ver_base(m_di);
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            dist_start = m_di.dist_start();
+
+            *p1 = 0;
+            if(dist_start <= 0)
+            {
+                *p1 = (cover_type)base_type::m_ren.cover(s1);
+            }
+            ++p1;
+
+            dx = 1;
+            while((dist = base_type::m_dist[dx] - s1) <= base_type::m_width)
+            {
+                dist_start += m_di.dy_start();
+                *p1 = 0;
+                if(dist_start <= 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(dist);
+                }
+                ++p1;
+                ++dx;
+            }
+
+            dx = 1;
+            dist_start = m_di.dist_start();
+            while((dist = base_type::m_dist[dx] + s1) <= base_type::m_width)
+            {
+                dist_start -= m_di.dy_start();
+                *--p0 = 0;
+                if(dist_start <= 0)
+                {
+                    *p0 = (cover_type)base_type::m_ren.cover(dist);
+                }
+                ++dx;
+            }
+            base_type::m_ren.blend_solid_hspan(base_type::m_x - dx + 1,
+                                               base_type::m_y,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return ++base_type::m_step < base_type::m_count;
+        }
+
+    private:
+        line_interpolator_aa1(const line_interpolator_aa1<Renderer>&);
+        const line_interpolator_aa1<Renderer>&
+            operator = (const line_interpolator_aa1<Renderer>&);
+
+        //---------------------------------------------------------------------
+        distance_interpolator2 m_di;
+    };
+
+
+
+
+
+
+
+
+
+
+
+
+    //====================================================line_interpolator_aa2
+    template<class Renderer> class line_interpolator_aa2 :
+    public line_interpolator_aa_base<Renderer>
+    {
+    public:
+        typedef Renderer renderer_type;
+        typedef typename Renderer::color_type color_type;
+        typedef line_interpolator_aa_base<Renderer> base_type;
+
+        //---------------------------------------------------------------------
+        line_interpolator_aa2(renderer_type& ren, const line_parameters& lp,
+                              int ex, int ey) :
+            line_interpolator_aa_base<Renderer>(ren, lp),
+            m_di(lp.x1, lp.y1, lp.x2, lp.y2, ex, ey,
+                 lp.x1 & ~line_subpixel_mask, lp.y1 & ~line_subpixel_mask,
+                 0)
+        {
+            base_type::m_li.adjust_forward();
+            base_type::m_step -= base_type::m_max_extent;
+        }
+
+        //---------------------------------------------------------------------
+        bool step_hor()
+        {
+            int dist_end;
+            int dist;
+            int dy;
+            int s1 = base_type::step_hor_base(m_di);
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            dist_end = m_di.dist_end();
+
+            int npix = 0;
+            *p1 = 0;
+            if(dist_end > 0)
+            {
+                *p1 = (cover_type)base_type::m_ren.cover(s1);
+                ++npix;
+            }
+            ++p1;
+
+            dy = 1;
+            while((dist = base_type::m_dist[dy] - s1) <= base_type::m_width)
+            {
+                dist_end -= m_di.dx_end();
+                *p1 = 0;
+                if(dist_end > 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++p1;
+                ++dy;
+            }
+
+            dy = 1;
+            dist_end = m_di.dist_end();
+            while((dist = base_type::m_dist[dy] + s1) <= base_type::m_width)
+            {
+                dist_end += m_di.dx_end();
+                *--p0 = 0;
+                if(dist_end > 0)
+                {
+                    *p0 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++dy;
+            }
+            base_type::m_ren.blend_solid_vspan(base_type::m_x,
+                                               base_type::m_y - dy + 1,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return npix && ++base_type::m_step < base_type::m_count;
+        }
+
+        //---------------------------------------------------------------------
+        bool step_ver()
+        {
+            int dist_end;
+            int dist;
+            int dx;
+            int s1 = base_type::step_ver_base(m_di);
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            dist_end = m_di.dist_end();
+
+            int npix = 0;
+            *p1 = 0;
+            if(dist_end > 0)
+            {
+                *p1 = (cover_type)base_type::m_ren.cover(s1);
+                ++npix;
+            }
+            ++p1;
+
+            dx = 1;
+            while((dist = base_type::m_dist[dx] - s1) <= base_type::m_width)
+            {
+                dist_end += m_di.dy_end();
+                *p1 = 0;
+                if(dist_end > 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++p1;
+                ++dx;
+            }
+
+            dx = 1;
+            dist_end = m_di.dist_end();
+            while((dist = base_type::m_dist[dx] + s1) <= base_type::m_width)
+            {
+                dist_end -= m_di.dy_end();
+                *--p0 = 0;
+                if(dist_end > 0)
+                {
+                    *p0 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++dx;
+            }
+            base_type::m_ren.blend_solid_hspan(base_type::m_x - dx + 1,
+                                               base_type::m_y,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return npix && ++base_type::m_step < base_type::m_count;
+        }
+
+    private:
+        line_interpolator_aa2(const line_interpolator_aa2<Renderer>&);
+        const line_interpolator_aa2<Renderer>&
+            operator = (const line_interpolator_aa2<Renderer>&);
+
+        //---------------------------------------------------------------------
+        distance_interpolator2 m_di;
+    };
+
+
+
+
+
+
+
+
+
+
+    //====================================================line_interpolator_aa3
+    template<class Renderer> class line_interpolator_aa3 :
+    public line_interpolator_aa_base<Renderer>
+    {
+    public:
+        typedef Renderer renderer_type;
+        typedef typename Renderer::color_type color_type;
+        typedef line_interpolator_aa_base<Renderer> base_type;
+
+        //---------------------------------------------------------------------
+        line_interpolator_aa3(renderer_type& ren, const line_parameters& lp,
+                              int sx, int sy, int ex, int ey) :
+            line_interpolator_aa_base<Renderer>(ren, lp),
+            m_di(lp.x1, lp.y1, lp.x2, lp.y2, sx, sy, ex, ey,
+                 lp.x1 & ~line_subpixel_mask, lp.y1 & ~line_subpixel_mask)
+        {
+            int dist1_start;
+            int dist2_start;
+            int npix = 1;
+            if(lp.vertical)
+            {
+                do
+                {
+                    --base_type::m_li;
+                    base_type::m_y -= lp.inc;
+                    base_type::m_x = (base_type::m_lp->x1 + base_type::m_li.y()) >> line_subpixel_shift;
+
+                    if(lp.inc > 0) m_di.dec_y(base_type::m_x - base_type::m_old_x);
+                    else           m_di.inc_y(base_type::m_x - base_type::m_old_x);
+
+                    base_type::m_old_x = base_type::m_x;
+
+                    dist1_start = dist2_start = m_di.dist_start();
+
+                    int dx = 0;
+                    if(dist1_start < 0) ++npix;
+                    do
+                    {
+                        dist1_start += m_di.dy_start();
+                        dist2_start -= m_di.dy_start();
+                        if(dist1_start < 0) ++npix;
+                        if(dist2_start < 0) ++npix;
+                        ++dx;
+                    }
+                    while(base_type::m_dist[dx] <= base_type::m_width);
+                    if(npix == 0) break;
+                    npix = 0;
+                }
+                while(--base_type::m_step >= -base_type::m_max_extent);
+            }
+            else
+            {
+                do
+                {
+                    --base_type::m_li;
+                    base_type::m_x -= lp.inc;
+                    base_type::m_y = (base_type::m_lp->y1 + base_type::m_li.y()) >> line_subpixel_shift;
+
+                    if(lp.inc > 0) m_di.dec_x(base_type::m_y - base_type::m_old_y);
+                    else           m_di.inc_x(base_type::m_y - base_type::m_old_y);
+
+                    base_type::m_old_y = base_type::m_y;
+
+                    dist1_start = dist2_start = m_di.dist_start();
+
+                    int dy = 0;
+                    if(dist1_start < 0) ++npix;
+                    do
+                    {
+                        dist1_start -= m_di.dx_start();
+                        dist2_start += m_di.dx_start();
+                        if(dist1_start < 0) ++npix;
+                        if(dist2_start < 0) ++npix;
+                        ++dy;
+                    }
+                    while(base_type::m_dist[dy] <= base_type::m_width);
+                    if(npix == 0) break;
+                    npix = 0;
+                }
+                while(--base_type::m_step >= -base_type::m_max_extent);
+            }
+            base_type::m_li.adjust_forward();
+            base_type::m_step -= base_type::m_max_extent;
+        }
+
+
+        //---------------------------------------------------------------------
+        bool step_hor()
+        {
+            int dist_start;
+            int dist_end;
+            int dist;
+            int dy;
+            int s1 = base_type::step_hor_base(m_di);
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            dist_start = m_di.dist_start();
+            dist_end   = m_di.dist_end();
+
+            int npix = 0;
+            *p1 = 0;
+            if(dist_end > 0)
+            {
+                if(dist_start <= 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(s1);
+                }
+                ++npix;
+            }
+            ++p1;
+
+            dy = 1;
+            while((dist = base_type::m_dist[dy] - s1) <= base_type::m_width)
+            {
+                dist_start -= m_di.dx_start();
+                dist_end   -= m_di.dx_end();
+                *p1 = 0;
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++p1;
+                ++dy;
+            }
+
+            dy = 1;
+            dist_start = m_di.dist_start();
+            dist_end   = m_di.dist_end();
+            while((dist = base_type::m_dist[dy] + s1) <= base_type::m_width)
+            {
+                dist_start += m_di.dx_start();
+                dist_end   += m_di.dx_end();
+                *--p0 = 0;
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    *p0 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++dy;
+            }
+            base_type::m_ren.blend_solid_vspan(base_type::m_x,
+                                               base_type::m_y - dy + 1,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return npix && ++base_type::m_step < base_type::m_count;
+        }
+
+        //---------------------------------------------------------------------
+        bool step_ver()
+        {
+            int dist_start;
+            int dist_end;
+            int dist;
+            int dx;
+            int s1 = base_type::step_ver_base(m_di);
+            cover_type* p0 = base_type::m_covers + base_type::max_half_width + 2;
+            cover_type* p1 = p0;
+
+            dist_start = m_di.dist_start();
+            dist_end   = m_di.dist_end();
+
+            int npix = 0;
+            *p1 = 0;
+            if(dist_end > 0)
+            {
+                if(dist_start <= 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(s1);
+                }
+                ++npix;
+            }
+            ++p1;
+
+            dx = 1;
+            while((dist = base_type::m_dist[dx] - s1) <= base_type::m_width)
+            {
+                dist_start += m_di.dy_start();
+                dist_end   += m_di.dy_end();
+                *p1 = 0;
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    *p1 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++p1;
+                ++dx;
+            }
+
+            dx = 1;
+            dist_start = m_di.dist_start();
+            dist_end   = m_di.dist_end();
+            while((dist = base_type::m_dist[dx] + s1) <= base_type::m_width)
+            {
+                dist_start -= m_di.dy_start();
+                dist_end   -= m_di.dy_end();
+                *--p0 = 0;
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    *p0 = (cover_type)base_type::m_ren.cover(dist);
+                    ++npix;
+                }
+                ++dx;
+            }
+            base_type::m_ren.blend_solid_hspan(base_type::m_x - dx + 1,
+                                               base_type::m_y,
+                                               unsigned(p1 - p0),
+                                               p0);
+            return npix && ++base_type::m_step < base_type::m_count;
+        }
+
+    private:
+        line_interpolator_aa3(const line_interpolator_aa3<Renderer>&);
+        const line_interpolator_aa3<Renderer>&
+            operator = (const line_interpolator_aa3<Renderer>&);
+
+        //---------------------------------------------------------------------
+        distance_interpolator3 m_di;
+    };
+
+
+
+
+    //==========================================================line_profile_aa
+    //
+    // See Implementation agg_line_profile_aa.cpp
+    //
+    class line_profile_aa
+    {
+    public:
+        //---------------------------------------------------------------------
+        typedef int8u value_type;
+        enum
+        {
+            subpixel_shift = line_subpixel_shift,
+            subpixel_size  = 1 << subpixel_shift,
+            subpixel_mask  = subpixel_size - 1
+        };
+
+        enum
+        {
+            aa_shift = 8,
+            aa_num   = 1 << aa_shift,
+            aa_mask  = aa_num - 1
+        };
+
+        //---------------------------------------------------------------------
+        ~line_profile_aa() { delete [] m_profile; }
+
+        //---------------------------------------------------------------------
+        line_profile_aa() :
+            m_size(0),
+            m_profile(0),
+            m_subpixel_width(0),
+            m_min_width(1.0),
+            m_smoother_width(1.0)
+        {
+            int i;
+            for(i = 0; i < aa_num; i++) m_gamma[i] = (value_type)i;
+        }
+
+        //---------------------------------------------------------------------
+        template<class GammaF>
+        line_profile_aa(double w, const GammaF& gamma_function) :
+            m_size(0),
+            m_profile(0),
+            m_subpixel_width(0),
+            m_min_width(1.0),
+            m_smoother_width(1.0)
+        {
+            gamma(gamma_function);
+            width(w);
+        }
+
+        //---------------------------------------------------------------------
+        void min_width(double w) { m_min_width = w; }
+        void smoother_width(double w) { m_smoother_width = w; }
+
+        //---------------------------------------------------------------------
+        template<class GammaF> void gamma(const GammaF& gamma_function)
+        {
+            int i;
+            for(i = 0; i < aa_num; i++)
+            {
+                m_gamma[i] = value_type(
+                    floor(
+                        gamma_function(double(i) / aa_mask) * aa_mask + 0.5));
+            }
+        }
+
+        void width(double w);
+
+        unsigned profile_size() const { return m_size; }
+        int subpixel_width() const { return m_subpixel_width; }
+
+        //---------------------------------------------------------------------
+        double min_width() const { return m_min_width; }
+        double smoother_width() const { return m_smoother_width; }
+
+        //---------------------------------------------------------------------
+        value_type value(int dist) const
+        {
+            return m_profile[dist + subpixel_size*2];
+        }
+
+    private:
+        line_profile_aa(const line_profile_aa&);
+        const line_profile_aa& operator = (const line_profile_aa&);
+
+        value_type* profile(double w);
+        void set(double center_width, double smoother_width);
+
+        //---------------------------------------------------------------------
+        unsigned    m_size;
+        value_type* m_profile;
+        value_type  m_gamma[aa_num];
+        int         m_subpixel_width;
+        double      m_min_width;
+        double      m_smoother_width;
+    };
+
+
+    //======================================================renderer_outline_aa
+    template<class BaseRenderer> class renderer_outline_aa
+    {
+    public:
+        //---------------------------------------------------------------------
+        typedef BaseRenderer base_ren_type;
+        typedef renderer_outline_aa<base_ren_type> self_type;
+        typedef typename base_ren_type::color_type color_type;
+
+        //---------------------------------------------------------------------
+        renderer_outline_aa(base_ren_type& ren, const line_profile_aa& prof) :
+            m_ren(&ren),
+            m_profile(&prof)
+        {
+        }
+
+        //---------------------------------------------------------------------
+        void color(const color_type& c) { m_color = c; }
+        const color_type& color() const { return m_color; }
+
+        //---------------------------------------------------------------------
+        void profile(const line_profile_aa& prof) { m_profile = &prof; }
+        const line_profile_aa& profile() const { return *m_profile; }
+        line_profile_aa& profile() { return const_cast<line_profile_aa&>(*m_profile); }
+
+        //---------------------------------------------------------------------
+        int subpixel_width() const { return m_profile->subpixel_width(); }
+
+        //---------------------------------------------------------------------
+        int cover(int d) const
+        {
+            return m_profile->value(d);
+        }
+
+        //-------------------------------------------------------------------------
+        void blend_solid_hspan(int x, int y, unsigned len, const cover_type* covers)
+        {
+            m_ren->blend_solid_hspan(x, y, len, m_color, covers);
+        }
+
+        //-------------------------------------------------------------------------
+        void blend_solid_vspan(int x, int y, unsigned len, const cover_type* covers)
+        {
+            m_ren->blend_solid_vspan(x, y, len, m_color, covers);
+        }
+
+        //-------------------------------------------------------------------------
+        static bool accurate_join_only() { return false; }
+
+        //-------------------------------------------------------------------------
+        template<class Cmp>
+        void semidot_hline(Cmp cmp,
+                           int xc1, int yc1, int xc2, int yc2,
+                           int x1,  int y1,  int x2)
+        {
+            cover_type covers[line_interpolator_aa_base<self_type>::max_half_width * 2 + 4];
+            cover_type* p0 = covers;
+            cover_type* p1 = covers;
+            int x = x1 << line_subpixel_shift;
+            int y = y1 << line_subpixel_shift;
+            int w = subpixel_width();
+            distance_interpolator0 di(xc1, yc1, xc2, yc2, x, y);
+            x += line_subpixel_size/2;
+            y += line_subpixel_size/2;
+
+            int x0 = x1;
+            int dx = x - xc1;
+            int dy = y - yc1;
+            do
+            {
+                int d = int(fast_sqrt(dx*dx + dy*dy));
+                *p1 = 0;
+                if(cmp(di.dist()) && d <= w)
+                {
+                    *p1 = (cover_type)cover(d);
+                }
+                ++p1;
+                dx += line_subpixel_size;
+                di.inc_x();
+            }
+            while(++x1 <= x2);
+            m_ren->blend_solid_hspan(x0, y1,
+                                     unsigned(p1 - p0),
+                                     color(),
+                                     p0);
+        }
+
+        //-------------------------------------------------------------------------
+        template<class Cmp>
+        void semidot(Cmp cmp, int xc1, int yc1, int xc2, int yc2)
+        {
+            int r = ((subpixel_width() + line_subpixel_mask) >> line_subpixel_shift);
+            if(r < 1) r = 1;
+            ellipse_bresenham_interpolator ei(r, r);
+            int dx = 0;
+            int dy = -r;
+            int dy0 = dy;
+            int dx0 = dx;
+            int x = xc1 >> line_subpixel_shift;
+            int y = yc1 >> line_subpixel_shift;
+
+            do
+            {
+                dx += ei.dx();
+                dy += ei.dy();
+
+                if(dy != dy0)
+                {
+                    semidot_hline(cmp, xc1, yc1, xc2, yc2, x-dx0, y+dy0, x+dx0);
+                    semidot_hline(cmp, xc1, yc1, xc2, yc2, x-dx0, y-dy0, x+dx0);
+                }
+                dx0 = dx;
+                dy0 = dy;
+                ++ei;
+            }
+            while(dy < 0);
+            semidot_hline(cmp, xc1, yc1, xc2, yc2, x-dx0, y+dy0, x+dx0);
+        }
+
+        //-------------------------------------------------------------------------
+        void line0(const line_parameters& lp)
+        {
+            line_interpolator_aa0<self_type> li(*this, lp);
+            if(li.count())
+            {
+                if(li.vertical())
+                {
+                    while(li.step_ver()) ;
+                }
+                else
+                {
+                    while(li.step_hor()) ;
+                }
+            }
+        }
+
+        //-------------------------------------------------------------------------
+        void line1(const line_parameters& lp, int sx, int sy)
+        {
+            fix_degenerate_bisectrix_start(lp, &sx, &sy);
+            line_interpolator_aa1<self_type> li(*this, lp, sx, sy);
+            if(li.vertical())
+            {
+                while(li.step_ver()) ;
+            }
+            else
+            {
+                while(li.step_hor()) ;
+            }
+        }
+
+        //-------------------------------------------------------------------------
+        void line2(const line_parameters& lp, int ex, int ey)
+        {
+            fix_degenerate_bisectrix_end(lp, &ex, &ey);
+            line_interpolator_aa2<self_type> li(*this, lp, ex, ey);
+            if(li.vertical())
+            {
+                while(li.step_ver()) ;
+            }
+            else
+            {
+                while(li.step_hor()) ;
+            }
+        }
+
+        //-------------------------------------------------------------------------
+        void line3(const line_parameters& lp,
+                   int sx, int sy, int ex, int ey)
+        {
+            fix_degenerate_bisectrix_start(lp, &sx, &sy);
+            fix_degenerate_bisectrix_end(lp, &ex, &ey);
+            line_interpolator_aa3<self_type> li(*this, lp, sx, sy, ex, ey);
+            if(li.vertical())
+            {
+                while(li.step_ver()) ;
+            }
+            else
+            {
+                while(li.step_hor()) ;
+            }
+        }
+
+    private:
+        base_ren_type*         m_ren;
+        const line_profile_aa* m_profile;
+        color_type             m_color;
+    };
+
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_renderer_outline_image.h b/agg/inc/agg_renderer_outline_image.h
new file mode 100755
index 000000000000..d5cd3992448c
--- /dev/null
+++ b/agg/inc/agg_renderer_outline_image.h
@@ -0,0 +1,924 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_RENDERER_OUTLINE_IMAGE_INCLUDED
+#define AGG_RENDERER_OUTLINE_IMAGE_INCLUDED
+
+#include <math.h>
+#include "agg_line_aa_basics.h"
+#include "agg_dda_line.h"
+#include "agg_rendering_buffer.h"
+
+
+namespace agg
+{
+    //========================================================line_image_scale
+    template<class Source> class line_image_scale
+    {
+    public:
+        typedef typename Source::color_type color_type;
+
+        line_image_scale(const Source& src, double height) :
+            m_source(src),
+            m_height(height),
+            m_scale(src.height() / height)
+        {
+        }
+
+        double width()  const { return m_source.width(); }
+        double height() const { return m_height; }
+
+        color_type pixel(int x, int y) const
+        {
+            double src_y = (y + 0.5) * m_scale - 0.5;
+            int h = int(m_source.height()) - 1;
+            int y1 = int(floor(src_y));
+            int y2 = y1 + 1;
+            color_type pix1 = (y1 < 0) ? color_type::no_color() : m_source.pixel(x, y1);
+            color_type pix2 = (y2 > h) ? color_type::no_color() : m_source.pixel(x, y2);
+            return pix1.gradient(pix2, src_y - y1);
+        }
+
+    private:
+        line_image_scale(const line_image_scale<Source>&);
+        const line_image_scale<Source>& operator = (const line_image_scale<Source>&);
+
+        const Source& m_source;
+        double        m_height;
+        double        m_scale;
+    };
+
+
+
+    //======================================================line_image_pattern
+    template<class Filter> class line_image_pattern
+    {
+    public:
+        typedef Filter filter_type;
+        typedef typename filter_type::color_type color_type;
+
+        //--------------------------------------------------------------------
+        ~line_image_pattern()
+        {
+            delete [] m_data;
+        }
+
+        //--------------------------------------------------------------------
+        line_image_pattern(const Filter& filter) :
+            m_filter(&filter),
+            m_dilation(filter.dilation() + 1),
+            m_dilation_hr(m_dilation << line_subpixel_shift),
+            m_data(0),
+            m_width(0),
+            m_height(0),
+            m_width_hr(0),
+            m_half_height_hr(0),
+            m_offset_y_hr(0)
+        {
+        }
+
+        // Create
+        //--------------------------------------------------------------------
+        template<class Source>
+        line_image_pattern(const Filter& filter, const Source& src) :
+            m_filter(&filter),
+            m_dilation(filter.dilation() + 1),
+            m_dilation_hr(m_dilation << line_subpixel_shift),
+            m_data(0),
+            m_width(0),
+            m_height(0),
+            m_width_hr(0),
+            m_half_height_hr(0),
+            m_offset_y_hr(0)
+        {
+            create(src);
+        }
+
+        // Create
+        //--------------------------------------------------------------------
+        template<class Source> void create(const Source& src)
+        {
+            m_height = unsigned(ceil((double)src.height()));
+            m_width  = unsigned(ceil((double)src.width()));
+            m_width_hr = int(src.width() * line_subpixel_size);
+            m_half_height_hr = int(src.height() * line_subpixel_size/2);
+            m_offset_y_hr = m_dilation_hr + m_half_height_hr - line_subpixel_size/2;
+            m_half_height_hr += line_subpixel_size/2;
+
+            delete [] m_data;
+            m_data = new color_type [(m_width + m_dilation * 2) * (m_height + m_dilation * 2)];
+
+            m_buf.attach(m_data, m_width  + m_dilation * 2,
+                                 m_height + m_dilation * 2,
+                                 m_width  + m_dilation * 2);
+            unsigned x, y;
+            color_type* d1;
+            color_type* d2;
+            for(y = 0; y < m_height; y++)
+            {
+                d1 = m_buf.row(y + m_dilation) + m_dilation;
+                for(x = 0; x < m_width; x++)
+                {
+                    *d1++ = src.pixel(x, y);
+                }
+            }
+
+            const color_type* s1;
+            const color_type* s2;
+            for(y = 0; y < m_dilation; y++)
+            {
+                //s1 = m_buf.row(m_height + m_dilation - 1) + m_dilation;
+                //s2 = m_buf.row(m_dilation) + m_dilation;
+                d1 = m_buf.row(m_dilation + m_height + y) + m_dilation;
+                d2 = m_buf.row(m_dilation - y - 1) + m_dilation;
+                for(x = 0; x < m_width; x++)
+                {
+                    //*d1++ = color_type(*s1++, 0);
+                    //*d2++ = color_type(*s2++, 0);
+                    *d1++ = color_type::no_color();
+                    *d2++ = color_type::no_color();
+                }
+            }
+
+            unsigned h = m_height + m_dilation * 2;
+            for(y = 0; y < h; y++)
+            {
+                s1 = m_buf.row(y) + m_dilation;
+                s2 = m_buf.row(y) + m_dilation + m_width;
+                d1 = m_buf.row(y) + m_dilation + m_width;
+                d2 = m_buf.row(y) + m_dilation;
+
+                for(x = 0; x < m_dilation; x++)
+                {
+                    *d1++ = *s1++;
+                    *--d2 = *--s2;
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------
+        int pattern_width() const { return m_width_hr; }
+        int line_width()    const { return m_half_height_hr; }
+
+        //--------------------------------------------------------------------
+        void pixel(color_type* p, int x, int y) const
+        {
+            m_filter->pixel_high_res(m_buf.rows(),
+                                     p,
+                                     x % m_width_hr + m_dilation_hr,
+                                     y + m_offset_y_hr);
+        }
+
+        //--------------------------------------------------------------------
+        const filter_type& filter() const { return *m_filter; }
+
+    private:
+        line_image_pattern(const line_image_pattern<filter_type>&);
+        const line_image_pattern<filter_type>&
+            operator = (const line_image_pattern<filter_type>&);
+
+    protected:
+        row_ptr_cache<color_type> m_buf;
+        const filter_type*        m_filter;
+        unsigned                  m_dilation;
+        int                       m_dilation_hr;
+        color_type*               m_data;
+        unsigned                  m_width;
+        unsigned                  m_height;
+        int                       m_width_hr;
+        int                       m_half_height_hr;
+        int                       m_offset_y_hr;
+    };
+
+
+
+
+
+
+    //=================================================line_image_pattern_pow2
+    template<class Filter> class line_image_pattern_pow2 :
+    public line_image_pattern<Filter>
+    {
+    public:
+        typedef Filter filter_type;
+        typedef typename filter_type::color_type color_type;
+        typedef line_image_pattern<Filter> base_type;
+
+        //--------------------------------------------------------------------
+        line_image_pattern_pow2(const Filter& filter) :
+            line_image_pattern<Filter>(filter), m_mask(line_subpixel_mask) {}
+
+        //--------------------------------------------------------------------
+        template<class Source>
+        line_image_pattern_pow2(const Filter& filter, const Source& src) :
+            line_image_pattern<Filter>(filter), m_mask(line_subpixel_mask)
+        {
+            create(src);
+        }
+
+        //--------------------------------------------------------------------
+        template<class Source> void create(const Source& src)
+        {
+            line_image_pattern<Filter>::create(src);
+            m_mask = 1;
+            while(m_mask < base_type::m_width)
+            {
+                m_mask <<= 1;
+                m_mask |= 1;
+            }
+            m_mask <<= line_subpixel_shift - 1;
+            m_mask |=  line_subpixel_mask;
+            base_type::m_width_hr = m_mask + 1;
+        }
+
+        //--------------------------------------------------------------------
+        void pixel(color_type* p, int x, int y) const
+        {
+            base_type::m_filter->pixel_high_res(
+                    base_type::m_buf.rows(),
+                    p,
+                    (x & m_mask) + base_type::m_dilation_hr,
+                    y + base_type::m_offset_y_hr);
+        }
+    private:
+        unsigned m_mask;
+    };
+
+
+
+
+
+
+
+    //===================================================distance_interpolator4
+    class distance_interpolator4
+    {
+    public:
+        //---------------------------------------------------------------------
+        distance_interpolator4() {}
+        distance_interpolator4(int x1,  int y1, int x2, int y2,
+                               int sx,  int sy, int ex, int ey,
+                               int len, double scale, int x, int y) :
+            m_dx(x2 - x1),
+            m_dy(y2 - y1),
+            m_dx_start(line_mr(sx) - line_mr(x1)),
+            m_dy_start(line_mr(sy) - line_mr(y1)),
+            m_dx_end(line_mr(ex) - line_mr(x2)),
+            m_dy_end(line_mr(ey) - line_mr(y2)),
+
+            m_dist(int(double(x + line_subpixel_size/2 - x2) * double(m_dy) -
+                       double(y + line_subpixel_size/2 - y2) * double(m_dx))),
+
+            m_dist_start((line_mr(x + line_subpixel_size/2) - line_mr(sx)) * m_dy_start -
+                         (line_mr(y + line_subpixel_size/2) - line_mr(sy)) * m_dx_start),
+
+            m_dist_end((line_mr(x + line_subpixel_size/2) - line_mr(ex)) * m_dy_end -
+                       (line_mr(y + line_subpixel_size/2) - line_mr(ey)) * m_dx_end),
+            m_len(int(len / scale))
+        {
+            double d = len * scale;
+            int dx = int(((x2 - x1) << line_subpixel_shift) / d);
+            int dy = int(((y2 - y1) << line_subpixel_shift) / d);
+            m_dx_pict   = -dy;
+            m_dy_pict   =  dx;
+            m_dist_pict =  ((x + line_subpixel_size/2 - (x1 - dy)) * m_dy_pict -
+                            (y + line_subpixel_size/2 - (y1 + dx)) * m_dx_pict) >>
+                           line_subpixel_shift;
+
+            m_dx       <<= line_subpixel_shift;
+            m_dy       <<= line_subpixel_shift;
+            m_dx_start <<= line_mr_subpixel_shift;
+            m_dy_start <<= line_mr_subpixel_shift;
+            m_dx_end   <<= line_mr_subpixel_shift;
+            m_dy_end   <<= line_mr_subpixel_shift;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_x()
+        {
+            m_dist += m_dy;
+            m_dist_start += m_dy_start;
+            m_dist_pict += m_dy_pict;
+            m_dist_end += m_dy_end;
+        }
+
+        //---------------------------------------------------------------------
+        void dec_x()
+        {
+            m_dist -= m_dy;
+            m_dist_start -= m_dy_start;
+            m_dist_pict -= m_dy_pict;
+            m_dist_end -= m_dy_end;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_y()
+        {
+            m_dist -= m_dx;
+            m_dist_start -= m_dx_start;
+            m_dist_pict -= m_dx_pict;
+            m_dist_end -= m_dx_end;
+        }
+
+        //---------------------------------------------------------------------
+        void dec_y()
+        {
+            m_dist += m_dx;
+            m_dist_start += m_dx_start;
+            m_dist_pict += m_dx_pict;
+            m_dist_end += m_dx_end;
+        }
+
+        //---------------------------------------------------------------------
+        void inc_x(int dy)
+        {
+            m_dist       += m_dy;
+            m_dist_start += m_dy_start;
+            m_dist_pict  += m_dy_pict;
+            m_dist_end   += m_dy_end;
+            if(dy > 0)
+            {
+                m_dist       -= m_dx;
+                m_dist_start -= m_dx_start;
+                m_dist_pict  -= m_dx_pict;
+                m_dist_end   -= m_dx_end;
+            }
+            if(dy < 0)
+            {
+                m_dist       += m_dx;
+                m_dist_start += m_dx_start;
+                m_dist_pict  += m_dx_pict;
+                m_dist_end   += m_dx_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void dec_x(int dy)
+        {
+            m_dist       -= m_dy;
+            m_dist_start -= m_dy_start;
+            m_dist_pict  -= m_dy_pict;
+            m_dist_end   -= m_dy_end;
+            if(dy > 0)
+            {
+                m_dist       -= m_dx;
+                m_dist_start -= m_dx_start;
+                m_dist_pict  -= m_dx_pict;
+                m_dist_end   -= m_dx_end;
+            }
+            if(dy < 0)
+            {
+                m_dist       += m_dx;
+                m_dist_start += m_dx_start;
+                m_dist_pict  += m_dx_pict;
+                m_dist_end   += m_dx_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void inc_y(int dx)
+        {
+            m_dist       -= m_dx;
+            m_dist_start -= m_dx_start;
+            m_dist_pict  -= m_dx_pict;
+            m_dist_end   -= m_dx_end;
+            if(dx > 0)
+            {
+                m_dist       += m_dy;
+                m_dist_start += m_dy_start;
+                m_dist_pict  += m_dy_pict;
+                m_dist_end   += m_dy_end;
+            }
+            if(dx < 0)
+            {
+                m_dist       -= m_dy;
+                m_dist_start -= m_dy_start;
+                m_dist_pict  -= m_dy_pict;
+                m_dist_end   -= m_dy_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        void dec_y(int dx)
+        {
+            m_dist       += m_dx;
+            m_dist_start += m_dx_start;
+            m_dist_pict  += m_dx_pict;
+            m_dist_end   += m_dx_end;
+            if(dx > 0)
+            {
+                m_dist       += m_dy;
+                m_dist_start += m_dy_start;
+                m_dist_pict  += m_dy_pict;
+                m_dist_end   += m_dy_end;
+            }
+            if(dx < 0)
+            {
+                m_dist       -= m_dy;
+                m_dist_start -= m_dy_start;
+                m_dist_pict  -= m_dy_pict;
+                m_dist_end   -= m_dy_end;
+            }
+        }
+
+        //---------------------------------------------------------------------
+        int dist()       const { return m_dist;       }
+        int dist_start() const { return m_dist_start; }
+        int dist_pict()  const { return m_dist_pict;  }
+        int dist_end()   const { return m_dist_end;   }
+
+        //---------------------------------------------------------------------
+        int dx()       const { return m_dx;       }
+        int dy()       const { return m_dy;       }
+        int dx_start() const { return m_dx_start; }
+        int dy_start() const { return m_dy_start; }
+        int dx_pict()  const { return m_dx_pict;  }
+        int dy_pict()  const { return m_dy_pict;  }
+        int dx_end()   const { return m_dx_end;   }
+        int dy_end()   const { return m_dy_end;   }
+        int len()      const { return m_len;      }
+
+    private:
+        //---------------------------------------------------------------------
+        int m_dx;
+        int m_dy;
+        int m_dx_start;
+        int m_dy_start;
+        int m_dx_pict;
+        int m_dy_pict;
+        int m_dx_end;
+        int m_dy_end;
+
+        int m_dist;
+        int m_dist_start;
+        int m_dist_pict;
+        int m_dist_end;
+        int m_len;
+    };
+
+
+
+
+
+    //==================================================line_interpolator_image
+    template<class Renderer> class line_interpolator_image
+    {
+    public:
+        typedef Renderer renderer_type;
+        typedef typename Renderer::color_type color_type;
+
+        //---------------------------------------------------------------------
+        enum
+        {
+            max_half_width = 64
+        };
+
+        //---------------------------------------------------------------------
+        line_interpolator_image(renderer_type& ren, const line_parameters& lp,
+                                int sx, int sy, int ex, int ey,
+                                int pattern_start,
+                                double scale_x) :
+            m_lp(lp),
+            m_li(lp.vertical ? line_dbl_hr(lp.x2 - lp.x1) :
+                               line_dbl_hr(lp.y2 - lp.y1),
+                 lp.vertical ? abs(lp.y2 - lp.y1) :
+                               abs(lp.x2 - lp.x1) + 1),
+            m_di(lp.x1, lp.y1, lp.x2, lp.y2, sx, sy, ex, ey, lp.len, scale_x,
+                 lp.x1 & ~line_subpixel_mask, lp.y1 & ~line_subpixel_mask),
+            m_ren(ren),
+            m_x(lp.x1 >> line_subpixel_shift),
+            m_y(lp.y1 >> line_subpixel_shift),
+            m_old_x(m_x),
+            m_old_y(m_y),
+            m_count((lp.vertical ? abs((lp.y2 >> line_subpixel_shift) - m_y) :
+                                   abs((lp.x2 >> line_subpixel_shift) - m_x))),
+            m_width(ren.subpixel_width()),
+            m_max_extent(m_width >> (line_subpixel_shift - 2)),
+            m_start(pattern_start + (m_max_extent + 2) * ren.pattern_width()),
+            m_step(0)
+        {
+            agg::dda2_line_interpolator li(0, lp.vertical ?
+                                              (lp.dy << agg::line_subpixel_shift) :
+                                              (lp.dx << agg::line_subpixel_shift),
+                                           lp.len);
+
+            unsigned i;
+            int stop = m_width + line_subpixel_size * 2;
+            for(i = 0; i < max_half_width; ++i)
+            {
+                m_dist_pos[i] = li.y();
+                if(m_dist_pos[i] >= stop) break;
+                ++li;
+            }
+            m_dist_pos[i] = 0x7FFF0000;
+
+            int dist1_start;
+            int dist2_start;
+            int npix = 1;
+
+            if(lp.vertical)
+            {
+                do
+                {
+                    --m_li;
+                    m_y -= lp.inc;
+                    m_x = (m_lp.x1 + m_li.y()) >> line_subpixel_shift;
+
+                    if(lp.inc > 0) m_di.dec_y(m_x - m_old_x);
+                    else           m_di.inc_y(m_x - m_old_x);
+
+                    m_old_x = m_x;
+
+                    dist1_start = dist2_start = m_di.dist_start();
+
+                    int dx = 0;
+                    if(dist1_start < 0) ++npix;
+                    do
+                    {
+                        dist1_start += m_di.dy_start();
+                        dist2_start -= m_di.dy_start();
+                        if(dist1_start < 0) ++npix;
+                        if(dist2_start < 0) ++npix;
+                        ++dx;
+                    }
+                    while(m_dist_pos[dx] <= m_width);
+                    if(npix == 0) break;
+
+                    npix = 0;
+                }
+                while(--m_step >= -m_max_extent);
+            }
+            else
+            {
+                do
+                {
+                    --m_li;
+
+                    m_x -= lp.inc;
+                    m_y = (m_lp.y1 + m_li.y()) >> line_subpixel_shift;
+
+                    if(lp.inc > 0) m_di.dec_x(m_y - m_old_y);
+                    else           m_di.inc_x(m_y - m_old_y);
+
+                    m_old_y = m_y;
+
+                    dist1_start = dist2_start = m_di.dist_start();
+
+                    int dy = 0;
+                    if(dist1_start < 0) ++npix;
+                    do
+                    {
+                        dist1_start -= m_di.dx_start();
+                        dist2_start += m_di.dx_start();
+                        if(dist1_start < 0) ++npix;
+                        if(dist2_start < 0) ++npix;
+                        ++dy;
+                    }
+                    while(m_dist_pos[dy] <= m_width);
+                    if(npix == 0) break;
+
+                    npix = 0;
+                }
+                while(--m_step >= -m_max_extent);
+            }
+            m_li.adjust_forward();
+            m_step -= m_max_extent;
+        }
+
+        //---------------------------------------------------------------------
+        bool step_hor()
+        {
+            ++m_li;
+            m_x += m_lp.inc;
+            m_y = (m_lp.y1 + m_li.y()) >> line_subpixel_shift;
+
+            if(m_lp.inc > 0) m_di.inc_x(m_y - m_old_y);
+            else             m_di.dec_x(m_y - m_old_y);
+
+            m_old_y = m_y;
+
+            int s1 = m_di.dist() / m_lp.len;
+            int s2 = -s1;
+
+            if(m_lp.inc < 0) s1 = -s1;
+
+            int dist_start;
+            int dist_pict;
+            int dist_end;
+            int dy;
+            int dist;
+
+            dist_start = m_di.dist_start();
+            dist_pict  = m_di.dist_pict() + m_start;
+            dist_end   = m_di.dist_end();
+            color_type* p0 = m_colors + max_half_width + 2;
+            color_type* p1 = p0;
+
+            int npix = 0;
+            p1->clear();
+            if(dist_end > 0)
+            {
+                if(dist_start <= 0)
+                {
+                    m_ren.pixel(p1, dist_pict, s2);
+                }
+                ++npix;
+            }
+            ++p1;
+
+            dy = 1;
+            while((dist = m_dist_pos[dy]) - s1 <= m_width)
+            {
+                dist_start -= m_di.dx_start();
+                dist_pict  -= m_di.dx_pict();
+                dist_end   -= m_di.dx_end();
+                p1->clear();
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    if(m_lp.inc > 0) dist = -dist;
+                    m_ren.pixel(p1, dist_pict, s2 - dist);
+                    ++npix;
+                }
+                ++p1;
+                ++dy;
+            }
+
+            dy = 1;
+            dist_start = m_di.dist_start();
+            dist_pict  = m_di.dist_pict() + m_start;
+            dist_end   = m_di.dist_end();
+            while((dist = m_dist_pos[dy]) + s1 <= m_width)
+            {
+                dist_start += m_di.dx_start();
+                dist_pict  += m_di.dx_pict();
+                dist_end   += m_di.dx_end();
+                --p0;
+                p0->clear();
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    if(m_lp.inc > 0) dist = -dist;
+                    m_ren.pixel(p0, dist_pict, s2 + dist);
+                    ++npix;
+                }
+                ++dy;
+            }
+            m_ren.blend_color_vspan(m_x,
+                                    m_y - dy + 1,
+                                    unsigned(p1 - p0),
+                                    p0);
+            return npix && ++m_step < m_count;
+        }
+
+
+
+        //---------------------------------------------------------------------
+        bool step_ver()
+        {
+            ++m_li;
+            m_y += m_lp.inc;
+            m_x = (m_lp.x1 + m_li.y()) >> line_subpixel_shift;
+
+            if(m_lp.inc > 0) m_di.inc_y(m_x - m_old_x);
+            else             m_di.dec_y(m_x - m_old_x);
+
+            m_old_x = m_x;
+
+            int s1 = m_di.dist() / m_lp.len;
+            int s2 = -s1;
+
+            if(m_lp.inc > 0) s1 = -s1;
+
+            int dist_start;
+            int dist_pict;
+            int dist_end;
+            int dist;
+            int dx;
+
+            dist_start = m_di.dist_start();
+            dist_pict  = m_di.dist_pict() + m_start;
+            dist_end   = m_di.dist_end();
+            color_type* p0 = m_colors + max_half_width + 2;
+            color_type* p1 = p0;
+
+            int npix = 0;
+            p1->clear();
+            if(dist_end > 0)
+            {
+                if(dist_start <= 0)
+                {
+                    m_ren.pixel(p1, dist_pict, s2);
+                }
+                ++npix;
+            }
+            ++p1;
+
+            dx = 1;
+            while((dist = m_dist_pos[dx]) - s1 <= m_width)
+            {
+                dist_start += m_di.dy_start();
+                dist_pict  += m_di.dy_pict();
+                dist_end   += m_di.dy_end();
+                p1->clear();
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    if(m_lp.inc > 0) dist = -dist;
+                    m_ren.pixel(p1, dist_pict, s2 + dist);
+                    ++npix;
+                }
+                ++p1;
+                ++dx;
+            }
+
+            dx = 1;
+            dist_start = m_di.dist_start();
+            dist_pict  = m_di.dist_pict() + m_start;
+            dist_end   = m_di.dist_end();
+            while((dist = m_dist_pos[dx]) + s1 <= m_width)
+            {
+                dist_start -= m_di.dy_start();
+                dist_pict  -= m_di.dy_pict();
+                dist_end   -= m_di.dy_end();
+                --p0;
+                p0->clear();
+                if(dist_end > 0 && dist_start <= 0)
+                {
+                    if(m_lp.inc > 0) dist = -dist;
+                    m_ren.pixel(p0, dist_pict, s2 - dist);
+                    ++npix;
+                }
+                ++dx;
+            }
+            m_ren.blend_color_hspan(m_x - dx + 1,
+                                    m_y,
+                                    unsigned(p1 - p0),
+                                    p0);
+            return npix && ++m_step < m_count;
+        }
+
+
+        //---------------------------------------------------------------------
+        int  pattern_end() const { return m_start + m_di.len(); }
+
+        //---------------------------------------------------------------------
+        bool vertical() const { return m_lp.vertical; }
+        int  width() const { return m_width; }
+        int  count() const { return m_count; }
+
+    private:
+        line_interpolator_image(const line_interpolator_image<Renderer>&);
+        const line_interpolator_image<Renderer>&
+            operator = (const line_interpolator_image<Renderer>&);
+
+    protected:
+        const line_parameters& m_lp;
+        dda2_line_interpolator m_li;
+        distance_interpolator4 m_di;
+        renderer_type&         m_ren;
+        int m_plen;
+        int m_x;
+        int m_y;
+        int m_old_x;
+        int m_old_y;
+        int m_count;
+        int m_width;
+        int m_max_extent;
+        int m_start;
+        int m_step;
+        int m_dist_pos[max_half_width + 1];
+        color_type m_colors[max_half_width * 2 + 4];
+    };
+
+
+
+
+
+
+
+
+    //===================================================renderer_outline_image
+    template<class BaseRenderer, class ImagePattern>
+    class renderer_outline_image
+    {
+    public:
+        //---------------------------------------------------------------------
+        typedef BaseRenderer base_ren_type;
+        typedef renderer_outline_image<BaseRenderer, ImagePattern> self_type;
+        typedef typename base_ren_type::color_type color_type;
+        typedef ImagePattern pattern_type;
+
+
+        //---------------------------------------------------------------------
+        renderer_outline_image(base_ren_type& ren, const pattern_type& patt) :
+            m_ren(&ren),
+            m_pattern(&patt),
+            m_start(0),
+            m_scale_x(1.0)
+        {
+        }
+
+        //---------------------------------------------------------------------
+        void pattern(const pattern_type& p) { m_pattern = &p; }
+        const pattern_type& pattern() const { return *m_pattern; }
+
+        //---------------------------------------------------------------------
+        void   scale_x(double s) { m_scale_x = s; }
+        double scale_x() const   { return m_scale_x; }
+
+        //---------------------------------------------------------------------
+        void   start_x(double s) { m_start = int(s * line_subpixel_size); }
+        double start_x() const   { return double(m_start) / line_subpixel_size; }
+
+        //---------------------------------------------------------------------
+        int subpixel_width() const { return m_pattern->line_width(); }
+        int pattern_width() const { return m_pattern->pattern_width(); }
+
+        //-------------------------------------------------------------------------
+        void pixel(color_type* p, int x, int y) const
+        {
+            m_pattern->pixel(p, x, y);
+        }
+
+        //-------------------------------------------------------------------------
+        void blend_color_hspan(int x, int y, unsigned len, const color_type* colors)
+        {
+            m_ren->blend_color_hspan(x, y, len, colors, 0);
+        }
+
+        //-------------------------------------------------------------------------
+        void blend_color_vspan(int x, int y, unsigned len, const color_type* colors)
+        {
+            m_ren->blend_color_vspan(x, y, len, colors, 0);
+        }
+
+        //-------------------------------------------------------------------------
+        static bool accurate_join_only() { return true; }
+
+        //-------------------------------------------------------------------------
+        template<class Cmp>
+        void semidot(Cmp, int, int, int, int)
+        {
+        }
+
+        //-------------------------------------------------------------------------
+        void line0(const line_parameters&)
+        {
+        }
+
+        //-------------------------------------------------------------------------
+        void line1(const line_parameters&, int, int)
+        {
+        }
+
+        //-------------------------------------------------------------------------
+        void line2(const line_parameters&, int, int)
+        {
+        }
+
+        //-------------------------------------------------------------------------
+        void line3(const line_parameters& lp,
+                   int sx, int sy, int ex, int ey)
+        {
+            fix_degenerate_bisectrix_start(lp, &sx, &sy);
+            fix_degenerate_bisectrix_end(lp, &ex, &ey);
+            line_interpolator_image<self_type> li(*this, lp,
+                                                  sx, sy,
+                                                  ex, ey,
+                                                  m_start, m_scale_x);
+            if(li.vertical())
+            {
+                while(li.step_ver());
+            }
+            else
+            {
+                while(li.step_hor());
+            }
+            m_start = li.pattern_end();
+        }
+
+    private:
+        base_ren_type*      m_ren;
+        const pattern_type* m_pattern;
+        int                 m_start;
+        double              m_scale_x;
+    };
+
+
+
+
+
+}
+
+
+
+#endif
diff --git a/agg/inc/agg_renderer_primitives.h b/agg/inc/agg_renderer_primitives.h
new file mode 100755
index 000000000000..522432c06df6
--- /dev/null
+++ b/agg/inc/agg_renderer_primitives.h
@@ -0,0 +1,224 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class renderer_primitives
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERER_PRIMITIVES_INCLUDED
+#define AGG_RENDERER_PRIMITIVES_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_renderer_base.h"
+#include "agg_dda_line.h"
+#include "agg_ellipse_bresenham.h"
+
+namespace agg
+{
+    //-----------------------------------------------------renderer_primitives
+    template<class BaseRenderer> class renderer_primitives
+    {
+    public:
+        typedef BaseRenderer base_ren_type;
+        typedef typename base_ren_type::color_type color_type;
+
+        //--------------------------------------------------------------------
+        renderer_primitives(base_ren_type& ren) :
+            m_ren(&ren),
+            m_fill_color(),
+            m_line_color(),
+            m_curr_x(0),
+            m_curr_y(0)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        static int coord(double c)
+        {
+            return int(c * line_bresenham_interpolator::subpixel_size);
+        }
+
+        //--------------------------------------------------------------------
+        void fill_color(const color_type& c) { m_fill_color = c; }
+        void line_color(const color_type& c) { m_line_color = c; }
+        const color_type& fill_color() const { return m_fill_color; }
+        const color_type& line_color() const { return m_line_color; }
+
+        //--------------------------------------------------------------------
+        void rectangle(int x1, int y1, int x2, int y2)
+        {
+            m_ren->blend_hline(x1,   y1,   x2-1, m_line_color, cover_full);
+            m_ren->blend_vline(x2,   y1,   y2-1, m_line_color, cover_full);
+            m_ren->blend_hline(x1+1, y2,   x2,   m_line_color, cover_full);
+            m_ren->blend_vline(x1,   y1+1, y2,   m_line_color, cover_full);
+        }
+
+        //--------------------------------------------------------------------
+        void solid_rectangle(int x1, int y1, int x2, int y2)
+        {
+            m_ren->blend_bar(x1, y1, x2, y2, m_fill_color, cover_full);
+        }
+
+        //--------------------------------------------------------------------
+        void outlined_rectangle(int x1, int y1, int x2, int y2)
+        {
+            rectangle(x1, y1, x2, y2);
+            m_ren->blend_bar(x1+1, y1+1, x2-1, y2-1, m_fill_color, cover_full);
+        }
+
+        //--------------------------------------------------------------------
+        void ellipse(int x, int y, int rx, int ry)
+        {
+            ellipse_bresenham_interpolator ei(rx, ry);
+            int dx = 0;
+            int dy = -ry;
+            do
+            {
+                dx += ei.dx();
+                dy += ei.dy();
+                m_ren->blend_pixel(x + dx, y + dy, m_line_color, cover_full);
+                m_ren->blend_pixel(x + dx, y - dy, m_line_color, cover_full);
+                m_ren->blend_pixel(x - dx, y - dy, m_line_color, cover_full);
+                m_ren->blend_pixel(x - dx, y + dy, m_line_color, cover_full);
+                ++ei;
+            }
+            while(dy < 0);
+        }
+
+        //--------------------------------------------------------------------
+        void solid_ellipse(int x, int y, int rx, int ry)
+        {
+            ellipse_bresenham_interpolator ei(rx, ry);
+            int dx = 0;
+            int dy = -ry;
+            int dy0 = dy;
+            int dx0 = dx;
+
+            do
+            {
+                dx += ei.dx();
+                dy += ei.dy();
+
+                if(dy != dy0)
+                {
+                    m_ren->blend_hline(x-dx0, y+dy0, x+dx0, m_fill_color, cover_full);
+                    m_ren->blend_hline(x-dx0, y-dy0, x+dx0, m_fill_color, cover_full);
+                }
+                dx0 = dx;
+                dy0 = dy;
+                ++ei;
+            }
+            while(dy < 0);
+            m_ren->blend_hline(x-dx0, y+dy0, x+dx0, m_fill_color, cover_full);
+        }
+
+        //--------------------------------------------------------------------
+        void outlined_ellipse(int x, int y, int rx, int ry)
+        {
+            ellipse_bresenham_interpolator ei(rx, ry);
+            int dx = 0;
+            int dy = -ry;
+
+            do
+            {
+                dx += ei.dx();
+                dy += ei.dy();
+
+                m_ren->blend_pixel(x + dx, y + dy, m_line_color, cover_full);
+                m_ren->blend_pixel(x + dx, y - dy, m_line_color, cover_full);
+                m_ren->blend_pixel(x - dx, y - dy, m_line_color, cover_full);
+                m_ren->blend_pixel(x - dx, y + dy, m_line_color, cover_full);
+
+                if(ei.dy() && dx)
+                {
+                   m_ren->blend_hline(x-dx+1, y+dy, x+dx-1, m_fill_color, cover_full);
+                   m_ren->blend_hline(x-dx+1, y-dy, x+dx-1, m_fill_color, cover_full);
+                }
+                ++ei;
+            }
+            while(dy < 0);
+        }
+
+        //--------------------------------------------------------------------
+        void line(int x1, int y1, int x2, int y2, bool last=false)
+        {
+            line_bresenham_interpolator li(x1, y1, x2, y2);
+
+            unsigned len = li.len();
+            if(len == 0)
+            {
+                if(last)
+                {
+                    m_ren->blend_pixel(li.line_lr(x1), li.line_lr(y1), m_line_color, cover_full);
+                }
+                return;
+            }
+
+            if(last) ++len;
+
+            if(li.is_ver())
+            {
+                do
+                {
+                    m_ren->blend_pixel(li.x2(), li.y1(), m_line_color, cover_full);
+                    li.vstep();
+                }
+                while(--len);
+            }
+            else
+            {
+                do
+                {
+                    m_ren->blend_pixel(li.x1(), li.y2(), m_line_color, cover_full);
+                    li.hstep();
+                }
+                while(--len);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void move_to(int x, int y)
+        {
+            m_curr_x = x;
+            m_curr_y = y;
+        }
+
+        //--------------------------------------------------------------------
+        void line_to(int x, int y, bool last=false)
+        {
+            line(m_curr_x, m_curr_y, x, y, last);
+            m_curr_x = x;
+            m_curr_y = y;
+        }
+
+        //--------------------------------------------------------------------
+        const base_ren_type& ren() const { return *m_ren; }
+        base_ren_type& ren() { return *m_ren; }
+
+        //--------------------------------------------------------------------
+        const rendering_buffer& rbuf() const { return m_ren->rbuf(); }
+        rendering_buffer& rbuf() { return m_ren->rbuf(); }
+
+    private:
+        base_ren_type* m_ren;
+        color_type m_fill_color;
+        color_type m_line_color;
+        int m_curr_x;
+        int m_curr_y;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_renderer_raster_text.h b/agg/inc/agg_renderer_raster_text.h
new file mode 100755
index 000000000000..957944600332
--- /dev/null
+++ b/agg/inc/agg_renderer_raster_text.h
@@ -0,0 +1,264 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERER_RASTER_TEXT_INCLUDED
+#define AGG_RENDERER_RASTER_TEXT_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //==============================================renderer_raster_htext_solid
+    template<class BaseRenderer, class GlyphGenerator>
+    class renderer_raster_htext_solid
+    {
+    public:
+        typedef BaseRenderer ren_type;
+        typedef GlyphGenerator glyph_gen_type;
+        typedef typename glyph_gen_type::glyph_rect glyph_rect;
+        typedef typename ren_type::color_type color_type;
+
+        renderer_raster_htext_solid(ren_type& ren, glyph_gen_type& glyph) :
+            m_ren(&ren),
+            m_glyph(&glyph)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void color(const color_type& c) { m_color = c; }
+        const color_type& color() const { return m_color; }
+
+        //--------------------------------------------------------------------
+        template<class CharT>
+        void render_text(double x, double y, const CharT* str, bool flip=false)
+        {
+            glyph_rect r;
+            while(*str)
+            {
+                m_glyph->prepare(&r, x, y, *str, flip);
+                if(r.x2 >= r.x1)
+                {
+                    int i;
+                    if(flip)
+                    {
+                        for(i = r.y1; i <= r.y2; i++)
+                        {
+                            m_ren->blend_solid_hspan(r.x1, i, (r.x2 - r.x1 + 1),
+                                                     m_color,
+                                                     m_glyph->span(r.y2 - i));
+                        }
+                    }
+                    else
+                    {
+                        for(i = r.y1; i <= r.y2; i++)
+                        {
+                            m_ren->blend_solid_hspan(r.x1, i, (r.x2 - r.x1 + 1),
+                                                     m_color,
+                                                     m_glyph->span(i - r.y1));
+                        }
+                    }
+                }
+                x += r.dx;
+                y += r.dy;
+                ++str;
+            }
+        }
+
+    private:
+        ren_type* m_ren;
+        glyph_gen_type* m_glyph;
+        color_type m_color;
+    };
+
+
+
+    //=============================================renderer_raster_vtext_solid
+    template<class BaseRenderer, class GlyphGenerator>
+    class renderer_raster_vtext_solid
+    {
+    public:
+        typedef BaseRenderer ren_type;
+        typedef GlyphGenerator glyph_gen_type;
+        typedef typename glyph_gen_type::glyph_rect glyph_rect;
+        typedef typename ren_type::color_type color_type;
+
+        renderer_raster_vtext_solid(ren_type& ren, glyph_gen_type& glyph) :
+            m_ren(&ren),
+            m_glyph(&glyph)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void color(const color_type& c) { m_color = c; }
+        const color_type& color() const { return m_color; }
+
+        //--------------------------------------------------------------------
+        template<class CharT>
+        void render_text(double x, double y, const CharT* str, bool flip=false)
+        {
+            glyph_rect r;
+            while(*str)
+            {
+                m_glyph->prepare(&r, x, y, *str, !flip);
+                if(r.x2 >= r.x1)
+                {
+                    int i;
+                    if(flip)
+                    {
+                        for(i = r.y1; i <= r.y2; i++)
+                        {
+                            m_ren->blend_solid_vspan(i, r.x1, (r.x2 - r.x1 + 1),
+                                                     m_color,
+                                                     m_glyph->span(i - r.y1));
+                        }
+                    }
+                    else
+                    {
+                        for(i = r.y1; i <= r.y2; i++)
+                        {
+                            m_ren->blend_solid_vspan(i, r.x1, (r.x2 - r.x1 + 1),
+                                                     m_color,
+                                                     m_glyph->span(r.y2 - i));
+                        }
+                    }
+                }
+                x += r.dx;
+                y += r.dy;
+                ++str;
+            }
+        }
+
+    private:
+        ren_type* m_ren;
+        glyph_gen_type* m_glyph;
+        color_type m_color;
+    };
+
+
+
+
+
+
+    //===================================================renderer_raster_htext
+    template<class ScanlineRenderer, class GlyphGenerator>
+    class renderer_raster_htext
+    {
+    public:
+        typedef ScanlineRenderer ren_type;
+        typedef GlyphGenerator glyph_gen_type;
+        typedef typename glyph_gen_type::glyph_rect glyph_rect;
+
+        class scanline_single_span
+        {
+        public:
+            typedef agg::cover_type cover_type;
+
+            //----------------------------------------------------------------
+            struct const_span
+            {
+                int x;
+                unsigned len;
+                const cover_type* covers;
+
+                const_span() {}
+                const_span(int x_, unsigned len_, const cover_type* covers_) :
+                    x(x_), len(len_), covers(covers_)
+                {}
+            };
+
+            typedef const const_span* const_iterator;
+
+            //----------------------------------------------------------------
+            scanline_single_span(int x, int y, unsigned len,
+                                 const cover_type* covers) :
+                m_y(y),
+                m_span(x, len, covers)
+            {}
+
+            //----------------------------------------------------------------
+            int      y()           const { return m_y; }
+            unsigned num_spans()   const { return 1;   }
+            const_iterator begin() const { return &m_span; }
+
+        private:
+            //----------------------------------------------------------------
+            int m_y;
+            const_span m_span;
+        };
+
+
+
+        //--------------------------------------------------------------------
+        renderer_raster_htext(ren_type& ren, glyph_gen_type& glyph) :
+            m_ren(&ren),
+            m_glyph(&glyph)
+        {
+        }
+
+
+        //--------------------------------------------------------------------
+        template<class CharT>
+        void render_text(double x, double y, const CharT* str, bool flip=false)
+        {
+            glyph_rect r;
+            while(*str)
+            {
+                m_glyph->prepare(&r, x, y, *str, flip);
+                if(r.x2 >= r.x1)
+                {
+                    m_ren->prepare(r.x2 - r.x1 + 1);
+                    int i;
+                    if(flip)
+                    {
+                        for(i = r.y1; i <= r.y2; i++)
+                        {
+                            m_ren->render(
+                                scanline_single_span(r.x1,
+                                                     i,
+                                                     (r.x2 - r.x1 + 1),
+                                                     m_glyph->span(r.y2 - i)));
+                        }
+                    }
+                    else
+                    {
+                        for(i = r.y1; i <= r.y2; i++)
+                        {
+                            m_ren->render(
+                                scanline_single_span(r.x1,
+                                                     i,
+                                                     (r.x2 - r.x1 + 1),
+                                                     m_glyph->span(i - r.y1)));
+                        }
+                    }
+                }
+                x += r.dx;
+                y += r.dy;
+                ++str;
+            }
+        }
+
+    private:
+        ren_type* m_ren;
+        glyph_gen_type* m_glyph;
+    };
+
+
+
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_renderer_scanline.h b/agg/inc/agg_renderer_scanline.h
new file mode 100755
index 000000000000..cc33942a3770
--- /dev/null
+++ b/agg/inc/agg_renderer_scanline.h
@@ -0,0 +1,450 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERER_SCANLINE_INCLUDED
+#define AGG_RENDERER_SCANLINE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_renderer_base.h"
+#include "agg_render_scanlines.h"
+
+namespace agg
+{
+
+    //====================================================renderer_scanline_aa
+    template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa
+    {
+    public:
+        typedef BaseRenderer base_ren_type;
+
+        //--------------------------------------------------------------------
+        renderer_scanline_aa(base_ren_type& ren, SpanGenerator& span_gen) :
+            m_ren(&ren),
+            m_span_gen(&span_gen)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            m_span_gen->prepare(max_span_len);
+        }
+
+        //--------------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            int y = sl.y();
+            m_ren->first_clip_box();
+            do
+            {
+                int xmin = m_ren->xmin();
+                int xmax = m_ren->xmax();
+
+                if(y >= m_ren->ymin() && y <= m_ren->ymax())
+                {
+                    unsigned num_spans = sl.num_spans();
+                    typename Scanline::const_iterator span = sl.begin();
+                    do
+                    {
+                        int x = span->x;
+                        int len = span->len;
+                        bool solid = false;
+                        const typename Scanline::cover_type* covers = span->covers;
+
+                        if(len < 0)
+                        {
+                            solid = true;
+                            len = -len;
+                        }
+
+                        if(x < xmin)
+                        {
+                            len -= xmin - x;
+                            if(!solid)
+                            {
+                                covers += xmin - x;
+                            }
+                            x = xmin;
+                        }
+
+                        if(len > 0)
+                        {
+                            if(x + len > xmax)
+                            {
+                                len = xmax - x + 1;
+                            }
+                            if(len > 0)
+                            {
+                                m_ren->blend_color_hspan_no_clip(
+                                    x, y, len,
+                                    m_span_gen->generate(x, y, len),
+                                    solid ? 0 : covers,
+                                    *covers);
+                            }
+                        }
+                        ++span;
+                    }
+                    while(--num_spans);
+                }
+            }
+            while(m_ren->next_clip_box());
+        }
+
+    private:
+        base_ren_type* m_ren;
+        SpanGenerator* m_span_gen;
+    };
+
+
+
+
+    //==============================================renderer_scanline_aa_opaque
+    template<class BaseRenderer, class SpanGenerator> class renderer_scanline_aa_opaque
+    {
+    public:
+        typedef BaseRenderer base_ren_type;
+
+        //--------------------------------------------------------------------
+        renderer_scanline_aa_opaque(base_ren_type& ren, SpanGenerator& span_gen) :
+            m_ren(&ren),
+            m_span_gen(&span_gen)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            m_span_gen->prepare(max_span_len);
+        }
+
+        //--------------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            int y = sl.y();
+            m_ren->first_clip_box();
+            do
+            {
+                int xmin = m_ren->xmin();
+                int xmax = m_ren->xmax();
+
+                if(y >= m_ren->ymin() && y <= m_ren->ymax())
+                {
+                    unsigned num_spans = sl.num_spans();
+                    typename Scanline::const_iterator span = sl.begin();
+                    do
+                    {
+                        int x = span->x;
+                        int len = span->len;
+                        bool solid = false;
+                        const typename Scanline::cover_type* covers = span->covers;
+
+                        if(len < 0)
+                        {
+                            solid = true;
+                            len = -len;
+                        }
+
+                        if(x < xmin)
+                        {
+                            len -= xmin - x;
+                            if(!solid)
+                            {
+                                covers += xmin - x;
+                            }
+                            x = xmin;
+                        }
+
+                        if(len > 0)
+                        {
+                            if(x + len > xmax)
+                            {
+                                len = xmax - x + 1;
+                            }
+                            if(len > 0)
+                            {
+                                m_ren->blend_opaque_color_hspan_no_clip(
+                                    x, y, len,
+                                    m_span_gen->generate(x, y, len),
+                                    solid ? 0 : covers,
+                                    *covers);
+                            }
+                        }
+                        ++span;
+                    }
+                    while(--num_spans);
+                }
+            }
+            while(m_ren->next_clip_box());
+        }
+
+    private:
+        base_ren_type* m_ren;
+        SpanGenerator* m_span_gen;
+    };
+
+
+
+    //==============================================renderer_scanline_aa_solid
+    template<class BaseRenderer> class renderer_scanline_aa_solid
+    {
+    public:
+        typedef BaseRenderer base_ren_type;
+        typedef typename base_ren_type::color_type color_type;
+
+        //--------------------------------------------------------------------
+        renderer_scanline_aa_solid(base_ren_type& ren) :
+            m_ren(&ren)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void color(const color_type& c) { m_color = c; }
+        const color_type& color() const { return m_color; }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned) {}
+
+        //--------------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            int y = sl.y();
+            unsigned num_spans = sl.num_spans();
+            typename Scanline::const_iterator span = sl.begin();
+
+            do
+            {
+                int x = span->x;
+                if(span->len > 0)
+                {
+                    m_ren->blend_solid_hspan(x, y, (unsigned)span->len,
+                                             m_color,
+                                             span->covers);
+                }
+                else
+                {
+                    m_ren->blend_hline(x, y, (unsigned)(x - span->len - 1),
+                                       m_color,
+                                       *(span->covers));
+                }
+                ++span;
+            }
+            while(--num_spans);
+        }
+
+    private:
+        base_ren_type* m_ren;
+        color_type m_color;
+    };
+
+
+
+
+
+
+
+    //===================================================renderer_scanline_bin
+    template<class BaseRenderer, class SpanGenerator> class renderer_scanline_bin
+    {
+    public:
+        typedef BaseRenderer base_ren_type;
+
+        //--------------------------------------------------------------------
+        renderer_scanline_bin(base_ren_type& ren, SpanGenerator& span_gen) :
+            m_ren(&ren),
+            m_span_gen(&span_gen)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            m_span_gen->prepare(max_span_len);
+        }
+
+        //--------------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            int y = sl.y();
+            m_ren->first_clip_box();
+            do
+            {
+                int xmin = m_ren->xmin();
+                int xmax = m_ren->xmax();
+
+                if(y >= m_ren->ymin() && y <= m_ren->ymax())
+                {
+                    unsigned num_spans = sl.num_spans();
+                    typename Scanline::const_iterator span = sl.begin();
+                    do
+                    {
+                        int x = span->x;
+                        int len = span->len;
+
+                        if(len < 0) len = -len;
+                        if(x < xmin)
+                        {
+                            len -= xmin - x;
+                            x = xmin;
+                        }
+                        if(len > 0)
+                        {
+                            if(x + len > xmax)
+                            {
+                                len = xmax - x + 1;
+                            }
+                            if(len > 0)
+                            {
+                                m_ren->blend_color_hspan_no_clip(
+                                    x, y, len,
+                                    m_span_gen->generate(x, y, len),
+                                    0);
+                            }
+                        }
+                        ++span;
+                    }
+                    while(--num_spans);
+                }
+            }
+            while(m_ren->next_clip_box());
+        }
+
+    private:
+        base_ren_type* m_ren;
+        SpanGenerator* m_span_gen;
+    };
+
+
+
+    //===============================================renderer_scanline_bin_opaque
+    template<class BaseRenderer, class SpanGenerator> class renderer_scanline_bin_opaque
+    {
+    public:
+        typedef BaseRenderer base_ren_type;
+
+        //--------------------------------------------------------------------
+        renderer_scanline_bin_opaque(base_ren_type& ren, SpanGenerator& span_gen) :
+            m_ren(&ren),
+            m_span_gen(&span_gen)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            m_span_gen->prepare(max_span_len);
+        }
+
+        //--------------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            int y = sl.y();
+            m_ren->first_clip_box();
+            do
+            {
+                int xmin = m_ren->xmin();
+                int xmax = m_ren->xmax();
+
+                if(y >= m_ren->ymin() && y <= m_ren->ymax())
+                {
+                    unsigned num_spans = sl.num_spans();
+                    typename Scanline::const_iterator span = sl.begin();
+                    do
+                    {
+                        int x = span->x;
+                        int len = span->len;
+
+                        if(len < 0) len = -len;
+                        if(x < xmin)
+                        {
+                            len -= xmin - x;
+                            x = xmin;
+                        }
+                        if(len > 0)
+                        {
+                            if(x + len > xmax)
+                            {
+                                len = xmax - x + 1;
+                            }
+                            if(len > 0)
+                            {
+                                m_ren->blend_opaque_color_hspan_no_clip(
+                                    x, y, len,
+                                    m_span_gen->generate(x, y, len),
+                                    0);
+                            }
+                        }
+                        ++span;
+                    }
+                    while(--num_spans);
+                }
+            }
+            while(m_ren->next_clip_box());
+        }
+
+    private:
+        base_ren_type* m_ren;
+        SpanGenerator* m_span_gen;
+    };
+
+
+
+
+    //=============================================renderer_scanline_bin_solid
+    template<class BaseRenderer> class renderer_scanline_bin_solid
+    {
+    public:
+        typedef BaseRenderer base_ren_type;
+        typedef typename base_ren_type::color_type color_type;
+
+        //--------------------------------------------------------------------
+        renderer_scanline_bin_solid(base_ren_type& ren) :
+            m_ren(&ren)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        void color(const color_type& c) { m_color = c; }
+        const color_type& color() const { return m_color; }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned) {}
+
+        //--------------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            unsigned num_spans = sl.num_spans();
+            typename Scanline::const_iterator span = sl.begin();
+            do
+            {
+                m_ren->blend_hline(span->x,
+                                   sl.y(),
+                                   span->x - 1 + ((span->len < 0) ?
+                                                     -span->len :
+                                                      span->len),
+                                   m_color,
+                                   cover_full);
+                ++span;
+            }
+            while(--num_spans);
+        }
+
+    private:
+        base_ren_type* m_ren;
+        color_type m_color;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_rendering_buffer.h b/agg/inc/agg_rendering_buffer.h
new file mode 100755
index 000000000000..50b6a46fdfa8
--- /dev/null
+++ b/agg/inc/agg_rendering_buffer.h
@@ -0,0 +1,179 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class rendering_buffer
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERING_BUFFER_INCLUDED
+#define AGG_RENDERING_BUFFER_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //==========================================================row_ptr_cache
+    template<class T> class row_ptr_cache
+    {
+    public:
+        //--------------------------------------------------------------------
+        struct row_data
+        {
+            int x1, x2;
+            const int8u* ptr;
+            row_data() {}
+            row_data(int x1_, int x2_, const int8u* ptr_) :
+                x1(x1_), x2(x2_), ptr(ptr_) {}
+        };
+
+        //-------------------------------------------------------------------
+        ~row_ptr_cache()
+        {
+            delete [] m_rows;
+        }
+
+        //-------------------------------------------------------------------
+        row_ptr_cache() :
+            m_buf(0),
+            m_rows(0),
+            m_width(0),
+            m_height(0),
+            m_stride(0),
+            m_max_height(0)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        row_ptr_cache(T* _buf, unsigned _width, unsigned _height, int _stride) :
+            m_buf(0),
+            m_rows(0),
+            m_width(0),
+            m_height(0),
+            m_stride(0),
+            m_max_height(0)
+        {
+            attach(_buf, _width, _height, _stride);
+        }
+
+        //--------------------------------------------------------------------
+        void attach(T* _buf, unsigned _width, unsigned _height, int _stride)
+        {
+            m_buf = _buf;
+            m_width = _width;
+            m_height = _height;
+            m_stride = _stride;
+            if(_height > m_max_height)
+            {
+                delete [] m_rows;
+                m_rows = new T* [m_max_height = _height];
+            }
+
+            T* row_ptr = m_buf;
+
+            if(_stride < 0)
+            {
+                row_ptr = m_buf - int(_height - 1) * _stride;
+            }
+
+            T** _rows = m_rows;
+
+            while(_height--)
+            {
+                *_rows++ = row_ptr;
+                row_ptr += _stride;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        const T* buf()    const { return m_buf;    }
+        unsigned width()  const { return m_width;  }
+        unsigned height() const { return m_height; }
+        int      stride() const { return m_stride; }
+        unsigned stride_abs() const
+        {
+            return (m_stride < 0) ?
+                unsigned(-m_stride) :
+                unsigned(m_stride);
+        }
+
+        //--------------------------------------------------------------------
+        T* row(unsigned y) { return m_rows[y]; }
+        const T* row(unsigned y) const { return m_rows[y]; }
+
+        T* next_row(void* p) { return (T*)p + m_stride; }
+        const T* next_row(const void* p) const { return (T*)p + m_stride; }
+
+        T const* const* rows() const { return m_rows; }
+
+        //--------------------------------------------------------------------
+        void copy_from(const row_ptr_cache<T>& mtx)
+        {
+            unsigned h = height();
+            if(mtx.height() < h) h = mtx.height();
+
+            unsigned l = stride_abs();
+            if(mtx.stride_abs() < l) l = mtx.stride_abs();
+
+            l *= sizeof(T);
+
+            unsigned y;
+            for (y = 0; y < h; y++)
+            {
+                memcpy(row(y), mtx.row(y), l);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        void clear(T value)
+        {
+            unsigned y;
+            for(y = 0; y < height(); y++)
+            {
+                T* p = row(y);
+                unsigned x;
+                for(x = 0; x < stride_abs(); x++)
+                {
+                    *p++ = value;
+                }
+            }
+        }
+
+
+    private:
+        //--------------------------------------------------------------------
+        // Prohibit copying
+        row_ptr_cache(const row_ptr_cache<T>&);
+        const row_ptr_cache<T>& operator = (const row_ptr_cache<T>&);
+
+    private:
+        //--------------------------------------------------------------------
+        T*       m_buf;        // Pointer to renrdering buffer
+        T**      m_rows;       // Pointers to each row of the buffer
+        unsigned m_width;      // Width in pixels
+        unsigned m_height;     // Height in pixels
+        int      m_stride;     // Number of bytes per row. Can be < 0
+        unsigned m_max_height; // The maximal height (currently allocated)
+    };
+
+
+
+    //========================================================rendering_buffer
+    typedef row_ptr_cache<int8u> rendering_buffer;
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_rendering_buffer_dynarow.h b/agg/inc/agg_rendering_buffer_dynarow.h
new file mode 100755
index 000000000000..b6724d99ff78
--- /dev/null
+++ b/agg/inc/agg_rendering_buffer_dynarow.h
@@ -0,0 +1,184 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class rendering_buffer_dynarow
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_RENDERING_BUFFER_DYNAROW_INCLUDED
+#define AGG_RENDERING_BUFFER_DYNAROW_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //===============================================rendering_buffer_dynarow
+    // Rendering buffer class with dynamic allocation of the rows.
+    // The rows are allocated as needed when requesting for span_ptr().
+    // The class automatically calculates min_x and max_x for each row.
+    // Generally it's more efficient to use this class as a temporary buffer
+    // for rendering a few lines and then to blend it with another buffer.
+    //
+    template<unsigned PixWidth> class rendering_buffer_dynarow
+    {
+    public:
+        //-------------------------------------------------------------------
+        struct row_data
+        {
+            int8u*   ptr;
+            int      x1;
+            int      x2;
+        };
+
+        //-------------------------------------------------------------------
+        ~rendering_buffer_dynarow()
+        {
+            init(0,0);
+        }
+
+        //-------------------------------------------------------------------
+        rendering_buffer_dynarow() :
+            m_rows(0),
+            m_width(0),
+            m_height(0)
+        {
+        }
+
+        // Allocate and clear the buffer
+        //--------------------------------------------------------------------
+        rendering_buffer_dynarow(unsigned width, unsigned height) :
+            m_rows(new row_data[height]),
+            m_width(width),
+            m_height(height)
+        {
+            memset(m_rows, 0, sizeof(row_data) * height);
+        }
+
+        // Allocate and clear the buffer
+        //--------------------------------------------------------------------
+        void init(unsigned width, unsigned height)
+        {
+            unsigned i;
+            for(i = 0; i < m_height; ++i) delete [] m_rows[i].ptr;
+            delete [] m_rows;
+            m_rows = 0;
+            if(width && height)
+            {
+                m_width  = width;
+                m_height = height;
+                m_rows = new row_data[height];
+                memset(m_rows, 0, sizeof(row_data) * height);
+            }
+        }
+
+        //--------------------------------------------------------------------
+        unsigned width()  const { return m_width;  }
+        unsigned height() const { return m_height; }
+
+        // Get pointer to the beginning of the row. Memory for the row
+        // is allocated as needed.
+        //--------------------------------------------------------------------
+        int8u* row(int y)
+        {
+            row_data* r = m_rows + y;
+            if(r->ptr == 0)
+            {
+                r->ptr = new int8u [m_width * PixWidth];
+                memset(r->ptr, 0, m_width * PixWidth);
+            }
+            return r->ptr;
+        }
+
+        // Get const pointer to the row. The caller must check it for null.
+        //--------------------------------------------------------------------
+        const int8u* row(int y) const
+        {
+            return m_rows[y].ptr;
+        }
+
+        // Get the Y-th span. The pointer r.ptr is automatically adjusted
+        // to the actual beginning of the span. Use this function as follows:
+        //
+        // rendering_buffer_dynarow::row_data r = rbuf.span(x, y);
+        // if(r.ptr)
+        // {
+        //    do { blend(r.ptr); r.ptr += PixWidth } while(++r.x1 < r.x2);
+        // }
+        //--------------------------------------------------------------------
+        row_data span(int x, int y) const
+        {
+            row_data r = m_rows[y];
+            if(r.ptr)
+            {
+                if(x < r.x1) x = r.x1;
+                r.ptr += x * PixWidth;
+            }
+            return r;
+        }
+
+
+        // The main function used for rendering. Returns pointer to the
+        // pre-allocated span. Memory for the row is allocated as needed.
+        //--------------------------------------------------------------------
+        int8u* span_ptr(int x, int y, unsigned len)
+        {
+            row_data* r = m_rows + y;
+            int x2 = x + len - 1;
+            if(r->ptr)
+            {
+                if(x  < r->x1) { r->x1 = x;  }
+                if(x2 > r->x2) { r->x2 = x2; }
+            }
+            else
+            {
+                r->ptr = new int8u [m_width * PixWidth];
+                r->x1 = x;
+                r->x2 = x2;
+                memset(r->ptr, 0, m_width * PixWidth);
+            }
+            return r->ptr + x * PixWidth;
+        }
+
+        // Get const pointer to the span. Used mostly in GetPixel function
+        // The caller must check the returned pointer for null.
+        //--------------------------------------------------------------------
+        const int8u* span_ptr(int x, int y, unsigned) const
+        {
+            row_data* r = m_rows + y;
+            return r->ptr ? r->ptr + x * PixWidth : 0;
+        }
+
+
+
+    private:
+        //--------------------------------------------------------------------
+        // Prohibit copying
+        rendering_buffer_dynarow(const rendering_buffer_dynarow<PixWidth>&);
+        const rendering_buffer_dynarow<PixWidth>&
+            operator = (const rendering_buffer_dynarow<PixWidth>&);
+
+    private:
+        //--------------------------------------------------------------------
+        row_data* m_rows;       // Pointers to each row of the buffer
+        unsigned  m_width;      // Width in pixels
+        unsigned  m_height;     // Height in pixels
+    };
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_rounded_rect.h b/agg/inc/agg_rounded_rect.h
new file mode 100755
index 000000000000..d4185dafa5b3
--- /dev/null
+++ b/agg/inc/agg_rounded_rect.h
@@ -0,0 +1,79 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Rounded rectangle vertex generator
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_ROUNDED_RECT_INCLUDED
+#define AGG_ROUNDED_RECT_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_arc.h"
+#include "agg_vertex_iterator.h"
+
+
+namespace agg
+{
+    //------------------------------------------------------------rounded_rect
+    //
+    // See Implemantation agg_rounded_rect.cpp
+    //
+    class rounded_rect
+    {
+    public:
+        rounded_rect() {}
+        rounded_rect(double x1, double y1, double x2, double y2, double r);
+
+        void rect(double x1, double y1, double x2, double y2);
+        void radius(double r);
+        void radius(double rx, double ry);
+        void radius(double rx_bottom, double ry_bottom, double rx_top, double ry_top);
+        void radius(double rx1, double ry1, double rx2, double ry2,
+                    double rx3, double ry3, double rx4, double ry4);
+        void normalize_radius();
+
+        void approximation_scale(double s) { m_arc.approximation_scale(s); }
+        double approximation_scale() const { return m_arc.approximation_scale(); }
+
+        void rewind(unsigned);
+        unsigned vertex(double* x, double* y);
+
+        typedef rounded_rect source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        double m_x1;
+        double m_y1;
+        double m_x2;
+        double m_y2;
+        double m_rx1;
+        double m_ry1;
+        double m_rx2;
+        double m_ry2;
+        double m_rx3;
+        double m_ry3;
+        double m_rx4;
+        double m_ry4;
+        unsigned m_status;
+        arc      m_arc;
+    };
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_scanline_bin.h b/agg/inc/agg_scanline_bin.h
new file mode 100755
index 000000000000..aa60ed061e07
--- /dev/null
+++ b/agg/inc/agg_scanline_bin.h
@@ -0,0 +1,171 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Class scanline_bin - binary scanline.
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SCANLINE_BIN_INCLUDED
+#define AGG_SCANLINE_BIN_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //=============================================================scanline_bin
+    //
+    // This is binary scaline container which supports the interface
+    // used in the rasterizer::render(). See description of agg_scanline_u8
+    // for details.
+    //
+    // Rendering:
+    //-------------------------------------------------------------------------
+    //
+    //  int y = sl.y();
+    //
+    // ************************************
+    // ...Perform vertical clipping here...
+    // ************************************
+    //
+    //  unsigned num_spans = sl.num_spans();
+    //  const agg::scanline_bin::span* cur_span = sl.spans();
+    //
+    //  do
+    //  {
+    //      x = cur_span->x;
+    //      len = cur_span->len;
+    //
+    //      **************************************
+    //      ...Perform horizontal clipping here...
+    //      **************************************
+    //
+    //      hor_line(x, y, len)
+    //      ++cur_span;
+    //  }
+    //  while(--num_spans);
+    //
+    //------------------------------------------------------------------------
+    class scanline_bin
+    {
+    public:
+        struct span
+        {
+            int16 x;
+            int16 len;
+        };
+
+        typedef const span* const_iterator;
+
+        ~scanline_bin()
+        {
+            delete [] m_spans;
+        }
+
+        scanline_bin() :
+            m_max_len(0),
+            m_last_x(0x7FFF),
+            m_spans(0),
+            m_cur_span(0)
+        {
+        }
+
+        void reset(int min_x, int max_x);
+        void add_cell(int x, unsigned);
+        void add_cells(int x, unsigned len, const void*);
+        void add_span(int x, unsigned len, unsigned);
+        void finalize(int y) { m_y = y; }
+        void reset_spans();
+
+        int            y()         const { return m_y; }
+        unsigned       num_spans() const { return unsigned(m_cur_span - m_spans); }
+        const_iterator begin()     const { return m_spans + 1; }
+
+    private:
+        scanline_bin(const scanline_bin&);
+        const scanline_bin operator = (const scanline_bin&);
+
+        unsigned  m_max_len;
+        int       m_last_x;
+        int       m_y;
+        span*     m_spans;
+        span*     m_cur_span;
+    };
+
+
+    //------------------------------------------------------------------------
+    inline void scanline_bin::reset(int min_x, int max_x)
+    {
+        unsigned max_len = max_x - min_x + 3;
+        if(max_len > m_max_len)
+        {
+            delete [] m_spans;
+            m_spans   = new span [max_len];
+            m_max_len = max_len;
+        }
+        m_last_x    = 0x7FFF;
+        m_cur_span  = m_spans;
+    }
+
+
+    //------------------------------------------------------------------------
+    inline void scanline_bin::reset_spans()
+    {
+        m_last_x    = 0x7FFF;
+        m_cur_span  = m_spans;
+    }
+
+
+    //------------------------------------------------------------------------
+    inline void scanline_bin::add_cell(int x, unsigned)
+    {
+        if(x == m_last_x+1)
+        {
+            m_cur_span->len++;
+        }
+        else
+        {
+            ++m_cur_span;
+            m_cur_span->x = (int16)x;
+            m_cur_span->len = 1;
+        }
+        m_last_x = x;
+    }
+
+
+    //------------------------------------------------------------------------
+    inline void scanline_bin::add_span(int x, unsigned len, unsigned)
+    {
+        if(x == m_last_x+1)
+        {
+            m_cur_span->len = (int16)(m_cur_span->len + len);
+        }
+        else
+        {
+            ++m_cur_span;
+            m_cur_span->x = (int16)x;
+            m_cur_span->len = (int16)len;
+        }
+        m_last_x = x + len - 1;
+    }
+
+    //------------------------------------------------------------------------
+    inline void scanline_bin::add_cells(int x, unsigned len, const void*)
+    {
+        add_span(x, len, 0);
+    }
+}
+
+
+#endif
diff --git a/agg/inc/agg_scanline_boolean_algebra.h b/agg/inc/agg_scanline_boolean_algebra.h
new file mode 100755
index 000000000000..7f1a3c5ba774
--- /dev/null
+++ b/agg/inc/agg_scanline_boolean_algebra.h
@@ -0,0 +1,1559 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SCANLINE_BOOLEAN_ALGEBRA_INCLUDED
+#define AGG_SCANLINE_BOOLEAN_ALGEBRA_INCLUDED
+
+#include <stdlib.h>
+#include <math.h>
+#include "agg_basics.h"
+
+
+namespace agg
+{
+
+    //-----------------------------------------------sbool_combine_spans_bin
+    // Functor.
+    // Combine two binary encoded spans, i.e., when we don't have any
+    // anti-aliasing information, but only X and Length. The function
+    // is compatible with any type of scanlines.
+    //----------------
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline>
+    struct sbool_combine_spans_bin
+    {
+        void operator () (const typename Scanline1::const_iterator&,
+                          const typename Scanline2::const_iterator&,
+                          int x, unsigned len,
+                          Scanline& sl) const
+        {
+            sl.add_span(x, len, cover_full);
+        }
+    };
+
+
+
+    //---------------------------------------------sbool_combine_spans_empty
+    // Functor.
+    // Combine two spans as empty ones. The functor does nothing
+    // and is used to XOR binary spans.
+    //----------------
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline>
+    struct sbool_combine_spans_empty
+    {
+        void operator () (const typename Scanline1::const_iterator&,
+                          const typename Scanline2::const_iterator&,
+                          int, unsigned,
+                          Scanline&) const
+        {}
+    };
+
+
+
+    //--------------------------------------------------sbool_add_span_empty
+    // Functor.
+    // Add nothing. Used in conbine_shapes_sub
+    //----------------
+    template<class Scanline1,
+             class Scanline>
+    struct sbool_add_span_empty
+    {
+        void operator () (const typename Scanline1::const_iterator&,
+                          int, unsigned,
+                          Scanline&) const
+        {}
+    };
+
+
+    //----------------------------------------------------sbool_add_span_bin
+    // Functor.
+    // Add a binary span
+    //----------------
+    template<class Scanline1,
+             class Scanline>
+    struct sbool_add_span_bin
+    {
+        void operator () (const typename Scanline1::const_iterator&,
+                          int x, unsigned len,
+                          Scanline& sl) const
+        {
+            sl.add_span(x, len, cover_full);
+        }
+    };
+
+
+
+
+    //-----------------------------------------------------sbool_add_span_aa
+    // Functor.
+    // Add an anti-aliased span
+    // anti-aliasing information, but only X and Length. The function
+    // is compatible with any type of scanlines.
+    //----------------
+    template<class Scanline1,
+             class Scanline>
+    struct sbool_add_span_aa
+    {
+        void operator () (const typename Scanline1::const_iterator& span,
+                          int x, unsigned len,
+                          Scanline& sl) const
+        {
+            if(span->len < 0)
+            {
+                sl.add_span(x, len, *span->covers);
+            }
+            else
+            if(span->len > 0)
+            {
+                const typename Scanline1::cover_type* covers = span->covers;
+                if(span->x < x) covers += x - span->x;
+                sl.add_cells(x, len, covers);
+            }
+        }
+    };
+
+
+
+
+    //----------------------------------------------sbool_intersect_spans_aa
+    // Functor.
+    // Intersect two spans preserving the anti-aliasing information.
+    // The result is added to the "sl" scanline.
+    //------------------
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline,
+             unsigned CoverShift = cover_shift>
+    struct sbool_intersect_spans_aa
+    {
+        enum
+        {
+            cover_shift = CoverShift,
+            cover_size  = 1 << cover_shift,
+            cover_mask  = cover_size - 1,
+            cover_full  = cover_mask
+        };
+
+
+        void operator () (const typename Scanline1::const_iterator& span1,
+                          const typename Scanline2::const_iterator& span2,
+                          int x, unsigned len,
+                          Scanline& sl) const
+        {
+            unsigned cover;
+            const typename Scanline1::cover_type* covers1;
+            const typename Scanline2::cover_type* covers2;
+
+            // Calculate the operation code and choose the
+            // proper combination algorithm.
+            // 0 = Both spans are of AA type
+            // 1 = span1 is solid, span2 is AA
+            // 2 = span1 is AA, span2 is solid
+            // 3 = Both spans are of solid type
+            //-----------------
+            switch((span1->len < 0) | ((span2->len < 0) << 1))
+            {
+            case 0:      // Both are AA spans
+                covers1 = span1->covers;
+                covers2 = span2->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                if(span2->x < x) covers2 += x - span2->x;
+                do
+                {
+                    cover = *covers1++ * *covers2++;
+                    sl.add_cell(x++,
+                                (cover == cover_full * cover_full) ?
+                                cover_full :
+                                (cover >> cover_shift));
+                }
+                while(--len);
+                break;
+
+            case 1:      // span1 is solid, span2 is AA
+                covers2 = span2->covers;
+                if(span2->x < x) covers2 += x - span2->x;
+                if(*(span1->covers) == cover_full)
+                {
+                    sl.add_cells(x, len, covers2);
+                }
+                else
+                {
+                    do
+                    {
+                        cover = *(span1->covers) * *covers2++;
+                        sl.add_cell(x++,
+                                    (cover == cover_full * cover_full) ?
+                                    cover_full :
+                                    (cover >> cover_shift));
+                    }
+                    while(--len);
+                }
+                break;
+
+            case 2:      // span1 is AA, span2 is solid
+                covers1 = span1->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                if(*(span2->covers) == cover_full)
+                {
+                    sl.add_cells(x, len, covers1);
+                }
+                else
+                {
+                    do
+                    {
+                        cover = *covers1++ * *(span2->covers);
+                        sl.add_cell(x++,
+                                    (cover == cover_full * cover_full) ?
+                                    cover_full :
+                                    (cover >> cover_shift));
+                    }
+                    while(--len);
+                }
+                break;
+
+            case 3:      // Both are solid spans
+                cover = *(span1->covers) * *(span2->covers);
+                sl.add_span(x, len,
+                            (cover == cover_full * cover_full) ?
+                            cover_full :
+                            (cover >> cover_shift));
+                break;
+            }
+        }
+    };
+
+
+
+
+
+
+    //--------------------------------------------------sbool_unite_spans_aa
+    // Functor.
+    // Unite two spans preserving the anti-aliasing information.
+    // The result is added to the "sl" scanline.
+    //------------------
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline,
+             unsigned CoverShift = cover_shift>
+    struct sbool_unite_spans_aa
+    {
+        enum
+        {
+            cover_shift = CoverShift,
+            cover_size  = 1 << cover_shift,
+            cover_mask  = cover_size - 1,
+            cover_full  = cover_mask
+        };
+
+
+        void operator () (const typename Scanline1::const_iterator& span1,
+                          const typename Scanline2::const_iterator& span2,
+                          int x, unsigned len,
+                          Scanline& sl) const
+        {
+            unsigned cover;
+            const typename Scanline1::cover_type* covers1;
+            const typename Scanline2::cover_type* covers2;
+
+            // Calculate the operation code and choose the
+            // proper combination algorithm.
+            // 0 = Both spans are of AA type
+            // 1 = span1 is solid, span2 is AA
+            // 2 = span1 is AA, span2 is solid
+            // 3 = Both spans are of solid type
+            //-----------------
+            switch((span1->len < 0) | ((span2->len < 0) << 1))
+            {
+            case 0:      // Both are AA spans
+                covers1 = span1->covers;
+                covers2 = span2->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                if(span2->x < x) covers2 += x - span2->x;
+                do
+                {
+                    cover = cover_mask * cover_mask -
+                                (cover_mask - *covers1++) *
+                                (cover_mask - *covers2++);
+                    sl.add_cell(x++,
+                                (cover == cover_full * cover_full) ?
+                                cover_full :
+                                (cover >> cover_shift));
+                }
+                while(--len);
+                break;
+
+            case 1:      // span1 is solid, span2 is AA
+                covers2 = span2->covers;
+                if(span2->x < x) covers2 += x - span2->x;
+                if(*(span1->covers) == cover_full)
+                {
+                    sl.add_span(x, len, cover_full);
+                }
+                else
+                {
+                    do
+                    {
+                        cover = cover_mask * cover_mask -
+                                    (cover_mask - *(span1->covers)) *
+                                    (cover_mask - *covers2++);
+                        sl.add_cell(x++,
+                                    (cover == cover_full * cover_full) ?
+                                    cover_full :
+                                    (cover >> cover_shift));
+                    }
+                    while(--len);
+                }
+                break;
+
+            case 2:      // span1 is AA, span2 is solid
+                covers1 = span1->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                if(*(span2->covers) == cover_full)
+                {
+                    sl.add_span(x, len, cover_full);
+                }
+                else
+                {
+                    do
+                    {
+                        cover = cover_mask * cover_mask -
+                                    (cover_mask - *covers1++) *
+                                    (cover_mask - *(span2->covers));
+                        sl.add_cell(x++,
+                                    (cover == cover_full * cover_full) ?
+                                    cover_full :
+                                    (cover >> cover_shift));
+                    }
+                    while(--len);
+                }
+                break;
+
+            case 3:      // Both are solid spans
+                cover = cover_mask * cover_mask -
+                            (cover_mask - *(span1->covers)) *
+                            (cover_mask - *(span2->covers));
+                sl.add_span(x, len,
+                            (cover == cover_full * cover_full) ?
+                            cover_full :
+                            (cover >> cover_shift));
+                break;
+            }
+        }
+    };
+
+
+    //---------------------------------------------sbool_xor_formula_linear
+    template<unsigned CoverShift = cover_shift>
+    struct sbool_xor_formula_linear
+    {
+        enum
+        {
+            cover_shift = CoverShift,
+            cover_size  = 1 << cover_shift,
+            cover_mask  = cover_size - 1
+        };
+
+        static AGG_INLINE unsigned calculate(unsigned a, unsigned b)
+        {
+            unsigned cover = a + b;
+            if(cover > cover_mask) cover = cover_mask + cover_mask - cover;
+            return cover;
+        }
+    };
+
+
+    //---------------------------------------------sbool_xor_formula_saddle
+    template<unsigned CoverShift = cover_shift>
+    struct sbool_xor_formula_saddle
+    {
+        enum
+        {
+            cover_shift = CoverShift,
+            cover_size  = 1 << cover_shift,
+            cover_mask  = cover_size - 1
+        };
+
+        static AGG_INLINE unsigned calculate(unsigned a, unsigned b)
+        {
+            unsigned k = a * b;
+            if(k == cover_mask * cover_mask) return 0;
+
+            a = (cover_mask * cover_mask - (a << cover_shift) + k) >> cover_shift;
+            b = (cover_mask * cover_mask - (b << cover_shift) + k) >> cover_shift;
+            return cover_mask - ((a * b) >> cover_shift);
+        }
+    };
+
+
+    //-------------------------------------------sbool_xor_formula_abs_diff
+    struct sbool_xor_formula_abs_diff
+    {
+        static AGG_INLINE unsigned calculate(unsigned a, unsigned b)
+        {
+            return unsigned(abs(int(a) - int(b)));
+        }
+    };
+
+
+
+    //----------------------------------------------------sbool_xor_spans_aa
+    // Functor.
+    // XOR two spans preserving the anti-aliasing information.
+    // The result is added to the "sl" scanline.
+    //------------------
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class XorFormula,
+             unsigned CoverShift = cover_shift>
+    struct sbool_xor_spans_aa
+    {
+        enum
+        {
+            cover_shift = CoverShift,
+            cover_size  = 1 << cover_shift,
+            cover_mask  = cover_size - 1,
+            cover_full  = cover_mask
+        };
+
+
+        void operator () (const typename Scanline1::const_iterator& span1,
+                          const typename Scanline2::const_iterator& span2,
+                          int x, unsigned len,
+                          Scanline& sl) const
+        {
+            unsigned cover;
+            const typename Scanline1::cover_type* covers1;
+            const typename Scanline2::cover_type* covers2;
+
+            // Calculate the operation code and choose the
+            // proper combination algorithm.
+            // 0 = Both spans are of AA type
+            // 1 = span1 is solid, span2 is AA
+            // 2 = span1 is AA, span2 is solid
+            // 3 = Both spans are of solid type
+            //-----------------
+            switch((span1->len < 0) | ((span2->len < 0) << 1))
+            {
+            case 0:      // Both are AA spans
+                covers1 = span1->covers;
+                covers2 = span2->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                if(span2->x < x) covers2 += x - span2->x;
+                do
+                {
+                    cover = XorFormula::calculate(*covers1++, *covers2++);
+                    if(cover) sl.add_cell(x, cover);
+                    ++x;
+                }
+                while(--len);
+                break;
+
+            case 1:      // span1 is solid, span2 is AA
+                covers2 = span2->covers;
+                if(span2->x < x) covers2 += x - span2->x;
+                do
+                {
+                    cover = XorFormula::calculate(*(span1->covers), *covers2++);
+                    if(cover) sl.add_cell(x, cover);
+                    ++x;
+                }
+                while(--len);
+                break;
+
+            case 2:      // span1 is AA, span2 is solid
+                covers1 = span1->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                do
+                {
+                    cover = XorFormula::calculate(*covers1++, *(span2->covers));
+                    if(cover) sl.add_cell(x, cover);
+                    ++x;
+                }
+                while(--len);
+                break;
+
+            case 3:      // Both are solid spans
+                cover = XorFormula::calculate(*(span1->covers), *(span2->covers));
+                if(cover) sl.add_span(x, len, cover);
+                break;
+
+            }
+        }
+    };
+
+
+
+
+
+    //-----------------------------------------------sbool_subtract_spans_aa
+    // Functor.
+    // Unite two spans preserving the anti-aliasing information.
+    // The result is added to the "sl" scanline.
+    //------------------
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline,
+             unsigned CoverShift = cover_shift>
+    struct sbool_subtract_spans_aa
+    {
+        enum
+        {
+            cover_shift = CoverShift,
+            cover_size  = 1 << cover_shift,
+            cover_mask  = cover_size - 1,
+            cover_full  = cover_mask
+        };
+
+
+        void operator () (const typename Scanline1::const_iterator& span1,
+                          const typename Scanline2::const_iterator& span2,
+                          int x, unsigned len,
+                          Scanline& sl) const
+        {
+            unsigned cover;
+            const typename Scanline1::cover_type* covers1;
+            const typename Scanline2::cover_type* covers2;
+
+            // Calculate the operation code and choose the
+            // proper combination algorithm.
+            // 0 = Both spans are of AA type
+            // 1 = span1 is solid, span2 is AA
+            // 2 = span1 is AA, span2 is solid
+            // 3 = Both spans are of solid type
+            //-----------------
+            switch((span1->len < 0) | ((span2->len < 0) << 1))
+            {
+            case 0:      // Both are AA spans
+                covers1 = span1->covers;
+                covers2 = span2->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                if(span2->x < x) covers2 += x - span2->x;
+                do
+                {
+                    cover = *covers1++ * (cover_mask - *covers2++);
+                    if(cover)
+                    {
+                        sl.add_cell(x,
+                                    (cover == cover_full * cover_full) ?
+                                    cover_full :
+                                    (cover >> cover_shift));
+                    }
+                    ++x;
+                }
+                while(--len);
+                break;
+
+            case 1:      // span1 is solid, span2 is AA
+                covers2 = span2->covers;
+                if(span2->x < x) covers2 += x - span2->x;
+                do
+                {
+                    cover = *(span1->covers) * (cover_mask - *covers2++);
+                    if(cover)
+                    {
+                        sl.add_cell(x,
+                                    (cover == cover_full * cover_full) ?
+                                    cover_full :
+                                    (cover >> cover_shift));
+                    }
+                    ++x;
+                }
+                while(--len);
+                break;
+
+            case 2:      // span1 is AA, span2 is solid
+                covers1 = span1->covers;
+                if(span1->x < x) covers1 += x - span1->x;
+                if(*(span2->covers) != cover_full)
+                {
+                    do
+                    {
+                        cover = *covers1++ * (cover_mask - *(span2->covers));
+                        if(cover)
+                        {
+                            sl.add_cell(x,
+                                        (cover == cover_full * cover_full) ?
+                                        cover_full :
+                                        (cover >> cover_shift));
+                        }
+                        ++x;
+                    }
+                    while(--len);
+                }
+                break;
+
+            case 3:      // Both are solid spans
+                cover = *(span1->covers) * (cover_mask - *(span2->covers));
+                if(cover)
+                {
+                    sl.add_span(x, len,
+                                (cover == cover_full * cover_full) ?
+                                cover_full :
+                                (cover >> cover_shift));
+                }
+                break;
+            }
+        }
+    };
+
+
+
+
+
+
+    //--------------------------------------------sbool_add_spans_and_render
+    template<class Scanline1,
+             class Scanline,
+             class Renderer,
+             class AddSpanFunctor>
+    void sbool_add_spans_and_render(const Scanline1& sl1,
+                                    Scanline& sl,
+                                    Renderer& ren,
+                                    AddSpanFunctor add_span)
+    {
+        sl.reset_spans();
+        typename Scanline::const_iterator span = sl1.begin();
+        unsigned num_spans = sl1.num_spans();
+        do
+        {
+            add_span(span, span->x, abs((int)span->len), sl);
+            ++span;
+        }
+        while(--num_spans);
+        sl.finalize(sl1.y());
+        ren.render(sl);
+    }
+
+
+
+
+
+
+
+    //---------------------------------------------sbool_intersect_scanlines
+    // Intersect two scanlines, "sl1" and "sl2" and generate a new "sl" one.
+    // The combine_spans functor can be of type sbool_combine_spans_bin or
+    // sbool_intersect_spans_aa. First is a general functor to combine
+    // two spans without Anti-Aliasing, the second preserves the AA
+    // information, but works slower
+    //
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class CombineSpansFunctor>
+    void sbool_intersect_scanlines(const Scanline1& sl1,
+                                   const Scanline2& sl2,
+                                   Scanline& sl,
+                                   CombineSpansFunctor combine_spans)
+    {
+        sl.reset_spans();
+
+        unsigned num1 = sl1.num_spans();
+        if(num1 == 0) return;
+
+        unsigned num2 = sl2.num_spans();
+        if(num2 == 0) return;
+
+        typename Scanline::const_iterator span1 = sl1.begin();
+        typename Scanline::const_iterator span2 = sl2.begin();
+
+        while(num1 && num2)
+        {
+            int xb1 = span1->x;
+            int xb2 = span2->x;
+            int xe1 = xb1 + abs((int)span1->len) - 1;
+            int xe2 = xb2 + abs((int)span2->len) - 1;
+
+            // Determine what spans we should advance in the next step
+            // The span with the least ending X should be advanced
+            // advance_both is just an optimization when we ending
+            // coordinates are the same and we can advance both
+            //--------------
+            bool advance_span1 = xe1 <  xe2;
+            bool advance_both  = xe1 == xe2;
+
+            // Find the intersection of the spans
+            // and check if they intersect
+            //--------------
+            if(xb1 < xb2) xb1 = xb2;
+            if(xe1 > xe2) xe1 = xe2;
+            if(xb1 <= xe1)
+            {
+                combine_spans(span1, span2, xb1, xe1 - xb1 + 1, sl);
+            }
+
+            // Advance the spans
+            //--------------
+            if(advance_both)
+            {
+                --num1;
+                --num2;
+                ++span1;
+                ++span2;
+            }
+            else
+            {
+                if(advance_span1)
+                {
+                    --num1;
+                    ++span1;
+                }
+                else
+                {
+                    --num2;
+                    ++span2;
+                }
+            }
+        }
+    }
+
+
+
+
+
+
+
+
+    //------------------------------------------------sbool_intersect_shapes
+    // Intersect the scanline shapes. Here the "Scanline Generator"
+    // abstraction is used. ScanlineGen1 and ScanlineGen2 are
+    // the generators, and can be of type rasterizer_scanline_aa<>.
+    // There function requires three scanline containers that can be of
+    // different types.
+    // "sl1" and "sl2" are used to retrieve scanlines from the generators,
+    // "sl" is ised as the resulting scanline to render it.
+    // The external "sl1" and "sl2" are used only for the sake of
+    // optimization and reusing of the scanline objects.
+    // the function calls sbool_intersect_scanlines with CombineSpansFunctor
+    // as the last argument. See sbool_intersect_scanlines for details.
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer,
+             class CombineSpansFunctor>
+    void sbool_intersect_shapes(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                Scanline1& sl1, Scanline2& sl2,
+                                Scanline& sl, Renderer& ren,
+                                CombineSpansFunctor combine_spans)
+    {
+        // Prepare the scanline generators.
+        // If anyone of them doesn't contain
+        // any scanlines, then return.
+        //-----------------
+        if(!sg1.rewind_scanlines()) return;
+        if(!sg2.rewind_scanlines()) return;
+
+        // Get the bounding boxes
+        //----------------
+        rect r1(sg1.min_x(), sg1.min_y(), sg1.max_x(), sg1.max_y());
+        rect r2(sg2.min_x(), sg2.min_y(), sg2.max_x(), sg2.max_y());
+
+        // Calculate the intersection of the bounding
+        // boxes and return if they don't intersect.
+        //-----------------
+        rect ir = intersect_rectangles(r1, r2);
+        if(!ir.is_valid()) return;
+
+        // Reset the scanlines and get two first ones
+        //-----------------
+        sl.reset(ir.x1, ir.x2);
+        sl1.reset(sg1.min_x(), sg1.max_x());
+        sl2.reset(sg2.min_x(), sg2.max_x());
+        if(!sg1.sweep_scanline(sl1)) return;
+        if(!sg2.sweep_scanline(sl2)) return;
+
+        ren.prepare(unsigned(ir.x2 - ir.x1 + 2));
+
+        // The main loop
+        // Here we synchronize the scanlines with
+        // the same Y coordinate, ignoring all other ones.
+        // Only scanlines having the same Y-coordinate
+        // are to be combined.
+        //-----------------
+        for(;;)
+        {
+            while(sl1.y() < sl2.y())
+            {
+                if(!sg1.sweep_scanline(sl1)) return;
+            }
+            while(sl2.y() < sl1.y())
+            {
+                if(!sg2.sweep_scanline(sl2)) return;
+            }
+
+            if(sl1.y() == sl2.y())
+            {
+                // The Y coordinates are the same.
+                // Combine the scanlines, render if they contain any spans,
+                // and advance both generators to the next scanlines
+                //----------------------
+                sbool_intersect_scanlines(sl1, sl2, sl, combine_spans);
+                if(sl.num_spans())
+                {
+                    sl.finalize(sl1.y());
+                    ren.render(sl);
+                }
+                if(!sg1.sweep_scanline(sl1)) return;
+                if(!sg2.sweep_scanline(sl2)) return;
+            }
+        }
+    }
+
+
+
+
+
+
+
+    //-------------------------------------------------sbool_unite_scanlines
+    // Unite two scanlines, "sl1" and "sl2" and generate a new "sl" one.
+    // The combine_spans functor can be of type sbool_combine_spans_bin or
+    // sbool_intersect_spans_aa. First is a general functor to combine
+    // two spans without Anti-Aliasing, the second preserves the AA
+    // information, but works slower
+    //
+    template<class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class AddSpanFunctor1,
+             class AddSpanFunctor2,
+             class CombineSpansFunctor>
+    void sbool_unite_scanlines(const Scanline1& sl1,
+                               const Scanline2& sl2,
+                               Scanline& sl,
+                               AddSpanFunctor1 add_span1,
+                               AddSpanFunctor2 add_span2,
+                               CombineSpansFunctor combine_spans)
+    {
+        sl.reset_spans();
+
+        unsigned num1 = sl1.num_spans();
+        unsigned num2 = sl2.num_spans();
+
+        typename Scanline::const_iterator span1;
+        typename Scanline::const_iterator span2;
+
+        enum { invalid_b = 0xFFFFFFF, invalid_e = invalid_b - 1 };
+
+        // Initialize the spans as invalid
+        //---------------
+        int xb1 = invalid_b;
+        int xb2 = invalid_b;
+        int xe1 = invalid_e;
+        int xe2 = invalid_e;
+
+        // Initialize span1 if there are spans
+        //---------------
+        if(num1)
+        {
+            span1 = sl1.begin();
+            xb1 = span1->x;
+            xe1 = xb1 + abs((int)span1->len) - 1;
+            --num1;
+        }
+
+        // Initialize span2 if there are spans
+        //---------------
+        if(num2)
+        {
+            span2 = sl2.begin();
+            xb2 = span2->x;
+            xe2 = xb2 + abs((int)span2->len) - 1;
+            --num2;
+        }
+
+
+        for(;;)
+        {
+            // Retrieve a new span1 if it's invalid
+            //----------------
+            if(num1 && xb1 > xe1)
+            {
+                --num1;
+                ++span1;
+                xb1 = span1->x;
+                xe1 = xb1 + abs((int)span1->len) - 1;
+            }
+
+            // Retrieve a new span2 if it's invalid
+            //----------------
+            if(num2 && xb2 > xe2)
+            {
+                --num2;
+                ++span2;
+                xb2 = span2->x;
+                xe2 = xb2 + abs((int)span2->len) - 1;
+            }
+
+            if(xb1 > xe1 && xb2 > xe2) break;
+
+            // Calculate the intersection
+            //----------------
+            int xb = xb1;
+            int xe = xe1;
+            if(xb < xb2) xb = xb2;
+            if(xe > xe2) xe = xe2;
+            int len = xe - xb + 1; // The length of the intersection
+            if(len > 0)
+            {
+                // The spans intersect,
+                // add the beginning of the span
+                //----------------
+                if(xb1 < xb2)
+                {
+                    add_span1(span1, xb1, xb2 - xb1, sl);
+                    xb1 = xb2;
+                }
+                else
+                if(xb2 < xb1)
+                {
+                    add_span2(span2, xb2, xb1 - xb2, sl);
+                    xb2 = xb1;
+                }
+
+                // Add the combination part of the spans
+                //----------------
+                combine_spans(span1, span2, xb, len, sl);
+
+
+                // Invalidate the fully processed span or both
+                //----------------
+                if(xe1 < xe2)
+                {
+                    // Invalidate span1 and eat
+                    // the processed part of span2
+                    //--------------
+                    xb1 = invalid_b;
+                    xe1 = invalid_e;
+                    xb2 += len;
+                }
+                else
+                if(xe2 < xe1)
+                {
+                    // Invalidate span2 and eat
+                    // the processed part of span1
+                    //--------------
+                    xb2 = invalid_b;
+                    xe2 = invalid_e;
+                    xb1 += len;
+                }
+                else
+                {
+                    xb1 = invalid_b;  // Invalidate both
+                    xb2 = invalid_b;
+                    xe1 = invalid_e;
+                    xe2 = invalid_e;
+                }
+            }
+            else
+            {
+                // The spans do not intersect
+                //--------------
+                if(xb1 < xb2)
+                {
+                    // Advance span1
+                    //---------------
+                    if(xb1 <= xe1)
+                    {
+                        add_span1(span1, xb1, xe1 - xb1 + 1, sl);
+                    }
+                    xb1 = invalid_b; // Invalidate
+                    xe1 = invalid_e;
+                }
+                else
+                {
+                    // Advance span2
+                    //---------------
+                    if(xb2 <= xe2)
+                    {
+                        add_span2(span2, xb2, xe2 - xb2 + 1, sl);
+                    }
+                    xb2 = invalid_b; // Invalidate
+                    xe2 = invalid_e;
+                }
+            }
+        }
+    }
+
+
+
+
+    //----------------------------------------------------sbool_unite_shapes
+    // Unite the scanline shapes. Here the "Scanline Generator"
+    // abstraction is used. ScanlineGen1 and ScanlineGen2 are
+    // the generators, and can be of type rasterizer_scanline_aa<>.
+    // There function requires three scanline containers that can be
+    // of different type.
+    // "sl1" and "sl2" are used to retrieve scanlines from the generators,
+    // "sl" is ised as the resulting scanline to render it.
+    // The external "sl1" and "sl2" are used only for the sake of
+    // optimization and reusing of the scanline objects.
+    // the function calls sbool_unite_scanlines with CombineSpansFunctor
+    // as the last argument. See sbool_unite_scanlines for details.
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer,
+             class AddSpanFunctor1,
+             class AddSpanFunctor2,
+             class CombineSpansFunctor>
+    void sbool_unite_shapes(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                            Scanline1& sl1, Scanline2& sl2,
+                            Scanline& sl, Renderer& ren,
+                            AddSpanFunctor1 add_span1,
+                            AddSpanFunctor2 add_span2,
+                            CombineSpansFunctor combine_spans)
+    {
+        // Prepare the scanline generators.
+        // If anyone of them doesn't contain
+        // any scanlines, then return.
+        //-----------------
+        bool flag1 = sg1.rewind_scanlines();
+        bool flag2 = sg2.rewind_scanlines();
+        if(!flag1 && !flag2) return;
+
+        // Get the bounding boxes
+        //----------------
+        rect r1(sg1.min_x(), sg1.min_y(), sg1.max_x(), sg1.max_y());
+        rect r2(sg2.min_x(), sg2.min_y(), sg2.max_x(), sg2.max_y());
+
+        // Calculate the union of the bounding boxes
+        //-----------------
+        rect ur = unite_rectangles(r1, r2);
+        if(!ur.is_valid()) return;
+
+        ren.prepare(unsigned(ur.x2 - ur.x2 + 2));
+
+        // Reset the scanlines and get two first ones
+        //-----------------
+        sl.reset(ur.x1, ur.x2);
+        if(flag1)
+        {
+            sl1.reset(sg1.min_x(), sg1.max_x());
+            flag1 = sg1.sweep_scanline(sl1);
+        }
+
+        if(flag2)
+        {
+            sl2.reset(sg2.min_x(), sg2.max_x());
+            flag2 = sg2.sweep_scanline(sl2);
+        }
+
+        // The main loop
+        // Here we synchronize the scanlines with
+        // the same Y coordinate.
+        //-----------------
+        while(flag1 || flag2)
+        {
+            if(flag1 && flag2)
+            {
+                if(sl1.y() == sl2.y())
+                {
+                    // The Y coordinates are the same.
+                    // Combine the scanlines, render if they contain any spans,
+                    // and advance both generators to the next scanlines
+                    //----------------------
+                    sbool_unite_scanlines(sl1, sl2, sl,
+                                          add_span1, add_span2, combine_spans);
+                    if(sl.num_spans())
+                    {
+                        sl.finalize(sl1.y());
+                        ren.render(sl);
+                    }
+                    flag1 = sg1.sweep_scanline(sl1);
+                    flag2 = sg2.sweep_scanline(sl2);
+                }
+                else
+                {
+                    if(sl1.y() < sl2.y())
+                    {
+                        sbool_add_spans_and_render(sl1, sl, ren, add_span1);
+                        flag1 = sg1.sweep_scanline(sl1);
+                    }
+                    else
+                    {
+                        sbool_add_spans_and_render(sl2, sl, ren, add_span2);
+                        flag2 = sg2.sweep_scanline(sl2);
+                    }
+                }
+            }
+            else
+            {
+                if(flag1)
+                {
+                    sbool_add_spans_and_render(sl1, sl, ren, add_span1);
+                    flag1 = sg1.sweep_scanline(sl1);
+                }
+                if(flag2)
+                {
+                    sbool_add_spans_and_render(sl2, sl, ren, add_span2);
+                    flag2 = sg2.sweep_scanline(sl2);
+                }
+            }
+        }
+    }
+
+
+
+
+
+
+
+
+    //-------------------------------------------------sbool_subtract_shapes
+    // Subtract the scanline shapes, "sg1-sg2". Here the "Scanline Generator"
+    // abstraction is used. ScanlineGen1 and ScanlineGen2 are
+    // the generators, and can be of type rasterizer_scanline_aa<>.
+    // There function requires three scanline containers that can be of
+    // different types.
+    // "sl1" and "sl2" are used to retrieve scanlines from the generators,
+    // "sl" is ised as the resulting scanline to render it.
+    // The external "sl1" and "sl2" are used only for the sake of
+    // optimization and reusing of the scanline objects.
+    // the function calls sbool_intersect_scanlines with CombineSpansFunctor
+    // as the last argument. See combine_scanlines_sub for details.
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer,
+             class AddSpanFunctor1,
+             class CombineSpansFunctor>
+    void sbool_subtract_shapes(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                               Scanline1& sl1, Scanline2& sl2,
+                               Scanline& sl, Renderer& ren,
+                               AddSpanFunctor1 add_span1,
+                               CombineSpansFunctor combine_spans)
+    {
+        // Prepare the scanline generators.
+        // Here "sg1" is master, "sg2" is slave.
+        //-----------------
+        if(!sg1.rewind_scanlines()) return;
+        bool flag2 = sg2.rewind_scanlines();
+
+        // Get the bounding box
+        //----------------
+        rect r1(sg1.min_x(), sg1.min_y(), sg1.max_x(), sg1.max_y());
+
+        // Reset the scanlines and get two first ones
+        //-----------------
+        sl.reset(sg1.min_x(), sg1.max_x());
+        sl1.reset(sg1.min_x(), sg1.max_x());
+        sl2.reset(sg2.min_x(), sg2.max_x());
+        if(!sg1.sweep_scanline(sl1)) return;
+
+        if(flag2) flag2 = sg2.sweep_scanline(sl2);
+
+        ren.prepare(unsigned(sg1.max_x() - sg1.min_x() + 2));
+
+        // A fake span2 processor
+        sbool_add_span_empty<Scanline1, Scanline> add_span2;
+
+        // The main loop
+        // Here we synchronize the scanlines with
+        // the same Y coordinate, ignoring all other ones.
+        // Only scanlines having the same Y-coordinate
+        // are to be combined.
+        //-----------------
+        bool flag1 = true;
+        do
+        {
+            // Synchronize "slave" with "master"
+            //-----------------
+            while(flag2 && sl2.y() < sl1.y())
+            {
+                flag2 = sg2.sweep_scanline(sl2);
+            }
+
+
+            if(flag2 && sl2.y() == sl1.y())
+            {
+                // The Y coordinates are the same.
+                // Combine the scanlines and render if they contain any spans.
+                //----------------------
+                sbool_unite_scanlines(sl1, sl2, sl, add_span1, add_span2, combine_spans);
+                if(sl.num_spans())
+                {
+                    sl.finalize(sl1.y());
+                    ren.render(sl);
+                }
+            }
+            else
+            {
+                sbool_add_spans_and_render(sl1, sl, ren, add_span1);
+            }
+
+            // Advance the "master"
+            flag1 = sg1.sweep_scanline(sl1);
+        }
+        while(flag1);
+    }
+
+
+
+
+
+
+
+    //---------------------------------------------sbool_intersect_shapes_aa
+    // Intersect two anti-aliased scanline shapes.
+    // Here the "Scanline Generator" abstraction is used.
+    // ScanlineGen1 and ScanlineGen2 are the generators, and can be of
+    // type rasterizer_scanline_aa<>. There function requires three
+    // scanline containers that can be of different types.
+    // "sl1" and "sl2" are used to retrieve scanlines from the generators,
+    // "sl" is ised as the resulting scanline to render it.
+    // The external "sl1" and "sl2" are used only for the sake of
+    // optimization and reusing of the scanline objects.
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_intersect_shapes_aa(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                   Scanline1& sl1, Scanline2& sl2,
+                                   Scanline& sl, Renderer& ren)
+    {
+        sbool_intersect_spans_aa<Scanline1, Scanline2, Scanline> combine_functor;
+        sbool_intersect_shapes(sg1, sg2, sl1, sl2, sl, ren, combine_functor);
+    }
+
+
+
+
+
+    //--------------------------------------------sbool_intersect_shapes_bin
+    // Intersect two binary scanline shapes (without anti-aliasing).
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_intersect_shapes_bin(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                    Scanline1& sl1, Scanline2& sl2,
+                                    Scanline& sl, Renderer& ren)
+    {
+        sbool_combine_spans_bin<Scanline1, Scanline2, Scanline> combine_functor;
+        sbool_intersect_shapes(sg1, sg2, sl1, sl2, sl, ren, combine_functor);
+    }
+
+
+
+
+
+    //-------------------------------------------------sbool_unite_shapes_aa
+    // Unite two anti-aliased scanline shapes
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_unite_shapes_aa(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                               Scanline1& sl1, Scanline2& sl2,
+                               Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_aa<Scanline1, Scanline> add_functor1;
+        sbool_add_span_aa<Scanline2, Scanline> add_functor2;
+        sbool_unite_spans_aa<Scanline1, Scanline2, Scanline> combine_functor;
+        sbool_unite_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                           add_functor1, add_functor2, combine_functor);
+    }
+
+
+
+
+
+    //------------------------------------------------sbool_unite_shapes_bin
+    // Unite two binary scanline shapes (without anti-aliasing).
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_unite_shapes_bin(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                Scanline1& sl1, Scanline2& sl2,
+                                Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_bin<Scanline1, Scanline> add_functor1;
+        sbool_add_span_bin<Scanline2, Scanline> add_functor2;
+        sbool_combine_spans_bin<Scanline1, Scanline2, Scanline> combine_functor;
+        sbool_unite_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                           add_functor1, add_functor2, combine_functor);
+    }
+
+
+
+
+
+
+
+
+
+    //---------------------------------------------------sbool_xor_shapes_aa
+    // Apply eXclusive OR to two anti-aliased scanline shapes. There's
+    // a modified "Linear" XOR used instead of classical "Saddle" one.
+    // The reason is to have the result absolutely conststent with what
+    // the scanline rasterizer produces.
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_xor_shapes_aa(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                             Scanline1& sl1, Scanline2& sl2,
+                             Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_aa<Scanline1, Scanline> add_functor1;
+        sbool_add_span_aa<Scanline2, Scanline> add_functor2;
+        sbool_xor_spans_aa<Scanline1, Scanline2, Scanline,
+                           sbool_xor_formula_linear<> > combine_functor;
+        sbool_unite_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                           add_functor1, add_functor2, combine_functor);
+    }
+
+
+
+    //------------------------------------------sbool_xor_shapes_saddle_aa
+    // Apply eXclusive OR to two anti-aliased scanline shapes.
+    // There's the classical "Saddle" used to calculate the
+    // Anti-Aliasing values, that is:
+    // a XOR b : 1-((1-a+a*b)*(1-b+a*b))
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_xor_shapes_saddle_aa(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                    Scanline1& sl1, Scanline2& sl2,
+                                    Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_aa<Scanline1, Scanline> add_functor1;
+        sbool_add_span_aa<Scanline2, Scanline> add_functor2;
+        sbool_xor_spans_aa<Scanline1,
+                           Scanline2,
+                           Scanline,
+                           sbool_xor_formula_saddle<> > combine_functor;
+        sbool_unite_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                           add_functor1, add_functor2, combine_functor);
+    }
+
+
+    //--------------------------------------sbool_xor_shapes_abs_diff_aa
+    // Apply eXclusive OR to two anti-aliased scanline shapes.
+    // There's the absolute difference used to calculate
+    // Anti-Aliasing values, that is:
+    // a XOR b : abs(a-b)
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_xor_shapes_abs_diff_aa(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                      Scanline1& sl1, Scanline2& sl2,
+                                      Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_aa<Scanline1, Scanline> add_functor1;
+        sbool_add_span_aa<Scanline2, Scanline> add_functor2;
+        sbool_xor_spans_aa<Scanline1,
+                           Scanline2,
+                           Scanline,
+                           sbool_xor_formula_abs_diff> combine_functor;
+        sbool_unite_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                           add_functor1, add_functor2, combine_functor);
+    }
+
+
+
+    //--------------------------------------------------sbool_xor_shapes_bin
+    // Apply eXclusive OR to two binary scanline shapes (without anti-aliasing).
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_xor_shapes_bin(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                              Scanline1& sl1, Scanline2& sl2,
+                              Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_bin<Scanline1, Scanline> add_functor1;
+        sbool_add_span_bin<Scanline2, Scanline> add_functor2;
+        sbool_combine_spans_empty<Scanline1, Scanline2, Scanline> combine_functor;
+        sbool_unite_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                           add_functor1, add_functor2, combine_functor);
+    }
+
+
+
+
+
+
+    //----------------------------------------------sbool_subtract_shapes_aa
+    // Subtract shapes "sg1-sg2" with anti-aliasing
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_subtract_shapes_aa(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                  Scanline1& sl1, Scanline2& sl2,
+                                  Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_aa<Scanline1, Scanline> add_functor;
+        sbool_subtract_spans_aa<Scanline1, Scanline2, Scanline> combine_functor;
+        sbool_subtract_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                              add_functor, combine_functor);
+    }
+
+
+
+
+
+    //---------------------------------------------sbool_subtract_shapes_bin
+    // Subtract binary shapes "sg1-sg2" without anti-aliasing
+    // See intersect_shapes_aa for more comments
+    //----------
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_subtract_shapes_bin(ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                   Scanline1& sl1, Scanline2& sl2,
+                                   Scanline& sl, Renderer& ren)
+    {
+        sbool_add_span_bin<Scanline1, Scanline> add_functor;
+        sbool_combine_spans_empty<Scanline1, Scanline2, Scanline> combine_functor;
+        sbool_subtract_shapes(sg1, sg2, sl1, sl2, sl, ren,
+                              add_functor, combine_functor);
+    }
+
+
+
+
+
+
+    //------------------------------------------------------------sbool_op_e
+    enum sbool_op_e
+    {
+        sbool_or,            //----sbool_or
+        sbool_and,           //----sbool_and
+        sbool_xor,           //----sbool_xor
+        sbool_xor_saddle,    //----sbool_xor_saddle
+        sbool_xor_abs_diff,  //----sbool_xor_abs_diff
+        sbool_a_minus_b,     //----sbool_a_minus_b
+        sbool_b_minus_a      //----sbool_b_minus_a
+    };
+
+
+
+
+
+
+    //----------------------------------------------sbool_combine_shapes_bin
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_combine_shapes_bin(sbool_op_e op,
+                                  ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                  Scanline1& sl1, Scanline2& sl2,
+                                  Scanline& sl, Renderer& ren)
+    {
+        switch(op)
+        {
+        case sbool_or          : sbool_unite_shapes_bin    (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_and         : sbool_intersect_shapes_bin(sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_xor         :
+        case sbool_xor_saddle  :
+        case sbool_xor_abs_diff: sbool_xor_shapes_bin      (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_a_minus_b   : sbool_subtract_shapes_bin (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_b_minus_a   : sbool_subtract_shapes_bin (sg2, sg1, sl2, sl1, sl, ren); break;
+        }
+    }
+
+
+
+
+    //-----------------------------------------------sbool_combine_shapes_aa
+    template<class ScanlineGen1,
+             class ScanlineGen2,
+             class Scanline1,
+             class Scanline2,
+             class Scanline,
+             class Renderer>
+    void sbool_combine_shapes_aa(sbool_op_e op,
+                                 ScanlineGen1& sg1, ScanlineGen2& sg2,
+                                 Scanline1& sl1, Scanline2& sl2,
+                                 Scanline& sl, Renderer& ren)
+    {
+        switch(op)
+        {
+        case sbool_or          : sbool_unite_shapes_aa       (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_and         : sbool_intersect_shapes_aa   (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_xor         : sbool_xor_shapes_aa         (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_xor_saddle  : sbool_xor_shapes_saddle_aa  (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_xor_abs_diff: sbool_xor_shapes_abs_diff_aa(sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_a_minus_b   : sbool_subtract_shapes_aa    (sg1, sg2, sl1, sl2, sl, ren); break;
+        case sbool_b_minus_a   : sbool_subtract_shapes_aa    (sg2, sg1, sl2, sl1, sl, ren); break;
+        }
+    }
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_scanline_p.h b/agg/inc/agg_scanline_p.h
new file mode 100755
index 000000000000..f217998578a1
--- /dev/null
+++ b/agg/inc/agg_scanline_p.h
@@ -0,0 +1,197 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Class scanline_p - a general purpose scanline container with packed spans.
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SCANLINE_P_INCLUDED
+#define AGG_SCANLINE_P_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //==============================================================scanline_p
+    //
+    // This is a general purpose scaline container which supports the interface
+    // used in the rasterizer::render(). See description of agg_scanline_u
+    // for details.
+    //
+    //------------------------------------------------------------------------
+    template<class T> class scanline_p
+    {
+    public:
+        typedef T cover_type;
+
+        struct span
+        {
+            int16    x;
+            int16    len; // If negative, it's a solid span, covers is valid
+            const T* covers;
+        };
+
+        typedef span* iterator;
+        typedef const span* const_iterator;
+
+        ~scanline_p()
+        {
+            delete [] m_spans;
+            delete [] m_covers;
+        }
+
+        scanline_p() :
+            m_max_len(0),
+            m_last_x(0x7FFFFFF0),
+            m_covers(0),
+            m_cover_ptr(0),
+            m_spans(0),
+            m_cur_span(0)
+        {
+        }
+
+        void reset(int min_x, int max_x);
+        void add_cell(int x, unsigned cover);
+        void add_cells(int x, unsigned len, const T* covers);
+        void add_span(int x, unsigned len, unsigned cover);
+        void finalize(int y_) { m_y = y_; }
+        void reset_spans();
+
+        int            y()         const { return m_y; }
+        unsigned       num_spans() const { return unsigned(m_cur_span - m_spans); }
+        const_iterator begin()     const { return m_spans + 1; }
+
+    private:
+        scanline_p(const scanline_p<T>&);
+        const scanline_p<T>& operator = (const scanline_p<T>&);
+
+        unsigned m_max_len;
+        int      m_last_x;
+        int      m_y;
+        T*       m_covers;
+        T*       m_cover_ptr;
+        span*    m_spans;
+        span*    m_cur_span;
+    };
+
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void scanline_p<T>::reset(int min_x, int max_x)
+    {
+        unsigned max_len = max_x - min_x + 3;
+        if(max_len > m_max_len)
+        {
+            delete [] m_spans;
+            delete [] m_covers;
+            m_covers  = new T [max_len];
+            m_spans   = new span [max_len];
+            m_max_len = max_len;
+        }
+        m_last_x    = 0x7FFFFFF0;
+        m_cover_ptr = m_covers;
+        m_cur_span  = m_spans;
+        m_cur_span->len = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void scanline_p<T>::reset_spans()
+    {
+        m_last_x    = 0x7FFFFFF0;
+        m_cover_ptr = m_covers;
+        m_cur_span  = m_spans;
+        m_cur_span->len = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void scanline_p<T>::add_cell(int x, unsigned cover)
+    {
+        *m_cover_ptr = (T)cover;
+        if(x == m_last_x+1 && m_cur_span->len > 0)
+        {
+            m_cur_span->len++;
+        }
+        else
+        {
+            m_cur_span++;
+            m_cur_span->covers = m_cover_ptr;
+            m_cur_span->x = (int16)x;
+            m_cur_span->len = 1;
+        }
+        m_last_x = x;
+        m_cover_ptr++;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void scanline_p<T>::add_cells(int x, unsigned len, const T* covers)
+    {
+        memcpy(m_cover_ptr, covers, len * sizeof(T));
+        if(x == m_last_x+1 && m_cur_span->len > 0)
+        {
+            m_cur_span->len += (int16)len;
+        }
+        else
+        {
+            m_cur_span++;
+            m_cur_span->covers = m_cover_ptr;
+            m_cur_span->x = (int16)x;
+            m_cur_span->len = (int16)len;
+        }
+        m_cover_ptr += len;
+        m_last_x = x + len - 1;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T>
+    void scanline_p<T>::add_span(int x, unsigned len, unsigned cover)
+    {
+        if(x == m_last_x+1 &&
+           m_cur_span->len < 0 &&
+           cover == *m_cur_span->covers)
+        {
+            m_cur_span->len -= (int16)len;
+        }
+        else
+        {
+            *m_cover_ptr = (T)cover;
+            m_cur_span++;
+            m_cur_span->covers = m_cover_ptr++;
+            m_cur_span->x      = (int16)x;
+            m_cur_span->len    = -((int16)len);
+        }
+        m_last_x = x + len - 1;
+    }
+
+
+    //=============================================================scanline_p8
+    typedef scanline_p<int8u> scanline_p8;
+
+    //============================================================scanline_p16
+    typedef scanline_p<int16u> scanline_p16;
+
+    //============================================================scanline_p32
+    typedef scanline_p<int32u> scanline_p32;
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_scanline_storage_aa.h b/agg/inc/agg_scanline_storage_aa.h
new file mode 100755
index 000000000000..3d8b5b946cf9
--- /dev/null
+++ b/agg/inc/agg_scanline_storage_aa.h
@@ -0,0 +1,796 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SCANLINE_STORAGE_AA_INCLUDED
+#define AGG_SCANLINE_STORAGE_AA_INCLUDED
+
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include "agg_array.h"
+#include "agg_render_scanlines.h"
+
+
+namespace agg
+{
+
+    //----------------------------------------------scanline_cell_storage
+    template<class T> class scanline_cell_storage
+    {
+        struct extra_span
+        {
+            unsigned len;
+            T*       ptr;
+        };
+
+    public:
+        typedef T value_type;
+
+        //---------------------------------------------------------------
+        ~scanline_cell_storage()
+        {
+            remove_all();
+        }
+
+        //---------------------------------------------------------------
+        scanline_cell_storage() :
+            m_cells(128-2),
+            m_extra_storage()
+        {}
+
+
+        // Copying
+        //---------------------------------------------------------------
+        scanline_cell_storage(const scanline_cell_storage<T>& v) :
+            m_cells(v.m_cells),
+            m_extra_storage()
+        {
+            copy_extra_storage(v);
+        }
+
+        //---------------------------------------------------------------
+        const scanline_cell_storage<T>&
+        operator = (const scanline_cell_storage<T>& v)
+        {
+            remove_all();
+            m_cells = v.m_cells;
+            copy_extra_storage(v);
+            return *this;
+        }
+
+        //---------------------------------------------------------------
+        void remove_all()
+        {
+            int i;
+            for(i = m_extra_storage.size()-1; i >= 0; --i)
+            {
+                delete [] m_extra_storage[(unsigned)i].ptr;
+            }
+            m_extra_storage.remove_all();
+            m_cells.remove_all();
+        }
+
+        //---------------------------------------------------------------
+        int add_cells(const T* cells, unsigned num_cells)
+        {
+            int idx = m_cells.allocate_continuous_block(num_cells);
+            if(idx >= 0)
+            {
+                T* ptr = &m_cells[idx];
+                memcpy(ptr, cells, sizeof(T) * num_cells);
+                return idx;
+            }
+            extra_span s;
+            s.len = num_cells;
+            s.ptr = new T [num_cells];
+            memcpy(s.ptr, cells, sizeof(T) * num_cells);
+            m_extra_storage.add(s);
+            return -int(m_extra_storage.size());
+        }
+
+        //---------------------------------------------------------------
+        const T* operator [] (int idx) const
+        {
+            if(idx >= 0)
+            {
+                if((unsigned)idx >= m_cells.size()) return 0;
+                return &m_cells[(unsigned)idx];
+            }
+            unsigned i = unsigned(-idx - 1);
+            if(i >= m_extra_storage.size()) return 0;
+            return m_extra_storage[i].ptr;
+        }
+
+        //---------------------------------------------------------------
+        T* operator [] (int idx)
+        {
+            if(idx >= 0)
+            {
+                if((unsigned)idx >= m_cells.size()) return 0;
+                return &m_cells[(unsigned)idx];
+            }
+            unsigned i = unsigned(-idx - 1);
+            if(i >= m_extra_storage.size()) return 0;
+            return m_extra_storage[i].ptr;
+        }
+
+    private:
+        void copy_extra_storage(const scanline_cell_storage<T>& v)
+        {
+            unsigned i;
+            for(i = 0; i < v.m_extra_storage.size(); ++i)
+            {
+                const extra_span& src = v.m_extra_storage[i];
+                extra_span dst;
+                dst.len = src.len;
+                dst.ptr = new T [dst.len];
+                memcpy(dst.ptr, src.ptr, dst.len * sizeof(T));
+                m_extra_storage.add(dst);
+            }
+        }
+
+        pod_deque<T, 12>         m_cells;
+        pod_deque<extra_span, 6> m_extra_storage;
+    };
+
+
+
+
+
+
+    //-----------------------------------------------scanline_storage_aa
+    template<class T> class scanline_storage_aa
+    {
+    public:
+        typedef T cover_type;
+
+        //---------------------------------------------------------------
+        struct span_data
+        {
+            int16 x;
+            int16 len;       // If negative, it's a solid span, covers is valid
+            int   covers_id; // The index of the cells in the scanline_cell_storage
+        };
+
+        //---------------------------------------------------------------
+        struct scanline_data
+        {
+            int      y;
+            unsigned num_spans;
+            unsigned start_span;
+        };
+
+
+        //---------------------------------------------------------------
+        class embedded_scanline
+        {
+        public:
+
+            //-----------------------------------------------------------
+            class const_iterator
+            {
+            public:
+                struct span
+                {
+                    int16    x;
+                    int16    len; // If negative, it's a solid span, covers is valid
+                    const T* covers;
+                };
+
+                const_iterator(const embedded_scanline& sl) :
+                    m_storage(sl.m_storage),
+                    m_span_idx(sl.m_scanline.start_span)
+                {
+                    init_span();
+                }
+
+                const span& operator*()  const { return m_span;  }
+                const span* operator->() const { return &m_span; }
+
+                void operator ++ ()
+                {
+                    ++m_span_idx;
+                    init_span();
+                }
+
+            private:
+                void init_span()
+                {
+                    const span_data& s = m_storage->span_by_index(m_span_idx);
+                    m_span.x      = s.x;
+                    m_span.len    = s.len;
+                    m_span.covers = m_storage->covers_by_index(s.covers_id);
+                }
+
+                const scanline_storage_aa* m_storage;
+                unsigned                   m_span_idx;
+                span                       m_span;
+            };
+
+            friend class const_iterator;
+
+
+            //-----------------------------------------------------------
+            embedded_scanline(const scanline_storage_aa& storage) :
+                m_storage(&storage)
+            {
+                init(0);
+            }
+
+            //-----------------------------------------------------------
+            void     reset(int, int)     {}
+            unsigned num_spans()   const { return m_scanline.num_spans;  }
+            int      y()           const { return m_scanline.y;          }
+            const_iterator begin() const { return const_iterator(*this); }
+
+            //-----------------------------------------------------------
+            void init(unsigned scanline_idx)
+            {
+                m_scanline_idx = scanline_idx;
+                m_scanline = m_storage->scanline_by_index(m_scanline_idx);
+            }
+
+        private:
+            const scanline_storage_aa* m_storage;
+            scanline_data              m_scanline;
+            unsigned                   m_scanline_idx;
+        };
+
+
+        //---------------------------------------------------------------
+        scanline_storage_aa() :
+            m_covers(),
+            m_spans(256-2),         // Block increment size
+            m_scanlines(),
+            m_min_x( 0x7FFFFFFF),
+            m_min_y( 0x7FFFFFFF),
+            m_max_x(-0x7FFFFFFF),
+            m_max_y(-0x7FFFFFFF),
+            m_cur_scanline(0)
+        {
+            m_fake_scanline.y = 0;
+            m_fake_scanline.num_spans = 0;
+            m_fake_scanline.start_span = 0;
+            m_fake_span.x = 0;
+            m_fake_span.len = 0;
+            m_fake_span.covers_id = 0;
+        }
+
+        // Renderer Interface
+        //---------------------------------------------------------------
+        void prepare(unsigned)
+        {
+            m_covers.remove_all();
+            m_scanlines.remove_all();
+            m_spans.remove_all();
+            m_min_x =  0x7FFFFFFF;
+            m_min_y =  0x7FFFFFFF;
+            m_max_x = -0x7FFFFFFF;
+            m_max_y = -0x7FFFFFFF;
+            m_cur_scanline = 0;
+        }
+
+        //---------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            scanline_data sl_this;
+
+            int y = sl.y();
+            if(y < m_min_y) m_min_y = y;
+            if(y > m_max_y) m_max_y = y;
+
+            sl_this.y = y;
+            sl_this.num_spans = sl.num_spans();
+            sl_this.start_span = m_spans.size();
+            typename Scanline::const_iterator span_iterator = sl.begin();
+
+            unsigned num_spans = sl_this.num_spans;
+            do
+            {
+                span_data sp;
+
+                sp.x         = span_iterator->x;
+                sp.len       = span_iterator->len;
+                int len      = abs(int(sp.len));
+                sp.covers_id =
+                    m_covers.add_cells(span_iterator->covers,
+                                       unsigned(len));
+                m_spans.add(sp);
+                int x1 = sp.x;
+                int x2 = sp.x + len - 1;
+                if(x1 < m_min_x) m_min_x = x1;
+                if(x2 > m_max_x) m_max_x = x2;
+                ++span_iterator;
+            }
+            while(--num_spans);
+            m_scanlines.add(sl_this);
+        }
+
+
+        //---------------------------------------------------------------
+        // Iterate scanlines interface
+        int min_x() const { return m_min_x; }
+        int min_y() const { return m_min_y; }
+        int max_x() const { return m_max_x; }
+        int max_y() const { return m_max_y; }
+
+        //---------------------------------------------------------------
+        bool rewind_scanlines()
+        {
+            m_cur_scanline = 0;
+            return m_scanlines.size() > 0;
+        }
+
+
+        //---------------------------------------------------------------
+        template<class Scanline> bool sweep_scanline(Scanline& sl)
+        {
+            sl.reset_spans();
+            for(;;)
+            {
+                if(m_cur_scanline >= m_scanlines.size()) return false;
+                const scanline_data& sl_this = m_scanlines[m_cur_scanline];
+
+                unsigned num_spans = sl_this.num_spans;
+                unsigned span_idx  = sl_this.start_span;
+                do
+                {
+                    const span_data& sp = m_spans[span_idx++];
+                    const T* covers = covers_by_index(sp.covers_id);
+                    if(sp.len < 0)
+                    {
+                        sl.add_span(sp.x, unsigned(-sp.len), *covers);
+                    }
+                    else
+                    {
+                        sl.add_cells(sp.x, sp.len, covers);
+                    }
+                }
+                while(--num_spans);
+                ++m_cur_scanline;
+                if(sl.num_spans())
+                {
+                    sl.finalize(sl_this.y);
+                    break;
+                }
+            }
+            return true;
+        }
+
+
+        //---------------------------------------------------------------
+        // Specialization for embedded_scanline
+        bool sweep_scanline(embedded_scanline& sl)
+        {
+            do
+            {
+                if(m_cur_scanline >= m_scanlines.size()) return false;
+                sl.init(m_cur_scanline);
+                ++m_cur_scanline;
+            }
+            while(sl.num_spans() == 0);
+            return true;
+        }
+
+        //---------------------------------------------------------------
+        unsigned byte_size() const
+        {
+            unsigned i;
+            unsigned size = sizeof(int16) * 4; // min_x, min_y, max_x, max_y
+
+            for(i = 0; i < m_scanlines.size(); ++i)
+            {
+                size += sizeof(int16) * 3; // scanline size in bytes, Y, num_spans
+
+                const scanline_data& sl_this = m_scanlines[i];
+
+                unsigned num_spans = sl_this.num_spans;
+                unsigned span_idx  = sl_this.start_span;
+                do
+                {
+                    const span_data& sp = m_spans[span_idx++];
+
+                    size += sizeof(int16) * 2;                // X, span_len
+                    if(sp.len < 0)
+                    {
+                        size += sizeof(T);                    // cover
+                    }
+                    else
+                    {
+                        size += sizeof(T) * unsigned(sp.len); // covers
+                    }
+                }
+                while(--num_spans);
+            }
+            return size;
+        }
+
+
+        //---------------------------------------------------------------
+        static void write_int16(int8u* dst, int16 val)
+        {
+            dst[0] = ((const int8u*)&val)[0];
+            dst[1] = ((const int8u*)&val)[1];
+        }
+
+
+        //---------------------------------------------------------------
+        void serialize(int8u* data) const
+        {
+            unsigned i;
+
+            write_int16(data, int16u(min_x())); // min_x
+            data += sizeof(int16u);
+            write_int16(data, int16u(min_y())); // min_y
+            data += sizeof(int16u);
+            write_int16(data, int16u(max_x())); // max_x
+            data += sizeof(int16u);
+            write_int16(data, int16u(max_y())); // max_y
+            data += sizeof(int16u);
+
+            for(i = 0; i < m_scanlines.size(); ++i)
+            {
+                const scanline_data& sl_this = m_scanlines[i];
+
+                int8u* size_ptr = data;
+                data += sizeof(int16);  // Reserve space for scanline size in bytes
+
+                write_int16(data, int16(sl_this.y));            // Y
+                data += sizeof(int16);
+
+                write_int16(data, int16(sl_this.num_spans));    // num_spans
+                data += sizeof(int16);
+
+                unsigned num_spans = sl_this.num_spans;
+                unsigned span_idx  = sl_this.start_span;
+                do
+                {
+                    const span_data& sp = m_spans[span_idx++];
+                    const T* covers = covers_by_index(sp.covers_id);
+
+                    write_int16(data, int16(sp.x));            // X
+                    data += sizeof(int16);
+
+                    write_int16(data, int16(sp.len));          // span_len
+                    data += sizeof(int16);
+
+                    if(sp.len < 0)
+                    {
+                        memcpy(data, covers, sizeof(T));
+                        data += sizeof(T);
+                    }
+                    else
+                    {
+                        memcpy(data, covers, unsigned(sp.len) * sizeof(T));
+                        data += sizeof(T) * unsigned(sp.len);
+                    }
+                }
+                while(--num_spans);
+                write_int16(size_ptr, int16(unsigned(data - size_ptr)));
+            }
+        }
+
+
+        //---------------------------------------------------------------
+        const scanline_data& scanline_by_index(unsigned i) const
+        {
+            return (i < m_scanlines.size()) ? m_scanlines[i] : m_fake_scanline;
+        }
+
+        //---------------------------------------------------------------
+        const span_data& span_by_index(unsigned i) const
+        {
+            return (i < m_spans.size()) ? m_spans[i] : m_fake_span;
+        }
+
+        //---------------------------------------------------------------
+        const T* covers_by_index(int i) const
+        {
+            return m_covers[i];
+        }
+
+    private:
+        scanline_cell_storage<T>    m_covers;
+        pod_deque<span_data, 10>    m_spans;
+        pod_deque<scanline_data, 8> m_scanlines;
+        span_data     m_fake_span;
+        scanline_data m_fake_scanline;
+        int           m_min_x;
+        int           m_min_y;
+        int           m_max_x;
+        int           m_max_y;
+        unsigned      m_cur_scanline;
+    };
+
+
+    typedef scanline_storage_aa<int8u>  scanline_storage_aa8;  //--------scanline_storage_aa8
+    typedef scanline_storage_aa<int16u> scanline_storage_aa16; //--------scanline_storage_aa16
+    typedef scanline_storage_aa<int32u> scanline_storage_aa32; //--------scanline_storage_aa32
+
+
+
+
+    //------------------------------------------serialized_scanlines_adaptor_aa
+    template<class T> class serialized_scanlines_adaptor_aa
+    {
+    public:
+        typedef T cover_type;
+
+        //---------------------------------------------------------------------
+        class embedded_scanline
+        {
+        public:
+            typedef T cover_type;
+
+            //-----------------------------------------------------------------
+            class const_iterator
+            {
+            public:
+                struct span
+                {
+                    int16    x;
+                    int16    len; // If negative, it's a solid span, "covers" is valid
+                    const T* covers;
+                };
+
+                const_iterator(const embedded_scanline& sl) :
+                    m_ptr(sl.m_ptr),
+                    m_dx(sl.m_dx)
+                {
+                    init_span();
+                }
+
+                const span& operator*()  const { return m_span;  }
+                const span* operator->() const { return &m_span; }
+
+                void operator ++ ()
+                {
+                    if(m_span.len < 0)
+                    {
+                        m_ptr += sizeof(T);
+                    }
+                    else
+                    {
+                        m_ptr += m_span.len * sizeof(T);
+                    }
+                    init_span();
+                }
+
+            private:
+                int read_int16()
+                {
+                    int16 val;
+                    ((int8u*)&val)[0] = *m_ptr++;
+                    ((int8u*)&val)[1] = *m_ptr++;
+                    return val;
+                }
+
+                void init_span()
+                {
+                    m_span.x      = read_int16() + m_dx;
+                    m_span.len    = read_int16();
+                    m_span.covers = m_ptr;
+                }
+
+                const int8u* m_ptr;
+                span         m_span;
+                int          m_dx;
+            };
+
+            friend class const_iterator;
+
+
+            //-----------------------------------------------------------------
+            embedded_scanline() : m_ptr(0), m_y(0), m_num_spans(0) {}
+
+            //-----------------------------------------------------------------
+            void     reset(int, int)     {}
+            unsigned num_spans()   const { return m_num_spans;  }
+            int      y()           const { return m_y;          }
+            const_iterator begin() const { return const_iterator(*this); }
+
+
+        private:
+            //-----------------------------------------------------------------
+            int read_int16()
+            {
+                int16 val;
+                ((int8u*)&val)[0] = *m_ptr++;
+                ((int8u*)&val)[1] = *m_ptr++;
+                return val;
+            }
+
+        public:
+            //-----------------------------------------------------------------
+            void init(const int8u* ptr, int dx, int dy)
+            {
+                m_ptr       = ptr;
+                m_y         = read_int16() + dy;
+                m_num_spans = unsigned(read_int16());
+                m_dx        = dx;
+            }
+
+        private:
+            const int8u* m_ptr;
+            int          m_y;
+            unsigned     m_num_spans;
+            int          m_dx;
+        };
+
+
+
+    public:
+        //--------------------------------------------------------------------
+        serialized_scanlines_adaptor_aa() :
+            m_data(0),
+            m_end(0),
+            m_ptr(0),
+            m_dx(0),
+            m_dy(0),
+            m_min_x(0x7FFFFFFF),
+            m_min_y(0x7FFFFFFF),
+            m_max_x(-0x7FFFFFFF),
+            m_max_y(-0x7FFFFFFF)
+        {}
+
+        //--------------------------------------------------------------------
+        serialized_scanlines_adaptor_aa(const int8u* data, unsigned size,
+                                        double dx, double dy) :
+            m_data(data),
+            m_end(data + size),
+            m_ptr(data),
+            m_dx(int(floor(dx + 0.5))),
+            m_dy(int(floor(dy + 0.5))),
+            m_min_x(0x7FFFFFFF),
+            m_min_y(0x7FFFFFFF),
+            m_max_x(-0x7FFFFFFF),
+            m_max_y(-0x7FFFFFFF)
+        {}
+
+        //--------------------------------------------------------------------
+        void init(const int8u* data, unsigned size, double dx, double dy)
+        {
+            m_data  = data;
+            m_end   = data + size;
+            m_ptr   = data;
+            m_dx    = int(floor(dx + 0.5));
+            m_dy    = int(floor(dy + 0.5));
+            m_min_x = 0x7FFFFFFF;
+            m_min_y = 0x7FFFFFFF;
+            m_max_x = -0x7FFFFFFF;
+            m_max_y = -0x7FFFFFFF;
+        }
+
+    private:
+        //--------------------------------------------------------------------
+        int read_int16()
+        {
+            int16 val;
+            ((int8u*)&val)[0] = *m_ptr++;
+            ((int8u*)&val)[1] = *m_ptr++;
+            return val;
+        }
+
+        //--------------------------------------------------------------------
+        unsigned read_int16u()
+        {
+            int16u val;
+            ((int8u*)&val)[0] = *m_ptr++;
+            ((int8u*)&val)[1] = *m_ptr++;
+            return val;
+        }
+
+    public:
+        // Iterate scanlines interface
+        //--------------------------------------------------------------------
+        bool rewind_scanlines()
+        {
+            m_ptr = m_data;
+            if(m_ptr < m_end)
+            {
+                m_min_x = read_int16() + m_dx;
+                m_min_y = read_int16() + m_dy;
+                m_max_x = read_int16() + m_dx;
+                m_max_y = read_int16() + m_dy;
+                return true;
+            }
+            return false;
+        }
+
+        //--------------------------------------------------------------------
+        int min_x() const { return m_min_x; }
+        int min_y() const { return m_min_y; }
+        int max_x() const { return m_max_x; }
+        int max_y() const { return m_max_y; }
+
+        //--------------------------------------------------------------------
+        template<class Scanline> bool sweep_scanline(Scanline& sl)
+        {
+            sl.reset_spans();
+            for(;;)
+            {
+                if(m_ptr >= m_end) return false;
+
+                read_int16();      // Skip scanline size in bytes
+                int y = read_int16() + m_dy;
+                unsigned num_spans = read_int16();
+
+                do
+                {
+                    int x = read_int16() + m_dx;
+                    int len = read_int16();
+
+                    if(len < 0)
+                    {
+                        sl.add_span(x, unsigned(-len), *m_ptr);
+                        m_ptr += sizeof(T);
+                    }
+                    else
+                    {
+                        sl.add_cells(x, len, m_ptr);
+                        m_ptr += len * sizeof(T);
+                    }
+                }
+                while(--num_spans);
+
+                if(sl.num_spans())
+                {
+                    sl.finalize(y);
+                    break;
+                }
+            }
+            return true;
+        }
+
+
+        //--------------------------------------------------------------------
+        // Specialization for embedded_scanline
+        bool sweep_scanline(embedded_scanline& sl)
+        {
+            do
+            {
+                if(m_ptr >= m_end) return false;
+
+                unsigned byte_size = read_int16u();
+                sl.init(m_ptr, m_dx, m_dy);
+                m_ptr += byte_size - sizeof(int16);
+            }
+            while(sl.num_spans() == 0);
+            return true;
+        }
+
+    private:
+        const int8u* m_data;
+        const int8u* m_end;
+        const int8u* m_ptr;
+        int          m_dx;
+        int          m_dy;
+        int          m_min_x;
+        int          m_min_y;
+        int          m_max_x;
+        int          m_max_y;
+    };
+
+
+
+    typedef serialized_scanlines_adaptor_aa<int8u>  serialized_scanlines_adaptor_aa8;  //----serialized_scanlines_adaptor_aa8
+    typedef serialized_scanlines_adaptor_aa<int16u> serialized_scanlines_adaptor_aa16; //----serialized_scanlines_adaptor_aa16
+    typedef serialized_scanlines_adaptor_aa<int32u> serialized_scanlines_adaptor_aa32; //----serialized_scanlines_adaptor_aa32
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_scanline_storage_bin.h b/agg/inc/agg_scanline_storage_bin.h
new file mode 100755
index 000000000000..90fa50e4ee6d
--- /dev/null
+++ b/agg/inc/agg_scanline_storage_bin.h
@@ -0,0 +1,569 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SCANLINE_STORAGE_BIN_INCLUDED
+#define AGG_SCANLINE_STORAGE_BIN_INCLUDED
+
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include "agg_array.h"
+#include "agg_render_scanlines.h"
+
+
+namespace agg
+{
+
+    //-----------------------------------------------scanline_storage_bin
+    class scanline_storage_bin
+    {
+    public:
+        //---------------------------------------------------------------
+        struct span_data
+        {
+            int16 x;
+            int16 len;
+        };
+
+        //---------------------------------------------------------------
+        struct scanline_data
+        {
+            int      y;
+            unsigned num_spans;
+            unsigned start_span;
+        };
+
+
+        //---------------------------------------------------------------
+        class embedded_scanline
+        {
+        public:
+
+            //-----------------------------------------------------------
+            class const_iterator
+            {
+            public:
+                const_iterator(const embedded_scanline& sl) :
+                    m_storage(sl.m_storage),
+                    m_span_idx(sl.m_scanline.start_span)
+                {
+                    m_span = m_storage->span_by_index(m_span_idx);
+                }
+
+                const span_data& operator*()  const { return m_span;  }
+                const span_data* operator->() const { return &m_span; }
+
+                void operator ++ ()
+                {
+                    ++m_span_idx;
+                    m_span = m_storage->span_by_index(m_span_idx);
+                }
+
+            private:
+                const scanline_storage_bin* m_storage;
+                unsigned                    m_span_idx;
+                span_data                   m_span;
+            };
+
+            friend class const_iterator;
+
+
+            //-----------------------------------------------------------
+            embedded_scanline(const scanline_storage_bin& storage) :
+                m_storage(&storage)
+            {
+                setup(0);
+            }
+
+            //-----------------------------------------------------------
+            void     reset(int, int)     {}
+            unsigned num_spans()   const { return m_scanline.num_spans;  }
+            int      y()           const { return m_scanline.y;          }
+            const_iterator begin() const { return const_iterator(*this); }
+
+            //-----------------------------------------------------------
+            void setup(unsigned scanline_idx)
+            {
+                m_scanline_idx = scanline_idx;
+                m_scanline = m_storage->scanline_by_index(m_scanline_idx);
+            }
+
+        private:
+            const scanline_storage_bin* m_storage;
+            scanline_data               m_scanline;
+            unsigned                    m_scanline_idx;
+        };
+
+
+        //---------------------------------------------------------------
+        scanline_storage_bin() :
+            m_spans(256-2),         // Block increment size
+            m_scanlines(),
+            m_min_x( 0x7FFFFFFF),
+            m_min_y( 0x7FFFFFFF),
+            m_max_x(-0x7FFFFFFF),
+            m_max_y(-0x7FFFFFFF),
+            m_cur_scanline(0)
+        {
+            m_fake_scanline.y = 0;
+            m_fake_scanline.num_spans = 0;
+            m_fake_scanline.start_span = 0;
+            m_fake_span.x = 0;
+            m_fake_span.len = 0;
+        }
+
+        // Renderer Interface
+        //---------------------------------------------------------------
+        void prepare(unsigned)
+        {
+            m_scanlines.remove_all();
+            m_spans.remove_all();
+            m_min_x =  0x7FFFFFFF;
+            m_min_y =  0x7FFFFFFF;
+            m_max_x = -0x7FFFFFFF;
+            m_max_y = -0x7FFFFFFF;
+            m_cur_scanline = 0;
+        }
+
+        //---------------------------------------------------------------
+        template<class Scanline> void render(const Scanline& sl)
+        {
+            scanline_data sl_this;
+
+            int y = sl.y();
+            if(y < m_min_y) m_min_y = y;
+            if(y > m_max_y) m_max_y = y;
+
+            sl_this.y = y;
+            sl_this.num_spans = sl.num_spans();
+            sl_this.start_span = m_spans.size();
+            typename Scanline::const_iterator span_iterator = sl.begin();
+
+            unsigned num_spans = sl_this.num_spans;
+            do
+            {
+                span_data sp;
+                sp.x   = span_iterator->x;
+                sp.len = (int16)abs((int)(span_iterator->len));
+                m_spans.add(sp);
+                int x1 = sp.x;
+                int x2 = sp.x + sp.len - 1;
+                if(x1 < m_min_x) m_min_x = x1;
+                if(x2 > m_max_x) m_max_x = x2;
+                ++span_iterator;
+            }
+            while(--num_spans);
+            m_scanlines.add(sl_this);
+        }
+
+
+        //---------------------------------------------------------------
+        // Iterate scanlines interface
+        int min_x() const { return m_min_x; }
+        int min_y() const { return m_min_y; }
+        int max_x() const { return m_max_x; }
+        int max_y() const { return m_max_y; }
+
+        //---------------------------------------------------------------
+        bool rewind_scanlines()
+        {
+            m_cur_scanline = 0;
+            return m_scanlines.size() > 0;
+        }
+
+
+        //---------------------------------------------------------------
+        template<class Scanline> bool sweep_scanline(Scanline& sl)
+        {
+            sl.reset_spans();
+            for(;;)
+            {
+                if(m_cur_scanline >= m_scanlines.size()) return false;
+                const scanline_data& sl_this = m_scanlines[m_cur_scanline];
+
+                unsigned num_spans = sl_this.num_spans;
+                unsigned span_idx  = sl_this.start_span;
+                do
+                {
+                    const span_data& sp = m_spans[span_idx++];
+                    sl.add_span(sp.x, sp.len, cover_full);
+                }
+                while(--num_spans);
+
+                ++m_cur_scanline;
+                if(sl.num_spans())
+                {
+                    sl.finalize(sl_this.y);
+                    break;
+                }
+            }
+            return true;
+        }
+
+
+        //---------------------------------------------------------------
+        // Specialization for embedded_scanline
+        bool sweep_scanline(embedded_scanline& sl)
+        {
+            do
+            {
+                if(m_cur_scanline >= m_scanlines.size()) return false;
+                sl.setup(m_cur_scanline);
+                ++m_cur_scanline;
+            }
+            while(sl.num_spans() == 0);
+            return true;
+        }
+
+
+        //---------------------------------------------------------------
+        unsigned byte_size() const
+        {
+            unsigned i;
+            unsigned size = sizeof(int16) * 4; // min_x, min_y, max_x, max_y
+
+            for(i = 0; i < m_scanlines.size(); ++i)
+            {
+                size += sizeof(int16) * 2 + // Y, num_spans
+                        unsigned(m_scanlines[i].num_spans) * sizeof(int16) * 2; // X, span_len
+            }
+            return size;
+        }
+
+
+        //---------------------------------------------------------------
+        static void write_int16(int8u* dst, int16 val)
+        {
+            dst[0] = ((const int8u*)&val)[0];
+            dst[1] = ((const int8u*)&val)[1];
+        }
+
+
+        //---------------------------------------------------------------
+        void serialize(int8u* data) const
+        {
+            unsigned i;
+
+            write_int16(data, int16u(min_x())); // min_x
+            data += sizeof(int16u);
+            write_int16(data, int16u(min_y())); // min_y
+            data += sizeof(int16u);
+            write_int16(data, int16u(max_x())); // max_x
+            data += sizeof(int16u);
+            write_int16(data, int16u(max_y())); // max_y
+            data += sizeof(int16u);
+
+            for(i = 0; i < m_scanlines.size(); ++i)
+            {
+                const scanline_data& sl_this = m_scanlines[i];
+
+                write_int16(data, int16(sl_this.y));            // Y
+                data += sizeof(int16);
+
+                write_int16(data, int16(sl_this.num_spans));    // num_spans
+                data += sizeof(int16);
+
+                unsigned num_spans = sl_this.num_spans;
+                unsigned span_idx  = sl_this.start_span;
+                do
+                {
+                    const span_data& sp = m_spans[span_idx++];
+
+                    write_int16(data, int16(sp.x));             // X
+                    data += sizeof(int16);
+
+                    write_int16(data, int16(sp.len));           // len
+                    data += sizeof(int16);
+                }
+                while(--num_spans);
+            }
+        }
+
+
+        //---------------------------------------------------------------
+        const scanline_data& scanline_by_index(unsigned i) const
+        {
+            return (i < m_scanlines.size()) ? m_scanlines[i] : m_fake_scanline;
+        }
+
+        //---------------------------------------------------------------
+        const span_data& span_by_index(unsigned i) const
+        {
+            return (i < m_spans.size()) ? m_spans[i] : m_fake_span;
+        }
+
+
+    private:
+        pod_deque<span_data, 10>    m_spans;
+        pod_deque<scanline_data, 8> m_scanlines;
+        span_data     m_fake_span;
+        scanline_data m_fake_scanline;
+        int           m_min_x;
+        int           m_min_y;
+        int           m_max_x;
+        int           m_max_y;
+        unsigned      m_cur_scanline;
+    };
+
+
+
+
+
+
+
+
+
+
+
+
+
+    //---------------------------------------serialized_scanlines_adaptor_bin
+    class serialized_scanlines_adaptor_bin
+    {
+    public:
+        typedef bool cover_type;
+
+        //--------------------------------------------------------------------
+        class embedded_scanline
+        {
+        public:
+
+            //----------------------------------------------------------------
+            class const_iterator
+            {
+            public:
+                struct span
+                {
+                    int16 x;
+                    int16 len;
+                };
+
+                const_iterator(const embedded_scanline& sl) :
+                    m_ptr(sl.m_ptr),
+                    m_dx(sl.m_dx)
+                {
+                    m_span.x   = read_int16() + m_dx;
+                    m_span.len = read_int16();
+                }
+
+                const span& operator*()  const { return m_span;  }
+                const span* operator->() const { return &m_span; }
+
+                void operator ++ ()
+                {
+                    m_span.x   = read_int16() + m_dx;
+                    m_span.len = read_int16();
+                }
+
+            private:
+                int read_int16()
+                {
+                    int16 val;
+                    ((int8u*)&val)[0] = *m_ptr++;
+                    ((int8u*)&val)[1] = *m_ptr++;
+                    return val;
+                }
+
+                const int8u* m_ptr;
+                span         m_span;
+                int          m_dx;
+            };
+
+            friend class const_iterator;
+
+
+            //----------------------------------------------------------------
+            embedded_scanline() : m_ptr(0), m_y(0), m_num_spans(0) {}
+
+            //----------------------------------------------------------------
+            void     reset(int, int)     {}
+            unsigned num_spans()   const { return m_num_spans;  }
+            int      y()           const { return m_y;          }
+            const_iterator begin() const { return const_iterator(*this); }
+
+
+        private:
+            //----------------------------------------------------------------
+            int read_int16()
+            {
+                int16 val;
+                ((int8u*)&val)[0] = *m_ptr++;
+                ((int8u*)&val)[1] = *m_ptr++;
+                return val;
+            }
+
+        public:
+            //----------------------------------------------------------------
+            void init(const int8u* ptr, int dx, int dy)
+            {
+                m_ptr       = ptr;
+                m_y         = read_int16() + dy;
+                m_num_spans = unsigned(read_int16());
+                m_dx        = dx;
+            }
+
+        private:
+            const int8u* m_ptr;
+            int          m_y;
+            unsigned     m_num_spans;
+            int          m_dx;
+        };
+
+
+
+    public:
+        //--------------------------------------------------------------------
+        serialized_scanlines_adaptor_bin() :
+            m_data(0),
+            m_end(0),
+            m_ptr(0),
+            m_dx(0),
+            m_dy(0),
+            m_min_x(0x7FFFFFFF),
+            m_min_y(0x7FFFFFFF),
+            m_max_x(-0x7FFFFFFF),
+            m_max_y(-0x7FFFFFFF)
+        {}
+
+        //--------------------------------------------------------------------
+        serialized_scanlines_adaptor_bin(const int8u* data, unsigned size,
+                                         double dx, double dy) :
+            m_data(data),
+            m_end(data + size),
+            m_ptr(data),
+            m_dx(int(floor(dx + 0.5))),
+            m_dy(int(floor(dy + 0.5))),
+            m_min_x(0x7FFFFFFF),
+            m_min_y(0x7FFFFFFF),
+            m_max_x(-0x7FFFFFFF),
+            m_max_y(-0x7FFFFFFF)
+        {}
+
+        //--------------------------------------------------------------------
+        void init(const int8u* data, unsigned size, double dx, double dy)
+        {
+            m_data  = data;
+            m_end   = data + size;
+            m_ptr   = data;
+            m_dx    = int(floor(dx + 0.5));
+            m_dy    = int(floor(dy + 0.5));
+            m_min_x = 0x7FFFFFFF;
+            m_min_y = 0x7FFFFFFF;
+            m_max_x = -0x7FFFFFFF;
+            m_max_y = -0x7FFFFFFF;
+        }
+
+    private:
+        //--------------------------------------------------------------------
+        int read_int16()
+        {
+            int16 val;
+            ((int8u*)&val)[0] = *m_ptr++;
+            ((int8u*)&val)[1] = *m_ptr++;
+            return val;
+        }
+
+    public:
+        // Iterate scanlines interface
+        //--------------------------------------------------------------------
+        bool rewind_scanlines()
+        {
+            m_ptr = m_data;
+            if(m_ptr < m_end)
+            {
+                m_min_x = read_int16() + m_dx;
+                m_min_y = read_int16() + m_dy;
+                m_max_x = read_int16() + m_dx;
+                m_max_y = read_int16() + m_dy;
+                return true;
+            }
+            return false;
+        }
+
+        //--------------------------------------------------------------------
+        int min_x() const { return m_min_x; }
+        int min_y() const { return m_min_y; }
+        int max_x() const { return m_max_x; }
+        int max_y() const { return m_max_y; }
+
+        //--------------------------------------------------------------------
+        template<class Scanline> bool sweep_scanline(Scanline& sl)
+        {
+            sl.reset_spans();
+            for(;;)
+            {
+                if(m_ptr >= m_end) return false;
+
+                int y = read_int16() + m_dy;
+                unsigned num_spans = read_int16();
+
+                do
+                {
+                    int x = read_int16() + m_dx;
+                    int len = read_int16();
+
+                    if(len < 0) len = -len;
+                    sl.add_span(x, unsigned(len), cover_full);
+                }
+                while(--num_spans);
+
+                if(sl.num_spans())
+                {
+                    sl.finalize(y);
+                    break;
+                }
+            }
+            return true;
+        }
+
+
+        //--------------------------------------------------------------------
+        // Specialization for embedded_scanline
+        bool sweep_scanline(embedded_scanline& sl)
+        {
+            do
+            {
+                if(m_ptr >= m_end) return false;
+
+                sl.init(m_ptr, m_dx, m_dy);
+
+                // Jump to the next scanline
+                //--------------------------
+                read_int16();                    // Y
+                int num_spans = read_int16();    // num_spans
+                m_ptr += num_spans * sizeof(int16) * 2;
+            }
+            while(sl.num_spans() == 0);
+            return true;
+        }
+
+    private:
+        const int8u* m_data;
+        const int8u* m_end;
+        const int8u* m_ptr;
+        int          m_dx;
+        int          m_dy;
+        int          m_min_x;
+        int          m_min_y;
+        int          m_max_x;
+        int          m_max_y;
+    };
+
+
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_scanline_u.h b/agg/inc/agg_scanline_u.h
new file mode 100755
index 000000000000..749c5b3c0054
--- /dev/null
+++ b/agg/inc/agg_scanline_u.h
@@ -0,0 +1,323 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SCANLINE_U_INCLUDED
+#define AGG_SCANLINE_U_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+    //==============================================================scanline_u
+    //
+    // Unpacked scanline container class
+    //
+    // This class is used to transfer data from a scanline rastyerizer
+    // to the rendering buffer. It's organized very simple. The class stores
+    // information of horizontal spans to render it into a pixel-map buffer.
+    // Each span has staring X, length, and an array of bytes that determine the
+    // cover-values for each pixel.
+    // Before using this class you should know the minimal and maximal pixel
+    // coordinates of your scanline. The protocol of using is:
+    // 1. reset(min_x, max_x)
+    // 2. add_cell() / add_span() - accumulate scanline.
+    //    When forming one scanline the next X coordinate must be always greater
+    //    than the last stored one, i.e. it works only with ordered coordinates.
+    // 3. Call finalize(y) and render the scanline.
+    // 3. Call reset_spans() to prepare for the new scanline.
+    //
+    // 4. Rendering:
+    //
+    // Scanline provides an iterator class that allows you to extract
+    // the spans and the cover values for each pixel. Be aware that clipping
+    // has not been done yet, so you should perform it yourself.
+    // Use scanline_u8::iterator to render spans:
+    //-------------------------------------------------------------------------
+    //
+    // int y = sl.y();                    // Y-coordinate of the scanline
+    //
+    // ************************************
+    // ...Perform vertical clipping here...
+    // ************************************
+    //
+    // scanline_u8::const_iterator span = sl.begin();
+    //
+    // unsigned char* row = m_rbuf->row(y); // The the address of the beginning
+    //                                      // of the current row
+    //
+    // unsigned num_spans = sl.num_spans(); // Number of spans. It's guaranteed that
+    //                                      // num_spans is always greater than 0.
+    //
+    // do
+    // {
+    //     const scanline_u8::cover_type* covers =
+    //         span->covers;                     // The array of the cover values
+    //
+    //     int num_pix = span->len;              // Number of pixels of the span.
+    //                                           // Always greater than 0, still it's
+    //                                           // better to use "int" instead of
+    //                                           // "unsigned" because it's more
+    //                                           // convenient for clipping
+    //     int x = span->x;
+    //
+    //     **************************************
+    //     ...Perform horizontal clipping here...
+    //     ...you have x, covers, and pix_count..
+    //     **************************************
+    //
+    //     unsigned char* dst = row + x;  // Calculate the start address of the row.
+    //                                    // In this case we assume a simple
+    //                                    // grayscale image 1-byte per pixel.
+    //     do
+    //     {
+    //         *dst++ = *covers++;        // Hypotetical rendering.
+    //     }
+    //     while(--num_pix);
+    //
+    //     ++span;
+    // }
+    // while(--num_spans);  // num_spans cannot be 0, so this loop is quite safe
+    //------------------------------------------------------------------------
+    //
+    // The question is: why should we accumulate the whole scanline when we
+    // could render just separate spans when they're ready?
+    // That's because using the scaline is generally faster. When is consists
+    // of more than one span the conditions for the processor cash system
+    // are better, because switching between two different areas of memory
+    // (that can be very large) occures less frequently.
+    //------------------------------------------------------------------------
+    template<class T> class scanline_u
+    {
+    public:
+        typedef T cover_type;
+
+        //--------------------------------------------------------------------
+        struct span
+        {
+            int16 x;
+            int16 len;
+            cover_type* covers;
+        };
+
+        typedef span* iterator;
+        typedef const span* const_iterator;
+
+        //--------------------------------------------------------------------
+        ~scanline_u();
+        scanline_u();
+
+        void     reset(int min_x, int max_x);
+        void     add_cell(int x, unsigned cover);
+        void     add_cells(int x, unsigned len, const T* covers);
+        void     add_span(int x, unsigned len, unsigned cover);
+        void     finalize(int y) { m_y = y; }
+        void     reset_spans();
+
+        int      y()           const { return m_y; }
+        unsigned num_spans()   const { return unsigned(m_cur_span - m_spans); }
+        const_iterator begin() const { return m_spans + 1; }
+        iterator       begin()       { return m_spans + 1; }
+
+    private:
+        scanline_u<T>(const scanline_u<T>&);
+        const scanline_u<T>& operator = (const scanline_u<T>&);
+
+    private:
+        int           m_min_x;
+        unsigned      m_max_len;
+        int           m_last_x;
+        int           m_y;
+        cover_type*   m_covers;
+        span*         m_spans;
+        span*         m_cur_span;
+    };
+
+
+
+    //------------------------------------------------------------------------
+    template<class T> scanline_u<T>::~scanline_u()
+    {
+        delete [] m_spans;
+        delete [] m_covers;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T> scanline_u<T>::scanline_u() :
+        m_min_x(0),
+        m_max_len(0),
+        m_last_x(0x7FFFFFF0),
+        m_covers(0),
+        m_spans(0),
+        m_cur_span(0)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T> void scanline_u<T>::reset(int min_x, int max_x)
+    {
+        unsigned max_len = max_x - min_x + 2;
+        if(max_len > m_max_len)
+        {
+            delete [] m_spans;
+            delete [] m_covers;
+            m_covers  = new cover_type [max_len];
+            m_spans   = new span       [max_len];
+            m_max_len = max_len;
+        }
+        m_last_x        = 0x7FFFFFF0;
+        m_min_x         = min_x;
+        m_cur_span      = m_spans;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T> inline void scanline_u<T>::reset_spans()
+    {
+        m_last_x    = 0x7FFFFFF0;
+        m_cur_span  = m_spans;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T> inline void scanline_u<T>::add_cell(int x, unsigned cover)
+    {
+        x -= m_min_x;
+        m_covers[x] = (unsigned char)cover;
+        if(x == m_last_x+1)
+        {
+            m_cur_span->len++;
+        }
+        else
+        {
+            m_cur_span++;
+            m_cur_span->x      = (int16)(x + m_min_x);
+            m_cur_span->len    = 1;
+            m_cur_span->covers = m_covers + x;
+        }
+        m_last_x = x;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T> void scanline_u<T>::add_cells(int x, unsigned len, const T* covers)
+    {
+        x -= m_min_x;
+        memcpy(m_covers + x, covers, len * sizeof(T));
+        if(x == m_last_x+1)
+        {
+            m_cur_span->len += (int16)len;
+        }
+        else
+        {
+            m_cur_span++;
+            m_cur_span->x      = (int16)(x + m_min_x);
+            m_cur_span->len    = (int16)len;
+            m_cur_span->covers = m_covers + x;
+        }
+        m_last_x = x + len - 1;
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T> void scanline_u<T>::add_span(int x, unsigned len, unsigned cover)
+    {
+        x -= m_min_x;
+        memset(m_covers + x, cover, len);
+        if(x == m_last_x+1)
+        {
+            m_cur_span->len += (int16)len;
+        }
+        else
+        {
+            m_cur_span++;
+            m_cur_span->x      = (int16)(x + m_min_x);
+            m_cur_span->len    = (int16)len;
+            m_cur_span->covers = m_covers + x;
+        }
+        m_last_x = x + len - 1;
+    }
+
+
+    //=============================================================scanline_u8
+    typedef scanline_u<int8u> scanline_u8;
+
+    //============================================================scanline_u16
+    typedef scanline_u<int16u> scanline_u16;
+
+    //============================================================scanline_u32
+    typedef scanline_u<int32u> scanline_u32;
+
+
+    //=============================================================scanline_am
+    //
+    // The scanline container with alpha-masking
+    //
+    //------------------------------------------------------------------------
+    template<class AlphaMask, class CoverT>
+    class scanline_am : public scanline_u<CoverT>
+    {
+    public:
+        typedef AlphaMask alpha_mask_type;
+        typedef CoverT cover_type;
+        typedef scanline_u<CoverT> scanline_type;
+
+        scanline_am() : scanline_type(), m_alpha_mask(0) {}
+        scanline_am(const AlphaMask& am) : scanline_type(), m_alpha_mask(&am) {}
+
+        //--------------------------------------------------------------------
+        void finalize(int span_y)
+        {
+            scanline_u<CoverT>::finalize(span_y);
+            if(m_alpha_mask)
+            {
+                typename scanline_type::iterator span = scanline_type::begin();
+                unsigned count = scanline_type::num_spans();
+                do
+                {
+                    m_alpha_mask->combine_hspan(span->x,
+                                                scanline_type::y(),
+                                                span->covers,
+                                                span->len);
+                    ++span;
+                }
+                while(--count);
+            }
+        }
+
+    private:
+        const AlphaMask* m_alpha_mask;
+    };
+
+
+    //==========================================================scanline_u8_am
+    template<class AlphaMask>
+    class scanline_u8_am : public scanline_am<AlphaMask, int8u>
+    {
+    public:
+        typedef AlphaMask alpha_mask_type;
+        typedef int8u cover_type;
+        typedef scanline_am<alpha_mask_type, cover_type> self_type;
+
+        scanline_u8_am() : self_type() {}
+        scanline_u8_am(const AlphaMask& am) : self_type(am) {}
+    };
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_shorten_path.h b/agg/inc/agg_shorten_path.h
new file mode 100755
index 000000000000..271d2a7ec572
--- /dev/null
+++ b/agg/inc/agg_shorten_path.h
@@ -0,0 +1,66 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SHORTEN_PATH_INCLUDED
+#define AGG_SHORTEN_PATH_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_sequence.h"
+
+namespace agg
+{
+
+    //===========================================================shorten_path
+    template<class VertexSequence>
+    void shorten_path(VertexSequence& vs, double s, unsigned closed = 0)
+    {
+        typedef typename VertexSequence::value_type vertex_type;
+
+        if(s > 0.0 && vs.size() > 1)
+        {
+            double d;
+            int n = int(vs.size() - 2);
+            while(n)
+            {
+                d = vs[n].dist;
+                if(d > s) break;
+                vs.remove_last();
+                s -= d;
+                --n;
+            }
+            if(vs.size() < 2)
+            {
+                vs.remove_all();
+            }
+            else
+            {
+                n = vs.size() - 1;
+                vertex_type& prev = vs[n-1];
+                vertex_type& last = vs[n];
+                d = (prev.dist - s) / prev.dist;
+                double x = prev.x + (last.x - prev.x) * d;
+                double y = prev.y + (last.y - prev.y) * d;
+                last.x = x;
+                last.y = y;
+                if(!prev(last)) vs.remove_last();
+                vs.close(closed != 0);
+            }
+        }
+    }
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_simul_eq.h b/agg/inc/agg_simul_eq.h
new file mode 100755
index 000000000000..f52662e82926
--- /dev/null
+++ b/agg/inc/agg_simul_eq.h
@@ -0,0 +1,147 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Solving simultaneous equations
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SIMUL_EQ_INCLUDED
+#define AGG_SIMUL_EQ_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //=============================================================swap_arrays
+    template<class T> void swap_arrays(T* a1, T* a2, unsigned n)
+    {
+        unsigned i;
+        for(i = 0; i < n; i++)
+        {
+            T tmp = *a1;
+            *a1++ = *a2;
+            *a2++ = tmp;
+        }
+    }
+
+
+    //============================================================matrix_pivot
+    template<unsigned Rows, unsigned Cols>
+    struct matrix_pivot
+    {
+        static int pivot(double m[Rows][Cols], unsigned row)
+        {
+            int k = int(row);
+            double max_val, tmp;
+
+            max_val = -1.0;
+            unsigned i;
+            for(i = row; i < Rows; i++)
+            {
+                if((tmp = fabs(m[i][row])) > max_val && tmp != 0.0)
+                {
+                    max_val = tmp;
+                    k = i;
+                }
+            }
+
+            if(m[k][row] == 0.0)
+            {
+                return -1;
+            }
+
+            if(k != int(row))
+            {
+                swap_arrays(m[k], m[row], Cols);
+                return k;
+            }
+            return 0;
+        }
+    };
+
+
+
+    //===============================================================simul_eq
+    template<unsigned Size, unsigned RightCols>
+    struct simul_eq
+    {
+        static bool solve(const double left[Size][Size],
+                          const double right[Size][RightCols],
+                          double result[Size][RightCols])
+        {
+            unsigned i, j, k;
+            double a1;
+
+            double tmp[Size][Size + RightCols];
+
+            for(i = 0; i < Size; i++)
+            {
+                for(j = 0; j < Size; j++)
+                {
+                    tmp[i][j] = left[i][j];
+                }
+                for(j = 0; j < RightCols; j++)
+                {
+                    tmp[i][Size + j] = right[i][j];
+                }
+            }
+
+            for(k = 0; k < Size; k++)
+            {
+                if(matrix_pivot<Size, Size + RightCols>::pivot(tmp, k) < 0)
+                {
+                    return false; // Singularity....
+                }
+
+                a1 = tmp[k][k];
+
+                for(j = k; j < Size + RightCols; j++)
+                {
+                    tmp[k][j] /= a1;
+                }
+
+                for(i = k + 1; i < Size; i++)
+                {
+                    a1 = tmp[i][k];
+                    for (j = k; j < Size + RightCols; j++)
+                    {
+                        tmp[i][j] -= a1 * tmp[k][j];
+                    }
+                }
+            }
+
+
+            for(k = 0; k < RightCols; k++)
+            {
+                int m;
+                for(m = int(Size - 1); m >= 0; m--)
+                {
+                    result[m][k] = tmp[m][Size + k];
+                    for(j = m + 1; j < Size; j++)
+                    {
+                        result[m][k] -= tmp[m][j] * result[j][k];
+                    }
+                }
+            }
+            return true;
+        }
+
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_allocator.h b/agg/inc/agg_span_allocator.h
new file mode 100755
index 000000000000..d99c5b9d8936
--- /dev/null
+++ b/agg/inc/agg_span_allocator.h
@@ -0,0 +1,72 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_ALLOCATOR_INCLUDED
+#define AGG_SPAN_ALLOCATOR_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    //----------------------------------------------------------span_allocator
+    template<class ColorT> class span_allocator
+    {
+    public:
+        typedef ColorT color_type;
+
+        //--------------------------------------------------------------------
+        ~span_allocator()
+        {
+            delete [] m_span;
+        }
+
+        //--------------------------------------------------------------------
+        span_allocator() :
+            m_max_span_len(0),
+            m_span(0)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        color_type* allocate(unsigned max_span_len)
+        {
+            if(max_span_len > m_max_span_len)
+            {
+                delete [] m_span;
+                m_span = new color_type[m_max_span_len = max_span_len];
+            }
+            return m_span;
+        }
+
+        //--------------------------------------------------------------------
+        color_type* span()
+        {
+            return m_span;
+        }
+
+    private:
+        //--------------------------------------------------------------------
+        span_allocator(const span_allocator<ColorT>&);
+        const span_allocator<ColorT>& operator = (const span_allocator<ColorT>&);
+
+        unsigned    m_max_span_len;
+        color_type* m_span;
+    };
+}
+
+
+#endif
+
+
diff --git a/agg/inc/agg_span_converter.h b/agg/inc/agg_span_converter.h
new file mode 100755
index 000000000000..104cd7d8e73e
--- /dev/null
+++ b/agg/inc/agg_span_converter.h
@@ -0,0 +1,53 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_CONVERTER_INCLUDED
+#define AGG_SPAN_CONVERTER_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    //----------------------------------------------------------span_converter
+    template<class SpanGenerator, class Conv> class span_converter
+    {
+    public:
+        typedef typename SpanGenerator::color_type color_type;
+
+        span_converter(SpanGenerator& span_gen, Conv& conv) :
+            m_span_gen(&span_gen), m_conv(&conv) {}
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            m_span_gen->prepare(max_span_len);
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = m_span_gen->generate(x, y, len);
+            m_conv->convert(span, x, y, len);
+            return span;
+        }
+
+    private:
+        SpanGenerator* m_span_gen;
+        Conv*          m_conv;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_generator.h b/agg/inc/agg_span_generator.h
new file mode 100755
index 000000000000..82b0ebef95f3
--- /dev/null
+++ b/agg/inc/agg_span_generator.h
@@ -0,0 +1,50 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_GENERATOR_INCLUDED
+#define AGG_SPAN_GENERATOR_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_span_allocator.h"
+
+namespace agg
+{
+
+    //==========================================================span_generator
+    template<class ColorT, class Allocator> class span_generator
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Allocator alloc_type;
+
+        //--------------------------------------------------------------------
+        span_generator(alloc_type& alloc) : m_alloc(&alloc) {}
+
+        //--------------------------------------------------------------------
+        void allocator(alloc_type& alloc) { m_alloc = &alloc; }
+        alloc_type& allocator() { return *m_alloc; }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            m_alloc->allocate(max_span_len);
+        }
+
+    private:
+        alloc_type* m_alloc;
+    };
+}
+
+#endif
diff --git a/agg/inc/agg_span_gouraud.h b/agg/inc/agg_span_gouraud.h
new file mode 100755
index 000000000000..76747899b5fc
--- /dev/null
+++ b/agg/inc/agg_span_gouraud.h
@@ -0,0 +1,180 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_GOURAUD_INCLUDED
+#define AGG_SPAN_GOURAUD_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_math.h"
+#include "agg_span_generator.h"
+
+namespace agg
+{
+
+    //============================================================span_gouraud
+    template<class ColorT, class Allocator>
+    class span_gouraud : public span_generator<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Allocator alloc_type;
+
+        struct coord_type
+        {
+            double x;
+            double y;
+            color_type color;
+        };
+
+        //--------------------------------------------------------------------
+        span_gouraud(alloc_type& alloc) :
+            span_generator<color_type, alloc_type>(alloc),
+            m_vertex(0)
+        {
+            m_cmd[0] = path_cmd_stop;
+        }
+
+        //--------------------------------------------------------------------
+        span_gouraud(alloc_type& alloc,
+                     const color_type& c1,
+                     const color_type& c2,
+                     const color_type& c3,
+                     double x1, double y1,
+                     double x2, double y2,
+                     double x3, double y3,
+                     double d) :
+            span_generator<color_type, alloc_type>(alloc)
+        {
+            colors(c1, c2, c3);
+            triangle(x1, y1, x2, y2, x3, y3, d);
+        }
+
+        //--------------------------------------------------------------------
+        void colors(ColorT c1, ColorT c2, ColorT c3)
+        {
+            m_coord[0].color = c1;
+            m_coord[1].color = c2;
+            m_coord[2].color = c3;
+        }
+
+        //--------------------------------------------------------------------
+        // Sets the triangle and dilates it if needed.
+        // The trick here is to calculate beveled joins in the vertices of the
+        // triangle and render it as a 6-vertex polygon.
+        // It's necessary to achieve numerical stability.
+        // However, the coordinates to interpolate colors are calculated
+        // as miter joins (calc_intersection).
+        void triangle(double x1, double y1,
+                      double x2, double y2,
+                      double x3, double y3,
+                      double d)
+        {
+            m_coord[0].x = m_x[0] = x1;
+            m_coord[0].y = m_y[0] = y1;
+            m_coord[1].x = m_x[1] = x2;
+            m_coord[1].y = m_y[1] = y2;
+            m_coord[2].x = m_x[2] = x3;
+            m_coord[2].y = m_y[2] = y3;
+            m_cmd[0] = path_cmd_move_to;
+            m_cmd[1] = path_cmd_line_to;
+            m_cmd[2] = path_cmd_line_to;
+            m_cmd[3] = path_cmd_stop;
+
+            if(d != 0.0)
+            {
+                dilate_triangle(m_coord[0].x, m_coord[0].y,
+                                m_coord[1].x, m_coord[1].y,
+                                m_coord[2].x, m_coord[2].y,
+                                m_x, m_y, d);
+
+                calc_intersection(m_x[4], m_y[4], m_x[5], m_y[5],
+                                  m_x[0], m_y[0], m_x[1], m_y[1],
+                                  &m_coord[0].x, &m_coord[0].y);
+
+                calc_intersection(m_x[0], m_y[0], m_x[1], m_y[1],
+                                  m_x[2], m_y[2], m_x[3], m_y[3],
+                                  &m_coord[1].x, &m_coord[1].y);
+
+                calc_intersection(m_x[2], m_y[2], m_x[3], m_y[3],
+                                  m_x[4], m_y[4], m_x[5], m_y[5],
+                                  &m_coord[2].x, &m_coord[2].y);
+                m_cmd[3] = path_cmd_line_to;
+                m_cmd[4] = path_cmd_line_to;
+                m_cmd[5] = path_cmd_line_to;
+                m_cmd[6] = path_cmd_stop;
+            }
+        }
+
+        //--------------------------------------------------------------------
+        // Vertex Source Interface to feed the coordinates to the rasterizer
+        void rewind(unsigned)
+        {
+            m_vertex = 0;
+        }
+
+        //--------------------------------------------------------------------
+        unsigned vertex(double* x, double* y)
+        {
+            *x = m_x[m_vertex];
+            *y = m_y[m_vertex];
+            return m_cmd[m_vertex++];
+        }
+
+
+
+    protected:
+        //--------------------------------------------------------------------
+        void arrange_vertices(coord_type* coord) const
+        {
+            coord[0] = m_coord[0];
+            coord[1] = m_coord[1];
+            coord[2] = m_coord[2];
+
+            if(m_coord[0].y > m_coord[2].y)
+            {
+                coord[0] = m_coord[2];
+                coord[2] = m_coord[0];
+            }
+
+            coord_type tmp;
+            if(coord[0].y > coord[1].y)
+            {
+                tmp      = coord[1];
+                coord[1] = coord[0];
+                coord[0] = tmp;
+            }
+
+            if(coord[1].y > coord[2].y)
+            {
+                tmp      = coord[2];
+                coord[2] = coord[1];
+                coord[1] = tmp;
+            }
+       }
+
+
+    private:
+        //--------------------------------------------------------------------
+        coord_type m_coord[3];
+        double m_x[8];
+        double m_y[8];
+        unsigned m_cmd[8];
+        unsigned m_vertex;
+    };
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_span_gouraud_gray.h b/agg/inc/agg_span_gouraud_gray.h
new file mode 100755
index 000000000000..caf288919e93
--- /dev/null
+++ b/agg/inc/agg_span_gouraud_gray.h
@@ -0,0 +1,185 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_GOURAUD_GRAY_INCLUDED
+#define AGG_SPAN_GOURAUD_GRAY_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_gray.h"
+#include "agg_dda_line.h"
+#include "agg_span_gouraud.h"
+
+namespace agg
+{
+
+    //=======================================================span_gouraud_gray
+    template<class ColorT, class Allocator = span_allocator<ColorT> >
+    class span_gouraud_gray : public span_gouraud<ColorT, Allocator>
+    {
+    public:
+        typedef Allocator alloc_type;
+        typedef ColorT color_type;
+        typedef typename color_type::value_type value_type;
+        typedef span_gouraud<color_type, alloc_type> base_type;
+        typedef typename base_type::coord_type coord_type;
+
+    private:
+        //--------------------------------------------------------------------
+        struct gray_calc
+        {
+            void init(const coord_type& c1, const coord_type& c2)
+            {
+                m_x1 = c1.x;
+                m_y1 = c1.y;
+                m_dx = c2.x - c1.x;
+                m_dy = 1.0 / (c2.y - c1.y);
+                m_v1 = c1.color.v;
+                m_a1 = c1.color.a;
+                m_dv = c2.color.v - m_v1;
+                m_da = c2.color.a - m_a1;
+            }
+
+            void calc(int y)
+            {
+                double k = 0.0;
+                if(y > m_y1) k = (y - m_y1) * m_dy;
+                gray8 c;
+                m_v = m_v1 + int(m_dv * k);
+                m_a = m_a1 + int(m_da * k);
+                m_x = int(m_x1 + m_dx * k);
+            }
+
+            double m_x1;
+            double m_y1;
+            double m_dx;
+            double m_dy;
+            int    m_v1;
+            int    m_a1;
+            int    m_dv;
+            int    m_da;
+            int    m_v;
+            int    m_a;
+            int    m_x;
+        };
+
+
+    public:
+        //--------------------------------------------------------------------
+        span_gouraud_gray(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_gouraud_gray(alloc_type& alloc,
+                          const color_type& c1,
+                          const color_type& c2,
+                          const color_type& c3,
+                          double x1, double y1,
+                          double x2, double y2,
+                          double x3, double y3,
+                          double d = 0) :
+            base_type(alloc, c1, c2, c3, x1, y1, x2, y2, x3, y3, d)
+        {}
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            base_type::prepare(max_span_len);
+
+            coord_type coord[3];
+            arrange_vertices(coord);
+
+            m_y2 = int(coord[1].y);
+
+            m_swap = calc_point_location(coord[0].x, coord[0].y,
+                                         coord[2].x, coord[2].y,
+                                         coord[1].x, coord[1].y) < 0.0;
+
+            m_c1.init(coord[0], coord[2]);
+            m_c2.init(coord[0], coord[1]);
+            m_c3.init(coord[1], coord[2]);
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            m_c1.calc(y);
+            const gray_calc* pc1 = &m_c1;
+            const gray_calc* pc2 = &m_c2;
+
+            if(y < m_y2)
+            {
+                m_c2.calc(y+1);
+            }
+            else
+            {
+                m_c3.calc(y);
+                pc2 = &m_c3;
+            }
+
+            if(m_swap)
+            {
+                const gray_calc* t = pc2;
+                pc2 = pc1;
+                pc1 = t;
+            }
+
+            int nx = pc1->m_x;
+            unsigned nlen = pc2->m_x - pc1->m_x + 1;
+
+            if(nlen < len) nlen = len;
+
+            dda_line_interpolator<14> v(pc1->m_v, pc2->m_v, nlen);
+            dda_line_interpolator<14> a(pc1->m_a, pc2->m_a, nlen);
+
+            if(nx < x)
+            {
+                unsigned d = unsigned(x - nx);
+                v += d;
+                a += d;
+            }
+
+            color_type* span = base_type::allocator().span();
+            do
+            {
+                span->v = (value_type)v.y();
+                span->a = (value_type)a.y();
+                ++v;
+                ++a;
+                ++span;
+            }
+            while(--len);
+            return base_type::allocator().span();
+        }
+
+
+    private:
+        bool      m_swap;
+        int       m_y2;
+        gray_calc m_c1;
+        gray_calc m_c2;
+        gray_calc m_c3;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_gouraud_rgba.h b/agg/inc/agg_span_gouraud_rgba.h
new file mode 100755
index 000000000000..75679a9426c2
--- /dev/null
+++ b/agg/inc/agg_span_gouraud_rgba.h
@@ -0,0 +1,206 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_GOURAUD_RGBA_INCLUDED
+#define AGG_SPAN_GOURAUD_RGBA_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_dda_line.h"
+#include "agg_span_gouraud.h"
+
+namespace agg
+{
+
+    //=======================================================span_gouraud_rgba
+    template<class ColorT, class Allocator = span_allocator<ColorT> >
+    class span_gouraud_rgba : public span_gouraud<ColorT, Allocator>
+    {
+    public:
+        typedef Allocator alloc_type;
+        typedef ColorT color_type;
+        typedef typename ColorT::value_type value_type;
+        typedef span_gouraud<color_type, alloc_type> base_type;
+        typedef typename base_type::coord_type coord_type;
+
+    private:
+        //--------------------------------------------------------------------
+        struct rgba_calc
+        {
+            void init(const coord_type& c1, const coord_type& c2)
+            {
+                m_x1 = c1.x;
+                m_y1 = c1.y;
+                m_dx = c2.x - c1.x;
+                m_dy = 1.0 / (c2.y - c1.y);
+                m_r1 = c1.color.r;
+                m_g1 = c1.color.g;
+                m_b1 = c1.color.b;
+                m_a1 = c1.color.a;
+                m_dr = c2.color.r - m_r1;
+                m_dg = c2.color.g - m_g1;
+                m_db = c2.color.b - m_b1;
+                m_da = c2.color.a - m_a1;
+            }
+
+            void calc(int y)
+            {
+                double k = 0.0;
+                if(y > m_y1) k = (y - m_y1) * m_dy;
+                color_type rgba;
+                m_r = m_r1 + int(m_dr * k);
+                m_g = m_g1 + int(m_dg * k);
+                m_b = m_b1 + int(m_db * k);
+                m_a = m_a1 + int(m_da * k);
+                m_x = int(m_x1 + m_dx * k);
+            }
+
+            double m_x1;
+            double m_y1;
+            double m_dx;
+            double m_dy;
+            int    m_r1;
+            int    m_g1;
+            int    m_b1;
+            int    m_a1;
+            int    m_dr;
+            int    m_dg;
+            int    m_db;
+            int    m_da;
+            int    m_r;
+            int    m_g;
+            int    m_b;
+            int    m_a;
+            int    m_x;
+        };
+
+    public:
+
+        //--------------------------------------------------------------------
+        span_gouraud_rgba(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_gouraud_rgba(alloc_type& alloc,
+                          const color_type& c1,
+                          const color_type& c2,
+                          const color_type& c3,
+                          double x1, double y1,
+                          double x2, double y2,
+                          double x3, double y3,
+                          double d = 0) :
+            base_type(alloc, c1, c2, c3, x1, y1, x2, y2, x3, y3, d)
+        {}
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            base_type::prepare(max_span_len);
+
+            coord_type coord[3];
+            arrange_vertices(coord);
+
+            m_y2 = int(coord[1].y);
+
+            m_swap = calc_point_location(coord[0].x, coord[0].y,
+                                         coord[2].x, coord[2].y,
+                                         coord[1].x, coord[1].y) < 0.0;
+
+            m_rgba1.init(coord[0], coord[2]);
+            m_rgba2.init(coord[0], coord[1]);
+            m_rgba3.init(coord[1], coord[2]);
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            m_rgba1.calc(y);
+            const rgba_calc* pc1 = &m_rgba1;
+            const rgba_calc* pc2 = &m_rgba2;
+
+            if(y < m_y2)
+            {
+                m_rgba2.calc(y+1);
+            }
+            else
+            {
+                m_rgba3.calc(y);
+                pc2 = &m_rgba3;
+            }
+
+            if(m_swap)
+            {
+                const rgba_calc* t = pc2;
+                pc2 = pc1;
+                pc1 = t;
+            }
+
+            int nx = pc1->m_x;
+            unsigned nlen = pc2->m_x - pc1->m_x + 1;
+
+            if(nlen < len) nlen = len;
+
+            dda_line_interpolator<14> r(pc1->m_r, pc2->m_r, nlen);
+            dda_line_interpolator<14> g(pc1->m_g, pc2->m_g, nlen);
+            dda_line_interpolator<14> b(pc1->m_b, pc2->m_b, nlen);
+            dda_line_interpolator<14> a(pc1->m_a, pc2->m_a, nlen);
+
+            if(nx < x)
+            {
+                unsigned d = unsigned(x - nx);
+                r += d;
+                g += d;
+                b += d;
+                a += d;
+            }
+
+            color_type* span = base_type::allocator().span();
+            do
+            {
+                span->r = (value_type)r.y();
+                span->g = (value_type)g.y();
+                span->b = (value_type)b.y();
+                span->a = (value_type)a.y();
+                ++r;
+                ++g;
+                ++b;
+                ++a;
+                ++span;
+            }
+            while(--len);
+            return base_type::allocator().span();
+        }
+
+
+    private:
+        bool      m_swap;
+        int       m_y2;
+        rgba_calc m_rgba1;
+        rgba_calc m_rgba2;
+        rgba_calc m_rgba3;
+    };
+
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_gradient.h b/agg/inc/agg_span_gradient.h
new file mode 100755
index 000000000000..6bac1c652a84
--- /dev/null
+++ b/agg/inc/agg_span_gradient.h
@@ -0,0 +1,422 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_GRADIENT_INCLUDED
+#define AGG_SPAN_GRADIENT_INCLUDED
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include "agg_basics.h"
+#include "agg_span_generator.h"
+#include "agg_math.h"
+#include "agg_array.h"
+
+
+namespace agg
+{
+
+    enum
+    {
+        gradient_subpixel_shift = 4,                              //-----gradient_subpixel_shift
+        gradient_subpixel_size  = 1 << gradient_subpixel_shift,   //-----gradient_subpixel_size
+        gradient_subpixel_mask  = gradient_subpixel_size - 1      //-----gradient_subpixel_mask
+    };
+
+
+
+    //==========================================================span_gradient
+    template<class ColorT,
+             class Interpolator,
+             class GradientF,
+             class ColorF,
+             class Allocator = span_allocator<ColorT> >
+    class span_gradient : public span_generator<ColorT, Allocator>
+    {
+    public:
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef ColorT color_type;
+        typedef span_generator<color_type, alloc_type> base_type;
+
+        enum
+        {
+            downscale_shift = interpolator_type::subpixel_shift -
+                              gradient_subpixel_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_gradient(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_gradient(alloc_type& alloc,
+                      interpolator_type& inter,
+                      const GradientF& gradient_function_,
+                      const ColorF& color_function_,
+                      double d1_, double d2_) :
+            base_type(alloc),
+            m_interpolator(&inter),
+            m_gradient_function(&gradient_function_),
+            m_color_function(&color_function_),
+            m_d1(int(d1_ * gradient_subpixel_size)),
+            m_d2(int(d2_ * gradient_subpixel_size))
+        {}
+
+        //--------------------------------------------------------------------
+        interpolator_type& interpolator() { return *m_interpolator; }
+        const GradientF& gradient_function() const { return *m_gradient_function; }
+        const ColorF& color_function() const { return *m_color_function; }
+        double d1() const { return double(m_d1) / gradient_subpixel_size; }
+        double d2() const { return double(m_d2) / gradient_subpixel_size; }
+
+        //--------------------------------------------------------------------
+        void interpolator(interpolator_type& i) { m_interpolator = &i; }
+        void gradient_function(const GradientF& gf) { m_gradient_function = &gf; }
+        void color_function(const ColorF& cf) { m_color_function = &cf; }
+        void d1(double v) { m_d1 = int(v * gradient_subpixel_size); }
+        void d2(double v) { m_d2 = int(v * gradient_subpixel_size); }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            int dd = m_d2 - m_d1;
+            if(dd < 1) dd = 1;
+            m_interpolator->begin(x+0.5, y+0.5, len);
+            do
+            {
+                m_interpolator->coordinates(&x, &y);
+                int d = m_gradient_function->calculate(x >> downscale_shift,
+                                                       y >> downscale_shift, dd);
+                d = ((d - m_d1) * (int)m_color_function->size()) / dd;
+                if(d < 0) d = 0;
+                if(d >= (int)m_color_function->size()) d = m_color_function->size() - 1;
+                *span++ = (*m_color_function)[d];
+                ++(*m_interpolator);
+            }
+            while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        interpolator_type* m_interpolator;
+        const GradientF*   m_gradient_function;
+        const ColorF*      m_color_function;
+        int                m_d1;
+        int                m_d2;
+    };
+
+
+
+
+    //=====================================================gradient_linear_color
+    template<class ColorT>
+    struct gradient_linear_color
+    {
+        typedef ColorT color_type;
+
+        gradient_linear_color() {}
+        gradient_linear_color(const color_type& c1, const color_type& c2,
+                              unsigned size = 256) :
+            m_c1(c1), m_c2(c2), m_size(size) {}
+
+        unsigned size() const { return m_size; }
+        color_type operator [] (unsigned v) const
+        {
+            return m_c1.gradient(m_c2, double(v) / double(m_size - 1));
+        }
+
+        void colors(const color_type& c1, const color_type& c2, unsigned size = 256)
+        {
+            m_c1 = c1;
+            m_c2 = c2;
+            m_size = size;
+        }
+
+        color_type m_c1;
+        color_type m_c2;
+        unsigned m_size;
+    };
+
+
+    //==========================================================gradient_circle
+    class gradient_circle
+    {
+        // Actually the same as radial. Just for compatibility
+    public:
+        static AGG_INLINE int calculate(int x, int y, int)
+        {
+            return int(fast_sqrt(x*x + y*y));
+        }
+    };
+
+
+    //==========================================================gradient_radial
+    class gradient_radial
+    {
+    public:
+        static AGG_INLINE int calculate(int x, int y, int)
+        {
+            return int(fast_sqrt(x*x + y*y));
+        }
+    };
+
+
+    //========================================================gradient_radial_d
+    class gradient_radial_d
+    {
+    public:
+        static AGG_INLINE int calculate(int x, int y, int)
+        {
+            return int(sqrt(double(x)*double(x) + double(y)*double(y)));
+        }
+    };
+
+
+    //====================================================gradient_radial_focus
+    class gradient_radial_focus
+    {
+    public:
+        //---------------------------------------------------------------------
+        gradient_radial_focus() :
+            m_radius(100 * gradient_subpixel_size),
+            m_focus_x(0),
+            m_focus_y(0)
+        {
+            update_values();
+        }
+
+        //---------------------------------------------------------------------
+        gradient_radial_focus(double r, double fx, double fy) :
+            m_radius (int(r  * gradient_subpixel_size)),
+            m_focus_x(int(fx * gradient_subpixel_size)),
+            m_focus_y(int(fy * gradient_subpixel_size))
+        {
+            update_values();
+        }
+
+        //---------------------------------------------------------------------
+        void init(double r, double fx, double fy)
+        {
+            m_radius  = int(r  * gradient_subpixel_size);
+            m_focus_x = int(fx * gradient_subpixel_size);
+            m_focus_y = int(fy * gradient_subpixel_size);
+            update_values();
+        }
+
+        //---------------------------------------------------------------------
+        double radius()  const { return double(m_radius)  / gradient_subpixel_size; }
+        double focus_x() const { return double(m_focus_x) / gradient_subpixel_size; }
+        double focus_y() const { return double(m_focus_y) / gradient_subpixel_size; }
+
+        //---------------------------------------------------------------------
+        int calculate(int x, int y, int d) const
+        {
+            double solution_x;
+            double solution_y;
+
+            // Special case to avoid divide by zero or very near zero
+            //---------------------------------
+            if(x == int(m_focus_x))
+            {
+                solution_x = m_focus_x;
+                solution_y = 0.0;
+                solution_y += (y > m_focus_y) ? m_trivial : -m_trivial;
+            }
+            else
+            {
+                // Slope of the focus-current line
+                //-------------------------------
+                double slope = double(y - m_focus_y) / double(x - m_focus_x);
+
+                // y-intercept of that same line
+                //--------------------------------
+                double yint  = double(y) - (slope * x);
+
+                // Use the classical quadratic formula to calculate
+                // the intersection point
+                //--------------------------------
+                double a = (slope * slope) + 1;
+                double b =  2 * slope * yint;
+                double c =  yint * yint - m_radius2;
+                double det = sqrt((b * b) - (4.0 * a * c));
+                solution_x = -b;
+
+                // Choose the positive or negative root depending
+                // on where the X coord lies with respect to the focus.
+                solution_x += (x < m_focus_x) ? -det : det;
+                solution_x /= 2.0 * a;
+
+                // Calculating of Y is trivial
+                solution_y  = (slope * solution_x) + yint;
+            }
+
+            // Calculate the percentage (0...1) of the current point along the
+            // focus-circumference line and return the normalized (0...d) value
+            //-------------------------------
+            solution_x -= double(m_focus_x);
+            solution_y -= double(m_focus_y);
+            double int_to_focus = solution_x * solution_x + solution_y * solution_y;
+            double cur_to_focus = double(x - m_focus_x) * double(x - m_focus_x) +
+                                  double(y - m_focus_y) * double(y - m_focus_y);
+
+            return int(sqrt(cur_to_focus / int_to_focus) * d);
+        }
+
+    private:
+        //---------------------------------------------------------------------
+        void update_values()
+        {
+            // For use in the quadractic equation
+            //-------------------------------
+            m_radius2 = double(m_radius) * double(m_radius);
+
+            double dist = sqrt(double(m_focus_x) * double(m_focus_x) +
+                               double(m_focus_y) * double(m_focus_y));
+
+            // Test if distance from focus to center is greater than the radius
+            // For the sake of assurance factor restrict the point to be
+            // no further than 99% of the radius.
+            //-------------------------------
+            double r = m_radius * 0.99;
+            if(dist > r)
+            {
+                // clamp focus to radius
+                // x = r cos theta, y = r sin theta
+                //------------------------
+                double a = atan2(double(m_focus_y), double(m_focus_x));
+                m_focus_x = int(r * cos(a));
+                m_focus_y = int(r * sin(a));
+            }
+
+            // Calculate the solution to be used in the case where x == focus_x
+            //------------------------------
+            m_trivial = sqrt(m_radius2 - (m_focus_x * m_focus_x));
+        }
+
+        int m_radius;
+        int m_focus_x;
+        int m_focus_y;
+        double m_radius2;
+        double m_trivial;
+    };
+
+
+
+    //==============================================================gradient_x
+    class gradient_x
+    {
+    public:
+        static int calculate(int x, int, int) { return x; }
+    };
+
+
+    //==============================================================gradient_y
+    class gradient_y
+    {
+    public:
+        static int calculate(int, int y, int) { return y; }
+    };
+
+
+    //========================================================gradient_diamond
+    class gradient_diamond
+    {
+    public:
+        static AGG_INLINE int calculate(int x, int y, int)
+        {
+            int ax = abs(x);
+            int ay = abs(y);
+            return ax > ay ? ax : ay;
+        }
+    };
+
+
+    //=============================================================gradient_xy
+    class gradient_xy
+    {
+    public:
+        static AGG_INLINE int calculate(int x, int y, int d)
+        {
+            return abs(x) * abs(y) / d;
+        }
+    };
+
+
+    //========================================================gradient_sqrt_xy
+    class gradient_sqrt_xy
+    {
+    public:
+        static AGG_INLINE int calculate(int x, int y, int)
+        {
+            return fast_sqrt(abs(x) * abs(y));
+        }
+    };
+
+
+    //==========================================================gradient_conic
+    class gradient_conic
+    {
+    public:
+        static AGG_INLINE int calculate(int x, int y, int d)
+        {
+            return int(fabs(atan2(double(y), double(x))) * double(d) / pi);
+        }
+    };
+
+
+    //=================================================gradient_repeat_adaptor
+    template<class GradientF> class gradient_repeat_adaptor
+    {
+    public:
+        gradient_repeat_adaptor(const GradientF& gradient) :
+            m_gradient(&gradient) {}
+
+        AGG_INLINE int calculate(int x, int y, int d) const
+        {
+            int ret = m_gradient->calculate(x, y, d) % d;
+            if(ret < 0) ret += d;
+            return ret;
+        }
+
+    private:
+        const GradientF* m_gradient;
+    };
+
+
+    //================================================gradient_reflect_adaptor
+    template<class GradientF> class gradient_reflect_adaptor
+    {
+    public:
+        gradient_reflect_adaptor(const GradientF& gradient) :
+            m_gradient(&gradient) {}
+
+        AGG_INLINE int calculate(int x, int y, int d) const
+        {
+            int d2 = d << 1;
+            int ret = m_gradient->calculate(x, y, d) % d2;
+            if(ret <  0) ret += d2;
+            if(ret >= d) ret  = d2 - ret;
+            return ret;
+        }
+
+    private:
+        const GradientF* m_gradient;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_gradient_alpha.h b/agg/inc/agg_span_gradient_alpha.h
new file mode 100755
index 000000000000..b1444ed8c4bc
--- /dev/null
+++ b/agg/inc/agg_span_gradient_alpha.h
@@ -0,0 +1,123 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_GRADIENT_ALPHA_INCLUDED
+#define AGG_SPAN_GRADIENT_ALPHA_INCLUDED
+
+#include "agg_span_gradient.h"
+
+namespace agg
+{
+    //======================================================span_gradient_alpha
+    template<class ColorT,
+             class Interpolator,
+             class GradientF,
+             class AlphaF>
+    class span_gradient_alpha
+    {
+    public:
+        typedef Interpolator interpolator_type;
+        typedef ColorT color_type;
+        typedef typename color_type::value_type alpha_type;
+
+        enum
+        {
+            downscale_shift = interpolator_type::subpixel_shift - gradient_subpixel_shift
+        };
+
+
+        //--------------------------------------------------------------------
+        span_gradient_alpha() {}
+
+        //--------------------------------------------------------------------
+        span_gradient_alpha(interpolator_type& inter,
+                            const GradientF& gradient_function,
+                            const AlphaF& alpha_function,
+                            double d1, double d2) :
+            m_interpolator(&inter),
+            m_gradient_function(&gradient_function),
+            m_alpha_function(&alpha_function),
+            m_d1(int(d1 * gradient_subpixel_size)),
+            m_d2(int(d2 * gradient_subpixel_size))
+        {}
+
+        //--------------------------------------------------------------------
+        interpolator_type& interpolator() { return *m_interpolator; }
+        const GradientF& gradient_function() const { return *m_gradient_function; }
+        const AlphaF& alpha_function() const { return *m_alpha_function; }
+        double d1() const { return double(m_d1) / gradient_subpixel_size; }
+        double d2() const { return double(m_d2) / gradient_subpixel_size; }
+
+        //--------------------------------------------------------------------
+        void interpolator(interpolator_type& i) { m_interpolator = &i; }
+        void gradient_function(const GradientF& gf) { m_gradient_function = &gf; }
+        void alpha_function(const AlphaF& af) { m_alpha_function = &af; }
+        void d1(double v) { m_d1 = int(v * gradient_subpixel_size); }
+        void d2(double v) { m_d2 = int(v * gradient_subpixel_size); }
+
+        //--------------------------------------------------------------------
+        void convert(color_type* span, int x, int y, unsigned len)
+        {
+            int dd = m_d2 - m_d1;
+            if(dd < 1) dd = 1;
+            m_interpolator->begin(x+0.5, y+0.5, len);
+            do
+            {
+                m_interpolator->coordinates(&x, &y);
+                int d = m_gradient_function->calculate(x >> downscale_shift,
+                                                       y >> downscale_shift, dd);
+                d = ((d - m_d1) * (int)m_alpha_function->size()) / dd;
+                if(d < 0) d = 0;
+                if(d >= (int)m_alpha_function->size()) d = m_alpha_function->size() - 1;
+                span->a = (*m_alpha_function)[d];
+                ++span;
+                ++(*m_interpolator);
+            }
+            while(--len);
+        }
+
+    private:
+        interpolator_type* m_interpolator;
+        const GradientF*   m_gradient_function;
+        const AlphaF*      m_alpha_function;
+        int                m_d1;
+        int                m_d2;
+    };
+
+
+    //=======================================================gradient_alpha_x
+    template<class ColorT> struct gradient_alpha_x
+    {
+        typedef typename ColorT::value_type alpha_type;
+        alpha_type operator [] (alpha_type x) const { return x; }
+    };
+
+    //====================================================gradient_alpha_x_u8
+    struct gradient_alpha_x_u8
+    {
+        typedef int8u alpha_type;
+        alpha_type operator [] (alpha_type x) const { return x; }
+    };
+
+    //==========================================gradient_alpha_one_munus_x_u8
+    struct gradient_alpha_one_munus_x_u8
+    {
+        typedef int8u alpha_type;
+        alpha_type operator [] (alpha_type x) const { return 255-x; }
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_image_filter.h b/agg/inc/agg_span_image_filter.h
new file mode 100755
index 000000000000..34163bb29f24
--- /dev/null
+++ b/agg/inc/agg_span_image_filter.h
@@ -0,0 +1,110 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Image transformations with filtering. Span generator base class
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_IMAGE_FILTER_INCLUDED
+#define AGG_SPAN_IMAGE_FILTER_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_image_filters.h"
+#include "agg_rendering_buffer.h"
+#include "agg_span_generator.h"
+
+
+namespace agg
+{
+
+    //--------------------------------------------------span_image_filter
+    template<class ColorT, class Interpolator, class Allocator>
+    class span_image_filter : public span_generator<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Allocator alloc_type;
+        typedef Interpolator interpolator_type;
+        typedef span_generator<color_type, alloc_type> base_type;
+
+        //----------------------------------------------------------------
+        span_image_filter(alloc_type& alloc) :
+            span_generator<color_type, alloc_type>(alloc)
+        {}
+
+        //----------------------------------------------------------------
+        span_image_filter(alloc_type& alloc,
+                          const rendering_buffer& src,
+                          const color_type& back_color,
+                          interpolator_type& interpolator_,
+                          const image_filter_lut* filter_) :
+            span_generator<color_type, alloc_type>(alloc),
+            m_src(&src),
+            m_back_color(back_color),
+            m_interpolator(&interpolator_),
+            m_filter(filter_),
+            m_dx_dbl(0.5),
+            m_dy_dbl(0.5),
+            m_dx_int(image_subpixel_size / 2),
+            m_dy_int(image_subpixel_size / 2)
+        {}
+
+        //----------------------------------------------------------------
+        const  rendering_buffer& source_image() const { return *m_src; }
+        const  color_type& background_color()   const { return m_back_color; }
+        const  image_filter_lut& filter()       const { return *m_filter; }
+        int    filter_dx_int()                  const { return m_dx_int; }
+        int    filter_dy_int()                  const { return m_dy_int; }
+        double filter_dx_dbl()                  const { return m_dx_dbl; }
+        double filter_dy_dbl()                  const { return m_dy_dbl; }
+
+        //----------------------------------------------------------------
+        void source_image(const rendering_buffer& v) { m_src = &v; }
+        void background_color(const color_type& v)   { m_back_color = v; }
+        void interpolator(interpolator_type& v)      { m_interpolator = &v; }
+        void filter(const image_filter_lut& v)       { m_filter = &v; }
+        void filter_offset(double dx, double dy)
+        {
+            m_dx_dbl = dx;
+            m_dy_dbl = dy;
+            m_dx_int = int(dx * image_subpixel_size);
+            m_dy_int = int(dy * image_subpixel_size);
+        }
+        void filter_offset(double d) { filter_offset(d, d); }
+
+        //----------------------------------------------------------------
+        interpolator_type& interpolator() { return *m_interpolator; }
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            base_type::prepare(max_span_len);
+        }
+
+        //----------------------------------------------------------------
+    private:
+        const rendering_buffer* m_src;
+        color_type              m_back_color;
+        interpolator_type*      m_interpolator;
+        const image_filter_lut* m_filter;
+        double   m_dx_dbl;
+        double   m_dy_dbl;
+        unsigned m_dx_int;
+        unsigned m_dy_int;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_image_filter_gray.h b/agg/inc/agg_span_image_filter_gray.h
new file mode 100755
index 000000000000..3f7ae6fcfa72
--- /dev/null
+++ b/agg/inc/agg_span_image_filter_gray.h
@@ -0,0 +1,701 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_IMAGE_FILTER_GRAY_INCLUDED
+#define AGG_SPAN_IMAGE_FILTER_GRAY_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_gray.h"
+#include "agg_span_image_filter.h"
+
+
+namespace agg
+{
+
+
+    //==============================================span_image_filter_gray_nn
+    template<class ColorT,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_gray_nn :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray_nn(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray_nn(alloc_type& alloc,
+                                  const rendering_buffer& src,
+                                  const color_type& back_color,
+                                  interpolator_type& inter) :
+            base_type(alloc, src, back_color, inter, 0)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            calc_type fg;
+            calc_type src_alpha;
+
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x >>= image_subpixel_shift;
+                y >>= image_subpixel_shift;
+
+                if(x >= 0    && y >= 0 &&
+                   x <= maxx && y <= maxy)
+                {
+                    fg = *((const value_type*)base_type::source_image().row(y) + x);
+                    src_alpha = base_mask;
+                }
+                else
+                {
+                    fg = base_type::background_color().v;
+                    src_alpha = base_type::background_color().a;
+                }
+
+                span->v = (value_type)fg;
+                span->a = (value_type)src_alpha;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+    //========================================span_image_filter_gray_bilinear
+    template<class ColorT,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_gray_bilinear :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray_bilinear(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray_bilinear(alloc_type& alloc,
+                                        const rendering_buffer& src,
+                                        const color_type& back_color,
+                                        interpolator_type& inter) :
+            base_type(alloc, src, back_color, inter, 0)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg;
+            calc_type src_alpha;
+            value_type back_v = base_type::background_color().v;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type *fg_ptr;
+
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                if(x_lr >= 0    && y_lr >= 0 &&
+                   x_lr <  maxx && y_lr <  maxy)
+                {
+                    fg = image_subpixel_size * image_subpixel_size / 2;
+
+                    x_hr &= image_subpixel_mask;
+                    y_hr &= image_subpixel_mask;
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr;
+
+                    fg += *fg_ptr++ * (image_subpixel_size - x_hr) * (image_subpixel_size - y_hr);
+                    fg += *fg_ptr++ * (image_subpixel_size - y_hr) * x_hr;
+
+                    fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - 2);
+
+                    fg += *fg_ptr++ * (image_subpixel_size - x_hr) * y_hr;
+                    fg += *fg_ptr++ * x_hr * y_hr;
+
+                    fg >>= image_subpixel_shift * 2;
+                    src_alpha = base_mask;
+                }
+                else
+                {
+                    unsigned weight;
+                    if(x_lr < -1   || y_lr < -1 ||
+                       x_lr > maxx || y_lr > maxy)
+                    {
+                        fg        = back_v;
+                        src_alpha = back_a;
+                    }
+                    else
+                    {
+                        fg =
+                        src_alpha = image_subpixel_size * image_subpixel_size / 2;
+
+                        x_hr &= image_subpixel_mask;
+                        y_hr &= image_subpixel_mask;
+
+                        weight = (image_subpixel_size - x_hr) *
+                                 (image_subpixel_size - y_hr);
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg        += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = x_hr * (image_subpixel_size - y_hr);
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg        += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+
+                        x_lr--;
+                        y_lr++;
+
+                        weight = (image_subpixel_size - x_hr) * y_hr;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = x_hr * y_hr;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg        += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+
+                        fg        >>= image_subpixel_shift * 2;
+                        src_alpha >>= image_subpixel_shift * 2;
+                    }
+                }
+
+                span->v = (value_type)fg;
+                span->a = (value_type)src_alpha;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+    //========================================span_image_filter_gray_2x2
+    template<class ColorT,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_gray_2x2 :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray_2x2(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray_2x2(alloc_type& alloc,
+                                   const rendering_buffer& src,
+                                   const color_type& back_color,
+                                   interpolator_type& inter,
+                                   const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, &filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg;
+            calc_type src_alpha;
+            value_type back_v = base_type::background_color().v;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type *fg_ptr;
+
+            color_type* span = base_type::allocator().span();
+            const int16* weight_array = base_type::filter().weight_array() +
+                                        ((base_type::filter().diameter()/2 - 1) <<
+                                          image_subpixel_shift);
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                if(x_lr >= 0    && y_lr >= 0 &&
+                   x_lr <  maxx && y_lr <  maxy)
+                {
+                    fg = image_filter_size / 2;
+
+                    x_hr &= image_subpixel_mask;
+                    y_hr &= image_subpixel_mask;
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr;
+
+                    fg += *fg_ptr++ * ((weight_array[x_hr + image_subpixel_size] *
+                                        weight_array[y_hr + image_subpixel_size] +
+                                        image_filter_size / 2) >>
+                                        image_filter_shift);
+                    fg += *fg_ptr++ * ((weight_array[x_hr] *
+                                        weight_array[y_hr + image_subpixel_size] +
+                                        image_filter_size / 2) >>
+                                        image_filter_shift);
+
+                    fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - 2);
+
+                    fg += *fg_ptr++ * ((weight_array[x_hr + image_subpixel_size] *
+                                        weight_array[y_hr] +
+                                        image_filter_size / 2) >>
+                                        image_filter_shift);
+                    fg += *fg_ptr++ * ((weight_array[x_hr] *
+                                        weight_array[y_hr] +
+                                        image_filter_size / 2) >>
+                                        image_filter_shift);
+
+                    fg >>= image_filter_shift;
+                    if(fg > base_mask) fg = base_mask;
+                    src_alpha = base_mask;
+                }
+                else
+                {
+                    unsigned weight;
+                    if(x_lr < -1   || y_lr < -1 ||
+                       x_lr > maxx || y_lr > maxy)
+                    {
+                        fg        = back_v;
+                        src_alpha = back_a;
+                    }
+                    else
+                    {
+                        fg = src_alpha = image_filter_size / 2;
+
+                        x_hr &= image_subpixel_mask;
+                        y_hr &= image_subpixel_mask;
+
+                        weight = (weight_array[x_hr + image_subpixel_size] *
+                                  weight_array[y_hr + image_subpixel_size] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg        += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = (weight_array[x_hr] *
+                                  weight_array[y_hr + image_subpixel_size] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg        += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+
+                        x_lr--;
+                        y_lr++;
+
+                        weight = (weight_array[x_hr + image_subpixel_size] *
+                                  weight_array[y_hr] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = (weight_array[x_hr] *
+                                  weight_array[y_hr] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg        += weight * *((const value_type*)base_type::source_image().row(y_lr) + x_lr);
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg        += back_v * weight;
+                            src_alpha += back_a * weight;
+                        }
+                        fg        >>= image_filter_shift;
+                        src_alpha >>= image_filter_shift;
+
+                        if(src_alpha > base_mask) src_alpha = base_mask;
+                        if(fg > src_alpha) fg = src_alpha;
+
+                    }
+                }
+
+                span->v = (value_type)fg;
+                span->a = (value_type)src_alpha;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+
+
+
+
+
+    //================================================span_image_filter_gray
+    template<class ColorT,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_gray :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_gray(alloc_type& alloc,
+                               const rendering_buffer& src,
+                               const color_type& back_color,
+                               interpolator_type& inter,
+                               const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, &filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            int fg;
+            int src_alpha;
+            value_type back_v = base_type::background_color().v;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type* fg_ptr;
+
+            unsigned   diameter     = base_type::filter().diameter();
+            int        start        = base_type::filter().start();
+            int        start1       = start - 1;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() + start - 2;
+            int maxy = base_type::source_image().height() + start - 2;
+
+            int maxx2 = base_type::source_image().width() - start - 1;
+            int maxy2 = base_type::source_image().height() - start - 1;
+
+            int x_count;
+            int weight_y;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x -= base_type::filter_dx_int();
+                y -= base_type::filter_dy_int();
+
+                int x_hr = x;
+                int y_hr = y;
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                fg = image_filter_size / 2;
+
+                int x_fract = x_hr & image_subpixel_mask;
+                unsigned y_count = diameter;
+
+                if(x_lr >= -start && y_lr >= -start &&
+                   x_lr <= maxx   && y_lr <= maxy)
+                {
+                    y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr + start) + x_lr + start;
+                    do
+                    {
+                        x_count = diameter;
+                        weight_y = weight_array[y_hr];
+                        x_hr = image_subpixel_mask - x_fract;
+
+                        do
+                        {
+                            fg += *fg_ptr++ * ((weight_y * weight_array[x_hr] +
+                                               image_filter_size / 2) >>
+                                               image_filter_shift);
+                            x_hr += image_subpixel_size;
+
+                        } while(--x_count);
+
+                        y_hr += image_subpixel_size;
+                        fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - diameter);
+
+                    } while(--y_count);
+
+                    fg >>= image_filter_shift;
+
+                    if(fg < 0)         fg = 0;
+                    if(fg > base_mask) fg = base_mask;
+                    src_alpha = base_mask;
+                }
+                else
+                {
+                    if(x_lr < start1 || y_lr < start1 ||
+                       x_lr > maxx2  || y_lr > maxy2)
+                    {
+                        fg        = back_v;
+                        src_alpha = back_a;
+                    }
+                    else
+                    {
+                        src_alpha = image_filter_size / 2;
+                        y_lr = (y >> image_subpixel_shift) + start;
+                        y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+
+                        do
+                        {
+                            x_count = diameter;
+                            weight_y = weight_array[y_hr];
+                            x_lr = (x >> image_subpixel_shift) + start;
+                            x_hr = image_subpixel_mask - x_fract;
+
+                            do
+                            {
+                                int weight = (weight_y * weight_array[x_hr] +
+                                             image_filter_size / 2) >>
+                                             image_filter_shift;
+
+                                if(x_lr >= 0 && y_lr >= 0 &&
+                                   x_lr < int(base_type::source_image().width()) &&
+                                   y_lr < int(base_type::source_image().height()))
+                                {
+                                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr;
+                                    fg        += *fg_ptr++ * weight;
+                                    src_alpha += base_mask * weight;
+                                }
+                                else
+                                {
+                                    fg        += back_v * weight;
+                                    src_alpha += back_a * weight;
+                                }
+                                x_hr += image_subpixel_size;
+                                x_lr++;
+
+                            } while(--x_count);
+
+                            y_hr += image_subpixel_size;
+                            y_lr++;
+
+                        } while(--y_count);
+
+
+                        fg        >>= image_filter_shift;
+                        src_alpha >>= image_filter_shift;
+
+                        if(fg < 0)        fg = 0;
+                        if(src_alpha < 0) src_alpha = 0;
+
+                        if(src_alpha > base_mask) src_alpha = base_mask;
+                        if(fg        > src_alpha) fg        = src_alpha;
+                    }
+                }
+
+                span->v = (value_type)fg;
+                span->a = (value_type)src_alpha;
+
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+}
+
+
+#endif
+
+
+
diff --git a/agg/inc/agg_span_image_filter_rgb.h b/agg/inc/agg_span_image_filter_rgb.h
new file mode 100755
index 000000000000..d8f8142bfffb
--- /dev/null
+++ b/agg/inc/agg_span_image_filter_rgb.h
@@ -0,0 +1,840 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_IMAGE_FILTER_RGB_INCLUDED
+#define AGG_SPAN_IMAGE_FILTER_RGB_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_span_image_filter.h"
+
+
+namespace agg
+{
+
+
+    //==============================================span_image_filter_rgb_nn
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgb_nn :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb_nn(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb_nn(alloc_type& alloc,
+                                 const rendering_buffer& src,
+                                 const color_type& back_color,
+                                 interpolator_type& inter) :
+            base_type(alloc, src, back_color, inter, 0)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            calc_type fg[3];
+            calc_type src_alpha;
+
+            const value_type *fg_ptr;
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x >>= image_subpixel_shift;
+                y >>= image_subpixel_shift;
+
+                if(x >= 0    && y >= 0 &&
+                   x <= maxx && y <= maxy)
+                {
+                    fg_ptr = (const value_type*)base_type::source_image().row(y) + x + x + x;
+                    fg[0] = *fg_ptr++;
+                    fg[1] = *fg_ptr++;
+                    fg[2] = *fg_ptr++;
+                    src_alpha = base_mask;
+                }
+                else
+                {
+                    fg[order_type::R] = base_type::background_color().r;
+                    fg[order_type::G] = base_type::background_color().g;
+                    fg[order_type::B] = base_type::background_color().b;
+                    src_alpha         = base_type::background_color().a;
+                }
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)src_alpha;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+    //=========================================span_image_filter_rgb_bilinear
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgb_bilinear :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb_bilinear(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb_bilinear(alloc_type& alloc,
+                                       const rendering_buffer& src,
+                                       const color_type& back_color,
+                                       interpolator_type& inter) :
+            base_type(alloc, src, back_color, inter, 0)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg[3];
+            calc_type src_alpha;
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type *fg_ptr;
+
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+                unsigned weight;
+
+                if(x_lr >= 0    && y_lr >= 0 &&
+                   x_lr <  maxx && y_lr <  maxy)
+                {
+                    fg[0] =
+                    fg[1] =
+                    fg[2] = image_subpixel_size * image_subpixel_size / 2;
+
+                    x_hr &= image_subpixel_mask;
+                    y_hr &= image_subpixel_mask;
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+
+                    weight = (image_subpixel_size - x_hr) *
+                             (image_subpixel_size - y_hr);
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    weight = x_hr * (image_subpixel_size - y_hr);
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - 6);
+
+                    weight = (image_subpixel_size - x_hr) * y_hr;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    weight = x_hr * y_hr;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    fg[0] >>= image_subpixel_shift * 2;
+                    fg[1] >>= image_subpixel_shift * 2;
+                    fg[2] >>= image_subpixel_shift * 2;
+                    src_alpha = base_mask;
+                }
+                else
+                {
+                    if(x_lr < -1   || y_lr < -1 ||
+                       x_lr > maxx || y_lr > maxy)
+                    {
+                        fg[order_type::R] = back_r;
+                        fg[order_type::G] = back_g;
+                        fg[order_type::B] = back_b;
+                        src_alpha         = back_a;
+                    }
+                    else
+                    {
+                        fg[0] =
+                        fg[1] =
+                        fg[2] =
+                        src_alpha = image_subpixel_size * image_subpixel_size / 2;
+
+                        x_hr &= image_subpixel_mask;
+                        y_hr &= image_subpixel_mask;
+
+                        weight = (image_subpixel_size - x_hr) *
+                                 (image_subpixel_size - y_hr);
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = x_hr * (image_subpixel_size - y_hr);
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0]     += weight * *fg_ptr++;
+                            fg[1]     += weight * *fg_ptr++;
+                            fg[2]     += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        x_lr--;
+                        y_lr++;
+
+                        weight = (image_subpixel_size - x_hr) * y_hr;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = x_hr * y_hr;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        fg[0] >>= image_subpixel_shift * 2;
+                        fg[1] >>= image_subpixel_shift * 2;
+                        fg[2] >>= image_subpixel_shift * 2;
+                        src_alpha >>= image_subpixel_shift * 2;
+                    }
+                }
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)src_alpha;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+
+    //=========================================span_image_filter_rgb_2x2
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgb_2x2 :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb_2x2(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb_2x2(alloc_type& alloc,
+                                  const rendering_buffer& src,
+                                  const color_type& back_color,
+                                  interpolator_type& inter,
+                                  const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, &filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg[3];
+            calc_type src_alpha;
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type *fg_ptr;
+
+            color_type* span = base_type::allocator().span();
+            const int16* weight_array = base_type::filter().weight_array() +
+                                        ((base_type::filter().diameter()/2 - 1) <<
+                                          image_subpixel_shift);
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+                unsigned weight;
+
+                if(x_lr >= 0    && y_lr >= 0 &&
+                   x_lr <  maxx && y_lr <  maxy)
+                {
+                    fg[0] = fg[1] = fg[2] = image_filter_size / 2;
+
+                    x_hr &= image_subpixel_mask;
+                    y_hr &= image_subpixel_mask;
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+
+                    weight = (weight_array[x_hr + image_subpixel_size] *
+                              weight_array[y_hr + image_subpixel_size] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    weight = (weight_array[x_hr] *
+                              weight_array[y_hr + image_subpixel_size] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - 6);
+
+                    weight = (weight_array[x_hr + image_subpixel_size] *
+                              weight_array[y_hr] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    weight = (weight_array[x_hr] *
+                              weight_array[y_hr] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+
+                    fg[0] >>= image_filter_shift;
+                    fg[1] >>= image_filter_shift;
+                    fg[2] >>= image_filter_shift;
+                    src_alpha = base_mask;
+
+                    if(fg[0] > base_mask) fg[0] = base_mask;
+                    if(fg[1] > base_mask) fg[1] = base_mask;
+                    if(fg[2] > base_mask) fg[2] = base_mask;
+                }
+                else
+                {
+                    if(x_lr < -1   || y_lr < -1 ||
+                       x_lr > maxx || y_lr > maxy)
+                    {
+                        fg[order_type::R] = back_r;
+                        fg[order_type::G] = back_g;
+                        fg[order_type::B] = back_b;
+                        src_alpha         = back_a;
+                    }
+                    else
+                    {
+                        fg[0] = fg[1] = fg[2] = src_alpha = image_filter_size / 2;
+
+                        x_hr &= image_subpixel_mask;
+                        y_hr &= image_subpixel_mask;
+
+                        weight = (weight_array[x_hr + image_subpixel_size] *
+                                  weight_array[y_hr + image_subpixel_size] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = (weight_array[x_hr] *
+                                  weight_array[y_hr + image_subpixel_size] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0]     += weight * *fg_ptr++;
+                            fg[1]     += weight * *fg_ptr++;
+                            fg[2]     += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        x_lr--;
+                        y_lr++;
+
+                        weight = (weight_array[x_hr + image_subpixel_size] *
+                                  weight_array[y_hr] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = (weight_array[x_hr] *
+                                  weight_array[y_hr] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr + x_lr + x_lr;
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            src_alpha += weight * base_mask;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            src_alpha         += back_a * weight;
+                        }
+
+                        fg[0]     >>= image_filter_shift;
+                        fg[1]     >>= image_filter_shift;
+                        fg[2]     >>= image_filter_shift;
+                        src_alpha >>= image_filter_shift;
+
+                        if(src_alpha > base_mask) src_alpha = base_mask;
+                        if(fg[0] > src_alpha) fg[0] = src_alpha;
+                        if(fg[1] > src_alpha) fg[1] = src_alpha;
+                        if(fg[2] > src_alpha) fg[2] = src_alpha;
+                    }
+                }
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)src_alpha;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+    //=================================================span_image_filter_rgb
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgb :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgb(alloc_type& alloc,
+                               const rendering_buffer& src,
+                               const color_type& back_color,
+                               interpolator_type& inter,
+                               const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, &filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            int fg[3];
+            int src_alpha;
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type* fg_ptr;
+
+            unsigned   diameter     = base_type::filter().diameter();
+            int        start        = base_type::filter().start();
+            int        start1       = start - 1;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            unsigned step_back = diameter * 3;
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() + start - 2;
+            int maxy = base_type::source_image().height() + start - 2;
+
+            int maxx2 = base_type::source_image().width() - start - 1;
+            int maxy2 = base_type::source_image().height() - start - 1;
+
+            int x_count;
+            int weight_y;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x -= base_type::filter_dx_int();
+                y -= base_type::filter_dy_int();
+
+                int x_hr = x;
+                int y_hr = y;
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                fg[0] = fg[1] = fg[2] = image_filter_size / 2;
+
+                int x_fract = x_hr & image_subpixel_mask;
+                unsigned y_count = diameter;
+
+                if(x_lr >= -start && y_lr >= -start &&
+                   x_lr <= maxx   && y_lr <= maxy)
+                {
+                    y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr + start) + (x_lr + start) * 3;
+                    do
+                    {
+                        x_count = diameter;
+                        weight_y = weight_array[y_hr];
+                        x_hr = image_subpixel_mask - x_fract;
+
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         image_filter_shift;
+
+                            fg[0] += *fg_ptr++ * weight;
+                            fg[1] += *fg_ptr++ * weight;
+                            fg[2] += *fg_ptr++ * weight;
+
+                            x_hr += image_subpixel_size;
+
+                        } while(--x_count);
+
+                        y_hr += image_subpixel_size;
+                        fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - step_back);
+
+                    } while(--y_count);
+
+                    fg[0] >>= image_filter_shift;
+                    fg[1] >>= image_filter_shift;
+                    fg[2] >>= image_filter_shift;
+
+                    if(fg[0] < 0) fg[0] = 0;
+                    if(fg[1] < 0) fg[1] = 0;
+                    if(fg[2] < 0) fg[2] = 0;
+
+                    if(fg[0] > base_mask) fg[0] = base_mask;
+                    if(fg[1] > base_mask) fg[1] = base_mask;
+                    if(fg[2] > base_mask) fg[2] = base_mask;
+                    src_alpha = base_mask;
+                }
+                else
+                {
+                    if(x_lr < start1 || y_lr < start1 ||
+                       x_lr > maxx2  || y_lr > maxy2)
+                    {
+                        fg[order_type::R] = back_r;
+                        fg[order_type::G] = back_g;
+                        fg[order_type::B] = back_b;
+                        src_alpha         = back_a;
+                    }
+                    else
+                    {
+                        src_alpha = image_filter_size / 2;
+                        y_lr = (y >> image_subpixel_shift) + start;
+                        y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+
+                        do
+                        {
+                            x_count = diameter;
+                            weight_y = weight_array[y_hr];
+                            x_lr = (x >> image_subpixel_shift) + start;
+                            x_hr = image_subpixel_mask - x_fract;
+
+                            do
+                            {
+                                int weight = (weight_y * weight_array[x_hr] +
+                                             image_filter_size / 2) >>
+                                             image_filter_shift;
+
+                                if(x_lr >= 0 && y_lr >= 0 &&
+                                   x_lr < int(base_type::source_image().width()) &&
+                                   y_lr < int(base_type::source_image().height()))
+                                {
+                                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + x_lr * 3;
+                                    fg[0] += *fg_ptr++ * weight;
+                                    fg[1] += *fg_ptr++ * weight;
+                                    fg[2] += *fg_ptr++ * weight;
+                                    src_alpha += base_mask * weight;
+                                }
+                                else
+                                {
+                                    fg[order_type::R] += back_r * weight;
+                                    fg[order_type::G] += back_g * weight;
+                                    fg[order_type::B] += back_b * weight;
+                                    src_alpha         += back_a * weight;
+                                }
+                                x_hr += image_subpixel_size;
+                                x_lr++;
+
+                            } while(--x_count);
+
+                            y_hr += image_subpixel_size;
+                            y_lr++;
+
+                        } while(--y_count);
+
+
+                        fg[0] >>= image_filter_shift;
+                        fg[1] >>= image_filter_shift;
+                        fg[2] >>= image_filter_shift;
+                        src_alpha >>= image_filter_shift;
+
+                        if(fg[0] < 0) fg[0] = 0;
+                        if(fg[1] < 0) fg[1] = 0;
+                        if(fg[2] < 0) fg[2] = 0;
+                        if(src_alpha < 0) src_alpha = 0;
+
+                        if(src_alpha > base_mask) src_alpha = base_mask;
+                        if(fg[0] > src_alpha) fg[0] = src_alpha;
+                        if(fg[1] > src_alpha) fg[1] = src_alpha;
+                        if(fg[2] > src_alpha) fg[2] = src_alpha;
+                    }
+                }
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)src_alpha;
+
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+}
+
+
+#endif
+
+
+
diff --git a/agg/inc/agg_span_image_filter_rgba.h b/agg/inc/agg_span_image_filter_rgba.h
new file mode 100755
index 000000000000..42b822c99b9b
--- /dev/null
+++ b/agg/inc/agg_span_image_filter_rgba.h
@@ -0,0 +1,864 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+//
+// classes span_image_filter_rgba32*
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_IMAGE_FILTER_RGBA_INCLUDED
+#define AGG_SPAN_IMAGE_FILTER_RGBA_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_span_image_filter.h"
+
+
+namespace agg
+{
+
+    //=============================================span_image_filter_rgba_nn
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgba_nn :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba_nn(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba_nn(alloc_type& alloc,
+                                  const rendering_buffer& src,
+                                  const color_type& back_color,
+                                  interpolator_type& inter) :
+            base_type(alloc, src, back_color, inter, 0)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            calc_type fg[4];
+
+            const value_type *fg_ptr;
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x >>= image_subpixel_shift;
+                y >>= image_subpixel_shift;
+
+                if(x >= 0    && y >= 0 &&
+                   x <= maxx && y <= maxy)
+                {
+                    fg_ptr = (const value_type*)base_type::source_image().row(y) + (x << 2);
+                    fg[0] = *fg_ptr++;
+                    fg[1] = *fg_ptr++;
+                    fg[2] = *fg_ptr++;
+                    fg[3] = *fg_ptr++;
+                }
+                else
+                {
+                   fg[order_type::R] = base_type::background_color().r;
+                   fg[order_type::G] = base_type::background_color().g;
+                   fg[order_type::B] = base_type::background_color().b;
+                   fg[order_type::A] = base_type::background_color().a;
+                }
+
+                span->r = fg[order_type::R];
+                span->g = fg[order_type::G];
+                span->b = fg[order_type::B];
+                span->a = fg[order_type::A];
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    };
+
+
+
+
+
+
+
+    //=======================================span_image_filter_rgba_bilinear
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgba_bilinear :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba_bilinear(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba_bilinear(alloc_type& alloc,
+                                        const rendering_buffer& src,
+                                        const color_type& back_color,
+                                        interpolator_type& inter) :
+            base_type(alloc, src, back_color, inter, 0)
+        {}
+
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            calc_type fg[4];
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type *fg_ptr;
+
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned weight;
+
+                if(x_lr >= 0    && y_lr >= 0 &&
+                   x_lr <  maxx && y_lr <  maxy)
+                {
+                    fg[0] =
+                    fg[1] =
+                    fg[2] =
+                    fg[3] = image_subpixel_size * image_subpixel_size / 2;
+
+                    x_hr &= image_subpixel_mask;
+                    y_hr &= image_subpixel_mask;
+
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+
+                    weight = (image_subpixel_size - x_hr) *
+                             (image_subpixel_size - y_hr);
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    weight = x_hr * (image_subpixel_size - y_hr);
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - 8);
+
+                    weight = (image_subpixel_size - x_hr) * y_hr;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    weight = x_hr * y_hr;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    fg[0] >>= image_subpixel_shift * 2;
+                    fg[1] >>= image_subpixel_shift * 2;
+                    fg[2] >>= image_subpixel_shift * 2;
+                    fg[3] >>= image_subpixel_shift * 2;
+                }
+                else
+                {
+                    if(x_lr < -1   || y_lr < -1 ||
+                       x_lr > maxx || y_lr > maxy)
+                    {
+                        fg[order_type::R] = back_r;
+                        fg[order_type::G] = back_g;
+                        fg[order_type::B] = back_b;
+                        fg[order_type::A] = back_a;
+                    }
+                    else
+                    {
+                        fg[0] =
+                        fg[1] =
+                        fg[2] =
+                        fg[3] = image_subpixel_size * image_subpixel_size / 2;
+
+                        x_hr &= image_subpixel_mask;
+                        y_hr &= image_subpixel_mask;
+
+                        weight = (image_subpixel_size - x_hr) *
+                                 (image_subpixel_size - y_hr);
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = x_hr * (image_subpixel_size - y_hr);
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        x_lr--;
+                        y_lr++;
+
+                        weight = (image_subpixel_size - x_hr) * y_hr;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = x_hr * y_hr;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        fg[0] >>= image_subpixel_shift * 2;
+                        fg[1] >>= image_subpixel_shift * 2;
+                        fg[2] >>= image_subpixel_shift * 2;
+                        fg[3] >>= image_subpixel_shift * 2;
+                    }
+                }
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[order_type::A];
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+    //=======================================span_image_filter_rgba_2x2
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgba_2x2 :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba_2x2(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba_2x2(alloc_type& alloc,
+                                   const rendering_buffer& src,
+                                   const color_type& back_color,
+                                   interpolator_type& inter,
+                                   const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, &filter)
+        {}
+
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            calc_type fg[4];
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type *fg_ptr;
+
+            color_type* span = base_type::allocator().span();
+            const int16* weight_array = base_type::filter().weight_array() +
+                                        ((base_type::filter().diameter()/2 - 1) <<
+                                          image_subpixel_shift);
+
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned weight;
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                if(x_lr >= 0    && y_lr >= 0 &&
+                   x_lr <  maxx && y_lr <  maxy)
+                {
+                    x_hr &= image_subpixel_mask;
+                    y_hr &= image_subpixel_mask;
+
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+
+                    weight = (weight_array[x_hr + image_subpixel_size] *
+                              weight_array[y_hr + image_subpixel_size] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    weight = (weight_array[x_hr] *
+                              weight_array[y_hr + image_subpixel_size] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - 8);
+
+                    weight = (weight_array[x_hr + image_subpixel_size] *
+                              weight_array[y_hr] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    weight = (weight_array[x_hr] *
+                              weight_array[y_hr] +
+                              image_filter_size / 2) >>
+                              image_filter_shift;
+                    fg[0] += weight * *fg_ptr++;
+                    fg[1] += weight * *fg_ptr++;
+                    fg[2] += weight * *fg_ptr++;
+                    fg[3] += weight * *fg_ptr++;
+
+                    fg[0] >>= image_filter_shift;
+                    fg[1] >>= image_filter_shift;
+                    fg[2] >>= image_filter_shift;
+                    fg[3] >>= image_filter_shift;
+
+                    if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                    if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                    if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                    if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+                }
+                else
+                {
+                    if(x_lr < -1   || y_lr < -1 ||
+                       x_lr > maxx || y_lr > maxy)
+                    {
+                        fg[order_type::R] = back_r;
+                        fg[order_type::G] = back_g;
+                        fg[order_type::B] = back_b;
+                        fg[order_type::A] = back_a;
+                    }
+                    else
+                    {
+                        x_hr &= image_subpixel_mask;
+                        y_hr &= image_subpixel_mask;
+
+                        weight = (weight_array[x_hr + image_subpixel_size] *
+                                  weight_array[y_hr + image_subpixel_size] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = (weight_array[x_hr] *
+                                  weight_array[y_hr + image_subpixel_size] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        x_lr--;
+                        y_lr++;
+
+                        weight = (weight_array[x_hr + image_subpixel_size] *
+                                  weight_array[y_hr] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        x_lr++;
+
+                        weight = (weight_array[x_hr] *
+                                  weight_array[y_hr] +
+                                  image_filter_size / 2) >>
+                                  image_filter_shift;
+                        if(x_lr >= 0    && y_lr >= 0 &&
+                           x_lr <= maxx && y_lr <= maxy)
+                        {
+                            fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                            fg[0] += weight * *fg_ptr++;
+                            fg[1] += weight * *fg_ptr++;
+                            fg[2] += weight * *fg_ptr++;
+                            fg[3] += weight * *fg_ptr++;
+                        }
+                        else
+                        {
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                        }
+
+                        fg[0] >>= image_filter_shift;
+                        fg[1] >>= image_filter_shift;
+                        fg[2] >>= image_filter_shift;
+                        fg[3] >>= image_filter_shift;
+
+                        if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                        if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                        if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                        if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+                    }
+                }
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[order_type::A];
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+
+
+
+
+
+
+    //================================================span_image_filter_rgba
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_filter_rgba :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_filter_rgba(alloc_type& alloc,
+                               const rendering_buffer& src,
+                               const color_type& back_color,
+                               interpolator_type& inter,
+                               const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, &filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            int fg[4];
+
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            const value_type *fg_ptr;
+
+            unsigned   diameter     = base_type::filter().diameter();
+            int        start        = base_type::filter().start();
+            int        start1       = start - 1;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            unsigned step_back = diameter << 2;
+            color_type* span = base_type::allocator().span();
+
+            int maxx = base_type::source_image().width() + start - 2;
+            int maxy = base_type::source_image().height() + start - 2;
+
+            int maxx2 = base_type::source_image().width() - start - 1;
+            int maxy2 = base_type::source_image().height() - start - 1;
+
+            int x_count;
+            int weight_y;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x -= base_type::filter_dx_int();
+                y -= base_type::filter_dy_int();
+
+                int x_hr = x;
+                int y_hr = y;
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                int x_fract = x_hr & image_subpixel_mask;
+                unsigned y_count = diameter;
+
+                if(x_lr >= -start && y_lr >= -start &&
+                   x_lr <= maxx   && y_lr <= maxy)
+                {
+                    y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr + start) + ((x_lr + start) << 2);
+                    do
+                    {
+                        x_count = diameter;
+                        weight_y = weight_array[y_hr];
+                        x_hr = image_subpixel_mask - x_fract;
+
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         image_filter_shift;
+
+                            fg[0] += *fg_ptr++ * weight;
+                            fg[1] += *fg_ptr++ * weight;
+                            fg[2] += *fg_ptr++ * weight;
+                            fg[3] += *fg_ptr++ * weight;
+
+                            x_hr += image_subpixel_size;
+
+                        } while(--x_count);
+
+                        y_hr += image_subpixel_size;
+                        fg_ptr = (const value_type*)base_type::source_image().next_row(fg_ptr - step_back);
+
+                    } while(--y_count);
+
+                    fg[0] >>= image_filter_shift;
+                    fg[1] >>= image_filter_shift;
+                    fg[2] >>= image_filter_shift;
+                    fg[3] >>= image_filter_shift;
+
+                    if(fg[0] < 0) fg[0] = 0;
+                    if(fg[1] < 0) fg[1] = 0;
+                    if(fg[2] < 0) fg[2] = 0;
+                    if(fg[3] < 0) fg[3] = 0;
+
+                    if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                    if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                    if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                    if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+                }
+                else
+                {
+                    if(x_lr < start1 || y_lr < start1 ||
+                       x_lr > maxx2  || y_lr > maxy2)
+                    {
+                        fg[order_type::R] = back_r;
+                        fg[order_type::G] = back_g;
+                        fg[order_type::B] = back_b;
+                        fg[order_type::A] = back_a;
+                    }
+                    else
+                    {
+                        y_lr = (y >> image_subpixel_shift) + start;
+                        y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+
+                        do
+                        {
+                            x_count = diameter;
+                            weight_y = weight_array[y_hr];
+                            x_lr = (x >> image_subpixel_shift) + start;
+                            x_hr = image_subpixel_mask - x_fract;
+
+                            do
+                            {
+                                int weight = (weight_y * weight_array[x_hr] +
+                                             image_filter_size / 2) >>
+                                             image_filter_shift;
+
+                                if(x_lr >= 0 && y_lr >= 0 &&
+                                   x_lr < int(base_type::source_image().width()) &&
+                                   y_lr < int(base_type::source_image().height()))
+                                {
+                                    fg_ptr = (const value_type*)base_type::source_image().row(y_lr) + (x_lr << 2);
+                                    fg[0] += *fg_ptr++ * weight;
+                                    fg[1] += *fg_ptr++ * weight;
+                                    fg[2] += *fg_ptr++ * weight;
+                                    fg[3] += *fg_ptr++ * weight;
+                                }
+                                else
+                                {
+                                    fg[order_type::R] += back_r * weight;
+                                    fg[order_type::G] += back_g * weight;
+                                    fg[order_type::B] += back_b * weight;
+                                    fg[order_type::A] += back_a * weight;
+                                }
+                                x_hr += image_subpixel_size;
+                                x_lr++;
+
+                            } while(--x_count);
+
+                            y_hr += image_subpixel_size;
+                            y_lr++;
+
+                        } while(--y_count);
+
+
+                        fg[0] >>= image_filter_shift;
+                        fg[1] >>= image_filter_shift;
+                        fg[2] >>= image_filter_shift;
+                        fg[3] >>= image_filter_shift;
+
+                        if(fg[0] < 0) fg[0] = 0;
+                        if(fg[1] < 0) fg[1] = 0;
+                        if(fg[2] < 0) fg[2] = 0;
+                        if(fg[3] < 0) fg[3] = 0;
+
+                        if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                        if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                        if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                        if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+                    }
+                }
+
+                span->r = fg[order_type::R];
+                span->g = fg[order_type::G];
+                span->b = fg[order_type::B];
+                span->a = fg[order_type::A];
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    };
+
+
+}
+
+
+#endif
+
+
+
diff --git a/agg/inc/agg_span_image_resample.h b/agg/inc/agg_span_image_resample.h
new file mode 100755
index 000000000000..f4dfd57455d7
--- /dev/null
+++ b/agg/inc/agg_span_image_resample.h
@@ -0,0 +1,180 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_IMAGE_RESAMPLE_INCLUDED
+#define AGG_SPAN_IMAGE_RESAMPLE_INCLUDED
+
+#include "agg_span_image_filter.h"
+#include "agg_span_interpolator_linear.h"
+
+
+namespace agg
+{
+
+
+    //=====================================================span_image_resample
+    template<class ColorT, class Interpolator, class Allocator>
+    class span_image_resample :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+
+        //--------------------------------------------------------------------
+        span_image_resample(alloc_type& alloc) :
+            base_type(alloc),
+            m_scale_limit(20),
+            m_blur_x(image_subpixel_size),
+            m_blur_y(image_subpixel_size)
+        {}
+
+        //--------------------------------------------------------------------
+        span_image_resample(alloc_type& alloc,
+                            const rendering_buffer& src,
+                            const color_type& back_color,
+                            interpolator_type& inter,
+                            const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, &filter),
+            m_scale_limit(20),
+            m_blur_x(image_subpixel_size),
+            m_blur_y(image_subpixel_size)
+        {}
+
+
+        //--------------------------------------------------------------------
+        int  scale_limit() const { return m_scale_limit; }
+        void scale_limit(int v)  { m_scale_limit = v; }
+
+        //--------------------------------------------------------------------
+        double blur_x() const { return double(m_blur_x) / double(image_subpixel_size); }
+        double blur_y() const { return double(m_blur_y) / double(image_subpixel_size); }
+        void blur_x(double v) { m_blur_x = int(v * double(image_subpixel_size) + 0.5); }
+        void blur_y(double v) { m_blur_y = int(v * double(image_subpixel_size) + 0.5); }
+        void blur(double v)   { m_blur_x =
+                                m_blur_y = int(v * double(image_subpixel_size) + 0.5); }
+
+    protected:
+        int m_scale_limit;
+        int m_blur_x;
+        int m_blur_y;
+    };
+
+
+
+
+
+
+
+
+    //==============================================span_image_resample_affine
+    template<class ColorT, class Allocator>
+    class span_image_resample_affine :
+    public span_image_filter<ColorT, span_interpolator_linear<trans_affine>, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef span_interpolator_linear<trans_affine> interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+
+        //--------------------------------------------------------------------
+        span_image_resample_affine(alloc_type& alloc) :
+            base_type(alloc),
+            m_scale_limit(200.0),
+            m_blur_x(1.0),
+            m_blur_y(1.0)
+        {}
+
+        //--------------------------------------------------------------------
+        span_image_resample_affine(alloc_type& alloc,
+                                   const rendering_buffer& src,
+                                   const color_type& back_color,
+                                   interpolator_type& inter,
+                                   const image_filter_lut& filter_) :
+            base_type(alloc, src, back_color, inter, &filter_),
+            m_scale_limit(200.0),
+            m_blur_x(1.0),
+            m_blur_y(1.0)
+        {}
+
+
+        //--------------------------------------------------------------------
+        int  scale_limit() const { return int(m_scale_limit); }
+        void scale_limit(int v)  { m_scale_limit = v; }
+
+        //--------------------------------------------------------------------
+        double blur_x() const { return m_blur_x; }
+        double blur_y() const { return m_blur_y; }
+        void blur_x(double v) { m_blur_x = v; }
+        void blur_y(double v) { m_blur_y = v; }
+        void blur(double v) { m_blur_x = m_blur_y = v; }
+
+
+        //--------------------------------------------------------------------
+        void prepare(unsigned max_span_len)
+        {
+            base_type::prepare(max_span_len);
+
+            double scale_x;
+            double scale_y;
+
+            base_type::interpolator().transformer().scaling_abs(&scale_x, &scale_y);
+
+            m_rx     = image_subpixel_size;
+            m_ry     = image_subpixel_size;
+            m_rx_inv = image_subpixel_size;
+            m_ry_inv = image_subpixel_size;
+
+            scale_x *= m_blur_x;
+            scale_y *= m_blur_y;
+
+            if(scale_x * scale_y > m_scale_limit)
+            {
+                scale_x = scale_x * m_scale_limit / (scale_x * scale_y);
+                scale_y = scale_y * m_scale_limit / (scale_x * scale_y);
+            }
+
+            if(scale_x > 1.0001)
+            {
+                if(scale_x > m_scale_limit) scale_x = m_scale_limit;
+                m_rx     = int(    scale_x * double(image_subpixel_size) + 0.5);
+                m_rx_inv = int(1.0/scale_x * double(image_subpixel_size) + 0.5);
+            }
+
+            if(scale_y > 1.0001)
+            {
+                if(scale_y > m_scale_limit) scale_y = m_scale_limit;
+                m_ry     = int(    scale_y * double(image_subpixel_size) + 0.5);
+                m_ry_inv = int(1.0/scale_y * double(image_subpixel_size) + 0.5);
+            }
+        }
+
+    protected:
+        int m_rx;
+        int m_ry;
+        int m_rx_inv;
+        int m_ry_inv;
+
+    private:
+        double m_scale_limit;
+        double m_blur_x;
+        double m_blur_y;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_image_resample_gray.h b/agg/inc/agg_span_image_resample_gray.h
new file mode 100755
index 000000000000..3d046462cd8c
--- /dev/null
+++ b/agg/inc/agg_span_image_resample_gray.h
@@ -0,0 +1,359 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_IMAGE_RESAMPLE_GRAY_INCLUDED
+#define AGG_SPAN_IMAGE_RESAMPLE_GRAY_INCLUDED
+
+#include "agg_color_gray.h"
+#include "agg_span_image_resample.h"
+
+namespace agg
+{
+
+    //========================================span_image_resample_gray_affine
+    template<class ColorT,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_resample_gray_affine :
+    public span_image_resample_affine<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample_affine<color_type, alloc_type> base_type;
+        typedef typename base_type::interpolator_type interpolator_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift      = color_type::base_shift,
+            base_mask       = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_image_resample_gray_affine(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_resample_gray_affine(alloc_type& alloc,
+                                        const rendering_buffer& src,
+                                        const color_type& back_color,
+                                        interpolator_type& inter,
+                                        const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, filter)
+        {}
+
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            long_type fg;
+            long_type src_alpha;
+            value_type back_v = base_type::background_color().v;
+            value_type back_a = base_type::background_color().a;
+
+            color_type* span = base_type::allocator().span();
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            int radius_x = (diameter * base_type::m_rx) >> 1;
+            int radius_y = (diameter * base_type::m_ry) >> 1;
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg = src_alpha = image_filter_size / 2;
+
+                int y_lr = y >> image_subpixel_shift;
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                                base_type::m_ry_inv) >>
+                                    image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   base_type::m_rx_inv) >>
+                                       image_subpixel_shift;
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = x_lr_ini;
+                    int x_hr = x_hr_ini;
+                    if(y_lr >= 0 && y_lr <= maxy)
+                    {
+                        const value_type* fg_ptr = (const value_type*)
+                            base_type::source_image().row(y_lr) + x_lr;
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            if(x_lr >= 0 && x_lr <= maxx)
+                            {
+                                fg        += *fg_ptr   * weight;
+                                src_alpha += base_mask * weight;
+                            }
+                            else
+                            {
+                                fg        += back_v * weight;
+                                src_alpha += back_a * weight;
+                            }
+                            total_weight += weight;
+                            x_hr += base_type::m_rx_inv;
+                            ++fg_ptr;
+                            ++x_lr;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    else
+                    {
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            total_weight += weight;
+                            fg           += back_v * weight;
+                            src_alpha    += back_a * weight;
+                            x_hr         += base_type::m_rx_inv;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    y_hr += base_type::m_ry_inv;
+                    ++y_lr;
+                }
+                while(y_hr < filter_size);
+
+                fg        /= total_weight;
+                src_alpha /= total_weight;
+
+                if(fg        < 0) fg        = 0;
+                if(src_alpha < 0) src_alpha = 0;
+
+                if(src_alpha > base_mask) src_alpha = base_mask;
+                if(fg        > src_alpha) fg        = src_alpha;
+
+                span->v = (value_type)fg;
+                span->a = (value_type)src_alpha;
+
+                ++span;
+                ++base_type::interpolator();
+            } while(--len);
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+    //==============================================span_image_resample_gray
+    template<class ColorT,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_resample_gray :
+    public span_image_resample<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_image_resample_gray(alloc_type& alloc) :
+            base_type(alloc)
+        {}
+
+        //--------------------------------------------------------------------
+        span_image_resample_gray(alloc_type& alloc,
+                                 const rendering_buffer& src,
+                                 const color_type& back_color,
+                                 interpolator_type& inter,
+                                 const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            long_type fg;
+            long_type src_alpha;
+            value_type back_v = base_type::background_color().v;
+            value_type back_a = base_type::background_color().a;
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                int rx;
+                int ry;
+                int rx_inv = image_subpixel_size;
+                int ry_inv = image_subpixel_size;
+                base_type::interpolator().coordinates(&x,  &y);
+                base_type::interpolator().local_scale(&rx, &ry);
+
+                rx = (rx * base_type::m_blur_x) >> image_subpixel_shift;
+                ry = (ry * base_type::m_blur_y) >> image_subpixel_shift;
+
+                if(rx < image_subpixel_size)
+                {
+                    rx = image_subpixel_size;
+                }
+                else
+                {
+                    if(rx > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        rx = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    rx_inv = image_subpixel_size * image_subpixel_size / rx;
+                }
+
+                if(ry < image_subpixel_size)
+                {
+                    ry = image_subpixel_size;
+                }
+                else
+                {
+                    if(ry > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        ry = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    ry_inv = image_subpixel_size * image_subpixel_size / ry;
+                }
+
+                int radius_x = (diameter * rx) >> 1;
+                int radius_y = (diameter * ry) >> 1;
+                int maxx = base_type::source_image().width() - 1;
+                int maxy = base_type::source_image().height() - 1;
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg = src_alpha = image_filter_size / 2;
+
+                int y_lr = y >> image_subpixel_shift;
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                               ry_inv) >>
+                                   image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   rx_inv) >>
+                                       image_subpixel_shift;
+
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = x_lr_ini;
+                    int x_hr = x_hr_ini;
+                    if(y_lr >= 0 && y_lr <= maxy)
+                    {
+                        const value_type* fg_ptr = (const value_type*)
+                            base_type::source_image().row(y_lr) + x_lr;
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            if(x_lr >= 0 && x_lr <= maxx)
+                            {
+                                fg        += *fg_ptr   * weight;
+                                src_alpha += base_mask * weight;
+                            }
+                            else
+                            {
+                                fg        += back_v * weight;
+                                src_alpha += back_a * weight;
+                            }
+                            total_weight += weight;
+                            x_hr         += rx_inv;
+                            ++fg_ptr;
+                            ++x_lr;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    else
+                    {
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            total_weight += weight;
+                            fg           += back_v * weight;
+                            src_alpha    += back_a * weight;
+                            x_hr         += rx_inv;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    y_hr += ry_inv;
+                    ++y_lr;
+                }
+                while(y_hr < filter_size);
+
+                fg        /= total_weight;
+                src_alpha /= total_weight;
+
+                if(fg        < 0) fg        = 0;
+                if(src_alpha < 0) src_alpha = 0;
+
+                if(src_alpha > base_mask) src_alpha = base_mask;
+                if(fg        > src_alpha) fg        = src_alpha;
+
+                span->v = (value_type)fg;
+                span->a = (value_type)src_alpha;
+
+                ++span;
+                ++base_type::interpolator();
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_span_image_resample_rgb.h b/agg/inc/agg_span_image_resample_rgb.h
new file mode 100755
index 000000000000..de25dd4b382b
--- /dev/null
+++ b/agg/inc/agg_span_image_resample_rgb.h
@@ -0,0 +1,393 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_IMAGE_RESAMPLE_RGB_INCLUDED
+#define AGG_SPAN_IMAGE_RESAMPLE_RGB_INCLUDED
+
+#include "agg_color_rgba.h"
+#include "agg_span_image_resample.h"
+
+namespace agg
+{
+
+    //=========================================span_image_resample_rgb_affine
+    template<class ColorT,
+             class Order,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_resample_rgb_affine :
+    public span_image_resample_affine<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample_affine<color_type, alloc_type> base_type;
+        typedef typename base_type::interpolator_type interpolator_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift      = color_type::base_shift,
+            base_mask       = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgb_affine(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgb_affine(alloc_type& alloc,
+                                       const rendering_buffer& src,
+                                       const color_type& back_color,
+                                       interpolator_type& inter,
+                                       const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, filter)
+        {}
+
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            long_type fg[4];
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            color_type* span = base_type::allocator().span();
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            int radius_x = (diameter * base_type::m_rx) >> 1;
+            int radius_y = (diameter * base_type::m_ry) >> 1;
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                int y_lr = y >> image_subpixel_shift;
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                                base_type::m_ry_inv) >>
+                                    image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   base_type::m_rx_inv) >>
+                                       image_subpixel_shift;
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = x_lr_ini;
+                    int x_hr = x_hr_ini;
+                    if(y_lr >= 0 && y_lr <= maxy)
+                    {
+                        const value_type* fg_ptr = (const value_type*)
+                            base_type::source_image().row(y_lr) + x_lr * 3;
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            if(x_lr >= 0 && x_lr <= maxx)
+                            {
+                                fg[0] += fg_ptr[0] * weight;
+                                fg[1] += fg_ptr[1] * weight;
+                                fg[2] += fg_ptr[2] * weight;
+                                fg[3] += base_mask * weight;
+                            }
+                            else
+                            {
+                                fg[order_type::R] += back_r * weight;
+                                fg[order_type::G] += back_g * weight;
+                                fg[order_type::B] += back_b * weight;
+                                fg[3]             += back_a * weight;
+                            }
+                            total_weight += weight;
+                            fg_ptr += 3;
+                            x_hr   += base_type::m_rx_inv;
+                            ++x_lr;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    else
+                    {
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            total_weight      += weight;
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[3]             += back_a * weight;
+                            x_hr              += base_type::m_rx_inv;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    y_hr += base_type::m_ry_inv;
+                    ++y_lr;
+                }
+                while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+                fg[3] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+                if(fg[3] < 0) fg[3] = 0;
+
+                if(fg[3] > base_mask) fg[3] = base_mask;
+                if(fg[0] > fg[3])     fg[0] = fg[3];
+                if(fg[1] > fg[3])     fg[1] = fg[3];
+                if(fg[2] > fg[3])     fg[2] = fg[3];
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[3];
+
+                ++span;
+                ++base_type::interpolator();
+            } while(--len);
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+    //===============================================span_image_resample_rgb
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_resample_rgb :
+    public span_image_resample<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgb(alloc_type& alloc) :
+            base_type(alloc)
+        {}
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgb(alloc_type& alloc,
+                                const rendering_buffer& src,
+                                const color_type& back_color,
+                                interpolator_type& inter,
+                                const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            long_type fg[4];
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                int rx;
+                int ry;
+                int rx_inv = image_subpixel_size;
+                int ry_inv = image_subpixel_size;
+                base_type::interpolator().coordinates(&x,  &y);
+                base_type::interpolator().local_scale(&rx, &ry);
+
+                rx = (rx * base_type::m_blur_x) >> image_subpixel_shift;
+                ry = (ry * base_type::m_blur_y) >> image_subpixel_shift;
+
+                if(rx < image_subpixel_size)
+                {
+                    rx = image_subpixel_size;
+                }
+                else
+                {
+                    if(rx > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        rx = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    rx_inv = image_subpixel_size * image_subpixel_size / rx;
+                }
+
+                if(ry < image_subpixel_size)
+                {
+                    ry = image_subpixel_size;
+                }
+                else
+                {
+                    if(ry > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        ry = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    ry_inv = image_subpixel_size * image_subpixel_size / ry;
+                }
+
+                int radius_x = (diameter * rx) >> 1;
+                int radius_y = (diameter * ry) >> 1;
+                int maxx = base_type::source_image().width() - 1;
+                int maxy = base_type::source_image().height() - 1;
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                int y_lr = y >> image_subpixel_shift;
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                               ry_inv) >>
+                                   image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   rx_inv) >>
+                                       image_subpixel_shift;
+
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = x_lr_ini;
+                    int x_hr = x_hr_ini;
+                    if(y_lr >= 0 && y_lr <= maxy)
+                    {
+                        const value_type* fg_ptr = (const value_type*)
+                            base_type::source_image().row(y_lr) + x_lr * 3;
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            if(x_lr >= 0 && x_lr <= maxx)
+                            {
+                                fg[0] += fg_ptr[0] * weight;
+                                fg[1] += fg_ptr[1] * weight;
+                                fg[2] += fg_ptr[2] * weight;
+                                fg[3] += base_mask * weight;
+                            }
+                            else
+                            {
+                                fg[order_type::R] += back_r * weight;
+                                fg[order_type::G] += back_g * weight;
+                                fg[order_type::B] += back_b * weight;
+                                fg[3]             += back_a * weight;
+                            }
+                            total_weight += weight;
+                            fg_ptr += 3;
+                            x_hr   += rx_inv;
+                            ++x_lr;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    else
+                    {
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            total_weight      += weight;
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[3]             += back_a * weight;
+                            x_hr              += rx_inv;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    y_hr += ry_inv;
+                    ++y_lr;
+                }
+                while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+                fg[3] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+                if(fg[3] < 0) fg[3] = 0;
+
+                if(fg[3] > base_mask) fg[3] = base_mask;
+                if(fg[0] > fg[3])     fg[0] = fg[3];
+                if(fg[1] > fg[3])     fg[1] = fg[3];
+                if(fg[2] > fg[3])     fg[2] = fg[3];
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[3];
+
+                ++span;
+                ++base_type::interpolator();
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_span_image_resample_rgba.h b/agg/inc/agg_span_image_resample_rgba.h
new file mode 100755
index 000000000000..40f7ccb42e00
--- /dev/null
+++ b/agg/inc/agg_span_image_resample_rgba.h
@@ -0,0 +1,393 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_IMAGE_RESAMPLE_RGBA_INCLUDED
+#define AGG_SPAN_IMAGE_RESAMPLE_RGBA_INCLUDED
+
+#include "agg_color_rgba.h"
+#include "agg_span_image_resample.h"
+
+namespace agg
+{
+
+    //========================================span_image_resample_rgba_affine
+    template<class ColorT,
+             class Order,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_resample_rgba_affine :
+    public span_image_resample_affine<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample_affine<color_type, alloc_type> base_type;
+        typedef typename base_type::interpolator_type interpolator_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift      = color_type::base_shift,
+            base_mask       = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgba_affine(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgba_affine(alloc_type& alloc,
+                                        const rendering_buffer& src,
+                                        const color_type& back_color,
+                                        interpolator_type& inter,
+                                        const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, filter)
+        {}
+
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+
+            long_type fg[4];
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            color_type* span = base_type::allocator().span();
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            int radius_x = (diameter * base_type::m_rx) >> 1;
+            int radius_y = (diameter * base_type::m_ry) >> 1;
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                int y_lr = y >> image_subpixel_shift;
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                                base_type::m_ry_inv) >>
+                                    image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   base_type::m_rx_inv) >>
+                                       image_subpixel_shift;
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = x_lr_ini;
+                    int x_hr = x_hr_ini;
+                    if(y_lr >= 0 && y_lr <= maxy)
+                    {
+                        const value_type* fg_ptr = (const value_type*)
+                            base_type::source_image().row(y_lr) + (x_lr << 2);
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            if(x_lr >= 0 && x_lr <= maxx)
+                            {
+                                fg[0] += fg_ptr[0] * weight;
+                                fg[1] += fg_ptr[1] * weight;
+                                fg[2] += fg_ptr[2] * weight;
+                                fg[3] += fg_ptr[3] * weight;
+                            }
+                            else
+                            {
+                                fg[order_type::R] += back_r * weight;
+                                fg[order_type::G] += back_g * weight;
+                                fg[order_type::B] += back_b * weight;
+                                fg[order_type::A] += back_a * weight;
+                            }
+                            total_weight += weight;
+                            fg_ptr += 4;
+                            x_hr   += base_type::m_rx_inv;
+                            ++x_lr;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    else
+                    {
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            total_weight      += weight;
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                            x_hr              += base_type::m_rx_inv;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    y_hr += base_type::m_ry_inv;
+                    ++y_lr;
+                }
+                while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+                fg[3] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+                if(fg[3] < 0) fg[3] = 0;
+
+                if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[order_type::A];
+
+                ++span;
+                ++base_type::interpolator();
+            } while(--len);
+            return base_type::allocator().span();
+        }
+    };
+
+
+
+
+
+
+
+    //==============================================span_image_resample_rgba
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class Allocator = span_allocator<ColorT> >
+    class span_image_resample_rgba :
+    public span_image_resample<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgba(alloc_type& alloc) :
+            base_type(alloc)
+        {}
+
+        //--------------------------------------------------------------------
+        span_image_resample_rgba(alloc_type& alloc,
+                                 const rendering_buffer& src,
+                                 const color_type& back_color,
+                                 interpolator_type& inter,
+                                 const image_filter_lut& filter) :
+            base_type(alloc, src, back_color, inter, filter)
+        {}
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            long_type fg[4];
+            value_type back_r = base_type::background_color().r;
+            value_type back_g = base_type::background_color().g;
+            value_type back_b = base_type::background_color().b;
+            value_type back_a = base_type::background_color().a;
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                int rx;
+                int ry;
+                int rx_inv = image_subpixel_size;
+                int ry_inv = image_subpixel_size;
+                base_type::interpolator().coordinates(&x,  &y);
+                base_type::interpolator().local_scale(&rx, &ry);
+
+                rx = (rx * base_type::m_blur_x) >> image_subpixel_shift;
+                ry = (ry * base_type::m_blur_y) >> image_subpixel_shift;
+
+                if(rx < image_subpixel_size)
+                {
+                    rx = image_subpixel_size;
+                }
+                else
+                {
+                    if(rx > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        rx = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    rx_inv = image_subpixel_size * image_subpixel_size / rx;
+                }
+
+                if(ry < image_subpixel_size)
+                {
+                    ry = image_subpixel_size;
+                }
+                else
+                {
+                    if(ry > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        ry = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    ry_inv = image_subpixel_size * image_subpixel_size / ry;
+                }
+
+                int radius_x = (diameter * rx) >> 1;
+                int radius_y = (diameter * ry) >> 1;
+                int maxx = base_type::source_image().width() - 1;
+                int maxy = base_type::source_image().height() - 1;
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                int y_lr = y >> image_subpixel_shift;
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                               ry_inv) >>
+                                   image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   rx_inv) >>
+                                       image_subpixel_shift;
+
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = x_lr_ini;
+                    int x_hr = x_hr_ini;
+                    if(y_lr >= 0 && y_lr <= maxy)
+                    {
+                        const value_type* fg_ptr = (const value_type*)
+                            base_type::source_image().row(y_lr) + (x_lr << 2);
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            if(x_lr >= 0 && x_lr <= maxx)
+                            {
+                                fg[0] += fg_ptr[0] * weight;
+                                fg[1] += fg_ptr[1] * weight;
+                                fg[2] += fg_ptr[2] * weight;
+                                fg[3] += fg_ptr[3] * weight;
+                            }
+                            else
+                            {
+                                fg[order_type::R] += back_r * weight;
+                                fg[order_type::G] += back_g * weight;
+                                fg[order_type::B] += back_b * weight;
+                                fg[order_type::A] += back_a * weight;
+                            }
+                            total_weight += weight;
+                            fg_ptr += 4;
+                            x_hr   += rx_inv;
+                            ++x_lr;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    else
+                    {
+                        do
+                        {
+                            int weight = (weight_y * weight_array[x_hr] +
+                                         image_filter_size / 2) >>
+                                         downscale_shift;
+
+                            total_weight      += weight;
+                            fg[order_type::R] += back_r * weight;
+                            fg[order_type::G] += back_g * weight;
+                            fg[order_type::B] += back_b * weight;
+                            fg[order_type::A] += back_a * weight;
+                            x_hr              += rx_inv;
+                        }
+                        while(x_hr < filter_size);
+                    }
+                    y_hr += ry_inv;
+                    ++y_lr;
+                }
+                while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+                fg[3] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+                if(fg[3] < 0) fg[3] = 0;
+
+                if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                if(fg[order_type::R] > fg[order_type::R]) fg[order_type::R] = fg[order_type::R];
+                if(fg[order_type::G] > fg[order_type::G]) fg[order_type::G] = fg[order_type::G];
+                if(fg[order_type::B] > fg[order_type::B]) fg[order_type::B] = fg[order_type::B];
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[order_type::A];
+
+                ++span;
+                ++base_type::interpolator();
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_span_interpolator_adaptor.h b/agg/inc/agg_span_interpolator_adaptor.h
new file mode 100755
index 000000000000..ead42c13590c
--- /dev/null
+++ b/agg/inc/agg_span_interpolator_adaptor.h
@@ -0,0 +1,77 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_INTERPOLATOR_ADAPTOR_INCLUDED
+#define AGG_SPAN_INTERPOLATOR_ADAPTOR_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //===============================================span_interpolator_adaptor
+    template<class Interpolator, class Distortion>
+    class span_interpolator_adaptor : public Interpolator
+    {
+    public:
+        typedef Interpolator base_type;
+        typedef typename base_type::trans_type trans_type;
+        typedef Distortion distortion_type;
+
+        //--------------------------------------------------------------------
+        span_interpolator_adaptor() {}
+        span_interpolator_adaptor(const trans_type& trans,
+                                  const distortion_type& dist) :
+            base_type(trans),
+            m_distortion(&dist)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        span_interpolator_adaptor(const trans_type& trans,
+                                  const distortion_type& dist,
+                                  double x, double y, unsigned len) :
+            base_type(trans, x, y, len),
+            m_distortion(&dist)
+        {
+        }
+
+        //--------------------------------------------------------------------
+        const distortion_type& distortion() const
+        {
+            return *m_distortion;
+        }
+
+        //--------------------------------------------------------------------
+        void distortion(const distortion_type& dist)
+        {
+            m_distortion = dist;
+        }
+
+        //--------------------------------------------------------------------
+        void coordinates(int* x, int* y) const
+        {
+            base_type::coordinates(x, y);
+            m_distortion->calculate(x, y);
+        }
+
+    private:
+        //--------------------------------------------------------------------
+        const distortion_type* m_distortion;
+    };
+}
+
+
+#endif
diff --git a/agg/inc/agg_span_interpolator_linear.h b/agg/inc/agg_span_interpolator_linear.h
new file mode 100755
index 000000000000..3cc2426be450
--- /dev/null
+++ b/agg/inc/agg_span_interpolator_linear.h
@@ -0,0 +1,232 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_INTERPOLATOR_LINEAR_INCLUDED
+#define AGG_SPAN_INTERPOLATOR_LINEAR_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_dda_line.h"
+#include "agg_trans_affine.h"
+
+namespace agg
+{
+
+    //================================================span_interpolator_linear
+    template<class Transformer = trans_affine, unsigned SubpixelShift = 8>
+    class span_interpolator_linear
+    {
+    public:
+        typedef Transformer trans_type;
+
+        enum
+        {
+            subpixel_shift = SubpixelShift,
+            subpixel_size  = 1 << subpixel_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_interpolator_linear() {}
+        span_interpolator_linear(const trans_type& trans) : m_trans(&trans) {}
+        span_interpolator_linear(const trans_type& trans,
+                                 double x, double y, unsigned len) :
+            m_trans(&trans)
+        {
+            begin(x, y, len);
+        }
+
+        //----------------------------------------------------------------
+        const trans_type& transformer() const { return *m_trans; }
+        void transformer(const trans_type& trans) { m_trans = &trans; }
+
+        //----------------------------------------------------------------
+        void begin(double x, double y, unsigned len)
+        {
+            double tx;
+            double ty;
+
+            tx = x;
+            ty = y;
+            m_trans->transform(&tx, &ty);
+            int x1 = int(tx * subpixel_size);
+            int y1 = int(ty * subpixel_size);
+
+            tx = x + len;
+            ty = y;
+            m_trans->transform(&tx, &ty);
+            int x2 = int(tx * subpixel_size);
+            int y2 = int(ty * subpixel_size);
+
+            m_li_x = dda2_line_interpolator(x1, x2, len);
+            m_li_y = dda2_line_interpolator(y1, y2, len);
+        }
+
+        //----------------------------------------------------------------
+        void resynchronize(double xe, double ye, unsigned len)
+        {
+            m_trans->transform(&xe, &ye);
+            m_li_x = dda2_line_interpolator(m_li_x.y(), int(xe * subpixel_size), len);
+            m_li_y = dda2_line_interpolator(m_li_y.y(), int(ye * subpixel_size), len);
+        }
+
+        //----------------------------------------------------------------
+        void operator++()
+        {
+            ++m_li_x;
+            ++m_li_y;
+        }
+
+        //----------------------------------------------------------------
+        void coordinates(int* x, int* y) const
+        {
+            *x = m_li_x.y();
+            *y = m_li_y.y();
+        }
+
+    private:
+        const trans_type* m_trans;
+        dda2_line_interpolator m_li_x;
+        dda2_line_interpolator m_li_y;
+    };
+
+
+
+
+
+
+    //=====================================span_interpolator_linear_subdiv
+    template<class Transformer = trans_affine, unsigned SubpixelShift = 8>
+    class span_interpolator_linear_subdiv
+    {
+    public:
+        typedef Transformer trans_type;
+
+        enum
+        {
+            subpixel_shift = SubpixelShift,
+            subpixel_size  = 1 << subpixel_shift
+        };
+
+
+        //----------------------------------------------------------------
+        span_interpolator_linear_subdiv() :
+            m_subdiv_shift(4),
+            m_subdiv_size(1 << m_subdiv_shift),
+            m_subdiv_mask(m_subdiv_size - 1) {}
+
+        span_interpolator_linear_subdiv(const trans_type& trans,
+                                        unsigned subdiv_shift = 4) :
+            m_subdiv_shift(subdiv_shift),
+            m_subdiv_size(1 << m_subdiv_shift),
+            m_subdiv_mask(m_subdiv_size - 1),
+            m_trans(&trans) {}
+
+        span_interpolator_linear_subdiv(const trans_type& trans,
+                                        double x, double y, unsigned len,
+                                        unsigned subdiv_shift = 4) :
+            m_subdiv_shift(subdiv_shift),
+            m_subdiv_size(1 << m_subdiv_shift),
+            m_subdiv_mask(m_subdiv_size - 1),
+            m_trans(&trans)
+        {
+            begin(x, y, len);
+        }
+
+        //----------------------------------------------------------------
+        const trans_type& transformer() const { return *m_trans; }
+        void transformer(const trans_type& trans) { m_trans = &trans; }
+
+        //----------------------------------------------------------------
+        unsigned subdiv_shift() const { return m_subdiv_shift; }
+        void subdiv_shift(unsigned shift)
+        {
+            m_subdiv_shift = shift;
+            m_subdiv_size = 1 << m_subdiv_shift;
+            m_subdiv_mask = m_subdiv_size - 1;
+        }
+
+        //----------------------------------------------------------------
+        void begin(double x, double y, unsigned len)
+        {
+            double tx;
+            double ty;
+            m_pos   = 1;
+            m_src_x = int(x * subpixel_size) + subpixel_size;
+            m_src_y = y;
+            m_len   = len;
+
+            if(len > m_subdiv_size) len = m_subdiv_size;
+            tx = x;
+            ty = y;
+            m_trans->transform(&tx, &ty);
+            int x1 = int(tx * subpixel_size);
+            int y1 = int(ty * subpixel_size);
+
+            tx = x + len;
+            ty = y;
+            m_trans->transform(&tx, &ty);
+
+            m_li_x = dda2_line_interpolator(x1, int(tx * subpixel_size), len);
+            m_li_y = dda2_line_interpolator(y1, int(ty * subpixel_size), len);
+        }
+
+        //----------------------------------------------------------------
+        void operator++()
+        {
+            ++m_li_x;
+            ++m_li_y;
+            if(m_pos >= m_subdiv_size)
+            {
+                unsigned len = m_len;
+                if(len > m_subdiv_size) len = m_subdiv_size;
+                double tx = double(m_src_x) / double(subpixel_size) + len;
+                double ty = m_src_y;
+                m_trans->transform(&tx, &ty);
+                m_li_x = dda2_line_interpolator(m_li_x.y(), int(tx * subpixel_size), len);
+                m_li_y = dda2_line_interpolator(m_li_y.y(), int(ty * subpixel_size), len);
+                m_pos = 0;
+            }
+            m_src_x += subpixel_size;
+            ++m_pos;
+            --m_len;
+        }
+
+        //----------------------------------------------------------------
+        void coordinates(int* x, int* y) const
+        {
+            *x = m_li_x.y();
+            *y = m_li_y.y();
+        }
+
+    private:
+        unsigned m_subdiv_shift;
+        unsigned m_subdiv_size;
+        unsigned m_subdiv_mask;
+        const trans_type* m_trans;
+        dda2_line_interpolator m_li_x;
+        dda2_line_interpolator m_li_y;
+        int      m_src_x;
+        double   m_src_y;
+        unsigned m_pos;
+        unsigned m_len;
+    };
+
+
+}
+
+
+
+#endif
+
+
diff --git a/agg/inc/agg_span_interpolator_persp.h b/agg/inc/agg_span_interpolator_persp.h
new file mode 100755
index 000000000000..632a56449f28
--- /dev/null
+++ b/agg/inc/agg_span_interpolator_persp.h
@@ -0,0 +1,462 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_INTERPOLATOR_PERSP_INCLUDED
+#define AGG_SPAN_INTERPOLATOR_PERSP_INCLUDED
+
+#include "agg_trans_perspective.h"
+#include "agg_dda_line.h"
+
+namespace agg
+{
+
+
+
+    //===========================================span_interpolator_persp_exact
+    template<unsigned SubpixelShift = 8>
+    class span_interpolator_persp_exact
+    {
+    public:
+        typedef trans_perspective trans_type;
+        typedef trans_perspective::iterator_x iterator_type;
+        enum
+        {
+            subpixel_shift = SubpixelShift,
+            subpixel_size  = 1 << subpixel_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_interpolator_persp_exact() {}
+
+        //--------------------------------------------------------------------
+        // Arbitrary quadrangle transformations
+        span_interpolator_persp_exact(const double* src, const double* dst)
+        {
+            quad_to_quad(src, dst);
+        }
+
+        //--------------------------------------------------------------------
+        // Direct transformations
+        span_interpolator_persp_exact(double x1, double y1,
+                                      double x2, double y2,
+                                      const double* quad)
+        {
+            rect_to_quad(x1, y1, x2, y2, quad);
+        }
+
+        //--------------------------------------------------------------------
+        // Reverse transformations
+        span_interpolator_persp_exact(const double* quad,
+                                      double x1, double y1,
+                                      double x2, double y2)
+        {
+            quad_to_rect(quad, x1, y1, x2, y2);
+        }
+
+        //--------------------------------------------------------------------
+        // Set the transformations using two arbitrary quadrangles.
+        void quad_to_quad(const double* src, const double* dst)
+        {
+            m_trans_dir.quad_to_quad(src, dst);
+            m_trans_inv.quad_to_quad(dst, src);
+        }
+
+        //--------------------------------------------------------------------
+        // Set the direct transformations, i.e., rectangle -> quadrangle
+        void rect_to_quad(double x1, double y1, double x2, double y2,
+                          const double* quad)
+        {
+            double src[8];
+            src[0] = src[6] = x1;
+            src[2] = src[4] = x2;
+            src[1] = src[3] = y1;
+            src[5] = src[7] = y2;
+            quad_to_quad(src, quad);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the reverse transformations, i.e., quadrangle -> rectangle
+        void quad_to_rect(const double* quad,
+                          double x1, double y1, double x2, double y2)
+        {
+            double dst[8];
+            dst[0] = dst[6] = x1;
+            dst[2] = dst[4] = x2;
+            dst[1] = dst[3] = y1;
+            dst[5] = dst[7] = y2;
+            quad_to_quad(quad, dst);
+        }
+
+        //--------------------------------------------------------------------
+        // Check if the equations were solved successfully
+        bool is_valid() const { return m_trans_dir.is_valid(); }
+
+        //----------------------------------------------------------------
+        void begin(double x, double y, unsigned len)
+        {
+            m_iterator = m_trans_dir.begin(x, y, 1.0);
+            double xt = m_iterator.x;
+            double yt = m_iterator.y;
+
+            double dx;
+            double dy;
+            const double delta = 1/double(subpixel_size);
+            dx = xt + delta;
+            dy = yt;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sx1 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+            dx = xt;
+            dy = yt + delta;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sy1 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            x += len;
+            xt = x;
+            yt = y;
+            m_trans_dir.transform(&xt, &yt);
+
+            dx = xt + delta;
+            dy = yt;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sx2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+            dx = xt;
+            dy = yt + delta;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sy2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            m_scale_x = dda2_line_interpolator(sx1, sx2, len);
+            m_scale_y = dda2_line_interpolator(sy1, sy2, len);
+        }
+
+
+        //----------------------------------------------------------------
+        void resynchronize(double xe, double ye, unsigned len)
+        {
+            // Assume x1,y1 are equal to the ones at the previous end point
+            int sx1 = m_scale_x.y();
+            int sy1 = m_scale_y.y();
+
+            // Calculate transformed coordinates at x2,y2
+            double xt = xe;
+            double yt = ye;
+            m_trans_dir.transform(&xt, &yt);
+
+            const double delta = 1/double(subpixel_size);
+            double dx;
+            double dy;
+
+            // Calculate scale by X at x2,y2
+            dx = xt + delta;
+            dy = yt;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= xe;
+            dy -= ye;
+            int sx2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Calculate scale by Y at x2,y2
+            dx = xt;
+            dy = yt + delta;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= xe;
+            dy -= ye;
+            int sy2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Initialize the interpolators
+            m_scale_x = dda2_line_interpolator(sx1, sx2, len);
+            m_scale_y = dda2_line_interpolator(sy1, sy2, len);
+        }
+
+
+
+        //----------------------------------------------------------------
+        void operator++()
+        {
+            ++m_iterator;
+            ++m_scale_x;
+            ++m_scale_y;
+        }
+
+        //----------------------------------------------------------------
+        void coordinates(int* x, int* y) const
+        {
+            *x = int(m_iterator.x * subpixel_size + 0.5);
+            *y = int(m_iterator.y * subpixel_size + 0.5);
+        }
+
+        //----------------------------------------------------------------
+        void local_scale(int* x, int* y)
+        {
+            *x = m_scale_x.y();
+            *y = m_scale_y.y();
+        }
+
+        //----------------------------------------------------------------
+        void transform(double* x, double* y) const
+        {
+            m_trans_dir.transform(x, y);
+        }
+
+    private:
+        trans_type             m_trans_dir;
+        trans_type             m_trans_inv;
+        iterator_type          m_iterator;
+        dda2_line_interpolator m_scale_x;
+        dda2_line_interpolator m_scale_y;
+    };
+
+
+
+
+
+
+
+
+
+
+
+    //============================================span_interpolator_persp_lerp
+    template<unsigned SubpixelShift = 8>
+    class span_interpolator_persp_lerp
+    {
+    public:
+        typedef trans_perspective trans_type;
+        enum
+        {
+            subpixel_shift = SubpixelShift,
+            subpixel_size  = 1 << subpixel_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_interpolator_persp_lerp() {}
+
+        //--------------------------------------------------------------------
+        // Arbitrary quadrangle transformations
+        span_interpolator_persp_lerp(const double* src, const double* dst)
+        {
+            quad_to_quad(src, dst);
+        }
+
+        //--------------------------------------------------------------------
+        // Direct transformations
+        span_interpolator_persp_lerp(double x1, double y1,
+                                     double x2, double y2,
+                                     const double* quad)
+        {
+            rect_to_quad(x1, y1, x2, y2, quad);
+        }
+
+        //--------------------------------------------------------------------
+        // Reverse transformations
+        span_interpolator_persp_lerp(const double* quad,
+                                     double x1, double y1,
+                                     double x2, double y2)
+        {
+            quad_to_rect(quad, x1, y1, x2, y2);
+        }
+
+        //--------------------------------------------------------------------
+        // Set the transformations using two arbitrary quadrangles.
+        void quad_to_quad(const double* src, const double* dst)
+        {
+            m_trans_dir.quad_to_quad(src, dst);
+            m_trans_inv.quad_to_quad(dst, src);
+        }
+
+        //--------------------------------------------------------------------
+        // Set the direct transformations, i.e., rectangle -> quadrangle
+        void rect_to_quad(double x1, double y1, double x2, double y2,
+                          const double* quad)
+        {
+            double src[8];
+            src[0] = src[6] = x1;
+            src[2] = src[4] = x2;
+            src[1] = src[3] = y1;
+            src[5] = src[7] = y2;
+            quad_to_quad(src, quad);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the reverse transformations, i.e., quadrangle -> rectangle
+        void quad_to_rect(const double* quad,
+                          double x1, double y1, double x2, double y2)
+        {
+            double dst[8];
+            dst[0] = dst[6] = x1;
+            dst[2] = dst[4] = x2;
+            dst[1] = dst[3] = y1;
+            dst[5] = dst[7] = y2;
+            quad_to_quad(quad, dst);
+        }
+
+        //--------------------------------------------------------------------
+        // Check if the equations were solved successfully
+        bool is_valid() const { return m_trans_dir.is_valid(); }
+
+        //----------------------------------------------------------------
+        void begin(double x, double y, unsigned len)
+        {
+            // Calculate transformed coordinates at x1,y1
+            double xt = x;
+            double yt = y;
+            m_trans_dir.transform(&xt, &yt);
+            int x1 = int(xt * subpixel_size);
+            int y1 = int(yt * subpixel_size);
+
+            double dx;
+            double dy;
+            const double delta = 1/double(subpixel_size);
+
+            // Calculate scale by X at x1,y1
+            dx = xt + delta;
+            dy = yt;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sx1 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Calculate scale by Y at x1,y1
+            dx = xt;
+            dy = yt + delta;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sy1 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Calculate transformed coordinates at x2,y2
+            x += len;
+            xt = x;
+            yt = y;
+            m_trans_dir.transform(&xt, &yt);
+            int x2 = int(xt * subpixel_size);
+            int y2 = int(yt * subpixel_size);
+
+            // Calculate scale by X at x2,y2
+            dx = xt + delta;
+            dy = yt;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sx2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Calculate scale by Y at x2,y2
+            dx = xt;
+            dy = yt + delta;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= x;
+            dy -= y;
+            int sy2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Initialize the interpolators
+            m_coord_x = dda2_line_interpolator(x1,  x2,  len);
+            m_coord_y = dda2_line_interpolator(y1,  y2,  len);
+            m_scale_x = dda2_line_interpolator(sx1, sx2, len);
+            m_scale_y = dda2_line_interpolator(sy1, sy2, len);
+        }
+
+
+        //----------------------------------------------------------------
+        void resynchronize(double xe, double ye, unsigned len)
+        {
+            // Assume x1,y1 are equal to the ones at the previous end point
+            int x1  = m_coord_x.y();
+            int y1  = m_coord_y.y();
+            int sx1 = m_scale_x.y();
+            int sy1 = m_scale_y.y();
+
+            // Calculate transformed coordinates at x2,y2
+            double xt = xe;
+            double yt = ye;
+            m_trans_dir.transform(&xt, &yt);
+            int x2 = int(xt * subpixel_size);
+            int y2 = int(yt * subpixel_size);
+
+            const double delta = 1/double(subpixel_size);
+            double dx;
+            double dy;
+
+            // Calculate scale by X at x2,y2
+            dx = xt + delta;
+            dy = yt;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= xe;
+            dy -= ye;
+            int sx2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Calculate scale by Y at x2,y2
+            dx = xt;
+            dy = yt + delta;
+            m_trans_inv.transform(&dx, &dy);
+            dx -= xe;
+            dy -= ye;
+            int sy2 = int(subpixel_size/sqrt(dx*dx + dy*dy)) >> subpixel_shift;
+
+            // Initialize the interpolators
+            m_coord_x = dda2_line_interpolator(x1,  x2,  len);
+            m_coord_y = dda2_line_interpolator(y1,  y2,  len);
+            m_scale_x = dda2_line_interpolator(sx1, sx2, len);
+            m_scale_y = dda2_line_interpolator(sy1, sy2, len);
+        }
+
+
+        //----------------------------------------------------------------
+        void operator++()
+        {
+            ++m_coord_x;
+            ++m_coord_y;
+            ++m_scale_x;
+            ++m_scale_y;
+        }
+
+        //----------------------------------------------------------------
+        void coordinates(int* x, int* y) const
+        {
+            *x = m_coord_x.y();
+            *y = m_coord_y.y();
+        }
+
+        //----------------------------------------------------------------
+        void local_scale(int* x, int* y)
+        {
+            *x = m_scale_x.y();
+            *y = m_scale_y.y();
+        }
+
+        //----------------------------------------------------------------
+        void transform(double* x, double* y) const
+        {
+            m_trans_dir.transform(x, y);
+        }
+
+    private:
+        trans_type             m_trans_dir;
+        trans_type             m_trans_inv;
+        dda2_line_interpolator m_coord_x;
+        dda2_line_interpolator m_coord_y;
+        dda2_line_interpolator m_scale_x;
+        dda2_line_interpolator m_scale_y;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_interpolator_trans.h b/agg/inc/agg_span_interpolator_trans.h
new file mode 100755
index 000000000000..5caaffe9e5c0
--- /dev/null
+++ b/agg/inc/agg_span_interpolator_trans.h
@@ -0,0 +1,97 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Horizontal span interpolator for use with an arbitrary transformer
+// The efficiency highly depends on the operations done in the transformer
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_INTERPOLATOR_TRANS_INCLUDED
+#define AGG_SPAN_INTERPOLATOR_TRANS_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    //=================================================span_interpolator_trans
+    template<class Transformer, unsigned SubpixelShift = 8>
+    class span_interpolator_trans
+    {
+    public:
+        typedef Transformer trans_type;
+        enum
+        {
+            subpixel_shift = SubpixelShift,
+            subpixel_size  = 1 << subpixel_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_interpolator_trans() {}
+        span_interpolator_trans(const trans_type& trans) : m_trans(&trans) {}
+        span_interpolator_trans(const trans_type& trans,
+                                double x, double y, unsigned) :
+            m_trans(&trans)
+        {
+            begin(x, y, 0);
+        }
+
+        //----------------------------------------------------------------
+        const trans_type& transformer() const { return *m_trans; }
+        void transformer(const trans_type& trans) { m_trans = &trans; }
+
+        //----------------------------------------------------------------
+        void begin(double x, double y, unsigned)
+        {
+            m_x = x;
+            m_y = y;
+            m_trans->transform(&x, &y);
+            m_ix = int(x * subpixel_size);
+            m_iy = int(y * subpixel_size);
+        }
+
+        //----------------------------------------------------------------
+        void next(double, double, unsigned)
+        {
+        }
+
+        //----------------------------------------------------------------
+        void operator++()
+        {
+            m_x += 1.0;
+            double x = m_x;
+            double y = m_y;
+            m_trans->transform(&x, &y);
+            m_ix = int(x * subpixel_size);
+            m_iy = int(y * subpixel_size);
+        }
+
+        //----------------------------------------------------------------
+        void coordinates(int* x, int* y) const
+        {
+            *x = m_ix;
+            *y = m_iy;
+        }
+
+    private:
+        const trans_type* m_trans;
+        double            m_x;
+        double            m_y;
+        int               m_ix;
+        int               m_iy;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_pattern.h b/agg/inc/agg_span_pattern.h
new file mode 100755
index 000000000000..b9e9b135ff84
--- /dev/null
+++ b/agg/inc/agg_span_pattern.h
@@ -0,0 +1,278 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+
+#ifndef AGG_SPAN_PATTERN_INCLUDED
+#define AGG_SPAN_PATTERN_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_rendering_buffer.h"
+#include "agg_span_generator.h"
+
+
+namespace agg
+{
+
+    //---------------------------------------------------span_pattern_base
+    template<class ColorT, class Allocator>
+    class span_pattern_base : public span_generator<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef typename ColorT::value_type value_type;
+        typedef Allocator alloc_type;
+        enum { base_mask = color_type::base_mask };
+
+        //----------------------------------------------------------------
+        span_pattern_base(alloc_type& alloc) :
+            span_generator<color_type, alloc_type>(alloc)
+        {}
+
+        //----------------------------------------------------------------
+        span_pattern_base(alloc_type& alloc,
+                     const rendering_buffer& src,
+                     unsigned offset_x, unsigned offset_y,
+                     double alpha) :
+            span_generator<color_type, alloc_type>(alloc),
+            m_src(&src),
+            m_offset_x(offset_x),
+            m_offset_y(offset_y),
+            m_alpha(value_type(alpha * double(base_mask)))
+        {}
+
+        //----------------------------------------------------------------
+        const rendering_buffer& source_image() const { return *m_src; }
+        unsigned   offset_x()                  const { return m_offset_x; }
+        unsigned   offset_y()                  const { return m_offset_y; }
+        double     alpha()                     const { return m_alpha / double(base_mask); }
+        value_type alpha_int()                 const { return m_alpha; }
+
+        //----------------------------------------------------------------
+        void source_image(const rendering_buffer& v)  { m_src = &v; }
+        void offset_x(unsigned v) { m_offset_x = v; }
+        void offset_y(unsigned v) { m_offset_y = v; }
+        void alpha(double v)  { m_alpha = value_type(v * double(base_mask)); }
+
+        //----------------------------------------------------------------
+    private:
+        const rendering_buffer* m_src;
+        unsigned m_offset_x;
+        unsigned m_offset_y;
+        value_type m_alpha;
+    };
+
+
+    //---------------------------------------------------wrap_mode_repeat
+    class wrap_mode_repeat
+    {
+    public:
+        wrap_mode_repeat(unsigned size) :
+            m_size(size),
+            m_add(size * (0x3FFFFFFF / size)),
+            m_value(0)
+        {}
+
+        AGG_INLINE unsigned operator() (int v)
+        {
+            return m_value = (unsigned(v) + m_add) % m_size;
+        }
+
+        AGG_INLINE unsigned operator++ ()
+        {
+            ++m_value;
+            if(m_value >= m_size) m_value = 0;
+            return m_value;
+        }
+    private:
+        unsigned m_size;
+        unsigned m_add;
+        unsigned m_value;
+    };
+
+
+    //---------------------------------------------wrap_mode_repeat_pow2
+    class wrap_mode_repeat_pow2
+    {
+    public:
+        wrap_mode_repeat_pow2(unsigned size) : m_value(0)
+        {
+            m_mask = 1;
+            while(m_mask < size) m_mask = (m_mask << 1) | 1;
+            m_mask >>= 1;
+        }
+        AGG_INLINE unsigned operator() (int v)
+        {
+            return m_value = unsigned(v) & m_mask;
+        }
+        AGG_INLINE unsigned operator++ ()
+        {
+            ++m_value;
+            if(m_value > m_mask) m_value = 0;
+            return m_value;
+        }
+    private:
+        unsigned m_mask;
+        unsigned m_value;
+    };
+
+
+    //----------------------------------------wrap_mode_repeat_auto_pow2
+    class wrap_mode_repeat_auto_pow2
+    {
+    public:
+        wrap_mode_repeat_auto_pow2(unsigned size) :
+            m_size(size),
+            m_add(size * (0x3FFFFFFF / size)),
+            m_mask((m_size & (m_size-1)) ? 0 : m_size-1),
+            m_value(0)
+        {}
+
+        AGG_INLINE unsigned operator() (int v)
+        {
+            if(m_mask) return m_value = unsigned(v) & m_mask;
+            return m_value = (unsigned(v) + m_add) % m_size;
+        }
+        AGG_INLINE unsigned operator++ ()
+        {
+            ++m_value;
+            if(m_value >= m_size) m_value = 0;
+            return m_value;
+        }
+
+    private:
+        unsigned m_size;
+        unsigned m_add;
+        unsigned m_mask;
+        unsigned m_value;
+    };
+
+
+    //--------------------------------------------------wrap_mode_reflect
+    class wrap_mode_reflect
+    {
+    public:
+        wrap_mode_reflect(unsigned size) :
+            m_size(size),
+            m_size2(size * 2),
+            m_add(m_size2 * (0x3FFFFFFF / m_size2)),
+            m_value(0)
+        {}
+
+        AGG_INLINE unsigned operator() (int v)
+        {
+            m_value = (unsigned(v) + m_add) % m_size2;
+            if(m_value >= m_size) return m_size2 - m_value - 1;
+            return m_value;
+        }
+
+        AGG_INLINE unsigned operator++ ()
+        {
+            ++m_value;
+            if(m_value >= m_size2) m_value = 0;
+            if(m_value >= m_size) return m_size2 - m_value - 1;
+            return m_value;
+        }
+    private:
+        unsigned m_size;
+        unsigned m_size2;
+        unsigned m_add;
+        unsigned m_value;
+    };
+
+
+
+    //-------------------------------------------wrap_mode_reflect_pow2
+    class wrap_mode_reflect_pow2
+    {
+    public:
+        wrap_mode_reflect_pow2(unsigned size) : m_value(0)
+        {
+            m_mask = 1;
+            m_size = 1;
+            while(m_mask < size)
+            {
+                m_mask = (m_mask << 1) | 1;
+                m_size <<= 1;
+            }
+        }
+        AGG_INLINE unsigned operator() (int v)
+        {
+            m_value = unsigned(v) & m_mask;
+            if(m_value >= m_size) return m_mask - m_value;
+            return m_value;
+        }
+        AGG_INLINE unsigned operator++ ()
+        {
+            ++m_value;
+            m_value &= m_mask;
+            if(m_value >= m_size) return m_mask - m_value;
+            return m_value;
+        }
+    private:
+        unsigned m_size;
+        unsigned m_mask;
+        unsigned m_value;
+    };
+
+
+
+    //---------------------------------------wrap_mode_reflect_auto_pow2
+    class wrap_mode_reflect_auto_pow2
+    {
+    public:
+        wrap_mode_reflect_auto_pow2(unsigned size) :
+            m_size(size),
+            m_size2(size * 2),
+            m_add(m_size2 * (0x3FFFFFFF / m_size2)),
+            m_mask((m_size2 & (m_size2-1)) ? 0 : m_size2-1),
+            m_value(0)
+        {}
+
+        AGG_INLINE unsigned operator() (int v)
+        {
+            m_value = m_mask ? unsigned(v) & m_mask :
+                               (unsigned(v) + m_add) % m_size2;
+            if(m_value >= m_size) return m_size2 - m_value - 1;
+            return m_value;
+        }
+        AGG_INLINE unsigned operator++ ()
+        {
+            ++m_value;
+            if(m_value >= m_size2) m_value = 0;
+            if(m_value >= m_size) return m_size2 - m_value - 1;
+            return m_value;
+        }
+
+    private:
+        unsigned m_size;
+        unsigned m_size2;
+        unsigned m_add;
+        unsigned m_mask;
+        unsigned m_value;
+    };
+
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_span_pattern_filter_gray.h b/agg/inc/agg_span_pattern_filter_gray.h
new file mode 100755
index 000000000000..17a7984be7fe
--- /dev/null
+++ b/agg/inc/agg_span_pattern_filter_gray.h
@@ -0,0 +1,472 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// classes span_pattern_filter_gray*
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_PATTERN_FILTER_GRAY_INCLUDED
+#define AGG_SPAN_PATTERN_FILTER_GRAY_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_gray.h"
+#include "agg_span_pattern.h"
+#include "agg_span_image_filter.h"
+
+
+namespace agg
+{
+
+    //===========================================span_pattern_filter_gray
+    template<class ColorT,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_gray_nn :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray_nn(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray_nn(alloc_type& alloc,
+                                    const rendering_buffer& src,
+                                    interpolator_type& inter) :
+            base_type(alloc, src, color_type(0,0), inter, 0),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            color_type* span = base_type::allocator().span();
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x = m_wrap_mode_x(x >> image_subpixel_shift);
+                y = m_wrap_mode_y(y >> image_subpixel_shift);
+
+                span->v = *((value_type*)base_type::source_image().row(y) + x);
+                span->a = base_mask;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+    //====================================span_pattern_filter_gray_bilinear
+    template<class ColorT,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_gray_bilinear :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray_bilinear(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray_bilinear(alloc_type& alloc,
+                                          const rendering_buffer& src,
+                                          interpolator_type& inter) :
+            base_type(alloc, src, color_type(0,0), inter, 0),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg;
+            color_type* span = base_type::allocator().span();
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned x1 = m_wrap_mode_x(x_lr);
+                unsigned x2 = ++m_wrap_mode_x;
+
+                unsigned y1 = m_wrap_mode_y(y_lr);
+                unsigned y2 = ++m_wrap_mode_y;
+                const value_type* ptr1 = (value_type*)base_type::source_image().row(y1);
+                const value_type* ptr2 = (value_type*)base_type::source_image().row(y2);
+
+                fg = image_subpixel_size * image_subpixel_size / 2;
+
+                x_hr &= image_subpixel_mask;
+                y_hr &= image_subpixel_mask;
+
+                fg += ptr1[x1] * (image_subpixel_size - x_hr) * (image_subpixel_size - y_hr);
+                fg += ptr1[x2] * x_hr * (image_subpixel_size - y_hr);
+                fg += ptr2[x1] * (image_subpixel_size - x_hr) * y_hr;
+                fg += ptr2[x2] * x_hr * y_hr;
+
+                span->v = (value_type)(fg >> image_subpixel_shift * 2);
+                span->a = base_mask;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+
+
+    //====================================span_pattern_filter_gray_2x2
+    template<class ColorT,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_gray_2x2 :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray_2x2(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray_2x2(alloc_type& alloc,
+                                     const rendering_buffer& src,
+                                     interpolator_type& inter,
+                                     const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0), inter, &filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg;
+            color_type* span = base_type::allocator().span();
+            const int16* weight_array = base_type::filter().weight_array() +
+                                        ((base_type::filter().diameter()/2 - 1) <<
+                                          image_subpixel_shift);
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned x1 = m_wrap_mode_x(x_lr);
+                unsigned x2 = ++m_wrap_mode_x;
+
+                unsigned y1 = m_wrap_mode_y(y_lr);
+                unsigned y2 = ++m_wrap_mode_y;
+                const value_type* ptr1 = (value_type*)base_type::source_image().row(y1);
+                const value_type* ptr2 = (value_type*)base_type::source_image().row(y2);
+
+                fg = image_filter_size / 2;
+
+                x_hr &= image_subpixel_mask;
+                y_hr &= image_subpixel_mask;
+
+                fg += ptr1[x1] * ((weight_array[x_hr + image_subpixel_size] *
+                                   weight_array[y_hr + image_subpixel_size] +
+                                   image_filter_size / 2) >>
+                                   image_filter_shift);
+                fg += ptr1[x2] * ((weight_array[x_hr] *
+                                   weight_array[y_hr + image_subpixel_size] +
+                                   image_filter_size / 2) >>
+                                   image_filter_shift);
+                fg += ptr2[x1] * ((weight_array[x_hr + image_subpixel_size] *
+                                   weight_array[y_hr] +
+                                   image_filter_size / 2) >>
+                                   image_filter_shift);
+                fg += ptr2[x2] * ((weight_array[x_hr] *
+                                   weight_array[y_hr] +
+                                   image_filter_size / 2) >>
+                                   image_filter_shift);
+
+                fg >>= image_filter_shift;
+                if(fg > base_mask) fg = base_mask;
+
+                span->v = (value_type)fg;
+                span->a = base_mask;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+
+
+
+
+
+    //==============================================span_pattern_filter_gray
+    template<class ColorT,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_gray :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray(alloc_type& alloc) :
+            base_type(alloc)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_gray(alloc_type& alloc,
+                                 const rendering_buffer& src,
+                                 interpolator_type& inter,
+                                 const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0), inter, &filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            int fg;
+
+            unsigned   diameter     = base_type::filter().diameter();
+            int        start        = base_type::filter().start();
+            const int16* weight_array = base_type::filter().weight_array();
+
+            color_type* span = base_type::allocator().span();
+
+            int x_count;
+            int weight_y;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x -= base_type::filter_dx_int();
+                y -= base_type::filter_dy_int();
+
+                int x_hr = x;
+                int y_hr = y;
+
+                int x_fract = x_hr & image_subpixel_mask;
+                unsigned y_count = diameter;
+
+                int y_lr  = m_wrap_mode_y((y >> image_subpixel_shift) + start);
+                int x_int = (x >> image_subpixel_shift) + start;
+                int x_lr;
+
+                y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+                fg = image_filter_size / 2;
+
+                do
+                {
+                    x_count = diameter;
+                    weight_y = weight_array[y_hr];
+                    x_hr = image_subpixel_mask - x_fract;
+                    x_lr = m_wrap_mode_x(x_int);
+                    const value_type* row_ptr = (value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        fg += row_ptr[x_lr] * ((weight_y * weight_array[x_hr] +
+                                               image_filter_size / 2) >>
+                                               image_filter_shift);
+                        x_hr += image_subpixel_size;
+                        x_lr = ++m_wrap_mode_x;
+                    } while(--x_count);
+
+                    y_hr += image_subpixel_size;
+                    y_lr = ++m_wrap_mode_y;
+                } while(--y_count);
+
+                fg >>= image_filter_shift;
+
+                if(fg < 0)         fg = 0;
+                if(fg > base_mask) fg = base_mask;
+
+                span->v = fg;
+                span->a = base_mask;
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+}
+
+
+#endif
+
+
+
diff --git a/agg/inc/agg_span_pattern_filter_rgb.h b/agg/inc/agg_span_pattern_filter_rgb.h
new file mode 100755
index 000000000000..d4dc1c1797eb
--- /dev/null
+++ b/agg/inc/agg_span_pattern_filter_rgb.h
@@ -0,0 +1,568 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+//
+// classes span_pattern_filter_rgb*
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_PATTERN_FILTER_RGB_INCLUDED
+#define AGG_SPAN_PATTERN_FILTER_RGB_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_span_pattern.h"
+#include "agg_span_image_filter.h"
+
+
+namespace agg
+{
+
+    //===========================================span_pattern_filter_rgb
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_rgb_nn :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb_nn(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb_nn(alloc_type& alloc,
+                                   const rendering_buffer& src,
+                                   interpolator_type& intr) :
+            base_type(alloc, src, color_type(0,0,0,0), intr, 0),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            const value_type *fg_ptr;
+            do
+            {
+                intr.coordinates(&x, &y);
+
+                x = m_wrap_mode_x(x >> image_subpixel_shift);
+                y = m_wrap_mode_y(y >> image_subpixel_shift);
+
+                fg_ptr = (const value_type*)base_type::source_image().row(y) + x * 3;
+                span->r = fg_ptr[order_type::R];
+                span->g = fg_ptr[order_type::G];
+                span->b = fg_ptr[order_type::B];
+                span->a = base_mask;
+                ++span;
+                ++intr;
+
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+
+
+
+    //=====================================span_pattern_filter_rgb_bilinear
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_rgb_bilinear :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb_bilinear(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb_bilinear(alloc_type& alloc,
+                                         const rendering_buffer& src,
+                                         interpolator_type& intr) :
+            base_type(alloc, src, color_type(0,0,0,0), intr, 0),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            calc_type fg[3];
+            const value_type *fg_ptr;
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                intr.coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned x1 = m_wrap_mode_x(x_lr);
+                unsigned x2 = ++m_wrap_mode_x;
+                x1 *= 3;
+                x2 *= 3;
+
+                unsigned y1 = m_wrap_mode_y(y_lr);
+                unsigned y2 = ++m_wrap_mode_y;
+                const value_type* ptr1 = (const value_type*)base_type::source_image().row(y1);
+                const value_type* ptr2 = (const value_type*)base_type::source_image().row(y2);
+
+                fg[0] =
+                fg[1] =
+                fg[2] = image_subpixel_size * image_subpixel_size / 2;
+
+                x_hr &= image_subpixel_mask;
+                y_hr &= image_subpixel_mask;
+
+                int weight;
+                fg_ptr = ptr1 + x1;
+                weight = (image_subpixel_size - x_hr) *
+                         (image_subpixel_size - y_hr);
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                fg_ptr = ptr1 + x2;
+                weight = x_hr * (image_subpixel_size - y_hr);
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                fg_ptr = ptr2 + x1;
+                weight = (image_subpixel_size - x_hr) * y_hr;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                fg_ptr = ptr2 + x2;
+                weight = x_hr * y_hr;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                span->r = (value_type)(fg[order_type::R] >> image_subpixel_shift * 2);
+                span->g = (value_type)(fg[order_type::G] >> image_subpixel_shift * 2);
+                span->b = (value_type)(fg[order_type::B] >> image_subpixel_shift * 2);
+                span->a = base_mask;
+                ++span;
+                ++intr;
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+    //=====================================span_pattern_filter_rgb_2x2
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_rgb_2x2 :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb_2x2(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb_2x2(alloc_type& alloc,
+                                    const rendering_buffer& src,
+                                    interpolator_type& intr,
+                                    const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0,0,0), intr, &filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            calc_type fg[3];
+            const value_type *fg_ptr;
+            const int16* weight_array = base_type::filter().weight_array() +
+                                        ((base_type::filter().diameter()/2 - 1) <<
+                                          image_subpixel_shift);
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                intr.coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned x1 = m_wrap_mode_x(x_lr);
+                unsigned x2 = ++m_wrap_mode_x;
+                x1 *= 3;
+                x2 *= 3;
+
+                unsigned y1 = m_wrap_mode_y(y_lr);
+                unsigned y2 = ++m_wrap_mode_y;
+                const value_type* ptr1 = (const value_type*)base_type::source_image().row(y1);
+                const value_type* ptr2 = (const value_type*)base_type::source_image().row(y2);
+
+                fg[0] = fg[1] = fg[2] = image_filter_size / 2;
+
+                x_hr &= image_subpixel_mask;
+                y_hr &= image_subpixel_mask;
+
+                int weight;
+                fg_ptr = ptr1 + x1;
+                weight = (weight_array[x_hr + image_subpixel_size] *
+                          weight_array[y_hr + image_subpixel_size] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                fg_ptr = ptr1 + x2;
+                weight = (weight_array[x_hr] *
+                          weight_array[y_hr + image_subpixel_size] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                fg_ptr = ptr2 + x1;
+                weight = (weight_array[x_hr + image_subpixel_size] *
+                          weight_array[y_hr] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                fg_ptr = ptr2 + x2;
+                weight = (weight_array[x_hr] *
+                          weight_array[y_hr] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+
+                fg[0] >>= image_filter_shift;
+                fg[1] >>= image_filter_shift;
+                fg[2] >>= image_filter_shift;
+
+                if(fg[0] > base_mask) fg[0] = base_mask;
+                if(fg[1] > base_mask) fg[1] = base_mask;
+                if(fg[2] > base_mask) fg[2] = base_mask;
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = base_mask;
+                ++span;
+                ++intr;
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+
+
+
+    //==============================================span_pattern_filter_rgb
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+             class span_pattern_filter_rgb :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb(alloc_type& alloc) :
+            base_type(alloc)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgb(alloc_type& alloc,
+                                const rendering_buffer& src,
+                                interpolator_type& intr,
+                                const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0,0,0), intr, &filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            int fg[3];
+
+            unsigned   diameter     = base_type::filter().diameter();
+            int        start        = base_type::filter().start();
+            const int16* weight_array = base_type::filter().weight_array();
+
+            int x_count;
+            int weight_y;
+
+            do
+            {
+                intr.coordinates(&x, &y);
+
+                x -= base_type::filter_dx_int();
+                y -= base_type::filter_dy_int();
+
+                int x_hr = x;
+                int y_hr = y;
+
+                int x_fract = x_hr & image_subpixel_mask;
+                unsigned y_count = diameter;
+
+                int y_lr  = m_wrap_mode_y((y >> image_subpixel_shift) + start);
+                int x_int = (x >> image_subpixel_shift) + start;
+                int x_lr;
+
+                y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+                fg[0] = fg[1] = fg[2] = image_filter_size / 2;
+
+                do
+                {
+                    x_count = diameter;
+                    weight_y = weight_array[y_hr];
+                    x_hr = image_subpixel_mask - x_fract;
+                    x_lr = m_wrap_mode_x(x_int);
+                    const value_type* row_ptr = (const value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + x_lr * 3;
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     image_filter_shift;
+
+                        fg[0] += fg_ptr[0] * weight;
+                        fg[1] += fg_ptr[1] * weight;
+                        fg[2] += fg_ptr[2] * weight;
+
+                        x_hr += image_subpixel_size;
+                        x_lr = ++m_wrap_mode_x;
+                    } while(--x_count);
+
+                    y_hr += image_subpixel_size;
+                    y_lr = ++m_wrap_mode_y;
+                } while(--y_count);
+
+                fg[0] >>= image_filter_shift;
+                fg[1] >>= image_filter_shift;
+                fg[2] >>= image_filter_shift;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+
+                if(fg[0] > base_mask) fg[0] = base_mask;
+                if(fg[1] > base_mask) fg[1] = base_mask;
+                if(fg[2] > base_mask) fg[2] = base_mask;
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = base_mask;
+                ++span;
+                ++intr;
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+}
+
+
+#endif
+
+
+
diff --git a/agg/inc/agg_span_pattern_filter_rgba.h b/agg/inc/agg_span_pattern_filter_rgba.h
new file mode 100755
index 000000000000..8460880fdb79
--- /dev/null
+++ b/agg/inc/agg_span_pattern_filter_rgba.h
@@ -0,0 +1,584 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+//
+// classes span_pattern_filter_rgba*
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_PATTERN_FILTER_RGBA_INCLUDED
+#define AGG_SPAN_PATTERN_FILTER_RGBA_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_color_rgba.h"
+#include "agg_span_pattern.h"
+#include "agg_span_image_filter.h"
+
+
+namespace agg
+{
+
+    //===========================================span_pattern_filter_rgba
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_rgba_nn :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba_nn(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba_nn(alloc_type& alloc,
+                                    const rendering_buffer& src,
+                                    interpolator_type& inter) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, 0),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            const value_type *fg_ptr;
+            color_type* span = base_type::allocator().span();
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x = m_wrap_mode_x(x >> image_subpixel_shift);
+                y = m_wrap_mode_y(y >> image_subpixel_shift);
+
+                fg_ptr = (value_type*)base_type::source_image().row(y) + (x << 2);
+                span->r = fg_ptr[order_type::R];
+                span->g = fg_ptr[order_type::G];
+                span->b = fg_ptr[order_type::B];
+                span->a = fg_ptr[order_type::A];
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+
+
+
+    //=====================================span_pattern_filter_rgba_bilinear
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_rgba_bilinear :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba_bilinear(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba_bilinear(alloc_type& alloc,
+                                          const rendering_buffer& src,
+                                          interpolator_type& inter) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, 0),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg[4];
+            const value_type *fg_ptr;
+            color_type* span = base_type::allocator().span();
+
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned x1 = m_wrap_mode_x(x_lr);
+                unsigned x2 = ++m_wrap_mode_x;
+                x1 <<= 2;
+                x2 <<= 2;
+
+                unsigned y1 = m_wrap_mode_y(y_lr);
+                unsigned y2 = ++m_wrap_mode_y;
+                const value_type* ptr1 = (value_type*)base_type::source_image().row(y1);
+                const value_type* ptr2 = (value_type*)base_type::source_image().row(y2);
+
+                fg[0] =
+                fg[1] =
+                fg[2] =
+                fg[3] = image_subpixel_size * image_subpixel_size / 2;
+
+                x_hr &= image_subpixel_mask;
+                y_hr &= image_subpixel_mask;
+
+                int weight;
+                fg_ptr = ptr1 + x1;
+                weight = (image_subpixel_size - x_hr) *
+                         (image_subpixel_size - y_hr);
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                fg_ptr = ptr1 + x2;
+                weight = x_hr * (image_subpixel_size - y_hr);
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                fg_ptr = ptr2 + x1;
+                weight = (image_subpixel_size - x_hr) * y_hr;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                fg_ptr = ptr2 + x2;
+                weight = x_hr * y_hr;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                span->r = (value_type)(fg[order_type::R] >> image_subpixel_shift * 2);
+                span->g = (value_type)(fg[order_type::G] >> image_subpixel_shift * 2);
+                span->b = (value_type)(fg[order_type::B] >> image_subpixel_shift * 2);
+                span->a = (value_type)(fg[order_type::A] >> image_subpixel_shift * 2);
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+
+    //=====================================span_pattern_filter_rgba_2x2
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_rgba_2x2 :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba_2x2(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba_2x2(alloc_type& alloc,
+                                     const rendering_buffer& src,
+                                     interpolator_type& inter,
+                                     const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, &filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            calc_type fg[4];
+            const value_type *fg_ptr;
+            color_type* span = base_type::allocator().span();
+            const int16* weight_array = base_type::filter().weight_array() +
+                                        ((base_type::filter().diameter()/2 - 1) <<
+                                          image_subpixel_shift);
+            do
+            {
+                int x_hr;
+                int y_hr;
+
+                base_type::interpolator().coordinates(&x_hr, &y_hr);
+
+                x_hr -= base_type::filter_dx_int();
+                y_hr -= base_type::filter_dy_int();
+
+                int x_lr = x_hr >> image_subpixel_shift;
+                int y_lr = y_hr >> image_subpixel_shift;
+
+                unsigned x1 = m_wrap_mode_x(x_lr);
+                unsigned x2 = ++m_wrap_mode_x;
+                x1 <<= 2;
+                x2 <<= 2;
+
+                unsigned y1 = m_wrap_mode_y(y_lr);
+                unsigned y2 = ++m_wrap_mode_y;
+                const value_type* ptr1 = (value_type*)base_type::source_image().row(y1);
+                const value_type* ptr2 = (value_type*)base_type::source_image().row(y2);
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                x_hr &= image_subpixel_mask;
+                y_hr &= image_subpixel_mask;
+
+                int weight;
+                fg_ptr = ptr1 + x1;
+                weight = (weight_array[x_hr + image_subpixel_size] *
+                          weight_array[y_hr + image_subpixel_size] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                fg_ptr = ptr1 + x2;
+                weight = (weight_array[x_hr] *
+                          weight_array[y_hr + image_subpixel_size] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                fg_ptr = ptr2 + x1;
+                weight = (weight_array[x_hr + image_subpixel_size] *
+                          weight_array[y_hr] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                fg_ptr = ptr2 + x2;
+                weight = (weight_array[x_hr] *
+                          weight_array[y_hr] +
+                          image_filter_size / 2) >>
+                          image_filter_shift;
+                fg[0] += weight * fg_ptr[0];
+                fg[1] += weight * fg_ptr[1];
+                fg[2] += weight * fg_ptr[2];
+                fg[3] += weight * fg_ptr[3];
+
+                fg[0] >>= image_filter_shift;
+                fg[1] >>= image_filter_shift;
+                fg[2] >>= image_filter_shift;
+                fg[3] >>= image_filter_shift;
+
+                if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[order_type::A];
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+
+
+
+
+
+    //==============================================span_pattern_filter_rgba
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_filter_rgba :
+    public span_image_filter<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_filter<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba(alloc_type& alloc) :
+            base_type(alloc)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_filter_rgba(alloc_type& alloc,
+                                 const rendering_buffer& src,
+                                 interpolator_type& inter,
+                                 const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, &filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            base_type::interpolator().begin(x + base_type::filter_dx_dbl(),
+                                            y + base_type::filter_dy_dbl(), len);
+            int fg[4];
+
+            unsigned   diameter     = base_type::filter().diameter();
+            int        start        = base_type::filter().start();
+            const int16* weight_array = base_type::filter().weight_array();
+
+            color_type* span = base_type::allocator().span();
+
+            int x_count;
+            int weight_y;
+
+            do
+            {
+                base_type::interpolator().coordinates(&x, &y);
+
+                x -= base_type::filter_dx_int();
+                y -= base_type::filter_dy_int();
+
+                int x_hr = x;
+                int y_hr = y;
+
+                int x_fract = x_hr & image_subpixel_mask;
+                unsigned y_count = diameter;
+
+                int y_lr  = m_wrap_mode_y((y >> image_subpixel_shift) + start);
+                int x_int = (x >> image_subpixel_shift) + start;
+                int x_lr;
+
+                y_hr = image_subpixel_mask - (y_hr & image_subpixel_mask);
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                do
+                {
+                    x_count = diameter;
+                    weight_y = weight_array[y_hr];
+                    x_hr = image_subpixel_mask - x_fract;
+                    x_lr = m_wrap_mode_x(x_int);
+                    const value_type* row_ptr = (value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + (x_lr << 2);
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     image_filter_shift;
+
+                        fg[0] += fg_ptr[0] * weight;
+                        fg[1] += fg_ptr[1] * weight;
+                        fg[2] += fg_ptr[2] * weight;
+                        fg[3] += fg_ptr[3] * weight;
+
+                        x_hr += image_subpixel_size;
+                        x_lr = ++m_wrap_mode_x;
+                    } while(--x_count);
+
+                    y_hr += image_subpixel_size;
+                    y_lr = ++m_wrap_mode_y;
+                } while(--y_count);
+
+                fg[0] >>= image_filter_shift;
+                fg[1] >>= image_filter_shift;
+                fg[2] >>= image_filter_shift;
+                fg[3] >>= image_filter_shift;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+                if(fg[3] < 0) fg[3] = 0;
+
+                if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+
+                span->r = fg[order_type::R];
+                span->g = fg[order_type::G];
+                span->b = fg[order_type::B];
+                span->a = fg[order_type::A];
+                ++span;
+                ++base_type::interpolator();
+
+            } while(--len);
+
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+}
+
+
+#endif
+
+
+
diff --git a/agg/inc/agg_span_pattern_resample_gray.h b/agg/inc/agg_span_pattern_resample_gray.h
new file mode 100755
index 000000000000..212209502f5f
--- /dev/null
+++ b/agg/inc/agg_span_pattern_resample_gray.h
@@ -0,0 +1,320 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_PATTERN_RESAMPLE_GRAY_INCLUDED
+#define AGG_SPAN_PATTERN_RESAMPLE_GRAY_INCLUDED
+
+#include "agg_color_gray.h"
+#include "agg_span_image_resample.h"
+
+namespace agg
+{
+
+    //=======================================span_pattern_resample_gray_affine
+    template<class ColorT,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_resample_gray_affine :
+    public span_image_resample_affine<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample_affine<color_type, alloc_type> base_type;
+        typedef typename base_type::interpolator_type interpolator_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift      = color_type::base_shift,
+            base_mask       = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_gray_affine(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_gray_affine(alloc_type& alloc,
+                                          const rendering_buffer& src,
+                                          interpolator_type& inter,
+                                          const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0), inter, filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            long_type fg;
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            int radius_x = (diameter * base_type::m_rx) >> 1;
+            int radius_y = (diameter * base_type::m_ry) >> 1;
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                intr.coordinates(&x, &y);
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg = image_filter_size / 2;
+
+                int y_lr  = m_wrap_mode_y(y >> image_subpixel_shift);
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                                base_type::m_ry_inv) >>
+                                    image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   base_type::m_rx_inv) >>
+                                       image_subpixel_shift;
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = m_wrap_mode_x(x_lr_ini);
+                    int x_hr = x_hr_ini;
+                    const value_type* row_ptr = (const value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + x_lr;
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     downscale_shift;
+
+                        fg += *fg_ptr * weight;
+                        total_weight += weight;
+                        x_hr   += base_type::m_rx_inv;
+                        x_lr = ++m_wrap_mode_x;
+                    }
+                    while(x_hr < filter_size);
+
+                    y_hr += base_type::m_ry_inv;
+                    y_lr = ++m_wrap_mode_y;
+                } while(y_hr < filter_size);
+
+                fg /= total_weight;
+
+                if(fg < 0)         fg = 0;
+                if(fg > base_mask) fg = base_mask;
+
+                span->v = (value_type)fg;
+                span->a = (value_type)base_mask;
+
+                ++span;
+                ++intr;
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+    //============================================span_pattern_resample_gray
+    template<class ColorT,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_resample_gray :
+    public span_image_resample<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_gray(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_gray(alloc_type& alloc,
+                                   const rendering_buffer& src,
+                                   interpolator_type& inter,
+                                   const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0), inter, filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            long_type fg;
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                int rx;
+                int ry;
+                int rx_inv = image_subpixel_size;
+                int ry_inv = image_subpixel_size;
+                intr.coordinates(&x,  &y);
+                intr.local_scale(&rx, &ry);
+
+                rx = (rx * base_type::m_blur_x) >> image_subpixel_shift;
+                ry = (ry * base_type::m_blur_y) >> image_subpixel_shift;
+
+                if(rx < image_subpixel_size)
+                {
+                    rx = image_subpixel_size;
+                }
+                else
+                {
+                    if(rx > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        rx = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    rx_inv = image_subpixel_size * image_subpixel_size / rx;
+                }
+
+                if(ry < image_subpixel_size)
+                {
+                    ry = image_subpixel_size;
+                }
+                else
+                {
+                    if(ry > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        ry = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    ry_inv = image_subpixel_size * image_subpixel_size / ry;
+                }
+
+                int radius_x = (diameter * rx) >> 1;
+                int radius_y = (diameter * ry) >> 1;
+                int maxx = base_type::source_image().width() - 1;
+                int maxy = base_type::source_image().height() - 1;
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg = image_filter_size / 2;
+
+                int y_lr  = m_wrap_mode_y(y >> image_subpixel_shift);
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                               ry_inv) >>
+                                   image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   rx_inv) >>
+                                       image_subpixel_shift;
+
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = m_wrap_mode_x(x_lr_ini);
+                    int x_hr = x_hr_ini;
+                    const value_type* row_ptr = (const value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + x_lr;
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     downscale_shift;
+                        fg += *fg_ptr * weight;
+                        total_weight += weight;
+                        x_hr   += rx_inv;
+                        x_lr = ++m_wrap_mode_x;
+                    }
+                    while(x_hr < filter_size);
+                    y_hr += ry_inv;
+                    y_lr = ++m_wrap_mode_y;
+                }
+                while(y_hr < filter_size);
+
+                fg /= total_weight;
+
+                if(fg < 0)         fg = 0;
+                if(fg > base_mask) fg = base_mask;
+
+                span->v = (value_type)fg;
+                span->a = (value_type)base_mask;
+
+                ++span;
+                ++intr;
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_span_pattern_resample_rgb.h b/agg/inc/agg_span_pattern_resample_rgb.h
new file mode 100755
index 000000000000..baef860eb472
--- /dev/null
+++ b/agg/inc/agg_span_pattern_resample_rgb.h
@@ -0,0 +1,346 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_PATTERN_RESAMPLE_RGB_INCLUDED
+#define AGG_SPAN_PATTERN_RESAMPLE_RGB_INCLUDED
+
+#include "agg_color_rgba.h"
+#include "agg_span_image_resample.h"
+
+namespace agg
+{
+
+    //========================================span_pattern_resample_rgb_affine
+    template<class ColorT,
+             class Order,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_resample_rgb_affine :
+    public span_image_resample_affine<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample_affine<color_type, alloc_type> base_type;
+        typedef typename base_type::interpolator_type interpolator_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift      = color_type::base_shift,
+            base_mask       = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgb_affine(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgb_affine(alloc_type& alloc,
+                                         const rendering_buffer& src,
+                                         interpolator_type& inter,
+                                         const image_filter_lut& filter_) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, filter_),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            long_type fg[3];
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            int radius_x = (diameter * base_type::m_rx) >> 1;
+            int radius_y = (diameter * base_type::m_ry) >> 1;
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                intr.coordinates(&x, &y);
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = image_filter_size / 2;
+
+                int y_lr  = m_wrap_mode_y(y >> image_subpixel_shift);
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                                base_type::m_ry_inv) >>
+                                    image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   base_type::m_rx_inv) >>
+                                       image_subpixel_shift;
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = m_wrap_mode_x(x_lr_ini);
+                    int x_hr = x_hr_ini;
+                    const value_type* row_ptr = (const value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + x_lr * 3;
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     downscale_shift;
+
+                        fg[0] += fg_ptr[0] * weight;
+                        fg[1] += fg_ptr[1] * weight;
+                        fg[2] += fg_ptr[2] * weight;
+                        total_weight += weight;
+                        x_hr   += base_type::m_rx_inv;
+                        x_lr = ++m_wrap_mode_x;
+                    }
+                    while(x_hr < filter_size);
+
+                    y_hr += base_type::m_ry_inv;
+                    y_lr = ++m_wrap_mode_y;
+                } while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+
+                if(fg[0] > base_mask) fg[0] = base_mask;
+                if(fg[1] > base_mask) fg[1] = base_mask;
+                if(fg[2] > base_mask) fg[2] = base_mask;
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)base_mask;
+
+                ++span;
+                ++intr;
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+    //=============================================span_pattern_resample_rgb
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_resample_rgb :
+    public span_image_resample<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgb(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgb(alloc_type& alloc,
+                                  const rendering_buffer& src,
+                                  interpolator_type& inter,
+                                  const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            long_type fg[3];
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                int rx;
+                int ry;
+                int rx_inv = image_subpixel_size;
+                int ry_inv = image_subpixel_size;
+                intr.coordinates(&x,  &y);
+                intr.local_scale(&rx, &ry);
+
+                rx = (rx * base_type::m_blur_x) >> image_subpixel_shift;
+                ry = (ry * base_type::m_blur_y) >> image_subpixel_shift;
+
+                if(rx < image_subpixel_size)
+                {
+                    rx = image_subpixel_size;
+                }
+                else
+                {
+                    if(rx > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        rx = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    rx_inv = image_subpixel_size * image_subpixel_size / rx;
+                }
+
+                if(ry < image_subpixel_size)
+                {
+                    ry = image_subpixel_size;
+                }
+                else
+                {
+                    if(ry > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        ry = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    ry_inv = image_subpixel_size * image_subpixel_size / ry;
+                }
+
+                int radius_x = (diameter * rx) >> 1;
+                int radius_y = (diameter * ry) >> 1;
+                int maxx = base_type::source_image().width() - 1;
+                int maxy = base_type::source_image().height() - 1;
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = image_filter_size / 2;
+
+                int y_lr  = m_wrap_mode_y(y >> image_subpixel_shift);
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                               ry_inv) >>
+                                   image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   rx_inv) >>
+                                       image_subpixel_shift;
+
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = m_wrap_mode_x(x_lr_ini);
+                    int x_hr = x_hr_ini;
+                    const value_type* row_ptr = (const value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + x_lr * 3;
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     downscale_shift;
+                        fg[0] += fg_ptr[0] * weight;
+                        fg[1] += fg_ptr[1] * weight;
+                        fg[2] += fg_ptr[2] * weight;
+                        total_weight += weight;
+                        x_hr   += rx_inv;
+                        x_lr = ++m_wrap_mode_x;
+                    }
+                    while(x_hr < filter_size);
+                    y_hr += ry_inv;
+                    y_lr = ++m_wrap_mode_y;
+                }
+                while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+
+                if(fg[0] > base_mask) fg[0] = base_mask;
+                if(fg[1] > base_mask) fg[1] = base_mask;
+                if(fg[2] > base_mask) fg[2] = base_mask;
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)base_mask;
+
+                ++span;
+                ++intr;
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_span_pattern_resample_rgba.h b/agg/inc/agg_span_pattern_resample_rgba.h
new file mode 100755
index 000000000000..37b4dade16f4
--- /dev/null
+++ b/agg/inc/agg_span_pattern_resample_rgba.h
@@ -0,0 +1,354 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_PATTERN_RESAMPLE_RGBA_INCLUDED
+#define AGG_SPAN_PATTERN_RESAMPLE_RGBA_INCLUDED
+
+#include "agg_color_rgba.h"
+#include "agg_span_image_resample.h"
+
+namespace agg
+{
+
+    //=======================================span_pattern_resample_rgba_affine
+    template<class ColorT,
+             class Order,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_resample_rgba_affine :
+    public span_image_resample_affine<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample_affine<color_type, alloc_type> base_type;
+        typedef typename base_type::interpolator_type interpolator_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift      = color_type::base_shift,
+            base_mask       = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgba_affine(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgba_affine(alloc_type& alloc,
+                                          const rendering_buffer& src,
+                                          interpolator_type& inter,
+                                          const image_filter_lut& filter_) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, filter_),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            long_type fg[4];
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            int radius_x = (diameter * base_type::m_rx) >> 1;
+            int radius_y = (diameter * base_type::m_ry) >> 1;
+            int maxx = base_type::source_image().width() - 1;
+            int maxy = base_type::source_image().height() - 1;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                intr.coordinates(&x, &y);
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                int y_lr  = m_wrap_mode_y(y >> image_subpixel_shift);
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                                base_type::m_ry_inv) >>
+                                    image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   base_type::m_rx_inv) >>
+                                       image_subpixel_shift;
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = m_wrap_mode_x(x_lr_ini);
+                    int x_hr = x_hr_ini;
+                    const value_type* row_ptr = (const value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + (x_lr << 2);
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     downscale_shift;
+
+                        fg[0] += fg_ptr[0] * weight;
+                        fg[1] += fg_ptr[1] * weight;
+                        fg[2] += fg_ptr[2] * weight;
+                        fg[3] += fg_ptr[3] * weight;
+                        total_weight += weight;
+                        x_hr   += base_type::m_rx_inv;
+                        x_lr = ++m_wrap_mode_x;
+                    }
+                    while(x_hr < filter_size);
+
+                    y_hr += base_type::m_ry_inv;
+                    y_lr = ++m_wrap_mode_y;
+                } while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+                fg[3] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+                if(fg[3] < 0) fg[3] = 0;
+
+                if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[order_type::A];
+
+                ++span;
+                ++intr;
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+
+
+
+
+    //============================================span_pattern_resample_rgba
+    template<class ColorT,
+             class Order,
+             class Interpolator,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_resample_rgba :
+    public span_image_resample<ColorT, Interpolator, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Interpolator interpolator_type;
+        typedef Allocator alloc_type;
+        typedef span_image_resample<color_type, interpolator_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::long_type long_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask,
+            downscale_shift = image_filter_shift
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgba(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //--------------------------------------------------------------------
+        span_pattern_resample_rgba(alloc_type& alloc,
+                                   const rendering_buffer& src,
+                                   interpolator_type& inter,
+                                   const image_filter_lut& filter) :
+            base_type(alloc, src, color_type(0,0,0,0), inter, filter),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //--------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeX(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            interpolator_type& intr = base_type::interpolator();
+            intr.begin(x + base_type::filter_dx_dbl(),
+                       y + base_type::filter_dy_dbl(), len);
+            long_type fg[4];
+
+            int diameter = base_type::filter().diameter();
+            int filter_size = diameter << image_subpixel_shift;
+            const int16* weight_array = base_type::filter().weight_array();
+
+            do
+            {
+                int rx;
+                int ry;
+                int rx_inv = image_subpixel_size;
+                int ry_inv = image_subpixel_size;
+                intr.coordinates(&x,  &y);
+                intr.local_scale(&rx, &ry);
+
+                rx = (rx * base_type::m_blur_x) >> image_subpixel_shift;
+                ry = (ry * base_type::m_blur_y) >> image_subpixel_shift;
+
+                if(rx < image_subpixel_size)
+                {
+                    rx = image_subpixel_size;
+                }
+                else
+                {
+                    if(rx > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        rx = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    rx_inv = image_subpixel_size * image_subpixel_size / rx;
+                }
+
+                if(ry < image_subpixel_size)
+                {
+                    ry = image_subpixel_size;
+                }
+                else
+                {
+                    if(ry > image_subpixel_size * base_type::m_scale_limit)
+                    {
+                        ry = image_subpixel_size * base_type::m_scale_limit;
+                    }
+                    ry_inv = image_subpixel_size * image_subpixel_size / ry;
+                }
+
+                int radius_x = (diameter * rx) >> 1;
+                int radius_y = (diameter * ry) >> 1;
+                int maxx = base_type::source_image().width() - 1;
+                int maxy = base_type::source_image().height() - 1;
+
+                x += base_type::filter_dx_int() - radius_x;
+                y += base_type::filter_dy_int() - radius_y;
+
+                fg[0] = fg[1] = fg[2] = fg[3] = image_filter_size / 2;
+
+                int y_lr  = m_wrap_mode_y(y >> image_subpixel_shift);
+                int y_hr = ((image_subpixel_mask - (y & image_subpixel_mask)) *
+                               ry_inv) >>
+                                   image_subpixel_shift;
+                int total_weight = 0;
+                int x_lr_ini = x >> image_subpixel_shift;
+                int x_hr_ini = ((image_subpixel_mask - (x & image_subpixel_mask)) *
+                                   rx_inv) >>
+                                       image_subpixel_shift;
+
+                do
+                {
+                    int weight_y = weight_array[y_hr];
+                    int x_lr = m_wrap_mode_x(x_lr_ini);
+                    int x_hr = x_hr_ini;
+                    const value_type* row_ptr = (const value_type*)base_type::source_image().row(y_lr);
+                    do
+                    {
+                        const value_type* fg_ptr = row_ptr + (x_lr << 2);
+                        int weight = (weight_y * weight_array[x_hr] +
+                                     image_filter_size / 2) >>
+                                     downscale_shift;
+                        fg[0] += fg_ptr[0] * weight;
+                        fg[1] += fg_ptr[1] * weight;
+                        fg[2] += fg_ptr[2] * weight;
+                        fg[3] += fg_ptr[3] * weight;
+                        total_weight += weight;
+                        x_hr   += rx_inv;
+                        x_lr = ++m_wrap_mode_x;
+                    }
+                    while(x_hr < filter_size);
+                    y_hr += ry_inv;
+                    y_lr = ++m_wrap_mode_y;
+                }
+                while(y_hr < filter_size);
+
+                fg[0] /= total_weight;
+                fg[1] /= total_weight;
+                fg[2] /= total_weight;
+                fg[3] /= total_weight;
+
+                if(fg[0] < 0) fg[0] = 0;
+                if(fg[1] < 0) fg[1] = 0;
+                if(fg[2] < 0) fg[2] = 0;
+                if(fg[3] < 0) fg[3] = 0;
+
+                if(fg[order_type::A] > base_mask)         fg[order_type::A] = base_mask;
+                if(fg[order_type::R] > fg[order_type::A]) fg[order_type::R] = fg[order_type::A];
+                if(fg[order_type::G] > fg[order_type::A]) fg[order_type::G] = fg[order_type::A];
+                if(fg[order_type::B] > fg[order_type::A]) fg[order_type::B] = fg[order_type::A];
+
+                span->r = (value_type)fg[order_type::R];
+                span->g = (value_type)fg[order_type::G];
+                span->b = (value_type)fg[order_type::B];
+                span->a = (value_type)fg[order_type::A];
+
+                ++span;
+                ++intr;
+            } while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_span_pattern_rgb.h b/agg/inc/agg_span_pattern_rgb.h
new file mode 100755
index 000000000000..2e17f11e7c70
--- /dev/null
+++ b/agg/inc/agg_span_pattern_rgb.h
@@ -0,0 +1,165 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+
+#ifndef AGG_SPAN_PATTERN_RGB_INCLUDED
+#define AGG_SPAN_PATTERN_RGB_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_pixfmt_rgb.h"
+#include "agg_span_pattern.h"
+
+namespace agg
+{
+    //=======================================================span_pattern_rgb
+    template<class ColorT,
+             class Order,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_rgb : public span_pattern_base<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Allocator alloc_type;
+        typedef span_pattern_base<color_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_rgb(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //----------------------------------------------------------------
+        span_pattern_rgb(alloc_type& alloc,
+                         const rendering_buffer& src,
+                         unsigned offset_x,
+                         unsigned offset_y,
+                         value_type alpha = base_mask) :
+            base_type(alloc, src, offset_x, offset_y, alpha),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeY(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            unsigned sx = m_wrap_mode_x(base_type::offset_x() + x);
+            const value_type* row_ptr =
+                (const value_type*)base_type::source_image().row(
+                    m_wrap_mode_y(
+                        base_type::offset_y() + y));
+            do
+            {
+                const value_type* p = row_ptr + sx + sx + sx;
+                span->r = p[order_type::R];
+                span->g = p[order_type::G];
+                span->b = p[order_type::B];
+                span->a = base_type::alpha_int();
+                sx = ++m_wrap_mode_x;
+                ++span;
+            }
+            while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+
+
+/*
+    //=========================================================span_pattern_rgb
+    template<class ColorT, class Order, class Allocator = span_allocator<ColorT> >
+    class span_pattern_rgb : public span_pattern<rgba8, int8u, Allocator>
+    {
+    public:
+        typedef Allocator alloc_type;
+        typedef rgba8 color_type;
+        typedef span_pattern<color_type, int8u, alloc_type> base_type;
+
+        //--------------------------------------------------------------------
+        span_pattern_rgb24(alloc_type& alloc) : base_type(alloc) {}
+
+        //----------------------------------------------------------------
+        span_pattern_rgb24(alloc_type& alloc,
+                           const rendering_buffer& src,
+                           unsigned offset_x, unsigned offset_y,
+                           int8u alpha = 255) :
+            base_type(alloc, src, offset_x, offset_y, alpha)
+        {}
+
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            unsigned sx = (base_type::offset_x() + x) % base_type::source_image().width();
+            unsigned wp = base_type::source_image().width() * 3;
+            const int8u* p = base_type::source_image().row((base_type::offset_y() + y) % base_type::source_image().height());
+            p += sx * 3;
+            do
+            {
+                span->r = p[Order::R];
+                span->g = p[Order::G];
+                span->b = p[Order::B];
+                span->a = base_type::alpha();
+                p += 3;
+                ++sx;
+                ++span;
+                if(sx >= base_type::source_image().width())
+                {
+                    sx -= base_type::source_image().width();
+                    p -= wp;
+                }
+            }
+            while(--len);
+            return base_type::allocator().span();
+        }
+    };
+*/
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_span_pattern_rgba.h b/agg/inc/agg_span_pattern_rgba.h
new file mode 100755
index 000000000000..d952d0733696
--- /dev/null
+++ b/agg/inc/agg_span_pattern_rgba.h
@@ -0,0 +1,111 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Adaptation for high precision colors has been sponsored by
+// Liberty Technology Systems, Inc., visit http://lib-sys.com
+//
+// Liberty Technology Systems, Inc. is the provider of
+// PostScript and PDF technology for software developers.
+//
+//----------------------------------------------------------------------------
+
+
+#ifndef AGG_SPAN_PATTERN_RGBA_INCLUDED
+#define AGG_SPAN_PATTERN_RGBA_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_pixfmt_rgba.h"
+#include "agg_span_pattern.h"
+
+namespace agg
+{
+
+    //======================================================span_pattern_rgba
+    template<class ColorT,
+             class Order,
+             class WrapModeX,
+             class WrapModeY,
+             class Allocator = span_allocator<ColorT> >
+    class span_pattern_rgba : public span_pattern_base<ColorT, Allocator>
+    {
+    public:
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef Allocator alloc_type;
+        typedef span_pattern_base<color_type, alloc_type> base_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
+
+        //--------------------------------------------------------------------
+        span_pattern_rgba(alloc_type& alloc) :
+            base_type(alloc),
+            m_wrap_mode_x(1),
+            m_wrap_mode_y(1)
+        {}
+
+        //----------------------------------------------------------------
+        span_pattern_rgba(alloc_type& alloc,
+                          const rendering_buffer& src,
+                          unsigned offset_x, unsigned offset_y) :
+            base_type(alloc, src, offset_x, offset_y, 0),
+            m_wrap_mode_x(src.width()),
+            m_wrap_mode_y(src.height())
+        {}
+
+        //-------------------------------------------------------------------
+        void source_image(const rendering_buffer& src)
+        {
+            base_type::source_image(src);
+            m_wrap_mode_x = WrapModeX(src.width());
+            m_wrap_mode_y = WrapModeY(src.height());
+        }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            unsigned sx = m_wrap_mode_x(base_type::offset_x() + x);
+            const value_type* row_ptr =
+                (const value_type*)base_type::source_image().row(
+                    m_wrap_mode_y(
+                        base_type::offset_y() + y));
+            do
+            {
+                const value_type* p = row_ptr + (sx << 2);
+                span->r = p[order_type::R];
+                span->g = p[order_type::G];
+                span->b = p[order_type::B];
+                span->a = p[order_type::A];
+                sx = ++m_wrap_mode_x;
+                ++span;
+            }
+            while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        WrapModeX m_wrap_mode_x;
+        WrapModeY m_wrap_mode_y;
+    };
+
+}
+
+#endif
+
diff --git a/agg/inc/agg_span_solid.h b/agg/inc/agg_span_solid.h
new file mode 100755
index 000000000000..aa8374bfe61f
--- /dev/null
+++ b/agg/inc/agg_span_solid.h
@@ -0,0 +1,63 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// span_solid_rgba8
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_SPAN_SOLID_INCLUDED
+#define AGG_SPAN_SOLID_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_span_generator.h"
+
+namespace agg
+{
+    //--------------------------------------------------------------span_solid
+    template<class ColorT, class Allocator = span_allocator<ColorT> >
+    class span_solid : public span_generator<ColorT, Allocator>
+    {
+    public:
+        typedef Allocator alloc_type;
+        typedef ColorT color_type;
+        typedef span_generator<color_type, alloc_type> base_type;
+
+        //--------------------------------------------------------------------
+        span_solid(alloc_type& alloc) : base_type(alloc) {}
+
+        //--------------------------------------------------------------------
+        void color(const color_type& c) { m_color = c; }
+        const color_type& color() const { return m_color; }
+
+        //--------------------------------------------------------------------
+        color_type* generate(int x, int y, unsigned len)
+        {
+            color_type* span = base_type::allocator().span();
+            do
+            {
+                *span++ = m_color;
+            }
+            while(--len);
+            return base_type::allocator().span();
+        }
+
+    private:
+        color_type m_color;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_span_subdiv_adaptor.h b/agg/inc/agg_span_subdiv_adaptor.h
new file mode 100755
index 000000000000..60196d705bdb
--- /dev/null
+++ b/agg/inc/agg_span_subdiv_adaptor.h
@@ -0,0 +1,141 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+#ifndef AGG_SPAN_SUBDIV_ADAPTOR_INCLUDED
+#define AGG_SPAN_SUBDIV_ADAPTOR_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //=================================================span_subdiv_adaptor
+    template<class Interpolator, unsigned SubpixelShift = 8>
+    class span_subdiv_adaptor
+    {
+    public:
+        typedef Interpolator interpolator_type;
+        typedef typename interpolator_type::trans_type trans_type;
+
+        enum
+        {
+            subpixel_shift = SubpixelShift,
+            subpixel_size  = 1 << subpixel_shift
+        };
+
+
+        //----------------------------------------------------------------
+        span_subdiv_adaptor() :
+            m_subdiv_shift(4),
+            m_subdiv_size(1 << m_subdiv_shift),
+            m_subdiv_mask(m_subdiv_size - 1) {}
+
+        span_subdiv_adaptor(interpolator_type& interpolator,
+                             unsigned subdiv_shift = 4) :
+            m_subdiv_shift(subdiv_shift),
+            m_subdiv_size(1 << m_subdiv_shift),
+            m_subdiv_mask(m_subdiv_size - 1),
+            m_interpolator(&interpolator) {}
+
+        span_subdiv_adaptor(interpolator_type& interpolator,
+                             double x, double y, unsigned len,
+                             unsigned subdiv_shift = 4) :
+            m_subdiv_shift(subdiv_shift),
+            m_subdiv_size(1 << m_subdiv_shift),
+            m_subdiv_mask(m_subdiv_size - 1),
+            m_interpolator(&interpolator)
+        {
+            begin(x, y, len);
+        }
+
+
+        //----------------------------------------------------------------
+        const interpolator_type& interpolator() const { return *m_interpolator; }
+        void interpolator(interpolator_type& intr) { m_interpolator = &intr; }
+
+        //----------------------------------------------------------------
+        const trans_type& transformer() const
+        {
+            return *m_interpolator->transformer();
+        }
+        void transformer(const trans_type& trans)
+        {
+            m_interpolator->transformer(trans);
+        }
+
+        //----------------------------------------------------------------
+        unsigned subdiv_shift() const { return m_subdiv_shift; }
+        void subdiv_shift(unsigned shift)
+        {
+            m_subdiv_shift = shift;
+            m_subdiv_size = 1 << m_subdiv_shift;
+            m_subdiv_mask = m_subdiv_size - 1;
+        }
+
+        //----------------------------------------------------------------
+        void begin(double x, double y, unsigned len)
+        {
+            m_pos   = 1;
+            m_src_x = int(x * subpixel_size) + subpixel_size;
+            m_src_y = y;
+            m_len   = len;
+            if(len > m_subdiv_size) len = m_subdiv_size;
+            m_interpolator->begin(x, y, len);
+        }
+
+        //----------------------------------------------------------------
+        void operator++()
+        {
+            ++(*m_interpolator);
+            if(m_pos >= m_subdiv_size)
+            {
+                unsigned len = m_len;
+                if(len > m_subdiv_size) len = m_subdiv_size;
+                m_interpolator->resynchronize(double(m_src_x) / double(subpixel_size) + len,
+                                              m_src_y,
+                                              len);
+                m_pos = 0;
+            }
+            m_src_x += subpixel_size;
+            ++m_pos;
+            --m_len;
+        }
+
+        //----------------------------------------------------------------
+        void coordinates(int* x, int* y) const
+        {
+            m_interpolator->coordinates(x, y);
+        }
+
+        //----------------------------------------------------------------
+        void local_scale(int* x, int* y) const
+        {
+            m_interpolator->local_scale(x, y);
+        }
+
+
+    private:
+        unsigned m_subdiv_shift;
+        unsigned m_subdiv_size;
+        unsigned m_subdiv_mask;
+        interpolator_type* m_interpolator;
+        int      m_src_x;
+        double   m_src_y;
+        unsigned m_pos;
+        unsigned m_len;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_trans_affine.h b/agg/inc/agg_trans_affine.h
new file mode 100755
index 000000000000..5a4098f904de
--- /dev/null
+++ b/agg/inc/agg_trans_affine.h
@@ -0,0 +1,344 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Affine transformation classes.
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_TRANS_AFFINE_INCLUDED
+#define AGG_TRANS_AFFINE_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+    const double affine_epsilon = 1e-14; // About of precision of doubles
+
+    //============================================================trans_affine
+    //
+    // See Implementation agg_trans_affine.cpp
+    //
+    // Affine transformation are linear transformations in Cartesian coordinates
+    // (strictly speaking not only in Cartesian, but for the beginning we will
+    // think so). They are rotation, scaling, translation and skewing.
+    // After any affine transformation a line segment remains a line segment
+    // and it will never become a curve.
+    //
+    // There will be no math about matrix calculations, since it has been
+    // described many times. Ask yourself a very simple question:
+    // "why do we need to understand and use some matrix stuff instead of just
+    // rotating, scaling and so on". The answers are:
+    //
+    // 1. Any combination of transformations can be done by only 4 multiplications
+    //    and 4 additions in floating point.
+    // 2. One matrix transformation is equivalent to the number of consecutive
+    //    discrete transformations, i.e. the matrix "accumulates" all transformations
+    //    in the order of their settings. Suppose we have 4 transformations:
+    //       * rotate by 30 degrees,
+    //       * scale X to 2.0,
+    //       * scale Y to 1.5,
+    //       * move to (100, 100).
+    //    The result will depend on the order of these transformations,
+    //    and the advantage of matrix is that the sequence of discret calls:
+    //    rotate(30), scaleX(2.0), scaleY(1.5), move(100,100)
+    //    will have exactly the same result as the following matrix transformations:
+    //
+    //    affine_matrix m;
+    //    m *= rotate_matrix(30);
+    //    m *= scaleX_matrix(2.0);
+    //    m *= scaleY_matrix(1.5);
+    //    m *= move_matrix(100,100);
+    //
+    //    m.transform_my_point_at_last(x, y);
+    //
+    // What is the good of it? In real life we will set-up the matrix only once
+    // and then transform many points, let alone the convenience to set any
+    // combination of transformations.
+    //
+    // So, how to use it? Very easy - literally as it's shown above. Not quite,
+    // let us write a correct example:
+    //
+    // agg::trans_affine m;
+    // m *= agg::trans_affine_rotation(30.0 * 3.1415926 / 180.0);
+    // m *= agg::trans_affine_scaling(2.0, 1.5);
+    // m *= agg::trans_affine_translation(100.0, 100.0);
+    // m.transform(&x, &y);
+    //
+    // The affine matrix is all you need to perform any linear transformation,
+    // but all transformations have origin point (0,0). It means that we need to
+    // use 2 translations if we want to rotate someting around (100,100):
+    //
+    // m *= agg::trans_affine_translation(-100.0, -100.0);         // move to (0,0)
+    // m *= agg::trans_affine_rotation(30.0 * 3.1415926 / 180.0);  // rotate
+    // m *= agg::trans_affine_translation(100.0, 100.0);           // move back to (100,100)
+    //----------------------------------------------------------------------
+    class trans_affine
+    {
+    public:
+        //------------------------------------------ Construction
+        // Construct an identity matrix - it does not transform anything
+        trans_affine() :
+            m0(1.0), m1(0.0), m2(0.0), m3(1.0), m4(0.0), m5(0.0)
+        {}
+
+        // Construct a custom matrix. Usually used in derived classes
+        trans_affine(double v0, double v1, double v2, double v3, double v4, double v5) :
+            m0(v0), m1(v1), m2(v2), m3(v3), m4(v4), m5(v5)
+        {}
+
+        // Construct a matrix to transform a parallelogram to another one.
+        trans_affine(const double* rect, const double* parl)
+        {
+            parl_to_parl(rect, parl);
+        }
+
+        // Construct a matrix to transform a rectangle to a parallelogram.
+        trans_affine(double x1, double y1, double x2, double y2,
+                     const double* parl)
+        {
+            rect_to_parl(x1, y1, x2, y2, parl);
+        }
+
+        // Construct a matrix to transform a parallelogram to a rectangle.
+        trans_affine(const double* parl,
+                     double x1, double y1, double x2, double y2)
+        {
+            parl_to_rect(parl, x1, y1, x2, y2);
+        }
+
+
+        //---------------------------------- Parellelogram transformations
+        // Calculate a matrix to transform a parallelogram to another one.
+        // src and dst are pointers to arrays of three points
+        // (double[6], x,y,...) that identify three corners of the
+        // parallelograms assuming implicit fourth points.
+        // There are also transformations rectangtle to parallelogram and
+        // parellelogram to rectangle
+        const trans_affine& parl_to_parl(const double* src,
+                                         const double* dst);
+
+        const trans_affine& rect_to_parl(double x1, double y1,
+                                         double x2, double y2,
+                                         const double* parl);
+
+        const trans_affine& parl_to_rect(const double* parl,
+                                         double x1, double y1,
+                                         double x2, double y2);
+
+
+        //------------------------------------------ Operations
+        // Reset - actually load an identity matrix
+        const trans_affine& reset();
+
+        // Multiply matrix to another one
+        const trans_affine& multiply(const trans_affine& m);
+
+        // Multiply "m" to "this" and assign the result to "this"
+        const trans_affine& premultiply(const trans_affine& m);
+
+        // Invert matrix. Do not try to invert degenerate matrices,
+        // there's no check for validity. If you set scale to 0 and
+        // then try to invert matrix, expect unpredictable result.
+        const trans_affine& invert();
+
+        // Mirroring around X
+        const trans_affine& flip_x();
+
+        // Mirroring around Y
+        const trans_affine& flip_y();
+
+        //------------------------------------------- Load/Store
+        // Store matrix to an array [6] of double
+        void store_to(double* m) const
+        {
+            *m++ = m0; *m++ = m1; *m++ = m2; *m++ = m3; *m++ = m4; *m++ = m5;
+        }
+
+        // Load matrix from an array [6] of double
+        const trans_affine& load_from(const double* m)
+        {
+            m0 = *m++; m1 = *m++; m2 = *m++; m3 = *m++; m4 = *m++;  m5 = *m++;
+            return *this;
+        }
+
+        //------------------------------------------- Operators
+
+        // Multiply current matrix to another one
+        const trans_affine& operator *= (const trans_affine& m)
+        {
+            return multiply(m);
+        }
+
+        // Multiply current matrix to another one and return
+        // the result in a separete matrix.
+        trans_affine operator * (const trans_affine& m)
+        {
+            return trans_affine(*this).multiply(m);
+        }
+
+        // Calculate and return the inverse matrix
+        trans_affine operator ~ () const
+        {
+            trans_affine ret = *this;
+            return ret.invert();
+        }
+
+        // Equal operator with default epsilon
+        bool operator == (const trans_affine& m) const
+        {
+            return is_equal(m, affine_epsilon);
+        }
+
+        // Not Equal operator with default epsilon
+        bool operator != (const trans_affine& m) const
+        {
+            return !is_equal(m, affine_epsilon);
+        }
+
+        //-------------------------------------------- Transformations
+        // Direct transformation x and y
+        void transform(double* x, double* y) const;
+
+        // Inverse transformation x and y. It works slower than the
+        // direct transformation, so if the performance is critical
+        // it's better to invert() the matrix and then use transform()
+        void inverse_transform(double* x, double* y) const;
+
+        //-------------------------------------------- Auxiliary
+        // Calculate the determinant of matrix
+        double determinant() const
+        {
+            return 1.0 / (m0 * m3 - m1 * m2);
+        }
+
+        // Get the average scale (by X and Y).
+        // Basically used to calculate the approximation_scale when
+        // decomposinting curves into line segments.
+        double scale() const;
+
+        // Check to see if it's an identity matrix
+        bool is_identity(double epsilon = affine_epsilon) const;
+
+        // Check to see if two matrices are equal
+        bool is_equal(const trans_affine& m, double epsilon = affine_epsilon) const;
+
+        // Determine the major parameters. Use carefully considering degenerate matrices
+        double rotation() const;
+        void   translation(double* dx, double* dy) const;
+        void   scaling(double* sx, double* sy) const;
+        void   scaling_abs(double* sx, double* sy) const
+        {
+            *sx = sqrt(m0*m0 + m2*m2);
+            *sy = sqrt(m1*m1 + m3*m3);
+        }
+
+    private:
+        double m0;
+        double m1;
+        double m2;
+        double m3;
+        double m4;
+        double m5;
+    };
+
+    //------------------------------------------------------------------------
+    inline void trans_affine::transform(double* x, double* y) const
+    {
+        register double tx = *x;
+        *x = tx * m0 + *y * m2 + m4;
+        *y = tx * m1 + *y * m3 + m5;
+    }
+
+    //------------------------------------------------------------------------
+    inline void trans_affine::inverse_transform(double* x, double* y) const
+    {
+        register double d = determinant();
+        register double a = (*x - m4) * d;
+        register double b = (*y - m5) * d;
+        *x = a * m3 - b * m2;
+        *y = b * m0 - a * m1;
+    }
+
+    //------------------------------------------------------------------------
+    inline double trans_affine::scale() const
+    {
+        double x = 0.707106781 * m0 + 0.707106781 * m2;
+        double y = 0.707106781 * m1 + 0.707106781 * m3;
+        return sqrt(x*x + y*y);
+    }
+
+
+    //------------------------------------------------------------------------
+    inline const trans_affine& trans_affine::premultiply(const trans_affine& m)
+    {
+        trans_affine t = m;
+        return *this = t.multiply(*this);
+    }
+
+
+    //====================================================trans_affine_rotation
+    // Rotation matrix. sin() and cos() are calculated twice for the same angle.
+    // There's no harm because the performance of sin()/cos() is very good on all
+    // modern processors. Besides, this operation is not going to be invoked too
+    // often.
+    class trans_affine_rotation : public trans_affine
+    {
+    public:
+        trans_affine_rotation(double a) :
+          trans_affine(cos(a), sin(a), -sin(a), cos(a), 0.0, 0.0)
+        {}
+    };
+
+    //====================================================trans_affine_scaling
+    // Scaling matrix. sx, sy - scale coefficients by X and Y respectively
+    class trans_affine_scaling : public trans_affine
+    {
+    public:
+        trans_affine_scaling(double sx, double sy) :
+          trans_affine(sx, 0.0, 0.0, sy, 0.0, 0.0)
+        {}
+
+        trans_affine_scaling(double s) :
+          trans_affine(s, 0.0, 0.0, s, 0.0, 0.0)
+        {}
+    };
+
+    //================================================trans_affine_translation
+    // Translation matrix
+    class trans_affine_translation : public trans_affine
+    {
+    public:
+        trans_affine_translation(double tx, double ty) :
+          trans_affine(1.0, 0.0, 0.0, 1.0, tx, ty)
+        {}
+    };
+
+    //====================================================trans_affine_skewing
+    // Sckewing (shear) matrix
+    class trans_affine_skewing : public trans_affine
+    {
+    public:
+        trans_affine_skewing(double sx, double sy) :
+          trans_affine(1.0, tan(sy), tan(sx), 1.0, 0.0, 0.0)
+        {}
+    };
+
+
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_trans_bilinear.h b/agg/inc/agg_trans_bilinear.h
new file mode 100755
index 000000000000..7398a866d3b0
--- /dev/null
+++ b/agg/inc/agg_trans_bilinear.h
@@ -0,0 +1,166 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Bilinear 2D transformations
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_TRANS_BILINEAR_INCLUDED
+#define AGG_TRANS_BILINEAR_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_simul_eq.h"
+
+namespace agg
+{
+
+    //==========================================================trans_bilinear
+    class trans_bilinear
+    {
+    public:
+        //--------------------------------------------------------------------
+        trans_bilinear() : m_valid(false) {}
+
+        //--------------------------------------------------------------------
+        // Arbitrary quadrangle transformations
+        trans_bilinear(const double* src, const double* dst)
+        {
+            quad_to_quad(src, dst);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Direct transformations
+        trans_bilinear(double x1, double y1, double x2, double y2,
+                       const double* quad)
+        {
+            rect_to_quad(x1, y1, x2, y2, quad);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Reverse transformations
+        trans_bilinear(const double* quad,
+                       double x1, double y1, double x2, double y2)
+        {
+            quad_to_rect(quad, x1, y1, x2, y2);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the transformations using two arbitrary quadrangles.
+        void quad_to_quad(const double* src, const double* dst)
+        {
+            double left[4][4];
+            double right[4][2];
+
+            unsigned i;
+            for(i = 0; i < 4; i++)
+            {
+                unsigned ix = i * 2;
+                unsigned iy = ix + 1;
+                left[i][0] = 1.0;
+                left[i][1] = src[ix] * src[iy];
+                left[i][2] = src[ix];
+                left[i][3] = src[iy];
+
+                right[i][0] = dst[ix];
+                right[i][1] = dst[iy];
+            }
+            m_valid = simul_eq<4, 2>::solve(left, right, m_mtx);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the direct transformations, i.e., rectangle -> quadrangle
+        void rect_to_quad(double x1, double y1, double x2, double y2,
+                          const double* quad)
+        {
+            double src[8];
+            src[0] = src[6] = x1;
+            src[2] = src[4] = x2;
+            src[1] = src[3] = y1;
+            src[5] = src[7] = y2;
+            quad_to_quad(src, quad);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the reverse transformations, i.e., quadrangle -> rectangle
+        void quad_to_rect(const double* quad,
+                          double x1, double y1, double x2, double y2)
+        {
+            double dst[8];
+            dst[0] = dst[6] = x1;
+            dst[2] = dst[4] = x2;
+            dst[1] = dst[3] = y1;
+            dst[5] = dst[7] = y2;
+            quad_to_quad(quad, dst);
+        }
+
+        //--------------------------------------------------------------------
+        // Check if the equations were solved successfully
+        bool is_valid() const { return m_valid; }
+
+        //--------------------------------------------------------------------
+        // Transform a point (x, y)
+        void transform(double* x, double* y) const
+        {
+            double tx = *x;
+            double ty = *y;
+            double xy = tx * ty;
+            *x = m_mtx[0][0] + m_mtx[1][0] * xy + m_mtx[2][0] * tx + m_mtx[3][0] * ty;
+            *y = m_mtx[0][1] + m_mtx[1][1] * xy + m_mtx[2][1] * tx + m_mtx[3][1] * ty;
+        }
+
+
+        //--------------------------------------------------------------------
+        class iterator_x
+        {
+            double inc_x;
+            double inc_y;
+
+        public:
+            double x;
+            double y;
+
+            iterator_x() {}
+            iterator_x(double tx, double ty, double step, const double m[4][2]) :
+                inc_x(m[1][0] * step * ty + m[2][0] * step),
+                inc_y(m[1][1] * step * ty + m[2][1] * step),
+                x(m[0][0] + m[1][0] * tx * ty + m[2][0] * tx + m[3][0] * ty),
+                y(m[0][1] + m[1][1] * tx * ty + m[2][1] * tx + m[3][1] * ty)
+            {
+            }
+
+            void operator ++ ()
+            {
+                x += inc_x;
+                y += inc_y;
+            }
+        };
+
+        iterator_x begin(double x, double y, double step) const
+        {
+            return iterator_x(x, y, step, m_mtx);
+        }
+
+    private:
+        double m_mtx[4][2];
+        bool   m_valid;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_trans_double_path.h b/agg/inc/agg_trans_double_path.h
new file mode 100755
index 000000000000..16ea9f7264bd
--- /dev/null
+++ b/agg/inc/agg_trans_double_path.h
@@ -0,0 +1,131 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_TRANS_DOUBLE_PATH_INCLUDED
+#define AGG_TRANS_DOUBLE_PATH_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_sequence.h"
+
+namespace agg
+{
+
+    // See also: agg_trans_double_path.cpp
+    //
+    //-------------------------------------------------------trans_double_path
+    class trans_double_path
+    {
+        enum status_e
+        {
+            initial,
+            making_path,
+            ready
+        };
+
+    public:
+        typedef vertex_sequence<vertex_dist, 6> vertex_storage;
+
+        trans_double_path();
+
+        //--------------------------------------------------------------------
+        void   base_length(double v)  { m_base_length = v; }
+        double base_length() const { return m_base_length; }
+
+        //--------------------------------------------------------------------
+        void   base_height(double v)  { m_base_height = v; }
+        double base_height() const { return m_base_height; }
+
+        //--------------------------------------------------------------------
+        void preserve_x_scale(bool f) { m_preserve_x_scale = f;    }
+        bool preserve_x_scale() const { return m_preserve_x_scale; }
+
+        //--------------------------------------------------------------------
+        void reset();
+        void move_to1(double x, double y);
+        void line_to1(double x, double y);
+        void move_to2(double x, double y);
+        void line_to2(double x, double y);
+        void finalize_paths();
+
+        //--------------------------------------------------------------------
+        template<class VertexSource1, class VertexSource2>
+        void add_paths(VertexSource1& vs1, VertexSource2& vs2,
+                       unsigned path1_id=0, unsigned path2_id=0)
+        {
+            double x;
+            double y;
+
+            unsigned cmd;
+
+            vs1.rewind(path1_id);
+            while(!is_stop(cmd = vs1.vertex(&x, &y)))
+            {
+                if(is_move_to(cmd))
+                {
+                    move_to1(x, y);
+                }
+                else
+                {
+                    if(is_vertex(cmd))
+                    {
+                        line_to1(x, y);
+                    }
+                }
+            }
+
+            vs2.rewind(path2_id);
+            while(!is_stop(cmd = vs2.vertex(&x, &y)))
+            {
+                if(is_move_to(cmd))
+                {
+                    move_to2(x, y);
+                }
+                else
+                {
+                    if(is_vertex(cmd))
+                    {
+                        line_to2(x, y);
+                    }
+                }
+            }
+            finalize_paths();
+        }
+
+        //--------------------------------------------------------------------
+        double total_length1() const;
+        double total_length2() const;
+        void transform(double *x, double *y) const;
+
+    private:
+        double finalize_path(vertex_storage& vertices);
+        void transform1(const vertex_storage& vertices,
+                        double kindex, double kx,
+                        double *x, double* y) const;
+
+        vertex_storage m_src_vertices1;
+        vertex_storage m_src_vertices2;
+        double         m_base_length;
+        double         m_base_height;
+        double         m_kindex1;
+        double         m_kindex2;
+        status_e       m_status1;
+        status_e       m_status2;
+        bool           m_preserve_x_scale;
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_trans_lens.h b/agg/inc/agg_trans_lens.h
new file mode 100755
index 000000000000..ad900686c3fd
--- /dev/null
+++ b/agg/inc/agg_trans_lens.h
@@ -0,0 +1,79 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.1
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_WARP_MAGNIFIER_INCLUDED
+#define AGG_WARP_MAGNIFIER_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+
+namespace agg
+{
+
+    class trans_warp_magnifier
+    {
+    public:
+        trans_warp_magnifier() : m_xc(0.0), m_yc(0.0), m_magn(1.0), m_radius(1.0), m_warp(false) {}
+
+        void center(double x, double y) { m_xc = x; m_yc = y; }
+        void magnification(double m)    { m_magn = m;         }
+        void radius(double r)           { m_radius = r;       }
+        void warp(bool w)               { m_warp = w;         }
+
+        void transform(double* x, double* y) const
+        {
+            double dx = *x - m_xc;
+            double dy = *y - m_yc;
+            double r = sqrt(dx * dx + dy * dy);
+            double rm = m_radius / m_magn;
+            if(r < rm)
+            {
+                *x = m_xc + dx * m_magn;
+                *y = m_yc + dy * m_magn;
+                return;
+            }
+
+            if(m_warp)
+            {
+                double m = (r + rm * (m_magn - 1.0)) / r;
+                *x = m_xc + dx * m;
+                *y = m_yc + dy * m;
+                return;
+            }
+
+            if(r < m_radius)
+            {
+                double m = m_radius / r;
+                *x = m_xc + dx * m;
+                *y = m_yc + dy * m;
+            }
+        }
+
+    private:
+        double m_xc;
+        double m_yc;
+        double m_magn;
+        double m_radius;
+        bool   m_warp;
+    };
+
+
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_trans_perspective.h b/agg/inc/agg_trans_perspective.h
new file mode 100755
index 000000000000..a127c9095ad2
--- /dev/null
+++ b/agg/inc/agg_trans_perspective.h
@@ -0,0 +1,192 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Perspective 2D transformations
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_TRANS_PERSPECTIVE_INCLUDED
+#define AGG_TRANS_PERSPECTIVE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_simul_eq.h"
+
+namespace agg
+{
+    //=======================================================trans_perspective
+    class trans_perspective
+    {
+    public:
+        //--------------------------------------------------------------------
+        trans_perspective() : m_valid(false) {}
+
+
+        //--------------------------------------------------------------------
+        // Arbitrary quadrangle transformations
+        trans_perspective(const double* src, const double* dst)
+        {
+            quad_to_quad(src, dst);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Direct transformations
+        trans_perspective(double x1, double y1, double x2, double y2,
+                          const double* quad)
+        {
+            rect_to_quad(x1, y1, x2, y2, quad);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Reverse transformations
+        trans_perspective(const double* quad,
+                          double x1, double y1, double x2, double y2)
+        {
+            quad_to_rect(quad, x1, y1, x2, y2);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the transformations using two arbitrary quadrangles.
+        void quad_to_quad(const double* src, const double* dst)
+        {
+
+            double left[8][8];
+            double right[8][1];
+
+            unsigned i;
+            for (i = 0; i < 4; i++)
+            {
+                unsigned ix = i * 2;
+                unsigned iy = ix + 1;
+
+                left[ix][0]  =  1.0;
+                left[ix][1]  =  src[ix];
+                left[ix][2]  =  src[iy];
+                left[ix][3]  =  0.0;
+                left[ix][4]  =  0.0;
+                left[ix][5]  =  0.0;
+                left[ix][6]  = -src[ix] * dst[ix];
+                left[ix][7]  = -src[iy] * dst[ix];
+                right[ix][0] =  dst[ix];
+
+                left[iy][0]  =  0.0;
+                left[iy][1]  =  0.0;
+                left[iy][2]  =  0.0;
+                left[iy][3]  =  1.0;
+                left[iy][4]  =  src[ix];
+                left[iy][5]  =  src[iy];
+                left[iy][6]  = -src[ix] * dst[iy];
+                left[iy][7]  = -src[iy] * dst[iy];
+                right[iy][0] =  dst[iy];
+            }
+            m_valid = simul_eq<8, 1>::solve(left, right, m_mtx);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the direct transformations, i.e., rectangle -> quadrangle
+        void rect_to_quad(double x1, double y1, double x2, double y2,
+                          const double* quad)
+        {
+            double src[8];
+            src[0] = src[6] = x1;
+            src[2] = src[4] = x2;
+            src[1] = src[3] = y1;
+            src[5] = src[7] = y2;
+            quad_to_quad(src, quad);
+        }
+
+
+        //--------------------------------------------------------------------
+        // Set the reverse transformations, i.e., quadrangle -> rectangle
+        void quad_to_rect(const double* quad,
+                          double x1, double y1, double x2, double y2)
+        {
+            double dst[8];
+            dst[0] = dst[6] = x1;
+            dst[2] = dst[4] = x2;
+            dst[1] = dst[3] = y1;
+            dst[5] = dst[7] = y2;
+            quad_to_quad(quad, dst);
+        }
+
+        //--------------------------------------------------------------------
+        // Check if the equations were solved successfully
+        bool is_valid() const { return m_valid; }
+
+        //--------------------------------------------------------------------
+        // Transform a point (x, y)
+        void transform(double* x, double* y) const
+        {
+            double tx = *x;
+            double ty = *y;
+            double d = 1.0 / (m_mtx[6][0] * tx + m_mtx[7][0] * ty + 1.0);
+            *x = (m_mtx[0][0] + m_mtx[1][0] * tx + m_mtx[2][0] * ty) * d;
+            *y = (m_mtx[3][0] + m_mtx[4][0] * tx + m_mtx[5][0] * ty) * d;
+        }
+
+        //--------------------------------------------------------------------
+        class iterator_x
+        {
+            double den;
+            double den_step;
+            double nom_x;
+            double nom_x_step;
+            double nom_y;
+            double nom_y_step;
+
+        public:
+            double x;
+            double y;
+
+            iterator_x() {}
+            iterator_x(double tx, double ty, double step, const double m[8][1]) :
+                den(m[6][0] * tx + m[7][0] * ty + 1.0),
+                den_step(m[6][0] * step),
+                nom_x(m[0][0] + m[1][0] * tx + m[2][0] * ty),
+                nom_x_step(m[1][0] * step),
+                nom_y(m[3][0] + m[4][0] * tx + m[5][0] * ty),
+                nom_y_step(m[4][0] * step),
+                x(nom_x / den),
+                y(nom_y / den)
+            {
+            }
+
+            void operator ++ ()
+            {
+                den   += den_step;
+                nom_x += nom_x_step;
+                nom_y += nom_y_step;
+                double d = 1.0 / den;
+                x = nom_x * d;
+                y = nom_y * d;
+            }
+        };
+
+        //--------------------------------------------------------------------
+        iterator_x begin(double x, double y, double step) const
+        {
+            return iterator_x(x, y, step, m_mtx);
+        }
+
+    private:
+        double m_mtx[8][1];
+        bool   m_valid;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_trans_single_path.h b/agg/inc/agg_trans_single_path.h
new file mode 100755
index 000000000000..68369626c396
--- /dev/null
+++ b/agg/inc/agg_trans_single_path.h
@@ -0,0 +1,97 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_TRANS_SINGLE_PATH_INCLUDED
+#define AGG_TRANS_SINGLE_PATH_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_sequence.h"
+
+namespace agg
+{
+
+    // See also: agg_trans_single_path.cpp
+    //
+    //-------------------------------------------------------trans_single_path
+    class trans_single_path
+    {
+        enum status_e
+        {
+            initial,
+            making_path,
+            ready
+        };
+
+    public:
+        typedef vertex_sequence<vertex_dist, 6> vertex_storage;
+
+        trans_single_path();
+
+        //--------------------------------------------------------------------
+        void   base_length(double v)  { m_base_length = v; }
+        double base_length() const { return m_base_length; }
+
+        //--------------------------------------------------------------------
+        void preserve_x_scale(bool f) { m_preserve_x_scale = f;    }
+        bool preserve_x_scale() const { return m_preserve_x_scale; }
+
+        //--------------------------------------------------------------------
+        void reset();
+        void move_to(double x, double y);
+        void line_to(double x, double y);
+        void finalize_path();
+
+        //--------------------------------------------------------------------
+        template<class VertexSource>
+        void add_path(VertexSource& vs, unsigned path_id=0)
+        {
+            double x;
+            double y;
+
+            unsigned cmd;
+            vs.rewind(path_id);
+            while(!is_stop(cmd = vs.vertex(&x, &y)))
+            {
+                if(is_move_to(cmd))
+                {
+                    move_to(x, y);
+                }
+                else
+                {
+                    if(is_vertex(cmd))
+                    {
+                        line_to(x, y);
+                    }
+                }
+            }
+            finalize_path();
+        }
+
+        //--------------------------------------------------------------------
+        double total_length() const;
+        void transform(double *x, double *y) const;
+
+    private:
+        vertex_storage m_src_vertices;
+        double         m_base_length;
+        double         m_kindex;
+        status_e       m_status;
+        bool           m_preserve_x_scale;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_trans_viewport.h b/agg/inc/agg_trans_viewport.h
new file mode 100755
index 000000000000..b77a7204feb9
--- /dev/null
+++ b/agg/inc/agg_trans_viewport.h
@@ -0,0 +1,304 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Viewport transformer - simple orthogonal conversions from world coordinates
+//                        to screen (device) ones.
+//
+//----------------------------------------------------------------------------
+
+#ifndef AGG_TRANS_VIEWPORT_INCLUDED
+#define AGG_TRANS_VIEWPORT_INCLUDED
+
+#include <string.h>
+#include "agg_basics.h"
+
+
+namespace agg
+{
+
+    enum aspect_ratio_e
+    {
+        aspect_ratio_stretch,
+        aspect_ratio_meet,
+        aspect_ratio_slice
+    };
+
+
+    //----------------------------------------------------------trans_viewport
+    class trans_viewport
+    {
+    public:
+        //-------------------------------------------------------------------
+        trans_viewport() :
+            m_world_x1(0.0),
+            m_world_y1(0.0),
+            m_world_x2(1.0),
+            m_world_y2(1.0),
+            m_device_x1(0.0),
+            m_device_y1(0.0),
+            m_device_x2(1.0),
+            m_device_y2(1.0),
+            m_aspect(aspect_ratio_stretch),
+            m_align_x(0.5),
+            m_align_y(0.5),
+            m_wx1(0.0),
+            m_wy1(0.0),
+            m_wx2(1.0),
+            m_wy2(1.0),
+            m_dx1(0.0),
+            m_dy1(0.0),
+            m_kx(1.0),
+            m_ky(1.0)
+        {}
+
+        //-------------------------------------------------------------------
+        void preserve_aspect_ratio(double alignx,
+                                   double aligny,
+                                   aspect_ratio_e aspect)
+        {
+            m_align_x = alignx;
+            m_align_y = aligny;
+            m_aspect  = aspect;
+            update();
+        }
+
+        //-------------------------------------------------------------------
+        void device_viewport(double x1, double y1, double x2, double y2)
+        {
+            m_device_x1 = x1;
+            m_device_y1 = y1;
+            m_device_x2 = x2;
+            m_device_y2 = y2;
+            update();
+        }
+
+        //-------------------------------------------------------------------
+        void world_viewport(double x1, double y1, double x2, double y2)
+        {
+            m_world_x1 = x1;
+            m_world_y1 = y1;
+            m_world_x2 = x2;
+            m_world_y2 = y2;
+            update();
+        }
+
+        //-------------------------------------------------------------------
+        void device_viewport(double* x1, double* y1, double* x2, double* y2) const
+        {
+            *x1 = m_device_x1;
+            *y1 = m_device_y1;
+            *x2 = m_device_x2;
+            *y2 = m_device_y2;
+        }
+
+        //-------------------------------------------------------------------
+        void world_viewport(double* x1, double* y1, double* x2, double* y2) const
+        {
+            *x1 = m_world_x1;
+            *y1 = m_world_y1;
+            *x2 = m_world_x2;
+            *y2 = m_world_y2;
+        }
+
+        //-------------------------------------------------------------------
+        void world_viewport_actual(double* x1, double* y1,
+                                   double* x2, double* y2) const
+        {
+            *x1 = m_wx1;
+            *y1 = m_wy1;
+            *x2 = m_wx2;
+            *y2 = m_wy2;
+        }
+
+        //-------------------------------------------------------------------
+        double align_x()              const { return m_align_x; }
+        double align_y()              const { return m_align_y; }
+        aspect_ratio_e aspect_ratio() const { return m_aspect; }
+
+        //-------------------------------------------------------------------
+        void transform(double* x, double* y) const
+        {
+            *x = (*x - m_wx1) * m_kx + m_dx1;
+            *y = (*y - m_wy1) * m_ky + m_dy1;
+        }
+
+        //-------------------------------------------------------------------
+        void inverse_transform(double* x, double* y) const
+        {
+            *x = (*x - m_dx1) / m_kx + m_wx1;
+            *y = (*y - m_dy1) / m_ky + m_wy1;
+        }
+
+        //-------------------------------------------------------------------
+        double scale_x() const
+        {
+            return m_kx;
+        }
+
+        //-------------------------------------------------------------------
+        double scale_y() const
+        {
+            return m_ky;
+        }
+
+        //-------------------------------------------------------------------
+        double scale() const
+        {
+            return (m_kx + m_ky) * 0.5;
+        }
+
+
+        //-------------------------------------------------------------------
+        unsigned byte_size() const
+        {
+            return
+                sizeof(m_world_x1) +
+                sizeof(m_world_y1) +
+                sizeof(m_world_x2) +
+                sizeof(m_world_y2) +
+                sizeof(m_device_x1) +
+                sizeof(m_device_y1) +
+                sizeof(m_device_x2) +
+                sizeof(m_device_y2) +
+                sizeof(m_aspect) +
+                sizeof(m_align_x) +
+                sizeof(m_align_y) +
+                sizeof(m_wx1) +
+                sizeof(m_wy1) +
+                sizeof(m_wx2) +
+                sizeof(m_wy2) +
+                sizeof(m_dx1) +
+                sizeof(m_dy1) +
+                sizeof(m_kx) +
+                sizeof(m_ky);
+        }
+
+        void serialize(int8u* ptr) const
+        {
+            memcpy(ptr, &m_world_x1,  sizeof(m_world_x1));  ptr += sizeof(m_world_x1);
+            memcpy(ptr, &m_world_y1,  sizeof(m_world_y1));  ptr += sizeof(m_world_y1);
+            memcpy(ptr, &m_world_x2,  sizeof(m_world_x2));  ptr += sizeof(m_world_x2);
+            memcpy(ptr, &m_world_y2,  sizeof(m_world_y2));  ptr += sizeof(m_world_y2);
+            memcpy(ptr, &m_device_x1, sizeof(m_device_x1)); ptr += sizeof(m_device_x1);
+            memcpy(ptr, &m_device_y1, sizeof(m_device_y1)); ptr += sizeof(m_device_y1);
+            memcpy(ptr, &m_device_x2, sizeof(m_device_x2)); ptr += sizeof(m_device_x2);
+            memcpy(ptr, &m_device_y2, sizeof(m_device_y2)); ptr += sizeof(m_device_y2);
+            memcpy(ptr, &m_aspect,    sizeof(m_aspect));    ptr += sizeof(m_aspect);
+            memcpy(ptr, &m_align_x,   sizeof(m_align_x));   ptr += sizeof(m_align_x);
+            memcpy(ptr, &m_align_y,   sizeof(m_align_y));   ptr += sizeof(m_align_y);
+            memcpy(ptr, &m_wx1,       sizeof(m_wx1));       ptr += sizeof(m_wx1);
+            memcpy(ptr, &m_wy1,       sizeof(m_wy1));       ptr += sizeof(m_wy1);
+            memcpy(ptr, &m_wx2,       sizeof(m_wx2));       ptr += sizeof(m_wx2);
+            memcpy(ptr, &m_wy2,       sizeof(m_wy2));       ptr += sizeof(m_wy2);
+            memcpy(ptr, &m_dx1,       sizeof(m_dx1));       ptr += sizeof(m_dx1);
+            memcpy(ptr, &m_dy1,       sizeof(m_dy1));       ptr += sizeof(m_dy1);
+            memcpy(ptr, &m_kx,        sizeof(m_kx));        ptr += sizeof(m_kx);
+            memcpy(ptr, &m_ky,        sizeof(m_ky));        ptr += sizeof(m_ky);
+        }
+
+        void deserialize(const int8u* ptr)
+        {
+            memcpy(&m_world_x1,  ptr, sizeof(m_world_x1));  ptr += sizeof(m_world_x1);
+            memcpy(&m_world_y1,  ptr, sizeof(m_world_y1));  ptr += sizeof(m_world_y1);
+            memcpy(&m_world_x2,  ptr, sizeof(m_world_x2));  ptr += sizeof(m_world_x2);
+            memcpy(&m_world_y2,  ptr, sizeof(m_world_y2));  ptr += sizeof(m_world_y2);
+            memcpy(&m_device_x1, ptr, sizeof(m_device_x1)); ptr += sizeof(m_device_x1);
+            memcpy(&m_device_y1, ptr, sizeof(m_device_y1)); ptr += sizeof(m_device_y1);
+            memcpy(&m_device_x2, ptr, sizeof(m_device_x2)); ptr += sizeof(m_device_x2);
+            memcpy(&m_device_y2, ptr, sizeof(m_device_y2)); ptr += sizeof(m_device_y2);
+            memcpy(&m_aspect,    ptr, sizeof(m_aspect));    ptr += sizeof(m_aspect);
+            memcpy(&m_align_x,   ptr, sizeof(m_align_x));   ptr += sizeof(m_align_x);
+            memcpy(&m_align_y,   ptr, sizeof(m_align_y));   ptr += sizeof(m_align_y);
+            memcpy(&m_wx1,       ptr, sizeof(m_wx1));       ptr += sizeof(m_wx1);
+            memcpy(&m_wy1,       ptr, sizeof(m_wy1));       ptr += sizeof(m_wy1);
+            memcpy(&m_wx2,       ptr, sizeof(m_wx2));       ptr += sizeof(m_wx2);
+            memcpy(&m_wy2,       ptr, sizeof(m_wy2));       ptr += sizeof(m_wy2);
+            memcpy(&m_dx1,       ptr, sizeof(m_dx1));       ptr += sizeof(m_dx1);
+            memcpy(&m_dy1,       ptr, sizeof(m_dy1));       ptr += sizeof(m_dy1);
+            memcpy(&m_kx,        ptr, sizeof(m_kx));        ptr += sizeof(m_kx);
+            memcpy(&m_ky,        ptr, sizeof(m_ky));        ptr += sizeof(m_ky);
+        }
+
+    private:
+        void update();
+
+        double         m_world_x1;
+        double         m_world_y1;
+        double         m_world_x2;
+        double         m_world_y2;
+        double         m_device_x1;
+        double         m_device_y1;
+        double         m_device_x2;
+        double         m_device_y2;
+        aspect_ratio_e m_aspect;
+        double         m_align_x;
+        double         m_align_y;
+        double         m_wx1;
+        double         m_wy1;
+        double         m_wx2;
+        double         m_wy2;
+        double         m_dx1;
+        double         m_dy1;
+        double         m_kx;
+        double         m_ky;
+    };
+
+
+
+    //-----------------------------------------------------------------------
+    inline void trans_viewport::update()
+    {
+        double world_x1  = m_world_x1;
+        double world_y1  = m_world_y1;
+        double world_x2  = m_world_x2;
+        double world_y2  = m_world_y2;
+        double device_x1 = m_device_x1;
+        double device_y1 = m_device_y1;
+        double device_x2 = m_device_x2;
+        double device_y2 = m_device_y2;
+        if(m_aspect != aspect_ratio_stretch)
+        {
+            double d;
+            m_kx = (device_x2 - device_x1) / (world_x2 - world_x1);
+            m_ky = (device_y2 - device_y1) / (world_y2 - world_y1);
+
+            if((m_aspect == aspect_ratio_meet) == (m_kx < m_ky))
+            {
+                d         = (world_y2 - world_y1) * m_ky / m_kx;
+                world_y1 += (world_y2 - world_y1 - d) * m_align_y;
+                world_y2  =  world_y1 + d;
+            }
+            else
+            {
+                d         = (world_x2 - world_x1) * m_kx / m_ky;
+                world_x1 += (world_x2 - world_x1 - d) * m_align_x;
+                world_x2  =  world_x1 + d;
+            }
+        }
+        m_wx1 = world_x1;
+        m_wy1 = world_y1;
+        m_wx2 = world_x2;
+        m_wy2 = world_y2;
+        m_dx1 = device_x1;
+        m_dy1 = device_y1;
+        m_kx  = (device_x2 - device_x1) / (world_x2 - world_x1);
+        m_ky  = (device_y2 - device_y1) / (world_y2 - world_y1);
+    }
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_trans_warp_magnifier.h b/agg/inc/agg_trans_warp_magnifier.h
new file mode 100755
index 000000000000..d71f567af2ca
--- /dev/null
+++ b/agg/inc/agg_trans_warp_magnifier.h
@@ -0,0 +1,51 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_WARP_MAGNIFIER_INCLUDED
+#define AGG_WARP_MAGNIFIER_INCLUDED
+
+
+namespace agg
+{
+
+    //----------------------------------------------------trans_warp_magnifier
+    //
+    // See Inmplementation agg_trans_warp_magnifier.cpp
+    //
+    class trans_warp_magnifier
+    {
+    public:
+        trans_warp_magnifier() : m_xc(0.0), m_yc(0.0), m_magn(1.0), m_radius(1.0) {}
+
+        void center(double x, double y) { m_xc = x; m_yc = y; }
+        void magnification(double m)    { m_magn = m;         }
+        void radius(double r)           { m_radius = r;       }
+
+        void transform(double* x, double* y) const;
+        void inverse_transform(double* x, double* y) const;
+
+    private:
+        double m_xc;
+        double m_yc;
+        double m_magn;
+        double m_radius;
+    };
+
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_vcgen_bspline.h b/agg/inc/agg_vcgen_bspline.h
new file mode 100755
index 000000000000..7490a50a6764
--- /dev/null
+++ b/agg/inc/agg_vcgen_bspline.h
@@ -0,0 +1,74 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VCGEN_BSPLINE_INCLUDED
+#define AGG_VCGEN_BSPLINE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_array.h"
+#include "agg_bspline.h"
+
+
+namespace agg
+{
+
+    //==========================================================vcgen_bspline
+    class vcgen_bspline
+    {
+        enum status_e
+        {
+            initial,
+            ready,
+            polygon,
+            end_poly,
+            stop
+        };
+
+    public:
+        typedef pod_deque<point_type, 6> vertex_storage;
+
+        vcgen_bspline();
+
+        void interpolation_step(double v) { m_interpolation_step = v; }
+        double interpolation_step() const { return m_interpolation_step; }
+
+        // Vertex Generator Interface
+        void remove_all();
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Vertex Source Interface
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        vcgen_bspline(const vcgen_bspline&);
+        const vcgen_bspline& operator = (const vcgen_bspline&);
+
+        vertex_storage m_src_vertices;
+        bspline        m_spline_x;
+        bspline        m_spline_y;
+        double         m_interpolation_step;
+        unsigned       m_closed;
+        status_e       m_status;
+        unsigned       m_src_vertex;
+        double         m_cur_abscissa;
+        double         m_max_abscissa;
+    };
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_vcgen_contour.h b/agg/inc/agg_vcgen_contour.h
new file mode 100755
index 000000000000..1c5428206640
--- /dev/null
+++ b/agg/inc/agg_vcgen_contour.h
@@ -0,0 +1,96 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VCGEN_CONTOUR_INCLUDED
+#define AGG_VCGEN_CONTOUR_INCLUDED
+
+#include "agg_math_stroke.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //----------------------------------------------------------vcgen_contour
+    //
+    // See Implementation agg_vcgen_contour.cpp
+    //
+    class vcgen_contour
+    {
+        enum status_e
+        {
+            initial,
+            ready,
+            outline,
+            out_vertices,
+            end_poly,
+            stop
+        };
+
+    public:
+        typedef vertex_sequence<vertex_dist, 6> vertex_storage;
+        typedef pod_deque<point_type, 6>        coord_storage;
+
+        vcgen_contour();
+
+        void line_join(line_join_e lj) { m_line_join = lj; }
+        void inner_line_join(line_join_e lj) { m_inner_line_join = lj; }
+        void width(double w) { m_width = w * 0.5; }
+        void miter_limit(double ml) { m_miter_limit = ml; }
+        void miter_limit_theta(double t);
+        void inner_miter_limit(double ml) { m_inner_miter_limit = ml; }
+        void approximation_scale(double as) { m_approx_scale = as; }
+        void auto_detect_orientation(bool v) { m_auto_detect = v; }
+
+        line_join_e line_join() const { return m_line_join; }
+        line_join_e inner_line_join() const { return m_inner_line_join; }
+        double width() const { return m_width * 2.0; }
+        double miter_limit() const { return m_miter_limit; }
+        double inner_miter_limit() const { return m_inner_miter_limit; }
+        double approximation_scale() const { return m_approx_scale; }
+        bool   auto_detect_orientation() const { return m_auto_detect; }
+
+        // Generator interface
+        void remove_all();
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Vertex Source Interface
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        vcgen_contour(const vcgen_contour&);
+        const vcgen_contour& operator = (const vcgen_contour&);
+
+        vertex_storage m_src_vertices;
+        coord_storage  m_out_vertices;
+        double         m_width;
+        line_join_e    m_line_join;
+        line_join_e    m_inner_line_join;
+        double         m_approx_scale;
+        double         m_abs_width;
+        double         m_signed_width;
+        double         m_miter_limit;
+        double         m_inner_miter_limit;
+        status_e       m_status;
+        unsigned       m_src_vertex;
+        unsigned       m_out_vertex;
+        unsigned       m_closed;
+        unsigned       m_orientation;
+        bool           m_auto_detect;
+    };
+
+}
+
+#endif
diff --git a/agg/inc/agg_vcgen_dash.h b/agg/inc/agg_vcgen_dash.h
new file mode 100755
index 000000000000..cc4c86dea833
--- /dev/null
+++ b/agg/inc/agg_vcgen_dash.h
@@ -0,0 +1,99 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Line dash generator
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_VCGEN_DASH_INCLUDED
+#define AGG_VCGEN_DASH_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_sequence.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //---------------------------------------------------------------vcgen_dash
+    //
+    // See Implementation agg_vcgen_dash.cpp
+    //
+    class vcgen_dash
+    {
+        enum
+        {
+            max_dashes = 32
+        };
+
+        enum status_e
+        {
+            initial,
+            ready,
+            polyline,
+            stop
+        };
+
+    public:
+        typedef vertex_sequence<vertex_dist, 6> vertex_storage;
+
+        vcgen_dash();
+
+        void remove_all_dashes();
+        void add_dash(double dash_len, double gap_len);
+        void dash_start(double ds);
+
+        void shorten(double s) { m_shorten = s; }
+        double shorten() const { return m_shorten; }
+
+        // Vertex Generator Interface
+        void remove_all();
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Vertex Source Interface
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        typedef vcgen_dash source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        vcgen_dash(const vcgen_dash&);
+        const vcgen_dash& operator = (const vcgen_dash&);
+
+        void calc_dash_start(double ds);
+
+        double             m_dashes[max_dashes];
+        double             m_total_dash_len;
+        unsigned           m_num_dashes;
+        double             m_dash_start;
+        double             m_shorten;
+        double             m_curr_dash_start;
+        unsigned           m_curr_dash;
+        double             m_curr_rest;
+        const vertex_dist* m_v1;
+        const vertex_dist* m_v2;
+
+        vertex_storage m_src_vertices;
+        unsigned       m_closed;
+        status_e       m_status;
+        unsigned       m_src_vertex;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_vcgen_markers_term.h b/agg/inc/agg_vcgen_markers_term.h
new file mode 100755
index 000000000000..6f213811c290
--- /dev/null
+++ b/agg/inc/agg_vcgen_markers_term.h
@@ -0,0 +1,72 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VCGEN_MARKERS_TERM_INCLUDED
+#define AGG_VCGEN_MARKERS_TERM_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_sequence.h"
+#include "agg_vertex_iterator.h"
+
+namespace agg
+{
+
+    //======================================================vcgen_markers_term
+    //
+    // See Implemantation agg_vcgen_markers_term.cpp
+    // Terminal markers generator (arrowhead/arrowtail)
+    //
+    //------------------------------------------------------------------------
+    class vcgen_markers_term
+    {
+    public:
+        vcgen_markers_term() : m_curr_id(0), m_curr_idx(0) {}
+
+        // Vertex Generator Interface
+        void remove_all();
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Vertex Source Interface
+        void rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        typedef vcgen_markers_term source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        vcgen_markers_term(const vcgen_markers_term&);
+        const vcgen_markers_term& operator = (const vcgen_markers_term&);
+
+        struct coord_type
+        {
+            double x, y;
+
+            coord_type() {}
+            coord_type(double x_, double y_) : x(x_), y(y_) {}
+        };
+
+        typedef pod_deque<coord_type, 6> coord_storage;
+
+        coord_storage m_markers;
+        unsigned      m_curr_id;
+        unsigned      m_curr_idx;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_vcgen_smooth_poly1.h b/agg/inc/agg_vcgen_smooth_poly1.h
new file mode 100755
index 000000000000..61ca14898328
--- /dev/null
+++ b/agg/inc/agg_vcgen_smooth_poly1.h
@@ -0,0 +1,87 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VCGEN_SMOOTH_POLY1_INCLUDED
+#define AGG_VCGEN_SMOOTH_POLY1_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_sequence.h"
+
+
+namespace agg
+{
+
+    //======================================================vcgen_smooth_poly1
+    //
+    // See Implementation agg_vcgen_smooth_poly1.cpp
+    // Smooth polygon generator
+    //
+    //------------------------------------------------------------------------
+    class vcgen_smooth_poly1
+    {
+        enum status_e
+        {
+            initial,
+            ready,
+            polygon,
+            ctrl_b,
+            ctrl_e,
+            ctrl1,
+            ctrl2,
+            end_poly,
+            stop
+        };
+
+    public:
+        typedef vertex_sequence<vertex_dist, 6> vertex_storage;
+
+        vcgen_smooth_poly1();
+
+        void   smooth_value(double v) { m_smooth_value = v * 0.5; }
+        double smooth_value() const { return m_smooth_value * 2.0; }
+
+        // Vertex Generator Interface
+        void remove_all();
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Vertex Source Interface
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        vcgen_smooth_poly1(const vcgen_smooth_poly1&);
+        const vcgen_smooth_poly1& operator = (const vcgen_smooth_poly1&);
+
+        void calculate(const vertex_dist& v0,
+                       const vertex_dist& v1,
+                       const vertex_dist& v2,
+                       const vertex_dist& v3);
+
+        vertex_storage m_src_vertices;
+        double         m_smooth_value;
+        unsigned       m_closed;
+        status_e       m_status;
+        unsigned       m_src_vertex;
+        double         m_ctrl1_x;
+        double         m_ctrl1_y;
+        double         m_ctrl2_x;
+        double         m_ctrl2_y;
+    };
+
+}
+
+
+#endif
+
diff --git a/agg/inc/agg_vcgen_stroke.h b/agg/inc/agg_vcgen_stroke.h
new file mode 100755
index 000000000000..a73509acf3d9
--- /dev/null
+++ b/agg/inc/agg_vcgen_stroke.h
@@ -0,0 +1,114 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VCGEN_STROKE_INCLUDED
+#define AGG_VCGEN_STROKE_INCLUDED
+
+#include "agg_math_stroke.h"
+#include "agg_vertex_iterator.h"
+
+
+namespace agg
+{
+
+    //============================================================vcgen_stroke
+    //
+    // See Implementation agg_vcgen_stroke.cpp
+    // Stroke generator
+    //
+    //------------------------------------------------------------------------
+    class vcgen_stroke
+    {
+        enum status_e
+        {
+            initial,
+            ready,
+            cap1,
+            cap2,
+            outline1,
+            close_first,
+            outline2,
+            out_vertices,
+            end_poly1,
+            end_poly2,
+            stop
+        };
+
+    public:
+        typedef vertex_sequence<vertex_dist, 6> vertex_storage;
+        typedef pod_deque<point_type, 6>        coord_storage;
+
+        vcgen_stroke();
+
+        void line_cap(line_cap_e lc) { m_line_cap = lc; }
+        void line_join(line_join_e lj) { m_line_join = lj; }
+        void inner_line_join(line_join_e lj) { m_inner_line_join = lj; }
+
+        line_cap_e line_cap() const { return m_line_cap; }
+        line_join_e line_join() const { return m_line_join; }
+        line_join_e inner_line_join() const { return m_inner_line_join; }
+
+        void width(double w) { m_width = w * 0.5; }
+        void miter_limit(double ml) { m_miter_limit = ml; }
+        void miter_limit_theta(double t);
+        void inner_miter_limit(double ml) { m_inner_miter_limit = ml; }
+        void approximation_scale(double as) { m_approx_scale = as; }
+
+        double width() const { return m_width * 2.0; }
+        double miter_limit() const { return m_miter_limit; }
+        double inner_miter_limit() const { return m_inner_miter_limit; }
+        double approximation_scale() const { return m_approx_scale; }
+
+        void shorten(double s) { m_shorten = s; }
+        double shorten() const { return m_shorten; }
+
+        // Vertex Generator Interface
+        void remove_all();
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Vertex Source Interface
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        typedef vcgen_stroke source_type;
+        typedef vertex_iterator<source_type> iterator;
+        iterator begin(unsigned id) { return iterator(*this, id); }
+        iterator end() { return iterator(path_cmd_stop); }
+
+    private:
+        vcgen_stroke(const vcgen_stroke&);
+        const vcgen_stroke& operator = (const vcgen_stroke&);
+
+        vertex_storage m_src_vertices;
+        coord_storage  m_out_vertices;
+        double         m_width;
+        double         m_miter_limit;
+        double         m_inner_miter_limit;
+        double         m_approx_scale;
+        double         m_shorten;
+        line_cap_e     m_line_cap;
+        line_join_e    m_line_join;
+        line_join_e    m_inner_line_join;
+        unsigned       m_closed;
+        status_e       m_status;
+        status_e       m_prev_status;
+        unsigned       m_src_vertex;
+        unsigned       m_out_vertex;
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_vcgen_vertex_sequence.h b/agg/inc/agg_vcgen_vertex_sequence.h
new file mode 100755
index 000000000000..7c4e9e4253e5
--- /dev/null
+++ b/agg/inc/agg_vcgen_vertex_sequence.h
@@ -0,0 +1,135 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VCGEN_VERTEX_SEQUENCE_INCLUDED
+#define AGG_VCGEN_VERTEX_SEQUENCE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_vertex_sequence.h"
+#include "agg_shorten_path.h"
+
+namespace agg
+{
+
+    //===================================================vcgen_vertex_sequence
+    class vcgen_vertex_sequence
+    {
+    public:
+        typedef vertex_dist_cmd                 vertex_type;
+        typedef vertex_sequence<vertex_type, 6> vertex_storage;
+
+        vcgen_vertex_sequence() :
+            m_flags(0),
+            m_cur_vertex(0),
+            m_shorten(0.0),
+            m_ready(false)
+        {
+        }
+
+        // Vertex Generator Interface
+        void remove_all();
+        void add_vertex(double x, double y, unsigned cmd);
+
+        // Vertex Source Interface
+        void     rewind(unsigned id);
+        unsigned vertex(double* x, double* y);
+
+        void shorten(double s) { m_shorten = s; }
+        double shorten() const { return m_shorten; }
+
+    private:
+        vcgen_vertex_sequence(const vcgen_vertex_sequence&);
+        const vcgen_vertex_sequence& operator = (const vcgen_vertex_sequence&);
+
+        vertex_storage m_src_vertices;
+        unsigned       m_flags;
+        unsigned       m_cur_vertex;
+        double         m_shorten;
+        bool           m_ready;
+    };
+
+
+    //------------------------------------------------------------------------
+    inline void vcgen_vertex_sequence::remove_all()
+    {
+        m_ready = false;
+        m_src_vertices.remove_all();
+        m_cur_vertex = 0;
+        m_flags = 0;
+    }
+
+    //------------------------------------------------------------------------
+    inline void vcgen_vertex_sequence::add_vertex(double x, double y, unsigned cmd)
+    {
+        m_ready = false;
+        if(is_move_to(cmd))
+        {
+            m_src_vertices.modify_last(vertex_dist_cmd(x, y, cmd));
+        }
+        else
+        {
+            if(is_vertex(cmd))
+            {
+                m_src_vertices.add(vertex_dist_cmd(x, y, cmd));
+            }
+            else
+            {
+                m_flags = cmd & path_flags_mask;
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    inline void vcgen_vertex_sequence::rewind(unsigned)
+    {
+        if(!m_ready)
+        {
+            m_src_vertices.close(is_closed(m_flags));
+            shorten_path(m_src_vertices, m_shorten, get_close_flag(m_flags));
+        }
+        m_ready = true;
+        m_cur_vertex = 0;
+    }
+
+    //------------------------------------------------------------------------
+    inline unsigned vcgen_vertex_sequence::vertex(double* x, double* y)
+    {
+        if(!m_ready)
+        {
+            rewind(0);
+        }
+
+        if(m_cur_vertex == m_src_vertices.size())
+        {
+            ++m_cur_vertex;
+            return path_cmd_end_poly | m_flags;
+        }
+
+        if(m_cur_vertex > m_src_vertices.size())
+        {
+            return path_cmd_stop;
+        }
+
+        vertex_type& v = m_src_vertices[m_cur_vertex++];
+        *x = v.x;
+        *y = v.y;
+        return v.cmd;
+    }
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_vertex_iterator.h b/agg/inc/agg_vertex_iterator.h
new file mode 100755
index 000000000000..f22af0acb888
--- /dev/null
+++ b/agg/inc/agg_vertex_iterator.h
@@ -0,0 +1,133 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// classes: vertex_iterator
+//          vertex_source_adaptor
+//          vertex_source_adaptor_with_id
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_VERTEX_ITERATOR_INCLUDED
+#define AGG_VERTEX_ITERATOR_INCLUDED
+
+#include "agg_basics.h"
+
+
+namespace agg
+{
+
+    //---------------------------------------------------------vertex_iterator
+    template<class VertexSource> class vertex_iterator
+    {
+    public:
+        vertex_iterator() {}
+        vertex_iterator(unsigned cmd) { m_vertex.cmd = cmd; }
+        vertex_iterator(const vertex_iterator& i) : m_vs(i.m_vs), m_vertex(i.m_vertex) {}
+        vertex_iterator(VertexSource& vs, unsigned id) : m_vs(&vs)
+        {
+            m_vs->rewind(id);
+            m_vertex.cmd = m_vs->vertex(&m_vertex.x, &m_vertex.y);
+        }
+        vertex_iterator& operator++()
+        {
+            m_vertex.cmd = m_vs->vertex(&m_vertex.x, &m_vertex.y);
+            return *this;
+        }
+
+        const vertex_type& operator*() const { return m_vertex; }
+        const vertex_type* operator->() const { return &m_vertex; }
+
+        bool operator != (const vertex_iterator& i)
+        {
+            return m_vertex.cmd != i.m_vertex.cmd;
+        }
+
+    private:
+        VertexSource* m_vs;
+        vertex_type   m_vertex;
+    };
+
+
+    //---------------------------------------------------vertex_source_adaptor
+    template<class VertexContainer> class vertex_source_adaptor
+    {
+    public:
+        vertex_source_adaptor(const VertexContainer& container) :
+            m_container(&container) {}
+
+        void rewind(unsigned)
+        {
+            m_iterator = m_container->begin();
+            m_end = m_container->end();
+        }
+
+        unsigned vertex(double* x, double* y)
+        {
+            unsigned cmd = path_cmd_stop;
+            if(m_iterator != m_end)
+            {
+                *x  = m_iterator->x;
+                *y  = m_iterator->y;
+                cmd = m_iterator->cmd;
+                ++m_iterator;
+            }
+            return cmd;
+        }
+
+    private:
+        const VertexContainer* m_container;
+        typename VertexContainer::const_iterator m_iterator;
+        typename VertexContainer::const_iterator m_end;
+    };
+
+
+
+    //-------------------------------------------vertex_source_adaptor_with_id
+    template<class VertexContainer> class vertex_source_adaptor_with_id
+    {
+    public:
+        vertex_source_adaptor_with_id(const VertexContainer& container) :
+            m_container(&container) {}
+
+        void rewind(unsigned id)
+        {
+            m_iterator = m_container->begin(id);
+            m_end = m_container->end();
+        }
+
+        unsigned vertex(double* x, double* y)
+        {
+            unsigned cmd = path_cmd_stop;
+            if(m_iterator != m_end)
+            {
+                *x  = m_iterator->x;
+                *y  = m_iterator->y;
+                cmd = m_iterator->cmd;
+                ++m_iterator;
+            }
+            return cmd;
+        }
+
+    private:
+        const VertexContainer* m_container;
+        typename VertexContainer::const_iterator m_iterator;
+        typename VertexContainer::const_iterator m_end;
+    };
+
+
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_vertex_sequence.h b/agg/inc/agg_vertex_sequence.h
new file mode 100755
index 000000000000..357a3df15fa4
--- /dev/null
+++ b/agg/inc/agg_vertex_sequence.h
@@ -0,0 +1,176 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// vertex_sequence container and vertex_dist struct
+//
+//----------------------------------------------------------------------------
+#ifndef AGG_VERTEX_SEQUENCE_INCLUDED
+#define AGG_VERTEX_SEQUENCE_INCLUDED
+
+#include "agg_basics.h"
+#include "agg_array.h"
+#include "agg_math.h"
+
+namespace agg
+{
+
+    //----------------------------------------------------------vertex_sequence
+    // Modified agg::pod_deque. The data is interpreted as a sequence of vertices.
+    // It means that the type T must expose:
+    //
+    // bool operator() (const T& val)
+    //
+    // that is called every time new vertex is being added. The main purpose
+    // of this operator is the possibility to calculate some values during
+    // adding and to return true if the vertex fits some criteria or false if
+    // it doesn't. In the last case the new vertex is not added.
+    //
+    // The simple example is filtering coinciding vertices with calculation
+    // of the distance between the current and previous ones:
+    //
+    //    struct vertex_dist
+    //    {
+    //        double   x;
+    //        double   y;
+    //        double   dist;
+    //
+    //        vertex_dist() {}
+    //        vertex_dist(double x_, double y_) :
+    //            x(x_),
+    //            y(y_),
+    //            dist(0.0)
+    //        {
+    //        }
+    //
+    //        bool operator () (const vertex_dist& val)
+    //        {
+    //            return (dist = calc_distance(x, y, val.x, val.y)) > EPSILON;
+    //        }
+    //    };
+    //
+    // Function close() calls this operator and removes the last vertex if
+    // necessary.
+    //------------------------------------------------------------------------
+    template<class T, unsigned S=6>
+    class vertex_sequence : public pod_deque<T, S>
+    {
+    public:
+        typedef pod_deque<T, S> base_type;
+
+        void add(const T& val);
+        void modify_last(const T& val);
+        void close(bool remove_flag);
+    };
+
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void vertex_sequence<T, S>::add(const T& val)
+    {
+        if(base_type::size() > 1)
+        {
+            if(!(*this)[base_type::size() - 2]((*this)[base_type::size() - 1]))
+            {
+                base_type::remove_last();
+            }
+        }
+        base_type::add(val);
+    }
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void vertex_sequence<T, S>::modify_last(const T& val)
+    {
+        base_type::remove_last();
+        add(val);
+    }
+
+
+
+    //------------------------------------------------------------------------
+    template<class T, unsigned S>
+    void vertex_sequence<T, S>::close(bool closed)
+    {
+        while(base_type::size() > 1)
+        {
+            if((*this)[base_type::size() - 2]((*this)[base_type::size() - 1])) break;
+            T t = (*this)[base_type::size() - 1];
+            base_type::remove_last();
+            modify_last(t);
+        }
+
+        if(closed)
+        {
+            while(base_type::size() > 1)
+            {
+                if((*this)[base_type::size() - 1]((*this)[0])) break;
+                base_type::remove_last();
+            }
+        }
+    }
+
+
+
+    // Coinciding points maximal distance (Epsilon)
+    const double vertex_dist_epsilon = 1e-14;
+
+    //-------------------------------------------------------------vertex_dist
+    // Vertex (x, y) with the distance to the next one. The last vertex has
+    // distance between the last and the first points if the polygon is closed
+    // and 0.0 if it's a polyline.
+    struct vertex_dist
+    {
+        double   x;
+        double   y;
+        double   dist;
+
+        vertex_dist() {}
+        vertex_dist(double x_, double y_) :
+            x(x_),
+            y(y_),
+            dist(0.0)
+        {
+        }
+
+        bool operator () (const vertex_dist& val)
+        {
+            bool ret = (dist = calc_distance(x, y, val.x, val.y)) > vertex_dist_epsilon;
+            if(!ret) dist = 1.0 / vertex_dist_epsilon;
+            return ret;
+        }
+    };
+
+
+
+    //--------------------------------------------------------vertex_dist_cmd
+    // Save as the above but with additional "command" value
+    struct vertex_dist_cmd : public vertex_dist
+    {
+        unsigned cmd;
+
+        vertex_dist_cmd() {}
+        vertex_dist_cmd(double x_, double y_, unsigned cmd_) :
+            vertex_dist(x_, y_),
+            cmd(cmd_)
+        {
+        }
+    };
+
+
+}
+
+#endif
diff --git a/agg/inc/agg_vpgen_clip_polygon.h b/agg/inc/agg_vpgen_clip_polygon.h
new file mode 100755
index 000000000000..d5da460843e6
--- /dev/null
+++ b/agg/inc/agg_vpgen_clip_polygon.h
@@ -0,0 +1,83 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VPGEN_CLIP_POLYGON_INCLUDED
+#define AGG_VPGEN_CLIP_POLYGON_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //======================================================vpgen_clip_polygon
+    //
+    // See Implementation agg_vpgen_clip_polygon.cpp
+    //
+    class vpgen_clip_polygon
+    {
+    public:
+        vpgen_clip_polygon() :
+            m_clip_box(0, 0, 1, 1),
+            m_x1(0),
+            m_y1(0),
+            m_clip_flags(0),
+            m_num_vertices(0),
+            m_vertex(0),
+            m_cmd(path_cmd_move_to)
+        {
+        }
+
+        void clip_box(double _x1, double _y1, double _x2, double _y2)
+        {
+            m_clip_box.x1 = _x1;
+            m_clip_box.y1 = _y1;
+            m_clip_box.x2 = _x2;
+            m_clip_box.y2 = _y2;
+            m_clip_box.normalize();
+        }
+
+
+        double x1() const { return m_clip_box.x1; }
+        double y1() const { return m_clip_box.y1; }
+        double x2() const { return m_clip_box.x2; }
+        double y2() const { return m_clip_box.y2; }
+
+        static bool auto_close()   { return true;  }
+        static bool auto_unclose() { return false; }
+
+        void     reset();
+        void     move_to(double x, double y);
+        void     line_to(double x, double y);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        unsigned clipping_flags(double x, double y);
+
+    private:
+        rect_d        m_clip_box;
+        double        m_x1;
+        double        m_y1;
+        unsigned      m_clip_flags;
+        double        m_x[4];
+        double        m_y[4];
+        unsigned      m_num_vertices;
+        unsigned      m_vertex;
+        unsigned      m_cmd;
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_vpgen_clip_polyline.h b/agg/inc/agg_vpgen_clip_polyline.h
new file mode 100755
index 000000000000..f951966a3293
--- /dev/null
+++ b/agg/inc/agg_vpgen_clip_polyline.h
@@ -0,0 +1,121 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VPGEN_CLIP_POLYLINE_INCLUDED
+#define AGG_VPGEN_CLIP_POLYLINE_INCLUDED
+
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //======================================================vpgen_clip_polyline
+    //
+    // See Implementation agg_vpgen_clip_polyline.cpp
+    //
+    class vpgen_clip_polyline
+    {
+    public:
+        vpgen_clip_polyline() :
+            m_clip_box(0, 0, 1, 1),
+            m_x1(0),
+            m_y1(0),
+            m_f1(0),
+            m_x2(0),
+            m_y2(0),
+            m_f2(0),
+            m_num_vertices(0),
+            m_vertex(0)
+        {
+        }
+
+        void clip_box(double _x1, double _y1, double _x2, double _y2)
+        {
+            m_clip_box.x1 = _x1;
+            m_clip_box.y1 = _y1;
+            m_clip_box.x2 = _x2;
+            m_clip_box.y2 = _y2;
+            m_clip_box.normalize();
+        }
+
+
+        double x1() const { return m_clip_box.x1; }
+        double y1() const { return m_clip_box.y1; }
+        double x2() const { return m_clip_box.x2; }
+        double y2() const { return m_clip_box.y2; }
+
+        static bool auto_close()   { return false; }
+        static bool auto_unclose() { return true; }
+
+        void     reset();
+        void     move_to(double x, double y);
+        void     line_to(double x, double y);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        enum clipping_flags_def
+        {
+            clip_x1 = 1,
+            clip_x2 = 2,
+            clip_y1 = 4,
+            clip_y2 = 8
+        };
+
+        // Determine the clipping code of the vertex according to the
+        // Cyrus-Beck line clipping algorithm
+        //--------------------------------------------------------------------
+        unsigned clipping_flags_x(double x)
+        {
+            unsigned f = 0;
+            if(x < m_clip_box.x1) f |= clip_x1;
+            if(x > m_clip_box.x2) f |= clip_x2;
+            return f;
+        }
+
+        unsigned clipping_flags_y(double y)
+        {
+            unsigned f = 0;
+            if(y < m_clip_box.y1) f |= clip_y1;
+            if(y > m_clip_box.y2) f |= clip_y2;
+            return f;
+        }
+
+        unsigned clipping_flags(double x, double y)
+        {
+            return clipping_flags_x(x) | clipping_flags_y(y);
+        }
+
+        bool move_point(double& x, double& y, unsigned& flags);
+        void clip_line_segment();
+
+    private:
+        rect_d        m_clip_box;
+        double        m_x1;
+        double        m_y1;
+        unsigned      m_f1;
+        double        m_x2;
+        double        m_y2;
+        unsigned      m_f2;
+        double        m_x[2];
+        double        m_y[2];
+        unsigned      m_cmd[2];
+        unsigned      m_num_vertices;
+        unsigned      m_vertex;
+    };
+
+}
+
+
+#endif
diff --git a/agg/inc/agg_vpgen_segmentator.h b/agg/inc/agg_vpgen_segmentator.h
new file mode 100755
index 000000000000..1acc3531cc6e
--- /dev/null
+++ b/agg/inc/agg_vpgen_segmentator.h
@@ -0,0 +1,61 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef AGG_VPGEN_SEGMENTATOR_INCLUDED
+#define AGG_VPGEN_SEGMENTATOR_INCLUDED
+
+#include <math.h>
+#include "agg_basics.h"
+
+namespace agg
+{
+
+    //=======================================================vpgen_segmentator
+    //
+    // See Implementation agg_vpgen_segmentator.cpp
+    //
+    class vpgen_segmentator
+    {
+    public:
+        vpgen_segmentator() : m_approximation_scale(1.0) {}
+
+        void approximation_scale(double s) { m_approximation_scale = s;     }
+        double approximation_scale() const { return m_approximation_scale;  }
+
+        static bool auto_close()   { return false; }
+        static bool auto_unclose() { return false; }
+
+        void reset() { m_cmd = path_cmd_stop; }
+        void move_to(double x, double y);
+        void line_to(double x, double y);
+        unsigned vertex(double* x, double* y);
+
+    private:
+        double   m_approximation_scale;
+        double   m_x1;
+        double   m_y1;
+        double   m_dx;
+        double   m_dy;
+        double   m_dl;
+        double   m_ddl;
+        unsigned m_cmd;
+    };
+
+
+
+}
+
+#endif
+
diff --git a/agg/prj/build.lst b/agg/prj/build.lst
new file mode 100755
index 000000000000..57a09328f82a
--- /dev/null
+++ b/agg/prj/build.lst
@@ -0,0 +1,5 @@
+ag      agg     :       soltools stlport NULL
+ag	agg										usr1	-	all	ag_mkout NULL
+ag	agg\inc									get		-	all	ag_inc NULL
+ag	agg\prj									get		-	all	ag_prj NULL
+ag	agg\source								nmake	-	all	ag_agg NULL
diff --git a/agg/prj/d.lst b/agg/prj/d.lst
new file mode 100755
index 000000000000..cbec37a17cc8
--- /dev/null
+++ b/agg/prj/d.lst
@@ -0,0 +1,11 @@
+
+..\%__SRC%\lib\iagg.lib %_DEST%\lib%_EXT%\iagg.lib
+..\%__SRC%\bin\agg?????.dll %_DEST%\bin%_EXT%\agg?????.dll
+
+..\%__SRC%\lib\libagg?????.* %_DEST%\lib%_EXT%\libagg?????.*
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+
+mkdir: %_DEST%\inc%_EXT%\agg2
+..\inc\*.h %_DEST%\inc%_EXT%\agg2
+
diff --git a/agg/source/agg.flt b/agg/source/agg.flt
new file mode 100644
index 000000000000..67e713474bf1
--- /dev/null
+++ b/agg/source/agg.flt
@@ -0,0 +1,3 @@
+__CT
+__real
+internal
diff --git a/agg/source/agg_arc.cpp b/agg/source/agg_arc.cpp
new file mode 100755
index 000000000000..eb10f5f7f2fc
--- /dev/null
+++ b/agg/source/agg_arc.cpp
@@ -0,0 +1,105 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Arc vertex generator
+//
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_arc.h"
+
+
+namespace agg
+{
+    //------------------------------------------------------------------------
+    arc::arc(double x,  double y,
+             double rx, double ry,
+             double a1, double a2,
+             bool ccw) :
+        m_x(x), m_y(y), m_rx(rx), m_ry(ry), m_scale(1.0)
+    {
+        normalize(a1, a2, ccw);
+    }
+
+    //------------------------------------------------------------------------
+    void arc::init(double x,  double y,
+                   double rx, double ry,
+                   double a1, double a2,
+                   bool ccw)
+    {
+        m_x   = x;  m_y  = y;
+        m_rx  = rx; m_ry = ry;
+        normalize(a1, a2, ccw);
+    }
+
+    //------------------------------------------------------------------------
+    void arc::approximation_scale(double s)
+    {
+        m_scale = s;
+        if(m_initialized)
+        {
+            normalize(m_start, m_end, m_ccw);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void arc::rewind(unsigned)
+    {
+        m_path_cmd = path_cmd_move_to;
+        m_angle = m_start;
+    }
+
+    //------------------------------------------------------------------------
+    unsigned arc::vertex(double* x, double* y)
+    {
+        if(is_stop(m_path_cmd)) return path_cmd_stop;
+        if((m_angle < m_end) != m_ccw)
+        {
+            *x = m_x + cos(m_end) * m_rx;
+            *y = m_y + sin(m_end) * m_ry;
+            m_path_cmd = path_cmd_stop;
+            return path_cmd_line_to;
+        }
+
+        *x = m_x + cos(m_angle) * m_rx;
+        *y = m_y + sin(m_angle) * m_ry;
+
+        m_angle += m_da;
+
+        unsigned pf = m_path_cmd;
+        m_path_cmd = path_cmd_line_to;
+        return pf;
+    }
+
+    //------------------------------------------------------------------------
+    void arc::normalize(double a1, double a2, bool ccw)
+    {
+        m_da = fabs(1.0 / ((m_rx + m_ry) * 0.5 * m_scale));
+        if(ccw)
+        {
+            while(a2 < a1) a2 += pi * 2.0;
+        }
+        else
+        {
+            while(a1 < a2) a1 += pi * 2.0;
+            m_da = -m_da;
+        }
+        m_ccw   = ccw;
+        m_start = a1;
+        m_end   = a2;
+        m_initialized = true;
+    }
+
+}
diff --git a/agg/source/agg_arrowhead.cpp b/agg/source/agg_arrowhead.cpp
new file mode 100755
index 000000000000..694ed5ad887b
--- /dev/null
+++ b/agg/source/agg_arrowhead.cpp
@@ -0,0 +1,110 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Simple arrowhead/arrowtail generator
+//
+//----------------------------------------------------------------------------
+
+#include "agg_arrowhead.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    arrowhead::arrowhead() :
+        m_head_d1(1.0),
+        m_head_d2(1.0),
+        m_head_d3(1.0),
+        m_head_d4(0.0),
+        m_tail_d1(1.0),
+        m_tail_d2(1.0),
+        m_tail_d3(1.0),
+        m_tail_d4(0.0),
+        m_head_flag(false),
+        m_tail_flag(false),
+        m_curr_id(0),
+        m_curr_coord(0)
+    {
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void arrowhead::rewind(unsigned id)
+    {
+        m_curr_id = id;
+        m_curr_coord = 0;
+        if(id == 0)
+        {
+            if(!m_tail_flag)
+            {
+                m_cmd[0] = path_cmd_stop;
+                return;
+            }
+            m_coord[0]  =  m_tail_d1;             m_coord[1]  =  0.0;
+            m_coord[2]  =  m_tail_d1 - m_tail_d4; m_coord[3]  =  m_tail_d3;
+            m_coord[4]  = -m_tail_d2 - m_tail_d4; m_coord[5]  =  m_tail_d3;
+            m_coord[6]  = -m_tail_d2;             m_coord[7]  =  0.0;
+            m_coord[8]  = -m_tail_d2 - m_tail_d4; m_coord[9]  = -m_tail_d3;
+            m_coord[10] =  m_tail_d1 - m_tail_d4; m_coord[11] = -m_tail_d3;
+
+            m_cmd[0] = path_cmd_move_to;
+            m_cmd[1] = path_cmd_line_to;
+            m_cmd[2] = path_cmd_line_to;
+            m_cmd[3] = path_cmd_line_to;
+            m_cmd[4] = path_cmd_line_to;
+            m_cmd[5] = path_cmd_line_to;
+            m_cmd[7] = (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw;
+            m_cmd[6] = path_cmd_stop;
+            return;
+        }
+
+        if(id == 1)
+        {
+            if(!m_head_flag)
+            {
+                m_cmd[0] = path_cmd_stop;
+                return;
+            }
+            m_coord[0]  = -m_head_d1;            m_coord[1]  = 0.0;
+            m_coord[2]  = m_head_d2 + m_head_d4; m_coord[3]  = -m_head_d3;
+            m_coord[4]  = m_head_d2;             m_coord[5]  = 0.0;
+            m_coord[6]  = m_head_d2 + m_head_d4; m_coord[7]  = m_head_d3;
+
+            m_cmd[0] = path_cmd_move_to;
+            m_cmd[1] = path_cmd_line_to;
+            m_cmd[2] = path_cmd_line_to;
+            m_cmd[3] = path_cmd_line_to;
+            m_cmd[4] = (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw;
+            m_cmd[5] = path_cmd_stop;
+            return;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned arrowhead::vertex(double* x, double* y)
+    {
+        if(m_curr_id < 2)
+        {
+            unsigned curr_idx = m_curr_coord * 2;
+            *x = m_coord[curr_idx];
+            *y = m_coord[curr_idx + 1];
+            return m_cmd[m_curr_coord++];
+        }
+        return path_cmd_stop;
+    }
+
+}
diff --git a/agg/source/agg_bezier_arc.cpp b/agg/source/agg_bezier_arc.cpp
new file mode 100755
index 000000000000..6b47fff76fc8
--- /dev/null
+++ b/agg/source/agg_bezier_arc.cpp
@@ -0,0 +1,237 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Arc generator. Produces at most 4 consecutive cubic bezier curves, i.e.,
+// 4, 7, 10, or 13 vertices.
+//
+//----------------------------------------------------------------------------
+
+
+#include <math.h>
+#include "agg_bezier_arc.h"
+
+
+namespace agg
+{
+
+    //------------------------------------------------------------arc_to_bezier
+    void arc_to_bezier(double cx, double cy, double rx, double ry,
+                       double start_angle, double sweep_angle,
+                       double* curve)
+    {
+        double x0 = cos(sweep_angle / 2.0);
+        double y0 = sin(sweep_angle / 2.0);
+        double tx = (1.0 - x0) * 4.0 / 3.0;
+        double ty = y0 - tx * x0 / y0;
+        double px[4];
+        double py[4];
+        px[0] =  x0;
+        py[0] = -y0;
+        px[1] =  x0 + tx;
+        py[1] = -ty;
+        px[2] =  x0 + tx;
+        py[2] =  ty;
+        px[3] =  x0;
+        py[3] =  y0;
+
+        double sn = sin(start_angle + sweep_angle / 2.0);
+        double cs = cos(start_angle + sweep_angle / 2.0);
+
+        unsigned i;
+        for(i = 0; i < 4; i++)
+        {
+            curve[i * 2]     = cx + rx * (px[i] * cs - py[i] * sn);
+            curve[i * 2 + 1] = cy + ry * (px[i] * sn + py[i] * cs);
+        }
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void bezier_arc::init(double x,  double y,
+                          double rx, double ry,
+                          double start_angle,
+                          double sweep_angle)
+    {
+        start_angle = fmod(start_angle, 2.0 * pi);
+        if(sweep_angle >=  2.0 * pi) sweep_angle =  2.0 * pi;
+        if(sweep_angle <= -2.0 * pi) sweep_angle = -2.0 * pi;
+
+        double total_sweep = 0.0;
+        double local_sweep = 0.0;
+        m_num_vertices = 2;
+        bool done = false;
+        do
+        {
+            if(sweep_angle < 0.0)
+            {
+                local_sweep = -pi * 0.5;
+                total_sweep -= pi * 0.5;
+                if(total_sweep <= sweep_angle)
+                {
+                    local_sweep = sweep_angle - (total_sweep + pi * 0.5);
+                    done = true;
+                }
+            }
+            else
+            {
+                local_sweep =  pi * 0.5;
+                total_sweep += pi * 0.5;
+                if(total_sweep >= sweep_angle)
+                {
+                    local_sweep = sweep_angle - (total_sweep - pi * 0.5);
+                    done = true;
+                }
+            }
+
+            arc_to_bezier(x, y, rx, ry,
+                          start_angle,
+                          local_sweep,
+                          m_vertices + m_num_vertices - 2);
+
+            m_num_vertices += 6;
+            start_angle += local_sweep;
+        }
+        while(!done && m_num_vertices < 26);
+    }
+
+
+
+
+    //--------------------------------------------------------------------
+    void bezier_arc_svg::init(double x0, double y0,
+                              double rx, double ry,
+                              double angle,
+                              bool large_arc_flag,
+                              bool sweep_flag,
+                              double x2, double y2)
+    {
+        m_radii_ok = true;
+
+        if(rx < 0.0) rx = -rx;
+        if(ry < 0.0) ry = -rx;
+
+        // Calculate the middle point between
+        // the current and the final points
+        //------------------------
+        double dx2 = (x0 - x2) / 2.0;
+        double dy2 = (y0 - y2) / 2.0;
+
+        // Convert angle from degrees to radians
+        //------------------------
+        double cos_a = cos(angle);
+        double sin_a = sin(angle);
+
+        // Calculate (x1, y1)
+        //------------------------
+        double x1 =  cos_a * dx2 + sin_a * dy2;
+        double y1 = -sin_a * dx2 + cos_a * dy2;
+
+        // Ensure radii are large enough
+        //------------------------
+        double prx = rx * rx;
+        double pry = ry * ry;
+        double px1 = x1 * x1;
+        double py1 = y1 * y1;
+
+        // Check that radii are large enough
+        //------------------------
+        double radii_check = px1/prx + py1/pry;
+        if(radii_check > 1.0)
+        {
+            rx = sqrt(radii_check) * rx;
+            ry = sqrt(radii_check) * ry;
+            prx = rx * rx;
+            pry = ry * ry;
+            if(radii_check > 10.0) m_radii_ok = false;
+        }
+
+        // Calculate (cx1, cy1)
+        //------------------------
+        double sign = (large_arc_flag == sweep_flag) ? -1.0 : 1.0;
+        double sq   = (prx*pry - prx*py1 - pry*px1) / (prx*py1 + pry*px1);
+        double coef = sign * sqrt((sq < 0) ? 0 : sq);
+        double cx1  = coef *  ((rx * y1) / ry);
+        double cy1  = coef * -((ry * x1) / rx);
+
+        //
+        // Calculate (cx, cy) from (cx1, cy1)
+        //------------------------
+        double sx2 = (x0 + x2) / 2.0;
+        double sy2 = (y0 + y2) / 2.0;
+        double cx = sx2 + (cos_a * cx1 - sin_a * cy1);
+        double cy = sy2 + (sin_a * cx1 + cos_a * cy1);
+
+        // Calculate the start_angle (angle1) and the sweep_angle (dangle)
+        //------------------------
+        double ux =  (x1 - cx1) / rx;
+        double uy =  (y1 - cy1) / ry;
+        double vx = (-x1 - cx1) / rx;
+        double vy = (-y1 - cy1) / ry;
+        double p, n;
+
+        // Calculate the angle start
+        //------------------------
+        n = sqrt(ux*ux + uy*uy);
+        p = ux; // (1 * ux) + (0 * uy)
+        sign = (uy < 0) ? -1.0 : 1.0;
+        double v = p / n;
+        if(v < -1.0) v = -1.0;
+        if(v >  1.0) v =  1.0;
+        double start_angle = sign * acos(v);
+
+        // Calculate the sweep angle
+        //------------------------
+        n = sqrt((ux*ux + uy*uy) * (vx*vx + vy*vy));
+        p = ux * vx + uy * vy;
+        sign = (ux * vy - uy * vx < 0) ? -1.0 : 1.0;
+        v = p / n;
+        if(v < -1.0) v = -1.0;
+        if(v >  1.0) v =  1.0;
+        double sweep_angle = sign * acos(v);
+        if(!sweep_flag && sweep_angle > 0)
+        {
+            sweep_angle -= pi * 2.0;
+        }
+        else
+        if (sweep_flag && sweep_angle < 0)
+        {
+            sweep_angle += pi * 2.0;
+        }
+
+        // We can now build and transform the resulting arc
+        //------------------------
+        m_arc.init(0.0, 0.0, rx, ry, start_angle, sweep_angle);
+        trans_affine mtx = trans_affine_rotation(angle);
+        mtx *= trans_affine_translation(cx, cy);
+
+        for(unsigned i = 2; i < m_arc.num_vertices()-2; i += 2)
+        {
+            mtx.transform(m_arc.vertices() + i, m_arc.vertices() + i + 1);
+        }
+
+        // We must make sure that the starting and ending points
+        // exactly coincide with the initial (x0,y0) and (x2,y2)
+        m_arc.vertices()[0] = x0;
+        m_arc.vertices()[1] = y0;
+        if(m_arc.num_vertices() > 2)
+        {
+            m_arc.vertices()[m_arc.num_vertices() - 2] = x2;
+            m_arc.vertices()[m_arc.num_vertices() - 1] = y2;
+        }
+    }
+
+
+}
diff --git a/agg/source/agg_bspline.cpp b/agg/source/agg_bspline.cpp
new file mode 100755
index 000000000000..8635495ecc9e
--- /dev/null
+++ b/agg/source/agg_bspline.cpp
@@ -0,0 +1,299 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// class bspline
+//
+//----------------------------------------------------------------------------
+
+
+#include "agg_bspline.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    bspline::~bspline()
+    {
+        delete [] m_am;
+    }
+
+
+    //------------------------------------------------------------------------
+    bspline::bspline() :
+        m_max(0),
+        m_num(0),
+        m_x(0),
+        m_y(0),
+        m_am(0),
+        m_last_idx(-1)
+    {
+    }
+
+    //------------------------------------------------------------------------
+    bspline::bspline(int num) :
+        m_max(0),
+        m_num(0),
+        m_x(0),
+        m_y(0),
+        m_am(0),
+        m_last_idx(-1)
+    {
+        init(num);
+    }
+
+    //------------------------------------------------------------------------
+    bspline::bspline(int num, const double* x, const double* y) :
+        m_max(0),
+        m_num(0),
+        m_x(0),
+        m_y(0),
+        m_am(0),
+        m_last_idx(-1)
+    {
+        init(num, x, y);
+    }
+
+
+    //------------------------------------------------------------------------
+    void bspline::init(int max)
+    {
+        if(max > 2 && max > m_max)
+        {
+            delete [] m_am;
+            m_am = new double[max * 3];
+            m_max = max;
+            m_x = m_am + m_max;
+            m_y = m_am + m_max * 2;
+        }
+        m_num = 0;
+        m_last_idx = -1;
+    }
+
+
+    //------------------------------------------------------------------------
+    void bspline::add_point(double x, double y)
+    {
+        if(m_num < m_max)
+        {
+            m_x[m_num] = x;
+            m_y[m_num] = y;
+            ++m_num;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void bspline::prepare()
+    {
+        if(m_num > 2)
+        {
+            int i, k, n1;
+            double* temp;
+            double* r;
+            double* s;
+            double* al;
+            double h, p, d, f, e;
+
+            for(k = 0; k < m_num; k++)
+            {
+                m_am[k] = 0.0;
+            }
+
+            n1 = 3 * m_num;
+
+            al = new double[n1];
+            temp = al;
+
+            for(k = 0; k < n1; k++)
+            {
+                temp[k] = 0.0;
+            }
+
+            r = temp + m_num;
+            s = temp + m_num * 2;
+
+            n1 = m_num - 1;
+            d = m_x[1] - m_x[0];
+            e = (m_y[1] - m_y[0]) / d;
+
+            for(k = 1; k < n1; k++)
+            {
+                h     = d;
+                d     = m_x[k + 1] - m_x[k];
+                f     = e;
+                e     = (m_y[k + 1] - m_y[k]) / d;
+                al[k] = d / (d + h);
+                r[k]  = 1.0 - al[k];
+                s[k]  = 6.0 * (e - f) / (h + d);
+            }
+
+            for(k = 1; k < n1; k++)
+            {
+                p = 1.0 / (r[k] * al[k - 1] + 2.0);
+                al[k] *= -p;
+                s[k] = (s[k] - r[k] * s[k - 1]) * p;
+            }
+
+            m_am[n1]     = 0.0;
+            al[n1 - 1]   = s[n1 - 1];
+            m_am[n1 - 1] = al[n1 - 1];
+
+            for(k = n1 - 2, i = 0; i < m_num - 2; i++, k--)
+            {
+                al[k]   = al[k] * al[k + 1] + s[k];
+                m_am[k] = al[k];
+            }
+            delete [] al;
+        }
+        m_last_idx = -1;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void bspline::init(int num, const double* x, const double* y)
+    {
+        if(num > 2)
+        {
+            init(num);
+            int i;
+            for(i = 0; i < num; i++)
+            {
+                add_point(*x++, *y++);
+            }
+            prepare();
+        }
+        m_last_idx = -1;
+    }
+
+
+    //------------------------------------------------------------------------
+    void bspline::bsearch(int n, const double *x, double x0, int *i)
+    {
+        int j = n - 1;
+        int k;
+
+        for(*i = 0; (j - *i) > 1; )
+        {
+            if(x0 < x[k = (*i + j) >> 1]) j = k;
+            else                         *i = k;
+        }
+    }
+
+
+
+    //------------------------------------------------------------------------
+    double bspline::interpolation(double x, int i) const
+    {
+        int j = i + 1;
+        double d = m_x[i] - m_x[j];
+        double h = x - m_x[j];
+        double r = m_x[i] - x;
+        double p = d * d / 6.0;
+        return (m_am[j] * r * r * r + m_am[i] * h * h * h) / 6.0 / d +
+               ((m_y[j] - m_am[j] * p) * r + (m_y[i] - m_am[i] * p) * h) / d;
+    }
+
+
+    //------------------------------------------------------------------------
+    double bspline::extrapolation_left(double x) const
+    {
+        double d = m_x[1] - m_x[0];
+        return (-d * m_am[1] / 6 + (m_y[1] - m_y[0]) / d) *
+               (x - m_x[0]) +
+               m_y[0];
+    }
+
+    //------------------------------------------------------------------------
+    double bspline::extrapolation_right(double x) const
+    {
+        double d = m_x[m_num - 1] - m_x[m_num - 2];
+        return (d * m_am[m_num - 2] / 6 + (m_y[m_num - 1] - m_y[m_num - 2]) / d) *
+               (x - m_x[m_num - 1]) +
+               m_y[m_num - 1];
+    }
+
+    //------------------------------------------------------------------------
+    double bspline::get(double x) const
+    {
+        if(m_num > 2)
+        {
+            int i;
+
+            // Extrapolation on the left
+            if(x < m_x[0]) return extrapolation_left(x);
+
+            // Extrapolation on the right
+            if(x >= m_x[m_num - 1]) return extrapolation_right(x);
+
+            // Interpolation
+            bsearch(m_num, m_x, x, &i);
+            return interpolation(x, i);
+        }
+        return 0.0;
+    }
+
+
+    //------------------------------------------------------------------------
+    double bspline::get_stateful(double x) const
+    {
+        if(m_num > 2)
+        {
+            // Extrapolation on the left
+            if(x < m_x[0]) return extrapolation_left(x);
+
+            // Extrapolation on the right
+            if(x >= m_x[m_num - 1]) return extrapolation_right(x);
+
+            if(m_last_idx >= 0)
+            {
+                // Check if x is not in current range
+                if(x < m_x[m_last_idx] || x > m_x[m_last_idx + 1])
+                {
+                    // Check if x between next points (most probably)
+                    if(m_last_idx < m_num - 2 &&
+                       x >= m_x[m_last_idx + 1] &&
+                       x <= m_x[m_last_idx + 2])
+                    {
+                        ++m_last_idx;
+                    }
+                    else
+                    if(m_last_idx > 0 &&
+                       x >= m_x[m_last_idx - 1] &&
+                       x <= m_x[m_last_idx])
+                    {
+                        // x is between pevious points
+                        --m_last_idx;
+                    }
+                    else
+                    {
+                        // Else perform full search
+                        bsearch(m_num, m_x, x, &m_last_idx);
+                    }
+                }
+                return interpolation(x, m_last_idx);
+            }
+            else
+            {
+                // Interpolation
+                bsearch(m_num, m_x, x, &m_last_idx);
+                return interpolation(x, m_last_idx);
+            }
+        }
+        return 0.0;
+    }
+
+}
+
diff --git a/agg/source/agg_curves.cpp b/agg/source/agg_curves.cpp
new file mode 100755
index 000000000000..bae65f26b5a3
--- /dev/null
+++ b/agg/source/agg_curves.cpp
@@ -0,0 +1,246 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// classes curve3 and curve4
+//
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_curves.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    void curve3::init(double x1, double y1,
+                      double x2, double y2,
+                      double x3, double y3)
+    {
+        m_start_x = x1;
+        m_start_y = y1;
+        m_end_x   = x3;
+        m_end_y   = y3;
+
+        double dx1 = x2 - x1;
+        double dy1 = y2 - y1;
+        double dx2 = x3 - x2;
+        double dy2 = y3 - y2;
+
+        double len = sqrt(dx1 * dx1 + dy1 * dy1) + sqrt(dx2 * dx2 + dy2 * dy2);
+
+        m_num_steps = int(len * 0.25 * m_scale);
+
+        if(m_num_steps < 2)
+        {
+            m_num_steps = 2;
+        }
+
+        double subdivide_step  = 1.0 / m_num_steps;
+        double subdivide_step2 = subdivide_step * subdivide_step;
+
+        double tmpx = (x1 - x2 * 2.0 + x3) * subdivide_step2;
+        double tmpy = (y1 - y2 * 2.0 + y3) * subdivide_step2;
+
+        m_saved_fx = m_fx = x1;
+        m_saved_fy = m_fy = y1;
+
+        m_saved_dfx = m_dfx = tmpx + (x2 - x1) * (2.0 * subdivide_step);
+        m_saved_dfy = m_dfy = tmpy + (y2 - y1) * (2.0 * subdivide_step);
+
+        m_ddfx = tmpx * 2.0;
+        m_ddfy = tmpy * 2.0;
+
+        m_step = m_num_steps;
+    }
+
+
+
+
+    //------------------------------------------------------------------------
+    void curve3::rewind(unsigned)
+    {
+        if(m_num_steps == 0)
+        {
+            m_step = -1;
+            return;
+        }
+        m_step = m_num_steps;
+        m_fx   = m_saved_fx;
+        m_fy   = m_saved_fy;
+        m_dfx  = m_saved_dfx;
+        m_dfy  = m_saved_dfy;
+    }
+
+
+
+
+    //------------------------------------------------------------------------
+    unsigned curve3::vertex(double* x, double* y)
+    {
+        if(m_step < 0) return path_cmd_stop;
+        if(m_step == m_num_steps)
+        {
+            *x = m_start_x;
+            *y = m_start_y;
+            --m_step;
+            return path_cmd_move_to;
+        }
+        if(m_step == 0)
+        {
+            *x = m_end_x;
+            *y = m_end_y;
+            --m_step;
+            return path_cmd_line_to;
+        }
+        m_fx  += m_dfx;
+        m_fy  += m_dfy;
+        m_dfx += m_ddfx;
+        m_dfy += m_ddfy;
+        *x = m_fx;
+        *y = m_fy;
+        --m_step;
+        return path_cmd_line_to;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+    //------------------------------------------------------------------------
+    void curve4::init(double x1, double y1,
+                      double x2, double y2,
+                      double x3, double y3,
+                      double x4, double y4)
+    {
+        m_start_x = x1;
+        m_start_y = y1;
+        m_end_x   = x4;
+        m_end_y   = y4;
+
+        double dx1 = x2 - x1;
+        double dy1 = y2 - y1;
+        double dx2 = x3 - x2;
+        double dy2 = y3 - y2;
+        double dx3 = x4 - x3;
+        double dy3 = y4 - y3;
+
+        double len = sqrt(dx1 * dx1 + dy1 * dy1) +
+                     sqrt(dx2 * dx2 + dy2 * dy2) +
+                     sqrt(dx3 * dx3 + dy3 * dy3);
+
+        m_num_steps = int(len * 0.25 * m_scale);
+
+        if(m_num_steps < 2)
+        {
+            m_num_steps = 2;
+        }
+
+        double subdivide_step  = 1.0 / m_num_steps;
+        double subdivide_step2 = subdivide_step * subdivide_step;
+        double subdivide_step3 = subdivide_step * subdivide_step * subdivide_step;
+
+        double pre1 = 3.0 * subdivide_step;
+        double pre2 = 3.0 * subdivide_step2;
+        double pre4 = 6.0 * subdivide_step2;
+        double pre5 = 6.0 * subdivide_step3;
+
+        double tmp1x = x1 - x2 * 2.0 + x3;
+        double tmp1y = y1 - y2 * 2.0 + y3;
+
+        double tmp2x = (x2 - x3) * 3.0 - x1 + x4;
+        double tmp2y = (y2 - y3) * 3.0 - y1 + y4;
+
+        m_saved_fx = m_fx = x1;
+        m_saved_fy = m_fy = y1;
+
+        m_saved_dfx = m_dfx = (x2 - x1) * pre1 + tmp1x * pre2 + tmp2x * subdivide_step3;
+        m_saved_dfy = m_dfy = (y2 - y1) * pre1 + tmp1y * pre2 + tmp2y * subdivide_step3;
+
+        m_saved_ddfx = m_ddfx = tmp1x * pre4 + tmp2x * pre5;
+        m_saved_ddfy = m_ddfy = tmp1y * pre4 + tmp2y * pre5;
+
+        m_dddfx = tmp2x * pre5;
+        m_dddfy = tmp2y * pre5;
+
+        m_step = m_num_steps;
+    }
+
+
+
+
+    //------------------------------------------------------------------------
+    void curve4::rewind(unsigned)
+    {
+        if(m_num_steps == 0)
+        {
+            m_step = -1;
+            return;
+        }
+        m_step = m_num_steps;
+        m_fx   = m_saved_fx;
+        m_fy   = m_saved_fy;
+        m_dfx  = m_saved_dfx;
+        m_dfy  = m_saved_dfy;
+        m_ddfx = m_saved_ddfx;
+        m_ddfy = m_saved_ddfy;
+    }
+
+
+
+
+
+    //------------------------------------------------------------------------
+    unsigned curve4::vertex(double* x, double* y)
+    {
+        if(m_step < 0) return path_cmd_stop;
+        if(m_step == m_num_steps)
+        {
+            *x = m_start_x;
+            *y = m_start_y;
+            --m_step;
+            return path_cmd_move_to;
+        }
+        if(m_step == 0)
+        {
+            *x = m_end_x;
+            *y = m_end_y;
+            --m_step;
+            return path_cmd_line_to;
+        }
+        m_fx   += m_dfx;
+        m_fy   += m_dfy;
+        m_dfx  += m_ddfx;
+        m_dfy  += m_ddfy;
+        m_ddfx += m_dddfx;
+        m_ddfy += m_dddfy;
+        *x = m_fx;
+        *y = m_fy;
+        --m_step;
+        return path_cmd_line_to;
+    }
+
+
+
+
+}
+
diff --git a/agg/source/agg_embedded_raster_fonts.cpp b/agg/source/agg_embedded_raster_fonts.cpp
new file mode 100755
index 000000000000..b1060fb7e176
--- /dev/null
+++ b/agg/source/agg_embedded_raster_fonts.cpp
@@ -0,0 +1,10426 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include "agg_embedded_raster_fonts.h"
+
+namespace agg
+{
+
+    const int8u gse4x6[] =
+    {
+        6, 0, 32, 128-32,
+
+        0x00,0x00,0x07,0x00,0x0e,0x00,0x15,0x00,0x1c,0x00,0x23,0x00,0x2a,0x00,0x31,0x00,0x38,0x00,
+        0x3f,0x00,0x46,0x00,0x4d,0x00,0x54,0x00,0x5b,0x00,0x62,0x00,0x69,0x00,0x70,0x00,0x77,0x00,
+        0x7e,0x00,0x85,0x00,0x8c,0x00,0x93,0x00,0x9a,0x00,0xa1,0x00,0xa8,0x00,0xaf,0x00,0xb6,0x00,
+        0xbd,0x00,0xc4,0x00,0xcb,0x00,0xd2,0x00,0xd9,0x00,0xe0,0x00,0xe7,0x00,0xee,0x00,0xf5,0x00,
+        0xfc,0x00,0x03,0x01,0x0a,0x01,0x11,0x01,0x18,0x01,0x1f,0x01,0x26,0x01,0x2d,0x01,0x34,0x01,
+        0x3b,0x01,0x42,0x01,0x49,0x01,0x50,0x01,0x57,0x01,0x5e,0x01,0x65,0x01,0x6c,0x01,0x73,0x01,
+        0x7a,0x01,0x81,0x01,0x88,0x01,0x8f,0x01,0x96,0x01,0x9d,0x01,0xa4,0x01,0xab,0x01,0xb2,0x01,
+        0xb9,0x01,0xc0,0x01,0xc7,0x01,0xce,0x01,0xd5,0x01,0xdc,0x01,0xe3,0x01,0xea,0x01,0xf1,0x01,
+        0xf8,0x01,0xff,0x01,0x06,0x02,0x0d,0x02,0x14,0x02,0x1b,0x02,0x22,0x02,0x29,0x02,0x30,0x02,
+        0x37,0x02,0x3e,0x02,0x45,0x02,0x4c,0x02,0x53,0x02,0x5a,0x02,0x61,0x02,0x68,0x02,0x6f,0x02,
+        0x76,0x02,0x7d,0x02,0x84,0x02,0x8b,0x02,0x92,0x02,0x99,0x02,
+
+        4, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x40,0x40,0x40,0x00,0x40,0x00,
+
+        4, // 0x22 '"'
+        0xa0,0xa0,0x00,0x00,0x00,0x00,
+
+        4, // 0x23 '#'
+        0x60,0xf0,0x60,0xf0,0x60,0x00,
+
+        4, // 0x24 '$'
+        0x40,0x60,0xc0,0x60,0xc0,0x40,
+
+        4, // 0x25 '%'
+        0xa0,0x20,0x40,0x80,0xa0,0x00,
+
+        4, // 0x26 '&'
+        0xe0,0xa0,0x50,0xa0,0xd0,0x00,
+
+        4, // 0x27 '''
+        0x40,0x40,0x00,0x00,0x00,0x00,
+
+        4, // 0x28 '('
+        0x20,0x40,0x40,0x40,0x20,0x00,
+
+        4, // 0x29 ')'
+        0x40,0x20,0x20,0x20,0x40,0x00,
+
+        4, // 0x2a '*'
+        0xa0,0x40,0xe0,0x40,0xa0,0x00,
+
+        4, // 0x2b '+'
+        0x40,0x40,0xe0,0x40,0x40,0x00,
+
+        4, // 0x2c ','
+        0x00,0x00,0x00,0x40,0x40,0x80,
+
+        4, // 0x2d '-'
+        0x00,0x00,0xe0,0x00,0x00,0x00,
+
+        4, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x40,0x00,
+
+        4, // 0x2f '/'
+        0x10,0x20,0x20,0x40,0x40,0x80,
+
+        4, // 0x30 '0'
+        0xe0,0xa0,0xa0,0xa0,0xe0,0x00,
+
+        4, // 0x31 '1'
+        0x40,0xc0,0x40,0x40,0xe0,0x00,
+
+        4, // 0x32 '2'
+        0xe0,0xa0,0x20,0x40,0xe0,0x00,
+
+        4, // 0x33 '3'
+        0xe0,0x20,0x40,0x20,0xe0,0x00,
+
+        4, // 0x34 '4'
+        0xa0,0xa0,0xe0,0x20,0x20,0x00,
+
+        4, // 0x35 '5'
+        0xe0,0x80,0xc0,0x20,0xc0,0x00,
+
+        4, // 0x36 '6'
+        0x40,0x80,0xe0,0xa0,0xe0,0x00,
+
+        4, // 0x37 '7'
+        0xe0,0xa0,0x20,0x40,0x40,0x00,
+
+        4, // 0x38 '8'
+        0xe0,0xa0,0x40,0xa0,0xe0,0x00,
+
+        4, // 0x39 '9'
+        0xe0,0xa0,0xe0,0x20,0xc0,0x00,
+
+        4, // 0x3a ':'
+        0x00,0x40,0x00,0x40,0x00,0x00,
+
+        4, // 0x3b ';'
+        0x00,0x40,0x00,0x40,0x40,0x80,
+
+        4, // 0x3c '<'
+        0x20,0x40,0x80,0x40,0x20,0x00,
+
+        4, // 0x3d '='
+        0x00,0xe0,0x00,0xe0,0x00,0x00,
+
+        4, // 0x3e '>'
+        0x80,0x40,0x20,0x40,0x80,0x00,
+
+        4, // 0x3f '?'
+        0xc0,0x20,0x40,0x00,0x40,0x00,
+
+        4, // 0x40 '@'
+        0x40,0xa0,0xe0,0xe0,0x80,0x60,
+
+        4, // 0x41 'A'
+        0x40,0xa0,0xe0,0xa0,0xa0,0x00,
+
+        4, // 0x42 'B'
+        0xc0,0xa0,0xc0,0xa0,0xc0,0x00,
+
+        4, // 0x43 'C'
+        0x60,0x80,0x80,0x80,0x60,0x00,
+
+        4, // 0x44 'D'
+        0xc0,0xa0,0xa0,0xa0,0xc0,0x00,
+
+        4, // 0x45 'E'
+        0xe0,0x80,0xc0,0x80,0xe0,0x00,
+
+        4, // 0x46 'F'
+        0xe0,0x80,0xc0,0x80,0x80,0x00,
+
+        4, // 0x47 'G'
+        0x60,0x80,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x48 'H'
+        0xa0,0xa0,0xe0,0xa0,0xa0,0x00,
+
+        4, // 0x49 'I'
+        0xe0,0x40,0x40,0x40,0xe0,0x00,
+
+        4, // 0x4a 'J'
+        0x20,0x20,0x20,0x20,0xa0,0x40,
+
+        4, // 0x4b 'K'
+        0xa0,0xa0,0xc0,0xc0,0xa0,0x00,
+
+        4, // 0x4c 'L'
+        0x80,0x80,0x80,0x80,0xe0,0x00,
+
+        4, // 0x4d 'M'
+        0xa0,0xe0,0xa0,0xa0,0xa0,0x00,
+
+        4, // 0x4e 'N'
+        0x90,0xd0,0xb0,0x90,0x90,0x00,
+
+        4, // 0x4f 'O'
+        0x40,0xa0,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x50 'P'
+        0xc0,0xa0,0xa0,0xc0,0x80,0x00,
+
+        4, // 0x51 'Q'
+        0x40,0xa0,0xa0,0xa0,0x60,0x00,
+
+        4, // 0x52 'R'
+        0xc0,0xa0,0xa0,0xc0,0xa0,0x00,
+
+        4, // 0x53 'S'
+        0x60,0x80,0x40,0x20,0xc0,0x00,
+
+        4, // 0x54 'T'
+        0xe0,0x40,0x40,0x40,0x40,0x00,
+
+        4, // 0x55 'U'
+        0xa0,0xa0,0xa0,0xa0,0xe0,0x00,
+
+        4, // 0x56 'V'
+        0xa0,0xa0,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x57 'W'
+        0xa0,0xa0,0xa0,0xe0,0xa0,0x00,
+
+        4, // 0x58 'X'
+        0xa0,0xa0,0x40,0xa0,0xa0,0x00,
+
+        4, // 0x59 'Y'
+        0xa0,0xa0,0x40,0x40,0x40,0x00,
+
+        4, // 0x5a 'Z'
+        0xe0,0x20,0x40,0x80,0xe0,0x00,
+
+        4, // 0x5b '['
+        0xc0,0x80,0x80,0x80,0xc0,0x00,
+
+        4, // 0x5c '\'
+        0x80,0x40,0x40,0x20,0x20,0x10,
+
+        4, // 0x5d ']'
+        0xc0,0x40,0x40,0x40,0xc0,0x00,
+
+        4, // 0x5e '^'
+        0x40,0xa0,0x00,0x00,0x00,0x00,
+
+        4, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0xf0,
+
+        4, // 0x60 '`'
+        0x40,0x20,0x00,0x00,0x00,0x00,
+
+        4, // 0x61 'a'
+        0x00,0x60,0xa0,0xa0,0x70,0x00,
+
+        4, // 0x62 'b'
+        0x80,0x80,0xc0,0xa0,0xc0,0x00,
+
+        4, // 0x63 'c'
+        0x00,0x60,0x80,0x80,0x60,0x00,
+
+        4, // 0x64 'd'
+        0x20,0x20,0x60,0xa0,0x60,0x00,
+
+        4, // 0x65 'e'
+        0x00,0x40,0xe0,0x80,0x60,0x00,
+
+        4, // 0x66 'f'
+        0x20,0x40,0xe0,0x40,0x40,0x00,
+
+        4, // 0x67 'g'
+        0x00,0x60,0xa0,0x60,0x20,0xc0,
+
+        4, // 0x68 'h'
+        0x80,0x80,0xc0,0xa0,0xa0,0x00,
+
+        4, // 0x69 'i'
+        0x40,0x00,0xc0,0x40,0xe0,0x00,
+
+        4, // 0x6a 'j'
+        0x40,0x00,0xc0,0x40,0x40,0x80,
+
+        4, // 0x6b 'k'
+        0x80,0x80,0xa0,0xc0,0xa0,0x00,
+
+        4, // 0x6c 'l'
+        0xc0,0x40,0x40,0x40,0xe0,0x00,
+
+        4, // 0x6d 'm'
+        0x00,0xa0,0xf0,0xf0,0x90,0x00,
+
+        4, // 0x6e 'n'
+        0x00,0xc0,0xa0,0xa0,0xa0,0x00,
+
+        4, // 0x6f 'o'
+        0x00,0x40,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x70 'p'
+        0x00,0xc0,0xa0,0xc0,0x80,0x80,
+
+        4, // 0x71 'q'
+        0x00,0x60,0xa0,0x60,0x20,0x20,
+
+        4, // 0x72 'r'
+        0x00,0xa0,0x50,0x40,0x40,0x00,
+
+        4, // 0x73 's'
+        0x00,0x60,0xc0,0x20,0xc0,0x00,
+
+        4, // 0x74 't'
+        0x40,0x40,0xe0,0x40,0x60,0x00,
+
+        4, // 0x75 'u'
+        0x00,0xa0,0xa0,0xa0,0x60,0x00,
+
+        4, // 0x76 'v'
+        0x00,0xa0,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x77 'w'
+        0x00,0xa0,0xa0,0xe0,0xa0,0x00,
+
+        4, // 0x78 'x'
+        0x00,0xa0,0x40,0xa0,0xa0,0x00,
+
+        4, // 0x79 'y'
+        0x00,0xa0,0xa0,0x60,0x20,0xc0,
+
+        4, // 0x7a 'z'
+        0x00,0xe0,0x40,0x80,0xe0,0x00,
+
+        4, // 0x7b '{'
+        0x30,0x20,0xc0,0x20,0x30,0x00,
+
+        4, // 0x7c '|'
+        0x40,0x40,0x00,0x40,0x40,0x40,
+
+        4, // 0x7d '}'
+        0xc0,0x40,0x30,0x40,0xc0,0x00,
+
+        4, // 0x7e '~'
+        0x50,0xa0,0x00,0x00,0x00,0x00,
+
+        4, // 0x7f ''
+        0x00,0x60,0x90,0xf0,0x00,0x00,
+        0
+    };
+
+    const int8u gse4x8[] =
+    {
+        8, 0, 32, 128-32,
+
+        0x00,0x00,0x09,0x00,0x12,0x00,0x1b,0x00,0x24,0x00,0x2d,0x00,0x36,0x00,0x3f,0x00,0x48,0x00,
+        0x51,0x00,0x5a,0x00,0x63,0x00,0x6c,0x00,0x75,0x00,0x7e,0x00,0x87,0x00,0x90,0x00,0x99,0x00,
+        0xa2,0x00,0xab,0x00,0xb4,0x00,0xbd,0x00,0xc6,0x00,0xcf,0x00,0xd8,0x00,0xe1,0x00,0xea,0x00,
+        0xf3,0x00,0xfc,0x00,0x05,0x01,0x0e,0x01,0x17,0x01,0x20,0x01,0x29,0x01,0x32,0x01,0x3b,0x01,
+        0x44,0x01,0x4d,0x01,0x56,0x01,0x5f,0x01,0x68,0x01,0x71,0x01,0x7a,0x01,0x83,0x01,0x8c,0x01,
+        0x95,0x01,0x9e,0x01,0xa7,0x01,0xb0,0x01,0xb9,0x01,0xc2,0x01,0xcb,0x01,0xd4,0x01,0xdd,0x01,
+        0xe6,0x01,0xef,0x01,0xf8,0x01,0x01,0x02,0x0a,0x02,0x13,0x02,0x1c,0x02,0x25,0x02,0x2e,0x02,
+        0x37,0x02,0x40,0x02,0x49,0x02,0x52,0x02,0x5b,0x02,0x64,0x02,0x6d,0x02,0x76,0x02,0x7f,0x02,
+        0x88,0x02,0x91,0x02,0x9a,0x02,0xa3,0x02,0xac,0x02,0xb5,0x02,0xbe,0x02,0xc7,0x02,0xd0,0x02,
+        0xd9,0x02,0xe2,0x02,0xeb,0x02,0xf4,0x02,0xfd,0x02,0x06,0x03,0x0f,0x03,0x18,0x03,0x21,0x03,
+        0x2a,0x03,0x33,0x03,0x3c,0x03,0x45,0x03,0x4e,0x03,0x57,0x03,
+
+        4, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x00,0x40,0x40,0x40,0x40,0x00,0x40,0x00,
+
+        4, // 0x22 '"'
+        0x00,0xa0,0xa0,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x23 '#'
+        0x60,0x60,0xf0,0x60,0x60,0xf0,0x60,0x60,
+
+        4, // 0x24 '$'
+        0x40,0x60,0xc0,0xc0,0x60,0x60,0xc0,0x40,
+
+        4, // 0x25 '%'
+        0x00,0xa0,0x20,0x40,0x40,0x80,0xa0,0x00,
+
+        4, // 0x26 '&'
+        0x00,0x40,0xa0,0xa0,0x40,0xb0,0xa0,0x70,
+
+        4, // 0x27 '''
+        0x00,0x40,0x40,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x28 '('
+        0x20,0x40,0x80,0x80,0x80,0x80,0x40,0x20,
+
+        4, // 0x29 ')'
+        0x80,0x40,0x20,0x20,0x20,0x20,0x40,0x80,
+
+        4, // 0x2a '*'
+        0x00,0xa0,0x40,0xe0,0x40,0xa0,0x00,0x00,
+
+        4, // 0x2b '+'
+        0x00,0x40,0x40,0xe0,0x40,0x40,0x00,0x00,
+
+        4, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x80,
+
+        4, // 0x2d '-'
+        0x00,0x00,0x00,0xe0,0x00,0x00,0x00,0x00,
+
+        4, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,
+
+        4, // 0x2f '/'
+        0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80,
+
+        4, // 0x30 '0'
+        0x00,0xe0,0xa0,0xa0,0xa0,0xa0,0xe0,0x00,
+
+        4, // 0x31 '1'
+        0x00,0x40,0xc0,0x40,0x40,0x40,0xe0,0x00,
+
+        4, // 0x32 '2'
+        0x00,0xe0,0xa0,0x20,0x40,0x80,0xe0,0x00,
+
+        4, // 0x33 '3'
+        0x00,0xe0,0x20,0x40,0x20,0x20,0xe0,0x00,
+
+        4, // 0x34 '4'
+        0x00,0x60,0xa0,0xa0,0xf0,0x20,0x20,0x00,
+
+        4, // 0x35 '5'
+        0x00,0xe0,0x80,0xc0,0x20,0x20,0xc0,0x00,
+
+        4, // 0x36 '6'
+        0x00,0x40,0x80,0xe0,0xa0,0xa0,0xe0,0x00,
+
+        4, // 0x37 '7'
+        0x00,0xe0,0xa0,0x20,0x40,0x40,0x40,0x00,
+
+        4, // 0x38 '8'
+        0x00,0xe0,0xa0,0x40,0xa0,0xa0,0xe0,0x00,
+
+        4, // 0x39 '9'
+        0x00,0xe0,0xa0,0xe0,0x20,0x20,0x40,0x00,
+
+        4, // 0x3a ':'
+        0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,
+
+        4, // 0x3b ';'
+        0x00,0x00,0x40,0x00,0x00,0x40,0x40,0x80,
+
+        4, // 0x3c '<'
+        0x00,0x20,0x40,0x80,0x40,0x20,0x00,0x00,
+
+        4, // 0x3d '='
+        0x00,0x00,0xe0,0x00,0xe0,0x00,0x00,0x00,
+
+        4, // 0x3e '>'
+        0x00,0x80,0x40,0x20,0x40,0x80,0x00,0x00,
+
+        4, // 0x3f '?'
+        0x00,0x40,0xa0,0x20,0x40,0x00,0x40,0x00,
+
+        4, // 0x40 '@'
+        0x00,0x40,0xa0,0xe0,0xe0,0x80,0x60,0x00,
+
+        4, // 0x41 'A'
+        0x00,0x40,0xa0,0xa0,0xe0,0xa0,0xa0,0x00,
+
+        4, // 0x42 'B'
+        0x00,0xc0,0xa0,0xc0,0xa0,0xa0,0xc0,0x00,
+
+        4, // 0x43 'C'
+        0x00,0x40,0xa0,0x80,0x80,0xa0,0x40,0x00,
+
+        4, // 0x44 'D'
+        0x00,0xc0,0xa0,0xa0,0xa0,0xa0,0xc0,0x00,
+
+        4, // 0x45 'E'
+        0x00,0xe0,0x80,0xc0,0x80,0x80,0xe0,0x00,
+
+        4, // 0x46 'F'
+        0x00,0xe0,0x80,0xc0,0x80,0x80,0x80,0x00,
+
+        4, // 0x47 'G'
+        0x00,0x60,0x80,0xa0,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x48 'H'
+        0x00,0xa0,0xa0,0xe0,0xa0,0xa0,0xa0,0x00,
+
+        4, // 0x49 'I'
+        0x00,0xe0,0x40,0x40,0x40,0x40,0xe0,0x00,
+
+        4, // 0x4a 'J'
+        0x00,0x20,0x20,0x20,0x20,0xa0,0x40,0x00,
+
+        4, // 0x4b 'K'
+        0x00,0xa0,0xa0,0xc0,0xc0,0xa0,0xa0,0x00,
+
+        4, // 0x4c 'L'
+        0x00,0x80,0x80,0x80,0x80,0x80,0xe0,0x00,
+
+        4, // 0x4d 'M'
+        0x00,0xa0,0xe0,0xa0,0xa0,0xa0,0xa0,0x00,
+
+        4, // 0x4e 'N'
+        0x00,0x90,0x90,0xd0,0xb0,0x90,0x90,0x00,
+
+        4, // 0x4f 'O'
+        0x00,0x40,0xa0,0xa0,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x50 'P'
+        0x00,0xc0,0xa0,0xa0,0xc0,0x80,0x80,0x00,
+
+        4, // 0x51 'Q'
+        0x00,0x40,0xa0,0xa0,0xa0,0xa0,0x60,0x00,
+
+        4, // 0x52 'R'
+        0x00,0xc0,0xa0,0xa0,0xc0,0xc0,0xa0,0x00,
+
+        4, // 0x53 'S'
+        0x00,0x60,0x80,0x40,0x20,0x20,0xc0,0x00,
+
+        4, // 0x54 'T'
+        0x00,0xe0,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        4, // 0x55 'U'
+        0x00,0xa0,0xa0,0xa0,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x56 'V'
+        0x00,0xa0,0xa0,0xa0,0xa0,0x40,0x40,0x00,
+
+        4, // 0x57 'W'
+        0x00,0xa0,0xa0,0xa0,0xa0,0xe0,0xa0,0x00,
+
+        4, // 0x58 'X'
+        0x00,0xa0,0xa0,0x40,0xa0,0xa0,0xa0,0x00,
+
+        4, // 0x59 'Y'
+        0x00,0xa0,0xa0,0x40,0x40,0x40,0x40,0x00,
+
+        4, // 0x5a 'Z'
+        0x00,0xe0,0x20,0x40,0x40,0x80,0xe0,0x00,
+
+        4, // 0x5b '['
+        0xc0,0x80,0x80,0x80,0x80,0x80,0x80,0xc0,
+
+        4, // 0x5c '\'
+        0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,
+
+        4, // 0x5d ']'
+        0xc0,0x40,0x40,0x40,0x40,0x40,0x40,0xc0,
+
+        4, // 0x5e '^'
+        0x00,0x40,0xa0,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+
+        4, // 0x60 '`'
+        0x00,0x40,0x20,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x61 'a'
+        0x00,0x00,0x60,0xa0,0xa0,0xa0,0x70,0x00,
+
+        4, // 0x62 'b'
+        0x00,0x80,0x80,0xc0,0xa0,0xa0,0xc0,0x00,
+
+        4, // 0x63 'c'
+        0x00,0x00,0x40,0xa0,0x80,0xa0,0x40,0x00,
+
+        4, // 0x64 'd'
+        0x00,0x20,0x20,0x60,0xa0,0xa0,0x60,0x00,
+
+        4, // 0x65 'e'
+        0x00,0x00,0x40,0xa0,0xe0,0x80,0x60,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x20,0x40,0x40,0xe0,0x40,0x40,0x00,
+
+        4, // 0x67 'g'
+        0x00,0x00,0x60,0xa0,0xa0,0x60,0x20,0xc0,
+
+        4, // 0x68 'h'
+        0x00,0x80,0x80,0xc0,0xa0,0xa0,0xa0,0x00,
+
+        4, // 0x69 'i'
+        0x00,0x40,0x00,0xc0,0x40,0x40,0xe0,0x00,
+
+        4, // 0x6a 'j'
+        0x00,0x40,0x00,0xc0,0x40,0x40,0x40,0x80,
+
+        4, // 0x6b 'k'
+        0x00,0x80,0x80,0xa0,0xc0,0xc0,0xa0,0x00,
+
+        4, // 0x6c 'l'
+        0x00,0xc0,0x40,0x40,0x40,0x40,0xe0,0x00,
+
+        4, // 0x6d 'm'
+        0x00,0x00,0xa0,0xf0,0xf0,0xf0,0x90,0x00,
+
+        4, // 0x6e 'n'
+        0x00,0x00,0xc0,0xa0,0xa0,0xa0,0xa0,0x00,
+
+        4, // 0x6f 'o'
+        0x00,0x00,0x40,0xa0,0xa0,0xa0,0x40,0x00,
+
+        4, // 0x70 'p'
+        0x00,0x00,0xc0,0xa0,0xa0,0xc0,0x80,0x80,
+
+        4, // 0x71 'q'
+        0x00,0x00,0x60,0xa0,0xa0,0x60,0x20,0x20,
+
+        4, // 0x72 'r'
+        0x00,0x00,0xa0,0x50,0x40,0x40,0x40,0x00,
+
+        4, // 0x73 's'
+        0x00,0x00,0x60,0x80,0x40,0x20,0xc0,0x00,
+
+        4, // 0x74 't'
+        0x00,0x40,0x40,0xe0,0x40,0x40,0x20,0x00,
+
+        4, // 0x75 'u'
+        0x00,0x00,0xa0,0xa0,0xa0,0xa0,0x60,0x00,
+
+        4, // 0x76 'v'
+        0x00,0x00,0xa0,0xa0,0xa0,0x40,0x40,0x00,
+
+        4, // 0x77 'w'
+        0x00,0x00,0xa0,0xa0,0xa0,0xe0,0xa0,0x00,
+
+        4, // 0x78 'x'
+        0x00,0x00,0xa0,0xa0,0x40,0xa0,0xa0,0x00,
+
+        4, // 0x79 'y'
+        0x00,0x00,0xa0,0xa0,0xa0,0x60,0x20,0xc0,
+
+        4, // 0x7a 'z'
+        0x00,0x00,0xe0,0x20,0x40,0x80,0xe0,0x00,
+
+        4, // 0x7b '{'
+        0x10,0x20,0x20,0xc0,0x20,0x20,0x10,0x00,
+
+        4, // 0x7c '|'
+        0x00,0x40,0x40,0x40,0x00,0x40,0x40,0x40,
+
+        4, // 0x7d '}'
+        0x80,0x40,0x40,0x30,0x40,0x40,0x80,0x00,
+
+        4, // 0x7e '~'
+        0x00,0x50,0xa0,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x7f ''
+        0x00,0x00,0x00,0x60,0x90,0xf0,0x00,0x00,
+        0
+    };
+
+    const int8u gse5x7[] =
+    {
+        7, 0, 32, 128-32,
+
+        0x00,0x00,0x08,0x00,0x10,0x00,0x18,0x00,0x20,0x00,0x28,0x00,0x30,0x00,0x38,0x00,0x40,0x00,
+        0x48,0x00,0x50,0x00,0x58,0x00,0x60,0x00,0x68,0x00,0x70,0x00,0x78,0x00,0x80,0x00,0x88,0x00,
+        0x90,0x00,0x98,0x00,0xa0,0x00,0xa8,0x00,0xb0,0x00,0xb8,0x00,0xc0,0x00,0xc8,0x00,0xd0,0x00,
+        0xd8,0x00,0xe0,0x00,0xe8,0x00,0xf0,0x00,0xf8,0x00,0x00,0x01,0x08,0x01,0x10,0x01,0x18,0x01,
+        0x20,0x01,0x28,0x01,0x30,0x01,0x38,0x01,0x40,0x01,0x48,0x01,0x50,0x01,0x58,0x01,0x60,0x01,
+        0x68,0x01,0x70,0x01,0x78,0x01,0x80,0x01,0x88,0x01,0x90,0x01,0x98,0x01,0xa0,0x01,0xa8,0x01,
+        0xb0,0x01,0xb8,0x01,0xc0,0x01,0xc8,0x01,0xd0,0x01,0xd8,0x01,0xe0,0x01,0xe8,0x01,0xf0,0x01,
+        0xf8,0x01,0x00,0x02,0x08,0x02,0x10,0x02,0x18,0x02,0x20,0x02,0x28,0x02,0x30,0x02,0x38,0x02,
+        0x40,0x02,0x48,0x02,0x50,0x02,0x58,0x02,0x60,0x02,0x68,0x02,0x70,0x02,0x78,0x02,0x80,0x02,
+        0x88,0x02,0x90,0x02,0x98,0x02,0xa0,0x02,0xa8,0x02,0xb0,0x02,0xb8,0x02,0xc0,0x02,0xc8,0x02,
+        0xd0,0x02,0xd8,0x02,0xe0,0x02,0xe8,0x02,0xf0,0x02,0xf8,0x02,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x00,0x20,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x50,0x50,0x00,0x00,0x00,0x00,
+
+        5, // 0x23 '#'
+        0x00,0x50,0xf8,0x50,0xf8,0x50,0x00,
+
+        5, // 0x24 '$'
+        0x20,0x78,0xa0,0x70,0x28,0xf0,0x20,
+
+        5, // 0x25 '%'
+        0x00,0x88,0x10,0x20,0x40,0x88,0x00,
+
+        5, // 0x26 '&'
+        0x00,0x40,0xa0,0x68,0x90,0x68,0x00,
+
+        5, // 0x27 '''
+        0x00,0x20,0x20,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x10,0x20,0x40,0x40,0x40,0x20,0x10,
+
+        5, // 0x29 ')'
+        0x80,0x40,0x20,0x20,0x20,0x40,0x80,
+
+        5, // 0x2a '*'
+        0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,
+
+        5, // 0x2b '+'
+        0x00,0x20,0x20,0xf8,0x20,0x20,0x00,
+
+        5, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x20,0x20,0x40,
+
+        5, // 0x2d '-'
+        0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
+
+        5, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x40,0x00,
+
+        5, // 0x2f '/'
+        0x00,0x08,0x10,0x20,0x40,0x80,0x00,
+
+        5, // 0x30 '0'
+        0x00,0x60,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x70,0x00,
+
+        5, // 0x32 '2'
+        0x00,0x60,0x90,0x20,0x40,0xf0,0x00,
+
+        5, // 0x33 '3'
+        0x00,0xf0,0x20,0x60,0x10,0xe0,0x00,
+
+        5, // 0x34 '4'
+        0x00,0x30,0x50,0x90,0xf0,0x10,0x00,
+
+        5, // 0x35 '5'
+        0x00,0xf0,0x80,0xe0,0x10,0xe0,0x00,
+
+        5, // 0x36 '6'
+        0x00,0x60,0x80,0xe0,0x90,0x60,0x00,
+
+        5, // 0x37 '7'
+        0x00,0xf0,0x90,0x20,0x40,0x40,0x00,
+
+        5, // 0x38 '8'
+        0x00,0x60,0x90,0x60,0x90,0x60,0x00,
+
+        5, // 0x39 '9'
+        0x00,0x60,0x90,0x70,0x10,0x60,0x00,
+
+        5, // 0x3a ':'
+        0x00,0x00,0x20,0x00,0x20,0x00,0x00,
+
+        5, // 0x3b ';'
+        0x00,0x00,0x20,0x00,0x20,0x20,0x40,
+
+        5, // 0x3c '<'
+        0x00,0x10,0x20,0x40,0x20,0x10,0x00,
+
+        5, // 0x3d '='
+        0x00,0x00,0xf0,0x00,0xf0,0x00,0x00,
+
+        5, // 0x3e '>'
+        0x00,0x80,0x40,0x20,0x40,0x80,0x00,
+
+        5, // 0x3f '?'
+        0x00,0x60,0x90,0x20,0x00,0x20,0x00,
+
+        5, // 0x40 '@'
+        0x00,0x60,0x90,0xb0,0x80,0x70,0x00,
+
+        5, // 0x41 'A'
+        0x00,0x60,0x90,0xf0,0x90,0x90,0x00,
+
+        5, // 0x42 'B'
+        0x00,0xe0,0x90,0xe0,0x90,0xe0,0x00,
+
+        5, // 0x43 'C'
+        0x00,0x60,0x90,0x80,0x90,0x60,0x00,
+
+        5, // 0x44 'D'
+        0x00,0xe0,0x90,0x90,0x90,0xe0,0x00,
+
+        5, // 0x45 'E'
+        0x00,0xf0,0x80,0xe0,0x80,0xf0,0x00,
+
+        5, // 0x46 'F'
+        0x00,0xf0,0x80,0xe0,0x80,0x80,0x00,
+
+        5, // 0x47 'G'
+        0x00,0x70,0x80,0xb0,0x90,0x60,0x00,
+
+        5, // 0x48 'H'
+        0x00,0x90,0x90,0xf0,0x90,0x90,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x4a 'J'
+        0x00,0x70,0x20,0x20,0xa0,0x40,0x00,
+
+        5, // 0x4b 'K'
+        0x00,0x90,0xa0,0xc0,0xa0,0x90,0x00,
+
+        5, // 0x4c 'L'
+        0x00,0x80,0x80,0x80,0x80,0xf0,0x00,
+
+        5, // 0x4d 'M'
+        0x00,0x90,0xf0,0x90,0x90,0x90,0x00,
+
+        5, // 0x4e 'N'
+        0x00,0x90,0xd0,0xb0,0x90,0x90,0x00,
+
+        5, // 0x4f 'O'
+        0x00,0x60,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x50 'P'
+        0x00,0xe0,0x90,0xe0,0x80,0x80,0x00,
+
+        5, // 0x51 'Q'
+        0x00,0x60,0x90,0x90,0xa0,0x50,0x00,
+
+        5, // 0x52 'R'
+        0x00,0xe0,0x90,0xe0,0xa0,0x90,0x00,
+
+        5, // 0x53 'S'
+        0x00,0x70,0x80,0x60,0x10,0xe0,0x00,
+
+        5, // 0x54 'T'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x55 'U'
+        0x00,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x56 'V'
+        0x00,0x50,0x50,0x50,0x20,0x20,0x00,
+
+        5, // 0x57 'W'
+        0x00,0x90,0x90,0x90,0xf0,0x90,0x00,
+
+        5, // 0x58 'X'
+        0x00,0x90,0x90,0x60,0x90,0x90,0x00,
+
+        5, // 0x59 'Y'
+        0x00,0x50,0x50,0x20,0x20,0x20,0x00,
+
+        5, // 0x5a 'Z'
+        0x00,0xf0,0x10,0x20,0x40,0xf0,0x00,
+
+        5, // 0x5b '['
+        0x70,0x40,0x40,0x40,0x40,0x40,0x70,
+
+        5, // 0x5c '\'
+        0x00,0x80,0x40,0x20,0x10,0x08,0x00,
+
+        5, // 0x5d ']'
+        0xe0,0x20,0x20,0x20,0x20,0x20,0xe0,
+
+        5, // 0x5e '^'
+        0x00,0x20,0x50,0x00,0x00,0x00,0x00,
+
+        5, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0xf8,0x00,
+
+        5, // 0x60 '`'
+        0x00,0x40,0x20,0x00,0x00,0x00,0x00,
+
+        5, // 0x61 'a'
+        0x00,0x00,0x60,0xa0,0xa0,0x50,0x00,
+
+        5, // 0x62 'b'
+        0x00,0x80,0x80,0xe0,0x90,0xe0,0x00,
+
+        5, // 0x63 'c'
+        0x00,0x00,0x70,0x80,0x80,0x70,0x00,
+
+        5, // 0x64 'd'
+        0x00,0x10,0x10,0x70,0x90,0x70,0x00,
+
+        5, // 0x65 'e'
+        0x00,0x00,0x60,0xf0,0x80,0x70,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x30,0x40,0xe0,0x40,0x40,0x00,
+
+        5, // 0x67 'g'
+        0x00,0x00,0x70,0x90,0x70,0x10,0x60,
+
+        5, // 0x68 'h'
+        0x00,0x80,0x80,0xe0,0x90,0x90,0x00,
+
+        5, // 0x69 'i'
+        0x20,0x00,0x60,0x20,0x20,0x70,0x00,
+
+        5, // 0x6a 'j'
+        0x20,0x00,0x60,0x20,0x20,0xa0,0x40,
+
+        5, // 0x6b 'k'
+        0x80,0x80,0x90,0xa0,0xe0,0x90,0x00,
+
+        5, // 0x6c 'l'
+        0x00,0x60,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x6d 'm'
+        0x00,0x00,0xa0,0xf0,0xf0,0x90,0x00,
+
+        5, // 0x6e 'n'
+        0x00,0x00,0xa0,0xd0,0x90,0x90,0x00,
+
+        5, // 0x6f 'o'
+        0x00,0x00,0x60,0x90,0x90,0x60,0x00,
+
+        5, // 0x70 'p'
+        0x00,0x00,0xe0,0x90,0xe0,0x80,0x80,
+
+        5, // 0x71 'q'
+        0x00,0x00,0x70,0x90,0x70,0x10,0x10,
+
+        5, // 0x72 'r'
+        0x00,0x00,0xe0,0x90,0x80,0x80,0x00,
+
+        5, // 0x73 's'
+        0x00,0x00,0x70,0xe0,0x10,0xe0,0x00,
+
+        5, // 0x74 't'
+        0x40,0x40,0xe0,0x40,0x40,0x70,0x00,
+
+        5, // 0x75 'u'
+        0x00,0x00,0x90,0x90,0x90,0x70,0x00,
+
+        5, // 0x76 'v'
+        0x00,0x00,0x50,0x50,0x50,0x20,0x00,
+
+        5, // 0x77 'w'
+        0x00,0x00,0x90,0x90,0xf0,0x90,0x00,
+
+        5, // 0x78 'x'
+        0x00,0x00,0x90,0x60,0x60,0x90,0x00,
+
+        5, // 0x79 'y'
+        0x00,0x00,0x90,0x90,0x70,0x10,0x60,
+
+        5, // 0x7a 'z'
+        0x00,0x00,0xf0,0x20,0x40,0xf0,0x00,
+
+        5, // 0x7b '{'
+        0x10,0x20,0x20,0xc0,0x20,0x20,0x10,
+
+        5, // 0x7c '|'
+        0x20,0x20,0x20,0x00,0x20,0x20,0x20,
+
+        5, // 0x7d '}'
+        0x40,0x20,0x20,0x18,0x20,0x20,0x40,
+
+        5, // 0x7e '~'
+        0x00,0x40,0xa8,0x10,0x00,0x00,0x00,
+
+        5, // 0x7f ''
+        0x00,0x00,0x20,0x50,0x88,0xf8,0x00,
+        0
+    };
+
+    const int8u gse5x9[] =
+    {
+        9, 0, 32, 128-32,
+
+        0x00,0x00,0x0a,0x00,0x14,0x00,0x1e,0x00,0x28,0x00,0x32,0x00,0x3c,0x00,0x46,0x00,0x50,0x00,
+        0x5a,0x00,0x64,0x00,0x6e,0x00,0x78,0x00,0x82,0x00,0x8c,0x00,0x96,0x00,0xa0,0x00,0xaa,0x00,
+        0xb4,0x00,0xbe,0x00,0xc8,0x00,0xd2,0x00,0xdc,0x00,0xe6,0x00,0xf0,0x00,0xfa,0x00,0x04,0x01,
+        0x0e,0x01,0x18,0x01,0x22,0x01,0x2c,0x01,0x36,0x01,0x40,0x01,0x4a,0x01,0x54,0x01,0x5e,0x01,
+        0x68,0x01,0x72,0x01,0x7c,0x01,0x86,0x01,0x90,0x01,0x9a,0x01,0xa4,0x01,0xae,0x01,0xb8,0x01,
+        0xc2,0x01,0xcc,0x01,0xd6,0x01,0xe0,0x01,0xea,0x01,0xf4,0x01,0xfe,0x01,0x08,0x02,0x12,0x02,
+        0x1c,0x02,0x26,0x02,0x30,0x02,0x3a,0x02,0x44,0x02,0x4e,0x02,0x58,0x02,0x62,0x02,0x6c,0x02,
+        0x76,0x02,0x80,0x02,0x8a,0x02,0x94,0x02,0x9e,0x02,0xa8,0x02,0xb2,0x02,0xbc,0x02,0xc6,0x02,
+        0xd0,0x02,0xda,0x02,0xe4,0x02,0xee,0x02,0xf8,0x02,0x02,0x03,0x0c,0x03,0x16,0x03,0x20,0x03,
+        0x2a,0x03,0x34,0x03,0x3e,0x03,0x48,0x03,0x52,0x03,0x5c,0x03,0x66,0x03,0x70,0x03,0x7a,0x03,
+        0x84,0x03,0x8e,0x03,0x98,0x03,0xa2,0x03,0xac,0x03,0xb6,0x03,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x23 '#'
+        0x00,0x50,0x50,0xf8,0x50,0xf8,0x50,0x50,0x00,
+
+        5, // 0x24 '$'
+        0x00,0x20,0x78,0xa0,0x70,0x28,0xf0,0x20,0x00,
+
+        5, // 0x25 '%'
+        0x00,0xc8,0xc8,0x10,0x20,0x40,0x98,0x98,0x00,
+
+        5, // 0x26 '&'
+        0x00,0x40,0xa0,0xa0,0x40,0xa8,0x90,0x68,0x00,
+
+        5, // 0x27 '''
+        0x00,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x10,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x10,
+
+        5, // 0x29 ')'
+        0x80,0x40,0x20,0x20,0x20,0x20,0x20,0x40,0x80,
+
+        5, // 0x2a '*'
+        0x00,0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,0x00,
+
+        5, // 0x2b '+'
+        0x00,0x00,0x20,0x20,0xf8,0x20,0x20,0x00,0x00,
+
+        5, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x40,
+
+        5, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,
+
+        5, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,
+
+        5, // 0x2f '/'
+        0x00,0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80,
+
+        5, // 0x30 '0'
+        0x00,0x60,0x90,0xb0,0xd0,0x90,0x90,0x60,0x00,
+
+        5, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x32 '2'
+        0x00,0x60,0x90,0x10,0x20,0x40,0x80,0xf0,0x00,
+
+        5, // 0x33 '3'
+        0x00,0xf0,0x10,0x20,0x60,0x10,0x90,0x60,0x00,
+
+        5, // 0x34 '4'
+        0x00,0x30,0x50,0x90,0x90,0xf8,0x10,0x10,0x00,
+
+        5, // 0x35 '5'
+        0x00,0xf0,0x80,0xe0,0x10,0x10,0x10,0xe0,0x00,
+
+        5, // 0x36 '6'
+        0x00,0x60,0x80,0xe0,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x37 '7'
+        0x00,0xf0,0x90,0x10,0x20,0x40,0x40,0x40,0x00,
+
+        5, // 0x38 '8'
+        0x00,0x60,0x90,0x90,0x60,0x90,0x90,0x60,0x00,
+
+        5, // 0x39 '9'
+        0x00,0x60,0x90,0x90,0x70,0x10,0x90,0x60,0x00,
+
+        5, // 0x3a ':'
+        0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x00,0x00,
+
+        5, // 0x3b ';'
+        0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x20,0x40,
+
+        5, // 0x3c '<'
+        0x00,0x10,0x20,0x40,0x80,0x40,0x20,0x10,0x00,
+
+        5, // 0x3d '='
+        0x00,0x00,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,
+
+        5, // 0x3e '>'
+        0x00,0x80,0x40,0x20,0x10,0x20,0x40,0x80,0x00,
+
+        5, // 0x3f '?'
+        0x00,0x60,0x90,0x10,0x20,0x20,0x00,0x20,0x00,
+
+        5, // 0x40 '@'
+        0x00,0x60,0x90,0xb0,0xb0,0xb0,0x80,0x70,0x00,
+
+        5, // 0x41 'A'
+        0x00,0x60,0x90,0x90,0xf0,0x90,0x90,0x90,0x00,
+
+        5, // 0x42 'B'
+        0x00,0xe0,0x90,0x90,0xe0,0x90,0x90,0xe0,0x00,
+
+        5, // 0x43 'C'
+        0x00,0x60,0x90,0x80,0x80,0x80,0x90,0x60,0x00,
+
+        5, // 0x44 'D'
+        0x00,0xe0,0x90,0x90,0x90,0x90,0x90,0xe0,0x00,
+
+        5, // 0x45 'E'
+        0x00,0xf0,0x80,0x80,0xe0,0x80,0x80,0xf0,0x00,
+
+        5, // 0x46 'F'
+        0x00,0xf0,0x80,0x80,0xe0,0x80,0x80,0x80,0x00,
+
+        5, // 0x47 'G'
+        0x00,0x60,0x90,0x80,0xb0,0x90,0x90,0x60,0x00,
+
+        5, // 0x48 'H'
+        0x00,0x90,0x90,0x90,0xf0,0x90,0x90,0x90,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x4a 'J'
+        0x00,0x70,0x20,0x20,0x20,0x20,0xa0,0x40,0x00,
+
+        5, // 0x4b 'K'
+        0x00,0x90,0x90,0xa0,0xc0,0xa0,0x90,0x90,0x00,
+
+        5, // 0x4c 'L'
+        0x00,0x80,0x80,0x80,0x80,0x80,0x80,0xf0,0x00,
+
+        5, // 0x4d 'M'
+        0x00,0x90,0xf0,0x90,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x4e 'N'
+        0x00,0x90,0x90,0xd0,0xb0,0x90,0x90,0x90,0x00,
+
+        5, // 0x4f 'O'
+        0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x50 'P'
+        0x00,0xe0,0x90,0x90,0xe0,0x80,0x80,0x80,0x00,
+
+        5, // 0x51 'Q'
+        0x00,0x60,0x90,0x90,0x90,0x90,0xa0,0x50,0x00,
+
+        5, // 0x52 'R'
+        0x00,0xe0,0x90,0x90,0xe0,0xa0,0x90,0x90,0x00,
+
+        5, // 0x53 'S'
+        0x00,0x60,0x90,0x80,0x60,0x10,0x90,0x60,0x00,
+
+        5, // 0x54 'T'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x55 'U'
+        0x00,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x56 'V'
+        0x00,0x50,0x50,0x50,0x50,0x50,0x20,0x20,0x00,
+
+        5, // 0x57 'W'
+        0x00,0x90,0x90,0x90,0x90,0x90,0xf0,0x90,0x00,
+
+        5, // 0x58 'X'
+        0x00,0x90,0x90,0x60,0x60,0x90,0x90,0x90,0x00,
+
+        5, // 0x59 'Y'
+        0x00,0x50,0x50,0x50,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x5a 'Z'
+        0x00,0xf0,0x10,0x10,0x20,0x40,0x80,0xf0,0x00,
+
+        5, // 0x5b '['
+        0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x70,0x00,
+
+        5, // 0x5c '\'
+        0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x00,
+
+        5, // 0x5d ']'
+        0xe0,0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00,
+
+        5, // 0x5e '^'
+        0x00,0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x00,
+
+        5, // 0x60 '`'
+        0x00,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x61 'a'
+        0x00,0x00,0x60,0x10,0x70,0x90,0x90,0x70,0x00,
+
+        5, // 0x62 'b'
+        0x00,0x80,0x80,0xe0,0x90,0x90,0x90,0xe0,0x00,
+
+        5, // 0x63 'c'
+        0x00,0x00,0x60,0x90,0x80,0x80,0x90,0x60,0x00,
+
+        5, // 0x64 'd'
+        0x00,0x10,0x10,0x70,0x90,0x90,0x90,0x70,0x00,
+
+        5, // 0x65 'e'
+        0x00,0x00,0x60,0x90,0xf0,0x80,0x80,0x70,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x30,0x40,0x40,0xe0,0x40,0x40,0x40,0x00,
+
+        5, // 0x67 'g'
+        0x00,0x00,0x70,0x90,0x90,0x70,0x10,0x90,0x60,
+
+        5, // 0x68 'h'
+        0x00,0x80,0x80,0xe0,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x69 'i'
+        0x00,0x20,0x00,0x60,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x6a 'j'
+        0x00,0x20,0x00,0x60,0x20,0x20,0x20,0xa0,0x40,
+
+        5, // 0x6b 'k'
+        0x00,0x80,0x80,0x90,0xa0,0xc0,0xa0,0x90,0x00,
+
+        5, // 0x6c 'l'
+        0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x6d 'm'
+        0x00,0x00,0xa0,0xf0,0xf0,0xf0,0x90,0x90,0x00,
+
+        5, // 0x6e 'n'
+        0x00,0x00,0xa0,0xd0,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x6f 'o'
+        0x00,0x00,0x60,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x70 'p'
+        0x00,0x00,0xe0,0x90,0x90,0x90,0xe0,0x80,0x80,
+
+        5, // 0x71 'q'
+        0x00,0x00,0x70,0x90,0x90,0x90,0x70,0x10,0x10,
+
+        5, // 0x72 'r'
+        0x00,0x00,0xe0,0x90,0x80,0x80,0x80,0x80,0x00,
+
+        5, // 0x73 's'
+        0x00,0x00,0x60,0x90,0x40,0x20,0x90,0x60,0x00,
+
+        5, // 0x74 't'
+        0x00,0x40,0x40,0xe0,0x40,0x40,0x50,0x20,0x00,
+
+        5, // 0x75 'u'
+        0x00,0x00,0x90,0x90,0x90,0x90,0x90,0x70,0x00,
+
+        5, // 0x76 'v'
+        0x00,0x00,0x50,0x50,0x50,0x50,0x20,0x20,0x00,
+
+        5, // 0x77 'w'
+        0x00,0x00,0x90,0x90,0x90,0x90,0xf0,0x90,0x00,
+
+        5, // 0x78 'x'
+        0x00,0x00,0x90,0x90,0x60,0x60,0x90,0x90,0x00,
+
+        5, // 0x79 'y'
+        0x00,0x00,0x90,0x90,0x90,0x90,0x70,0x10,0xe0,
+
+        5, // 0x7a 'z'
+        0x00,0x00,0xf0,0x10,0x20,0x40,0x80,0xf0,0x00,
+
+        5, // 0x7b '{'
+        0x10,0x20,0x20,0x20,0xc0,0x20,0x20,0x20,0x10,
+
+        5, // 0x7c '|'
+        0x00,0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x00,
+
+        5, // 0x7d '}'
+        0x80,0x40,0x40,0x40,0x30,0x40,0x40,0x40,0x80,
+
+        5, // 0x7e '~'
+        0x00,0x40,0xa8,0x10,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x7f ''
+        0x00,0x00,0x00,0x20,0x50,0x88,0xf8,0x00,0x00,
+        0
+    };
+
+    const int8u gse6x12[] =
+    {
+        12, 0, 32, 128-32,
+
+        0x00,0x00,0x0d,0x00,0x1a,0x00,0x27,0x00,0x34,0x00,0x41,0x00,0x4e,0x00,0x5b,0x00,0x68,0x00,
+        0x75,0x00,0x82,0x00,0x8f,0x00,0x9c,0x00,0xa9,0x00,0xb6,0x00,0xc3,0x00,0xd0,0x00,0xdd,0x00,
+        0xea,0x00,0xf7,0x00,0x04,0x01,0x11,0x01,0x1e,0x01,0x2b,0x01,0x38,0x01,0x45,0x01,0x52,0x01,
+        0x5f,0x01,0x6c,0x01,0x79,0x01,0x86,0x01,0x93,0x01,0xa0,0x01,0xad,0x01,0xba,0x01,0xc7,0x01,
+        0xd4,0x01,0xe1,0x01,0xee,0x01,0xfb,0x01,0x08,0x02,0x15,0x02,0x22,0x02,0x2f,0x02,0x3c,0x02,
+        0x49,0x02,0x56,0x02,0x63,0x02,0x70,0x02,0x7d,0x02,0x8a,0x02,0x97,0x02,0xa4,0x02,0xb1,0x02,
+        0xbe,0x02,0xcb,0x02,0xd8,0x02,0xe5,0x02,0xf2,0x02,0xff,0x02,0x0c,0x03,0x19,0x03,0x26,0x03,
+        0x33,0x03,0x40,0x03,0x4d,0x03,0x5a,0x03,0x67,0x03,0x74,0x03,0x81,0x03,0x8e,0x03,0x9b,0x03,
+        0xa8,0x03,0xb5,0x03,0xc2,0x03,0xcf,0x03,0xdc,0x03,0xe9,0x03,0xf6,0x03,0x03,0x04,0x10,0x04,
+        0x1d,0x04,0x2a,0x04,0x37,0x04,0x44,0x04,0x51,0x04,0x5e,0x04,0x6b,0x04,0x78,0x04,0x85,0x04,
+        0x92,0x04,0x9f,0x04,0xac,0x04,0xb9,0x04,0xc6,0x04,0xd3,0x04,
+
+        6, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        6, // 0x22 '"'
+        0x00,0x50,0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x23 '#'
+        0x00,0x50,0x50,0xf8,0x50,0x50,0x50,0xf8,0x50,0x50,0x00,0x00,
+
+        6, // 0x24 '$'
+        0x00,0x20,0x70,0xa8,0xa0,0x70,0x28,0xa8,0x70,0x20,0x00,0x00,
+
+        6, // 0x25 '%'
+        0x00,0xc8,0xd8,0x10,0x30,0x20,0x60,0x40,0xd8,0x98,0x00,0x00,
+
+        6, // 0x26 '&'
+        0x00,0x60,0x90,0x90,0x90,0x60,0xa8,0x90,0x90,0x68,0x00,0x00,
+
+        6, // 0x27 '''
+        0x00,0x20,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x28 '('
+        0x00,0x10,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x10,0x00,0x00,
+
+        6, // 0x29 ')'
+        0x00,0x40,0x20,0x10,0x10,0x10,0x10,0x10,0x20,0x40,0x00,0x00,
+
+        6, // 0x2a '*'
+        0x00,0x00,0x00,0x50,0x20,0xf8,0x20,0x50,0x00,0x00,0x00,0x00,
+
+        6, // 0x2b '+'
+        0x00,0x00,0x20,0x20,0x20,0xf8,0x20,0x20,0x20,0x00,0x00,0x00,
+
+        6, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x40,
+
+        6, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0x00,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,
+
+        6, // 0x2f '/'
+        0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80,0x00,0x00,
+
+        6, // 0x30 '0'
+        0x00,0x70,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x31 '1'
+        0x00,0x20,0x20,0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        6, // 0x32 '2'
+        0x00,0x70,0x88,0x88,0x08,0x10,0x20,0x40,0x80,0xf8,0x00,0x00,
+
+        6, // 0x33 '3'
+        0x00,0xf8,0x10,0x20,0x70,0x08,0x08,0x08,0x88,0x70,0x00,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x10,0x20,0x40,0x90,0x90,0xf8,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x35 '5'
+        0x00,0xf8,0x80,0x80,0xf0,0x08,0x08,0x08,0x88,0x70,0x00,0x00,
+
+        6, // 0x36 '6'
+        0x00,0x70,0x88,0x80,0x80,0xf0,0x88,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x37 '7'
+        0x00,0xf8,0x88,0x08,0x08,0x10,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        6, // 0x38 '8'
+        0x00,0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x39 '9'
+        0x00,0x70,0x88,0x88,0x88,0x78,0x08,0x08,0x88,0x70,0x00,0x00,
+
+        6, // 0x3a ':'
+        0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
+
+        6, // 0x3b ';'
+        0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x20,0x20,0x20,0x40,
+
+        6, // 0x3c '<'
+        0x00,0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10,0x08,0x00,0x00,
+
+        6, // 0x3d '='
+        0x00,0x00,0x00,0x00,0xf8,0x00,0xf8,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x3e '>'
+        0x00,0x80,0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x80,0x00,0x00,
+
+        6, // 0x3f '?'
+        0x00,0x70,0x88,0x88,0x08,0x10,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        6, // 0x40 '@'
+        0x00,0x70,0x88,0x88,0xb8,0xb8,0xb0,0x80,0x88,0x70,0x00,0x00,
+
+        6, // 0x41 'A'
+        0x00,0x20,0x50,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x00,0x00,
+
+        6, // 0x42 'B'
+        0x00,0xf0,0x88,0x88,0x88,0xf0,0x88,0x88,0x88,0xf0,0x00,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x70,0x88,0x88,0x80,0x80,0x80,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x44 'D'
+        0x00,0xe0,0x90,0x88,0x88,0x88,0x88,0x88,0x90,0xe0,0x00,0x00,
+
+        6, // 0x45 'E'
+        0x00,0xf8,0x80,0x80,0x80,0xf0,0x80,0x80,0x80,0xf8,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0xf8,0x80,0x80,0x80,0xf0,0x80,0x80,0x80,0x80,0x00,0x00,
+
+        6, // 0x47 'G'
+        0x00,0x70,0x88,0x80,0x80,0xb8,0x88,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x48 'H'
+        0x00,0x88,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x88,0x00,0x00,
+
+        6, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        6, // 0x4a 'J'
+        0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x90,0x60,0x00,0x00,
+
+        6, // 0x4b 'K'
+        0x00,0x88,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x88,0x00,0x00,
+
+        6, // 0x4c 'L'
+        0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xf8,0x00,0x00,
+
+        6, // 0x4d 'M'
+        0x00,0x88,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x88,0x00,0x00,
+
+        6, // 0x4e 'N'
+        0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88,0x88,0x88,0x00,0x00,
+
+        6, // 0x4f 'O'
+        0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x50 'P'
+        0x00,0xf0,0x88,0x88,0x88,0xf0,0x80,0x80,0x80,0x80,0x00,0x00,
+
+        6, // 0x51 'Q'
+        0x00,0x70,0x88,0x88,0x88,0x88,0x88,0xa8,0x90,0x68,0x00,0x00,
+
+        6, // 0x52 'R'
+        0x00,0xf0,0x88,0x88,0x88,0x88,0xf0,0xa0,0x90,0x88,0x00,0x00,
+
+        6, // 0x53 'S'
+        0x00,0x70,0x88,0x80,0x80,0x70,0x08,0x08,0x88,0x70,0x00,0x00,
+
+        6, // 0x54 'T'
+        0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        6, // 0x55 'U'
+        0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x88,0x88,0x88,0x88,0x88,0x50,0x50,0x20,0x20,0x00,0x00,
+
+        6, // 0x57 'W'
+        0x00,0x88,0x88,0x88,0x88,0x88,0xa8,0xa8,0xd8,0x88,0x00,0x00,
+
+        6, // 0x58 'X'
+        0x00,0x88,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x88,0x00,0x00,
+
+        6, // 0x59 'Y'
+        0x00,0x88,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        6, // 0x5a 'Z'
+        0x00,0xf8,0x08,0x08,0x10,0x20,0x40,0x80,0x80,0xf8,0x00,0x00,
+
+        6, // 0x5b '['
+        0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,0x00,
+
+        6, // 0x5c '\'
+        0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,0x00,
+
+        6, // 0x5d ']'
+        0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x70,0x00,
+
+        6, // 0x5e '^'
+        0x00,0x00,0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x00,0x00,
+
+        6, // 0x60 '`'
+        0x00,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x61 'a'
+        0x00,0x00,0x00,0x70,0x88,0x08,0x78,0x88,0x88,0x78,0x00,0x00,
+
+        6, // 0x62 'b'
+        0x00,0x80,0x80,0x80,0xf0,0x88,0x88,0x88,0x88,0xf0,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x00,0x00,
+
+        6, // 0x64 'd'
+        0x00,0x08,0x08,0x08,0x78,0x88,0x88,0x88,0x88,0x78,0x00,0x00,
+
+        6, // 0x65 'e'
+        0x00,0x00,0x00,0x70,0x88,0x88,0xf8,0x80,0x80,0x78,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x18,0x20,0x20,0xf8,0x20,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        6, // 0x67 'g'
+        0x00,0x00,0x00,0x78,0x88,0x88,0x88,0x88,0x78,0x08,0x08,0xf0,
+
+        6, // 0x68 'h'
+        0x00,0x80,0x80,0x80,0xf0,0x88,0x88,0x88,0x88,0x88,0x00,0x00,
+
+        6, // 0x69 'i'
+        0x00,0x20,0x00,0x00,0x60,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        6, // 0x6a 'j'
+        0x00,0x10,0x00,0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x90,0x60,
+
+        6, // 0x6b 'k'
+        0x00,0x80,0x80,0x80,0x88,0x90,0xa0,0xd0,0x88,0x88,0x00,0x00,
+
+        6, // 0x6c 'l'
+        0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        6, // 0x6d 'm'
+        0x00,0x00,0x00,0xd0,0xa8,0xa8,0xa8,0xa8,0xa8,0xa8,0x00,0x00,
+
+        6, // 0x6e 'n'
+        0x00,0x00,0x00,0xb0,0xc8,0x88,0x88,0x88,0x88,0x88,0x00,0x00,
+
+        6, // 0x6f 'o'
+        0x00,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x00,
+
+        6, // 0x70 'p'
+        0x00,0x00,0x00,0xf0,0x88,0x88,0x88,0x88,0xf0,0x80,0x80,0x80,
+
+        6, // 0x71 'q'
+        0x00,0x00,0x00,0x78,0x88,0x88,0x88,0x88,0x78,0x08,0x08,0x08,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0xb0,0xc8,0x88,0x80,0x80,0x80,0x80,0x00,0x00,
+
+        6, // 0x73 's'
+        0x00,0x00,0x00,0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x40,0x40,0x40,0xe0,0x40,0x40,0x40,0x48,0x30,0x00,0x00,
+
+        6, // 0x75 'u'
+        0x00,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x78,0x00,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x88,0x88,0x88,0x50,0x50,0x20,0x20,0x00,0x00,
+
+        6, // 0x77 'w'
+        0x00,0x00,0x00,0x88,0x88,0x88,0xa8,0xa8,0xd8,0x88,0x00,0x00,
+
+        6, // 0x78 'x'
+        0x00,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x00,0x00,
+
+        6, // 0x79 'y'
+        0x00,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0x78,0x08,0x10,0xe0,
+
+        6, // 0x7a 'z'
+        0x00,0x00,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x00,0x00,
+
+        6, // 0x7b '{'
+        0x18,0x20,0x20,0x20,0x20,0xc0,0x20,0x20,0x20,0x20,0x18,0x00,
+
+        6, // 0x7c '|'
+        0x00,0x20,0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        6, // 0x7d '}'
+        0xc0,0x20,0x20,0x20,0x20,0x18,0x20,0x20,0x20,0x20,0xc0,0x00,
+
+        6, // 0x7e '~'
+        0x00,0x00,0x40,0xa8,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x7f ''
+        0x00,0x00,0x00,0x00,0x20,0x50,0x88,0xf8,0x00,0x00,0x00,0x00,
+        0
+    };
+
+    const int8u gse6x9[] =
+    {
+        9, 0, 32, 128-32,
+
+        0x00,0x00,0x0a,0x00,0x14,0x00,0x1e,0x00,0x28,0x00,0x32,0x00,0x3c,0x00,0x46,0x00,0x50,0x00,
+        0x5a,0x00,0x64,0x00,0x6e,0x00,0x78,0x00,0x82,0x00,0x8c,0x00,0x96,0x00,0xa0,0x00,0xaa,0x00,
+        0xb4,0x00,0xbe,0x00,0xc8,0x00,0xd2,0x00,0xdc,0x00,0xe6,0x00,0xf0,0x00,0xfa,0x00,0x04,0x01,
+        0x0e,0x01,0x18,0x01,0x22,0x01,0x2c,0x01,0x36,0x01,0x40,0x01,0x4a,0x01,0x54,0x01,0x5e,0x01,
+        0x68,0x01,0x72,0x01,0x7c,0x01,0x86,0x01,0x90,0x01,0x9a,0x01,0xa4,0x01,0xae,0x01,0xb8,0x01,
+        0xc2,0x01,0xcc,0x01,0xd6,0x01,0xe0,0x01,0xea,0x01,0xf4,0x01,0xfe,0x01,0x08,0x02,0x12,0x02,
+        0x1c,0x02,0x26,0x02,0x30,0x02,0x3a,0x02,0x44,0x02,0x4e,0x02,0x58,0x02,0x62,0x02,0x6c,0x02,
+        0x76,0x02,0x80,0x02,0x8a,0x02,0x94,0x02,0x9e,0x02,0xa8,0x02,0xb2,0x02,0xbc,0x02,0xc6,0x02,
+        0xd0,0x02,0xda,0x02,0xe4,0x02,0xee,0x02,0xf8,0x02,0x02,0x03,0x0c,0x03,0x16,0x03,0x20,0x03,
+        0x2a,0x03,0x34,0x03,0x3e,0x03,0x48,0x03,0x52,0x03,0x5c,0x03,0x66,0x03,0x70,0x03,0x7a,0x03,
+        0x84,0x03,0x8e,0x03,0x98,0x03,0xa2,0x03,0xac,0x03,0xb6,0x03,
+
+        6, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,
+
+        6, // 0x22 '"'
+        0x00,0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x23 '#'
+        0x00,0x50,0x50,0xf8,0x50,0xf8,0x50,0x50,0x00,
+
+        6, // 0x24 '$'
+        0x00,0x70,0xa8,0xa0,0x70,0x28,0xa8,0x70,0x00,
+
+        6, // 0x25 '%'
+        0x00,0xc8,0xc8,0x10,0x20,0x40,0x98,0x98,0x00,
+
+        6, // 0x26 '&'
+        0x00,0x60,0x90,0x90,0x60,0xa8,0x90,0x68,0x00,
+
+        6, // 0x27 '''
+        0x00,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x28 '('
+        0x10,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x10,
+
+        6, // 0x29 ')'
+        0x40,0x20,0x10,0x10,0x10,0x10,0x10,0x20,0x40,
+
+        6, // 0x2a '*'
+        0x00,0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,0x00,
+
+        6, // 0x2b '+'
+        0x00,0x00,0x20,0x20,0xf8,0x20,0x20,0x00,0x00,
+
+        6, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x40,
+
+        6, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0xf8,0x00,0x00,0x00,0x00,
+
+        6, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,
+
+        6, // 0x2f '/'
+        0x00,0x08,0x08,0x10,0x20,0x40,0x80,0x80,0x00,
+
+        6, // 0x30 '0'
+        0x00,0x70,0x88,0x98,0xa8,0xc8,0x88,0x70,0x00,
+
+        6, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        6, // 0x32 '2'
+        0x00,0x70,0x88,0x08,0x10,0x20,0x40,0xf8,0x00,
+
+        6, // 0x33 '3'
+        0x00,0xf8,0x10,0x20,0x70,0x08,0x88,0x70,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x10,0x20,0x40,0x90,0xf8,0x10,0x10,0x00,
+
+        6, // 0x35 '5'
+        0x00,0xf8,0x80,0xf0,0x08,0x08,0x88,0x70,0x00,
+
+        6, // 0x36 '6'
+        0x00,0x70,0x88,0x80,0xf0,0x88,0x88,0x70,0x00,
+
+        6, // 0x37 '7'
+        0x00,0xf8,0x08,0x08,0x10,0x20,0x40,0x40,0x00,
+
+        6, // 0x38 '8'
+        0x00,0x70,0x88,0x88,0x70,0x88,0x88,0x70,0x00,
+
+        6, // 0x39 '9'
+        0x00,0x70,0x88,0x88,0x78,0x08,0x88,0x70,0x00,
+
+        6, // 0x3a ':'
+        0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x00,0x00,
+
+        6, // 0x3b ';'
+        0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x20,0x40,
+
+        6, // 0x3c '<'
+        0x00,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x00,
+
+        6, // 0x3d '='
+        0x00,0x00,0x00,0xf8,0x00,0xf8,0x00,0x00,0x00,
+
+        6, // 0x3e '>'
+        0x00,0x80,0x40,0x20,0x10,0x20,0x40,0x80,0x00,
+
+        6, // 0x3f '?'
+        0x00,0x70,0x88,0x08,0x10,0x20,0x00,0x20,0x00,
+
+        6, // 0x40 '@'
+        0x00,0x70,0x88,0x88,0xb8,0xb8,0x80,0x70,0x00,
+
+        6, // 0x41 'A'
+        0x00,0x20,0x50,0x88,0x88,0xf8,0x88,0x88,0x00,
+
+        6, // 0x42 'B'
+        0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x00,
+
+        6, // 0x44 'D'
+        0x00,0xe0,0x90,0x88,0x88,0x88,0x90,0xe0,0x00,
+
+        6, // 0x45 'E'
+        0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x00,
+
+        6, // 0x46 'F'
+        0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0x80,0x00,
+
+        6, // 0x47 'G'
+        0x00,0x70,0x88,0x80,0xb8,0x88,0x88,0x70,0x00,
+
+        6, // 0x48 'H'
+        0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x00,
+
+        6, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        6, // 0x4a 'J'
+        0x00,0x38,0x10,0x10,0x10,0x10,0x90,0x60,0x00,
+
+        6, // 0x4b 'K'
+        0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x00,
+
+        6, // 0x4c 'L'
+        0x00,0x80,0x80,0x80,0x80,0x80,0x80,0xf8,0x00,
+
+        6, // 0x4d 'M'
+        0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x00,
+
+        6, // 0x4e 'N'
+        0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88,0x00,
+
+        6, // 0x4f 'O'
+        0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00,
+
+        6, // 0x50 'P'
+        0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x00,
+
+        6, // 0x51 'Q'
+        0x00,0x70,0x88,0x88,0x88,0xa8,0x90,0x68,0x00,
+
+        6, // 0x52 'R'
+        0x00,0xf0,0x88,0x88,0x88,0xf0,0x90,0x88,0x00,
+
+        6, // 0x53 'S'
+        0x00,0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x00,
+
+        6, // 0x54 'T'
+        0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        6, // 0x55 'U'
+        0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x88,0x88,0x88,0x50,0x50,0x20,0x20,0x00,
+
+        6, // 0x57 'W'
+        0x00,0x88,0x88,0x88,0xa8,0xa8,0xd8,0x88,0x00,
+
+        6, // 0x58 'X'
+        0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x00,
+
+        6, // 0x59 'Y'
+        0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x00,
+
+        6, // 0x5a 'Z'
+        0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x00,
+
+        6, // 0x5b '['
+        0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,
+
+        6, // 0x5c '\'
+        0x00,0x80,0x80,0x40,0x20,0x10,0x08,0x08,0x00,
+
+        6, // 0x5d ']'
+        0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x70,
+
+        6, // 0x5e '^'
+        0x00,0x00,0x20,0x50,0x88,0x00,0x00,0x00,0x00,
+
+        6, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x00,
+
+        6, // 0x60 '`'
+        0x00,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x61 'a'
+        0x00,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x00,
+
+        6, // 0x62 'b'
+        0x00,0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x00,
+
+        6, // 0x64 'd'
+        0x00,0x08,0x08,0x78,0x88,0x88,0x88,0x78,0x00,
+
+        6, // 0x65 'e'
+        0x00,0x00,0x00,0x70,0x88,0xf8,0x80,0x78,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x18,0x20,0x20,0xf8,0x20,0x20,0x20,0x00,
+
+        6, // 0x67 'g'
+        0x00,0x00,0x00,0x78,0x88,0x88,0x78,0x08,0x70,
+
+        6, // 0x68 'h'
+        0x00,0x80,0x80,0xf0,0x88,0x88,0x88,0x88,0x00,
+
+        6, // 0x69 'i'
+        0x00,0x20,0x00,0x60,0x20,0x20,0x20,0x70,0x00,
+
+        6, // 0x6a 'j'
+        0x00,0x10,0x00,0x30,0x10,0x10,0x10,0x90,0x60,
+
+        6, // 0x6b 'k'
+        0x00,0x00,0x80,0x88,0x90,0xa0,0xd0,0x88,0x00,
+
+        6, // 0x6c 'l'
+        0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        6, // 0x6d 'm'
+        0x00,0x00,0x00,0xd0,0xa8,0xa8,0xa8,0xa8,0x00,
+
+        6, // 0x6e 'n'
+        0x00,0x00,0x00,0xb0,0xc8,0x88,0x88,0x88,0x00,
+
+        6, // 0x6f 'o'
+        0x00,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x00,
+
+        6, // 0x70 'p'
+        0x00,0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,
+
+        6, // 0x71 'q'
+        0x00,0x00,0x00,0x78,0x88,0x88,0x78,0x08,0x08,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0xb8,0xc0,0x80,0x80,0x80,0x00,
+
+        6, // 0x73 's'
+        0x00,0x00,0x00,0x78,0x80,0x70,0x08,0xf0,0x00,
+
+        6, // 0x74 't'
+        0x00,0x40,0x40,0xe0,0x40,0x40,0x48,0x30,0x00,
+
+        6, // 0x75 'u'
+        0x00,0x00,0x00,0x88,0x88,0x88,0x88,0x78,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x00,
+
+        6, // 0x77 'w'
+        0x00,0x00,0x00,0x88,0x88,0xa8,0xd8,0x88,0x00,
+
+        6, // 0x78 'x'
+        0x00,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x00,
+
+        6, // 0x79 'y'
+        0x00,0x00,0x00,0x88,0x88,0x88,0x78,0x08,0x70,
+
+        6, // 0x7a 'z'
+        0x00,0x00,0x00,0xf8,0x10,0x20,0x40,0xf8,0x00,
+
+        6, // 0x7b '{'
+        0x18,0x20,0x20,0x20,0xc0,0x20,0x20,0x20,0x18,
+
+        6, // 0x7c '|'
+        0x00,0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x00,
+
+        6, // 0x7d '}'
+        0xc0,0x20,0x20,0x20,0x18,0x20,0x20,0x20,0xc0,
+
+        6, // 0x7e '~'
+        0x00,0x40,0xa8,0x10,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x7f ''
+        0x00,0x00,0x00,0x20,0x50,0x88,0xf8,0x00,0x00,
+        0
+    };
+
+    const int8u gse7x11[] =
+    {
+        11, 0, 32, 128-32,
+
+        0x00,0x00,0x0c,0x00,0x18,0x00,0x24,0x00,0x30,0x00,0x3c,0x00,0x48,0x00,0x54,0x00,0x60,0x00,
+        0x6c,0x00,0x78,0x00,0x84,0x00,0x90,0x00,0x9c,0x00,0xa8,0x00,0xb4,0x00,0xc0,0x00,0xcc,0x00,
+        0xd8,0x00,0xe4,0x00,0xf0,0x00,0xfc,0x00,0x08,0x01,0x14,0x01,0x20,0x01,0x2c,0x01,0x38,0x01,
+        0x44,0x01,0x50,0x01,0x5c,0x01,0x68,0x01,0x74,0x01,0x80,0x01,0x8c,0x01,0x98,0x01,0xa4,0x01,
+        0xb0,0x01,0xbc,0x01,0xc8,0x01,0xd4,0x01,0xe0,0x01,0xec,0x01,0xf8,0x01,0x04,0x02,0x10,0x02,
+        0x1c,0x02,0x28,0x02,0x34,0x02,0x40,0x02,0x4c,0x02,0x58,0x02,0x64,0x02,0x70,0x02,0x7c,0x02,
+        0x88,0x02,0x94,0x02,0xa0,0x02,0xac,0x02,0xb8,0x02,0xc4,0x02,0xd0,0x02,0xdc,0x02,0xe8,0x02,
+        0xf4,0x02,0x00,0x03,0x0c,0x03,0x18,0x03,0x24,0x03,0x30,0x03,0x3c,0x03,0x48,0x03,0x54,0x03,
+        0x60,0x03,0x6c,0x03,0x78,0x03,0x84,0x03,0x90,0x03,0x9c,0x03,0xa8,0x03,0xb4,0x03,0xc0,0x03,
+        0xcc,0x03,0xd8,0x03,0xe4,0x03,0xf0,0x03,0xfc,0x03,0x08,0x04,0x14,0x04,0x20,0x04,0x2c,0x04,
+        0x38,0x04,0x44,0x04,0x50,0x04,0x5c,0x04,0x68,0x04,0x74,0x04,
+
+        7, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x21 '!'
+        0x00,0x10,0x38,0x38,0x38,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x00,0x24,0x24,0x24,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x23 '#'
+        0x00,0x48,0x48,0xfc,0x48,0x48,0xfc,0x48,0x48,0x00,0x00,
+
+        7, // 0x24 '$'
+        0x00,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x00,
+
+        7, // 0x25 '%'
+        0x00,0x00,0x42,0xa4,0x48,0x10,0x24,0x4a,0x84,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x30,0x48,0x48,0x30,0x60,0x94,0x98,0x6c,0x00,0x00,
+
+        7, // 0x27 '''
+        0x00,0x20,0x20,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x00,0x04,0x08,0x10,0x10,0x10,0x10,0x08,0x04,0x00,0x00,
+
+        7, // 0x29 ')'
+        0x00,0x40,0x20,0x10,0x10,0x10,0x10,0x20,0x40,0x00,0x00,
+
+        7, // 0x2a '*'
+        0x00,0x00,0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,0x00,0x00,
+
+        7, // 0x2b '+'
+        0x00,0x00,0x00,0x10,0x10,0x7c,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x60,
+
+        7, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        7, // 0x2f '/'
+        0x00,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x38,0x44,0x4c,0x54,0x64,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x10,0x30,0x10,0x10,0x10,0x10,0x10,0x7c,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x38,0x44,0x04,0x08,0x10,0x20,0x44,0x7c,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x7c,0x48,0x10,0x38,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x08,0x10,0x20,0x48,0x48,0x7c,0x08,0x1c,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x7c,0x40,0x40,0x78,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x18,0x20,0x40,0x78,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0x7c,0x44,0x04,0x08,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x44,0x3c,0x04,0x08,0x30,0x00,0x00,
+
+        7, // 0x3a ':'
+        0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,
+
+        7, // 0x3b ';'
+        0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x30,0x60,0x00,
+
+        7, // 0x3c '<'
+        0x00,0x00,0x04,0x08,0x10,0x20,0x10,0x08,0x04,0x00,0x00,
+
+        7, // 0x3d '='
+        0x00,0x00,0x00,0x00,0xfc,0x00,0xfc,0x00,0x00,0x00,0x00,
+
+        7, // 0x3e '>'
+        0x00,0x00,0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x00,0x00,
+
+        7, // 0x3f '?'
+        0x00,0x70,0x88,0x88,0x10,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x30,0x48,0x04,0x34,0x54,0x54,0x54,0x28,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x10,0x28,0x44,0x44,0x7c,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x78,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        7, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x48,0x70,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0x7c,0x40,0x40,0x70,0x40,0x40,0x40,0x7c,0x00,0x00,
+
+        7, // 0x46 'F'
+        0x00,0x7c,0x40,0x40,0x70,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x40,0x5c,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x7c,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x49 'I'
+        0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x4a 'J'
+        0x00,0x1c,0x08,0x08,0x08,0x08,0x08,0x48,0x30,0x00,0x00,
+
+        7, // 0x4b 'K'
+        0x00,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x44,0x00,0x00,
+
+        7, // 0x4c 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7c,0x00,0x00,
+
+        7, // 0x4d 'M'
+        0x00,0x44,0x6c,0x54,0x54,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x4e 'N'
+        0x00,0x44,0x44,0x64,0x54,0x4c,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x4f 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x50,0x48,0x44,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x7c,0x54,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        7, // 0x57 'W'
+        0x00,0x44,0x44,0x44,0x44,0x54,0x54,0x6c,0x44,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x5a 'Z'
+        0x00,0x7c,0x04,0x08,0x10,0x20,0x40,0x44,0x7c,0x00,0x00,
+
+        7, // 0x5b '['
+        0x00,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x38,0x00,0x00,
+
+        7, // 0x5c '\'
+        0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,0x00,
+
+        7, // 0x5d ']'
+        0x00,0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x38,0x00,0x00,
+
+        7, // 0x5e '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+
+        7, // 0x60 '`'
+        0x00,0x20,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3c,0x44,0x44,0x3c,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x04,0x04,0x3c,0x44,0x44,0x44,0x44,0x3c,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x7c,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x66 'f'
+        0x00,0x18,0x24,0x20,0x70,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x3c,0x44,0x44,0x44,0x3c,0x04,0x44,0x38,
+
+        7, // 0x68 'h'
+        0x00,0x40,0x40,0x40,0x58,0x64,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x69 'i'
+        0x00,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x6a 'j'
+        0x00,0x08,0x00,0x18,0x08,0x08,0x08,0x08,0x48,0x30,0x00,
+
+        7, // 0x6b 'k'
+        0x00,0x40,0x40,0x44,0x48,0x50,0x68,0x44,0x44,0x00,0x00,
+
+        7, // 0x6c 'l'
+        0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x6d 'm'
+        0x00,0x00,0x00,0xa8,0x54,0x54,0x54,0x54,0x54,0x00,0x00,
+
+        7, // 0x6e 'n'
+        0x00,0x00,0x00,0xb8,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x6f 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x3c,0x44,0x44,0x44,0x44,0x3c,0x04,0x04,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x64,0x44,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x3c,0x40,0x38,0x04,0x04,0x78,0x00,0x00,
+
+        7, // 0x74 't'
+        0x00,0x20,0x20,0x70,0x20,0x20,0x20,0x24,0x18,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x3a,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x28,0x10,0x00,0x00,
+
+        7, // 0x77 'w'
+        0x00,0x00,0x00,0x44,0x44,0x54,0x54,0x6c,0x44,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x3c,0x04,0x08,0x30,0x00,
+
+        7, // 0x7a 'z'
+        0x00,0x00,0x00,0x7c,0x08,0x10,0x20,0x44,0x7c,0x00,0x00,
+
+        7, // 0x7b '{'
+        0x00,0x0c,0x10,0x10,0x10,0x60,0x10,0x10,0x0c,0x00,0x00,
+
+        7, // 0x7c '|'
+        0x00,0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        7, // 0x7d '}'
+        0x00,0x60,0x10,0x10,0x10,0x0c,0x10,0x10,0x60,0x00,0x00,
+
+        7, // 0x7e '~'
+        0x00,0x00,0x64,0x98,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7f ''
+        0x00,0x00,0x00,0x10,0x28,0x44,0x44,0x7c,0x00,0x00,0x00,
+        0
+    };
+
+    const int8u gse7x11_bold[] =
+    {
+        11, 0, 32, 128-32,
+
+        0x00,0x00,0x0c,0x00,0x18,0x00,0x24,0x00,0x30,0x00,0x3c,0x00,0x48,0x00,0x54,0x00,0x60,0x00,
+        0x6c,0x00,0x78,0x00,0x84,0x00,0x90,0x00,0x9c,0x00,0xa8,0x00,0xb4,0x00,0xc0,0x00,0xcc,0x00,
+        0xd8,0x00,0xe4,0x00,0xf0,0x00,0xfc,0x00,0x08,0x01,0x14,0x01,0x20,0x01,0x2c,0x01,0x38,0x01,
+        0x44,0x01,0x50,0x01,0x5c,0x01,0x68,0x01,0x74,0x01,0x80,0x01,0x8c,0x01,0x98,0x01,0xa4,0x01,
+        0xb0,0x01,0xbc,0x01,0xc8,0x01,0xd4,0x01,0xe0,0x01,0xec,0x01,0xf8,0x01,0x04,0x02,0x10,0x02,
+        0x1c,0x02,0x28,0x02,0x34,0x02,0x40,0x02,0x4c,0x02,0x58,0x02,0x64,0x02,0x70,0x02,0x7c,0x02,
+        0x88,0x02,0x94,0x02,0xa0,0x02,0xac,0x02,0xb8,0x02,0xc4,0x02,0xd0,0x02,0xdc,0x02,0xe8,0x02,
+        0xf4,0x02,0x00,0x03,0x0c,0x03,0x18,0x03,0x24,0x03,0x30,0x03,0x3c,0x03,0x48,0x03,0x54,0x03,
+        0x60,0x03,0x6c,0x03,0x78,0x03,0x84,0x03,0x90,0x03,0x9c,0x03,0xa8,0x03,0xb4,0x03,0xc0,0x03,
+        0xcc,0x03,0xd8,0x03,0xe4,0x03,0xf0,0x03,0xfc,0x03,0x08,0x04,0x14,0x04,0x20,0x04,0x2c,0x04,
+        0x38,0x04,0x44,0x04,0x50,0x04,0x5c,0x04,0x68,0x04,0x74,0x04,
+
+        7, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x21 '!'
+        0x00,0x30,0x30,0x30,0x30,0x30,0x00,0x30,0x30,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x6c,0x6c,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x23 '#'
+        0x00,0x48,0x48,0xfc,0x48,0x48,0xfc,0x48,0x48,0x00,0x00,
+
+        7, // 0x24 '$'
+        0x30,0x30,0x78,0xcc,0xc0,0x78,0x0c,0xcc,0x78,0x30,0x30,
+
+        7, // 0x25 '%'
+        0x00,0x00,0xc4,0x0c,0x18,0x30,0x60,0xc0,0x8c,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x30,0x58,0x58,0x30,0x74,0xdc,0xd8,0x6c,0x00,0x00,
+
+        7, // 0x27 '''
+        0x00,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x00,0x0c,0x18,0x30,0x30,0x30,0x30,0x18,0x0c,0x00,0x00,
+
+        7, // 0x29 ')'
+        0x00,0xc0,0x60,0x30,0x30,0x30,0x30,0x60,0xc0,0x00,0x00,
+
+        7, // 0x2a '*'
+        0x00,0x00,0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,0x00,0x00,
+
+        7, // 0x2b '+'
+        0x00,0x00,0x00,0x30,0x30,0xfc,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x60,0x00,
+
+        7, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        7, // 0x2f '/'
+        0x00,0x0c,0x0c,0x18,0x18,0x30,0x30,0x60,0x60,0x00,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x78,0xcc,0xcc,0xdc,0xec,0xcc,0xcc,0x78,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x30,0x70,0xf0,0x30,0x30,0x30,0x30,0xfc,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x78,0xcc,0xcc,0x18,0x30,0x60,0xcc,0xfc,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0xfc,0x98,0x30,0x78,0x0c,0x0c,0xcc,0x78,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x18,0x30,0x68,0xd8,0xd8,0xfc,0x18,0x3c,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0xfc,0xc0,0xc0,0xf8,0x0c,0x0c,0xcc,0x78,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x38,0x60,0xc0,0xf8,0xcc,0xcc,0xcc,0x78,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0xfc,0x8c,0x0c,0x18,0x30,0x30,0x30,0x30,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x78,0xcc,0xcc,0x78,0xcc,0xcc,0xcc,0x78,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x78,0xcc,0xcc,0xcc,0x7c,0x0c,0x18,0x70,0x00,0x00,
+
+        7, // 0x3a ':'
+        0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x3b ';'
+        0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x30,0x60,0x00,
+
+        7, // 0x3c '<'
+        0x00,0x00,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x00,0x00,
+
+        7, // 0x3d '='
+        0x00,0x00,0x00,0x00,0xfc,0x00,0xfc,0x00,0x00,0x00,0x00,
+
+        7, // 0x3e '>'
+        0x00,0x00,0x60,0x30,0x18,0x0c,0x18,0x30,0x60,0x00,0x00,
+
+        7, // 0x3f '?'
+        0x00,0x78,0xcc,0xcc,0x18,0x30,0x30,0x00,0x30,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x70,0x88,0x04,0x74,0xb4,0xb4,0xb4,0x68,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x30,0x78,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0xf8,0xcc,0xcc,0xf8,0xcc,0xcc,0xcc,0xf8,0x00,0x00,
+
+        7, // 0x43 'C'
+        0x00,0x78,0xcc,0xc0,0xc0,0xc0,0xc0,0xcc,0x78,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0xf0,0xd8,0xcc,0xcc,0xcc,0xcc,0xd8,0xf0,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0xfc,0xc4,0xd0,0xf0,0xd0,0xc0,0xc4,0xfc,0x00,0x00,
+
+        7, // 0x46 'F'
+        0x00,0xfc,0xc4,0xd0,0xf0,0xd0,0xc0,0xc0,0xc0,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x78,0xcc,0xc0,0xc0,0xdc,0xcc,0xcc,0x78,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x49 'I'
+        0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        7, // 0x4a 'J'
+        0x00,0x3c,0x18,0x18,0x18,0x18,0xd8,0xd8,0x70,0x00,0x00,
+
+        7, // 0x4b 'K'
+        0x00,0xcc,0xcc,0xd8,0xf0,0xd8,0xcc,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x4c 'L'
+        0x00,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc4,0xfc,0x00,0x00,
+
+        7, // 0x4d 'M'
+        0x00,0x84,0xcc,0xfc,0xb4,0xcc,0xcc,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x4e 'N'
+        0x00,0xcc,0xcc,0xec,0xfc,0xdc,0xcc,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x4f 'O'
+        0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0xf8,0xcc,0xcc,0xcc,0xf8,0xc0,0xc0,0xc0,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xdc,0x78,0x18,0x0c,0x00,
+
+        7, // 0x52 'R'
+        0x00,0xf8,0xcc,0xcc,0xcc,0xf8,0xd8,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x78,0xcc,0xe0,0x70,0x38,0x1c,0xcc,0x78,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0xfc,0xb4,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,
+
+        7, // 0x56 'V'
+        0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x00,0x00,
+
+        7, // 0x57 'W'
+        0x00,0xcc,0xcc,0xcc,0xcc,0xb4,0xfc,0xcc,0x84,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0xcc,0xcc,0x78,0x30,0x78,0xcc,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0xcc,0xcc,0xcc,0x78,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        7, // 0x5a 'Z'
+        0x00,0xfc,0x8c,0x18,0x30,0x60,0xc0,0xc4,0xfc,0x00,0x00,
+
+        7, // 0x5b '['
+        0x00,0x78,0x60,0x60,0x60,0x60,0x60,0x60,0x78,0x00,0x00,
+
+        7, // 0x5c '\'
+        0x00,0x60,0x60,0x30,0x30,0x18,0x18,0x0c,0x0c,0x00,0x00,
+
+        7, // 0x5d ']'
+        0x00,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x00,0x00,
+
+        7, // 0x5e '^'
+        0x00,0x10,0x38,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+
+        7, // 0x60 '`'
+        0x00,0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x70,0x18,0x78,0xd8,0xd8,0x6c,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x60,0x60,0x60,0x78,0x6c,0x6c,0x6c,0x78,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x78,0xcc,0xc0,0xc0,0xcc,0x78,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x18,0x18,0x18,0x78,0xd8,0xd8,0xd8,0x6c,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x78,0xcc,0xfc,0xc0,0xcc,0x78,0x00,0x00,
+
+        7, // 0x66 'f'
+        0x00,0x18,0x34,0x30,0x78,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x6c,0xd8,0xd8,0xd8,0x78,0x18,0xd8,0x70,
+
+        7, // 0x68 'h'
+        0x00,0xc0,0xc0,0xd8,0xec,0xcc,0xcc,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x69 'i'
+        0x00,0x30,0x00,0x70,0x30,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        7, // 0x6a 'j'
+        0x00,0x0c,0x00,0x1c,0x0c,0x0c,0x0c,0x0c,0x6c,0x6c,0x38,
+
+        7, // 0x6b 'k'
+        0x00,0xc0,0xc0,0xcc,0xcc,0xd8,0xf0,0xd8,0xcc,0x00,0x00,
+
+        7, // 0x6c 'l'
+        0x00,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        7, // 0x6d 'm'
+        0x00,0x00,0x00,0xe8,0xfc,0xd4,0xd4,0xc4,0xc4,0x00,0x00,
+
+        7, // 0x6e 'n'
+        0x00,0x00,0x00,0xd8,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,
+
+        7, // 0x6f 'o'
+        0x00,0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0xf8,0xcc,0xcc,0xcc,0xf8,0xc0,0xc0,0xc0,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x7c,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x0c,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0xd8,0xec,0xcc,0xc0,0xc0,0xc0,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x78,0xcc,0x60,0x18,0xcc,0x78,0x00,0x00,
+
+        7, // 0x74 't'
+        0x00,0x20,0x60,0x60,0xf0,0x60,0x60,0x68,0x30,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0xd8,0xd8,0xd8,0xd8,0xd8,0x6c,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x00,0x00,
+
+        7, // 0x77 'w'
+        0x00,0x00,0x00,0xcc,0xcc,0xb4,0xfc,0xcc,0x84,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0xcc,0x78,0x30,0x78,0xcc,0xcc,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x18,0xf0,
+
+        7, // 0x7a 'z'
+        0x00,0x00,0x00,0xfc,0x98,0x30,0x60,0xc4,0xfc,0x00,0x00,
+
+        7, // 0x7b '{'
+        0x1c,0x30,0x30,0x30,0xe0,0x30,0x30,0x30,0x1c,0x00,0x00,
+
+        7, // 0x7c '|'
+        0x30,0x30,0x30,0x30,0x00,0x30,0x30,0x30,0x30,0x00,0x00,
+
+        7, // 0x7d '}'
+        0xe0,0x30,0x30,0x30,0x1c,0x30,0x30,0x30,0xe0,0x00,0x00,
+
+        7, // 0x7e '~'
+        0x00,0x34,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7f ''
+        0x00,0x00,0x00,0x30,0x78,0xcc,0xcc,0xfc,0x00,0x00,0x00,
+        0
+    };
+
+    const int8u gse7x15[] =
+    {
+        15, 0, 32, 128-32,
+
+        0x00,0x00,0x10,0x00,0x20,0x00,0x30,0x00,0x40,0x00,0x50,0x00,0x60,0x00,0x70,0x00,0x80,0x00,
+        0x90,0x00,0xa0,0x00,0xb0,0x00,0xc0,0x00,0xd0,0x00,0xe0,0x00,0xf0,0x00,0x00,0x01,0x10,0x01,
+        0x20,0x01,0x30,0x01,0x40,0x01,0x50,0x01,0x60,0x01,0x70,0x01,0x80,0x01,0x90,0x01,0xa0,0x01,
+        0xb0,0x01,0xc0,0x01,0xd0,0x01,0xe0,0x01,0xf0,0x01,0x00,0x02,0x10,0x02,0x20,0x02,0x30,0x02,
+        0x40,0x02,0x50,0x02,0x60,0x02,0x70,0x02,0x80,0x02,0x90,0x02,0xa0,0x02,0xb0,0x02,0xc0,0x02,
+        0xd0,0x02,0xe0,0x02,0xf0,0x02,0x00,0x03,0x10,0x03,0x20,0x03,0x30,0x03,0x40,0x03,0x50,0x03,
+        0x60,0x03,0x70,0x03,0x80,0x03,0x90,0x03,0xa0,0x03,0xb0,0x03,0xc0,0x03,0xd0,0x03,0xe0,0x03,
+        0xf0,0x03,0x00,0x04,0x10,0x04,0x20,0x04,0x30,0x04,0x40,0x04,0x50,0x04,0x60,0x04,0x70,0x04,
+        0x80,0x04,0x90,0x04,0xa0,0x04,0xb0,0x04,0xc0,0x04,0xd0,0x04,0xe0,0x04,0xf0,0x04,0x00,0x05,
+        0x10,0x05,0x20,0x05,0x30,0x05,0x40,0x05,0x50,0x05,0x60,0x05,0x70,0x05,0x80,0x05,0x90,0x05,
+        0xa0,0x05,0xb0,0x05,0xc0,0x05,0xd0,0x05,0xe0,0x05,0xf0,0x05,
+
+        7, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x21 '!'
+        0x00,0x00,0x10,0x38,0x38,0x38,0x38,0x10,0x10,0x00,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x00,0x24,0x24,0x24,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x23 '#'
+        0x00,0x00,0x48,0x48,0x48,0xfc,0x48,0x48,0xfc,0x48,0x48,0x48,0x00,0x00,0x00,
+
+        7, // 0x24 '$'
+        0x00,0x00,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x54,0x38,0x10,0x00,0x00,0x00,
+
+        7, // 0x25 '%'
+        0x00,0x00,0x44,0x44,0x08,0x08,0x10,0x10,0x20,0x20,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x00,0x00,0x30,0x48,0x48,0x30,0x60,0x94,0x98,0x90,0x6c,0x00,0x00,0x00,
+
+        7, // 0x27 '''
+        0x00,0x00,0x20,0x20,0x20,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x00,0x04,0x08,0x10,0x20,0x20,0x20,0x20,0x20,0x10,0x08,0x04,0x00,0x00,0x00,
+
+        7, // 0x29 ')'
+        0x00,0x40,0x20,0x10,0x08,0x08,0x08,0x08,0x08,0x10,0x20,0x40,0x00,0x00,0x00,
+
+        7, // 0x2a '*'
+        0x00,0x00,0x00,0x00,0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2b '+'
+        0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x7c,0x10,0x10,0x10,0x00,0x00,0x00,0x00,
+
+        7, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x60,0x00,
+
+        7, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x2f '/'
+        0x00,0x00,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x00,0x38,0x44,0x44,0x4c,0x54,0x64,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x00,0x10,0x10,0x30,0x10,0x10,0x10,0x10,0x10,0x10,0x7c,0x00,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x00,0x38,0x44,0x44,0x04,0x08,0x10,0x20,0x40,0x44,0x7c,0x00,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x00,0x7c,0x44,0x08,0x10,0x38,0x04,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x00,0x08,0x10,0x20,0x40,0x48,0x48,0x7c,0x08,0x08,0x1c,0x00,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x00,0x7c,0x40,0x40,0x40,0x78,0x04,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x00,0x18,0x20,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0x00,0x7c,0x44,0x04,0x04,0x08,0x08,0x10,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x00,0x38,0x44,0x44,0x44,0x38,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x3c,0x04,0x04,0x08,0x30,0x00,0x00,0x00,
+
+        7, // 0x3a ':'
+        0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,
+
+        7, // 0x3b ';'
+        0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x30,0x30,0x60,0x00,0x00,
+
+        7, // 0x3c '<'
+        0x00,0x00,0x00,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,0x00,0x00,
+
+        7, // 0x3d '='
+        0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x3e '>'
+        0x00,0x00,0x00,0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,0x00,0x00,
+
+        7, // 0x3f '?'
+        0x00,0x00,0x78,0x84,0x84,0x84,0x08,0x10,0x20,0x20,0x00,0x20,0x00,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x00,0x00,0x30,0x48,0x04,0x34,0x54,0x54,0x54,0x54,0x28,0x00,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x00,0x10,0x28,0x44,0x44,0x44,0x7c,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x00,0x78,0x44,0x44,0x44,0x78,0x44,0x44,0x44,0x44,0x78,0x00,0x00,0x00,
+
+        7, // 0x43 'C'
+        0x00,0x00,0x38,0x44,0x44,0x40,0x40,0x40,0x40,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x44,0x44,0x48,0x70,0x00,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0x00,0x7c,0x40,0x40,0x40,0x70,0x40,0x40,0x40,0x40,0x7c,0x00,0x00,0x00,
+
+        7, // 0x46 'F'
+        0x00,0x00,0x7c,0x40,0x40,0x40,0x70,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x00,0x38,0x44,0x40,0x40,0x40,0x5c,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x00,0x44,0x44,0x44,0x44,0x7c,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x49 'I'
+        0x00,0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x4a 'J'
+        0x00,0x00,0x1c,0x08,0x08,0x08,0x08,0x08,0x08,0x48,0x48,0x30,0x00,0x00,0x00,
+
+        7, // 0x4b 'K'
+        0x00,0x00,0x44,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x4c 'L'
+        0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7c,0x00,0x00,0x00,
+
+        7, // 0x4d 'M'
+        0x00,0x00,0x44,0x6c,0x54,0x54,0x44,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x4e 'N'
+        0x00,0x00,0x44,0x44,0x44,0x64,0x54,0x4c,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x4f 'O'
+        0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x50,0x48,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x00,0x38,0x44,0x44,0x40,0x38,0x04,0x04,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x00,0x7c,0x54,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x56 'V'
+        0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x57 'W'
+        0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x54,0x54,0x6c,0x44,0x00,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x00,0x44,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x00,0x44,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x5a 'Z'
+        0x00,0x00,0x7c,0x04,0x04,0x08,0x10,0x20,0x40,0x40,0x40,0x7c,0x00,0x00,0x00,
+
+        7, // 0x5b '['
+        0x00,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x38,0x00,0x00,
+
+        7, // 0x5c '\'
+        0x00,0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,0x00,0x00,
+
+        7, // 0x5d ']'
+        0x00,0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x38,0x00,0x00,
+
+        7, // 0x5e '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+
+        7, // 0x60 '`'
+        0x00,0x20,0x20,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x38,0x44,0x04,0x3c,0x44,0x44,0x44,0x3a,0x00,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x00,0x40,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x00,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x00,0x04,0x04,0x04,0x3c,0x44,0x44,0x44,0x44,0x44,0x3a,0x00,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x38,0x44,0x44,0x7c,0x40,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x66 'f'
+        0x00,0x00,0x18,0x24,0x20,0x70,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x3a,0x44,0x44,0x44,0x44,0x44,0x3c,0x04,0x44,0x38,0x00,
+
+        7, // 0x68 'h'
+        0x00,0x00,0x40,0x40,0x40,0x58,0x64,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x69 'i'
+        0x00,0x00,0x10,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x6a 'j'
+        0x00,0x00,0x08,0x08,0x00,0x18,0x08,0x08,0x08,0x08,0x08,0x48,0x48,0x30,0x00,
+
+        7, // 0x6b 'k'
+        0x00,0x00,0x40,0x40,0x44,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,0x00,
+
+        7, // 0x6c 'l'
+        0x00,0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x6d 'm'
+        0x00,0x00,0x00,0x00,0xa8,0x54,0x54,0x54,0x54,0x54,0x54,0x54,0x00,0x00,0x00,
+
+        7, // 0x6e 'n'
+        0x00,0x00,0x00,0x00,0xb8,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x6f 'o'
+        0x00,0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x3c,0x44,0x44,0x44,0x44,0x44,0x3c,0x04,0x04,0x04,0x00,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x58,0x64,0x44,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x74 't'
+        0x00,0x00,0x20,0x20,0x20,0x70,0x20,0x20,0x20,0x20,0x24,0x18,0x00,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x3a,0x00,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x54,0x54,0x6c,0x44,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x3c,0x04,0x08,0x70,0x00,
+
+        7, // 0x7a 'z'
+        0x00,0x00,0x00,0x00,0x7c,0x04,0x08,0x10,0x20,0x40,0x40,0x7c,0x00,0x00,0x00,
+
+        7, // 0x7b '{'
+        0x00,0x0c,0x10,0x10,0x10,0x10,0x10,0x60,0x10,0x10,0x10,0x10,0x0c,0x00,0x00,
+
+        7, // 0x7c '|'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        7, // 0x7d '}'
+        0x00,0x60,0x10,0x10,0x10,0x10,0x10,0x0c,0x10,0x10,0x10,0x10,0x60,0x00,0x00,
+
+        7, // 0x7e '~'
+        0x00,0x00,0x64,0x98,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7f ''
+        0x00,0x00,0x00,0x00,0x00,0x10,0x28,0x44,0x44,0x7c,0x00,0x00,0x00,0x00,0x00,
+        0
+    };
+
+    const int8u gse7x15_bold[] =
+    {
+        15, 0, 32, 128-32,
+
+        0x00,0x00,0x10,0x00,0x20,0x00,0x30,0x00,0x40,0x00,0x50,0x00,0x60,0x00,0x70,0x00,0x80,0x00,
+        0x90,0x00,0xa0,0x00,0xb0,0x00,0xc0,0x00,0xd0,0x00,0xe0,0x00,0xf0,0x00,0x00,0x01,0x10,0x01,
+        0x20,0x01,0x30,0x01,0x40,0x01,0x50,0x01,0x60,0x01,0x70,0x01,0x80,0x01,0x90,0x01,0xa0,0x01,
+        0xb0,0x01,0xc0,0x01,0xd0,0x01,0xe0,0x01,0xf0,0x01,0x00,0x02,0x10,0x02,0x20,0x02,0x30,0x02,
+        0x40,0x02,0x50,0x02,0x60,0x02,0x70,0x02,0x80,0x02,0x90,0x02,0xa0,0x02,0xb0,0x02,0xc0,0x02,
+        0xd0,0x02,0xe0,0x02,0xf0,0x02,0x00,0x03,0x10,0x03,0x20,0x03,0x30,0x03,0x40,0x03,0x50,0x03,
+        0x60,0x03,0x70,0x03,0x80,0x03,0x90,0x03,0xa0,0x03,0xb0,0x03,0xc0,0x03,0xd0,0x03,0xe0,0x03,
+        0xf0,0x03,0x00,0x04,0x10,0x04,0x20,0x04,0x30,0x04,0x40,0x04,0x50,0x04,0x60,0x04,0x70,0x04,
+        0x80,0x04,0x90,0x04,0xa0,0x04,0xb0,0x04,0xc0,0x04,0xd0,0x04,0xe0,0x04,0xf0,0x04,0x00,0x05,
+        0x10,0x05,0x20,0x05,0x30,0x05,0x40,0x05,0x50,0x05,0x60,0x05,0x70,0x05,0x80,0x05,0x90,0x05,
+        0xa0,0x05,0xb0,0x05,0xc0,0x05,0xd0,0x05,0xe0,0x05,0xf0,0x05,
+
+        7, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x21 '!'
+        0x00,0x00,0x00,0x30,0x78,0x78,0x78,0x30,0x30,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x00,0x6c,0x6c,0x6c,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x23 '#'
+        0x00,0x00,0x48,0x48,0x48,0xfc,0x48,0x48,0xfc,0x48,0x48,0x48,0x00,0x00,0x00,
+
+        7, // 0x24 '$'
+        0x00,0x30,0x30,0x78,0xcc,0xe0,0x70,0x38,0x1c,0xcc,0x78,0x30,0x30,0x00,0x00,
+
+        7, // 0x25 '%'
+        0x00,0x00,0x00,0x64,0x6c,0x08,0x18,0x10,0x30,0x20,0x6c,0x4c,0x00,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x00,0x00,0x30,0x58,0x58,0x30,0x74,0xdc,0xd8,0xd8,0x6c,0x00,0x00,0x00,
+
+        7, // 0x27 '''
+        0x00,0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x00,0x0c,0x18,0x30,0x60,0x60,0x60,0x60,0x60,0x30,0x18,0x0c,0x00,0x00,0x00,
+
+        7, // 0x29 ')'
+        0x00,0xc0,0x60,0x30,0x18,0x18,0x18,0x18,0x18,0x30,0x60,0xc0,0x00,0x00,0x00,
+
+        7, // 0x2a '*'
+        0x00,0x00,0x00,0x00,0x00,0x20,0xa8,0x70,0xa8,0x20,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2b '+'
+        0x00,0x00,0x00,0x00,0x00,0x30,0x30,0xfc,0x30,0x30,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x60,0x00,
+
+        7, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x2f '/'
+        0x00,0x00,0x0c,0x0c,0x18,0x18,0x30,0x30,0x60,0x60,0xc0,0xc0,0x00,0x00,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x00,0x78,0xcc,0xcc,0xcc,0xdc,0xec,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x00,0x30,0x30,0x70,0xf0,0x30,0x30,0x30,0x30,0x30,0xfc,0x00,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x00,0x78,0xcc,0xcc,0x0c,0x18,0x30,0x60,0xc0,0xcc,0xfc,0x00,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x00,0xfc,0x8c,0x18,0x30,0x78,0x0c,0x0c,0x0c,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x00,0x18,0x30,0x60,0xc8,0xd8,0xd8,0xfc,0x18,0x18,0x3c,0x00,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x00,0xfc,0xc0,0xc0,0xc0,0xf8,0x0c,0x0c,0x0c,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x00,0x38,0x60,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0x00,0xfc,0x8c,0x0c,0x0c,0x18,0x18,0x30,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x00,0x78,0xcc,0xcc,0xcc,0x78,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x18,0x70,0x00,0x00,0x00,
+
+        7, // 0x3a ':'
+        0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00,
+
+        7, // 0x3b ';'
+        0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x60,0x00,
+
+        7, // 0x3c '<'
+        0x00,0x00,0x00,0x0c,0x18,0x30,0x60,0xc0,0x60,0x30,0x18,0x0c,0x00,0x00,0x00,
+
+        7, // 0x3d '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x3e '>'
+        0x00,0x00,0x00,0xc0,0x60,0x30,0x18,0x0c,0x18,0x30,0x60,0xc0,0x00,0x00,0x00,
+
+        7, // 0x3f '?'
+        0x00,0x00,0x78,0xcc,0xcc,0x18,0x30,0x30,0x30,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x00,0x00,0x70,0x88,0x04,0x74,0xb4,0xb4,0xb4,0xb4,0x68,0x00,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x00,0x30,0x78,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x00,0xf8,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc,0xcc,0xcc,0xf8,0x00,0x00,0x00,
+
+        7, // 0x43 'C'
+        0x00,0x00,0x78,0xcc,0xc4,0xc0,0xc0,0xc0,0xc0,0xc4,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x00,0xf0,0xd8,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xd8,0xf0,0x00,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0x00,0xfc,0xc4,0xc0,0xd0,0xf0,0xd0,0xc0,0xc0,0xc4,0xfc,0x00,0x00,0x00,
+
+        7, // 0x46 'F'
+        0x00,0x00,0xfc,0xc4,0xc0,0xd0,0xf0,0xd0,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x00,0x78,0xcc,0xc0,0xc0,0xc0,0xdc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x49 'I'
+        0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,
+
+        7, // 0x4a 'J'
+        0x00,0x00,0x3c,0x18,0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0x70,0x00,0x00,0x00,
+
+        7, // 0x4b 'K'
+        0x00,0x00,0xcc,0xcc,0xd8,0xd8,0xf0,0xd8,0xd8,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x4c 'L'
+        0x00,0x00,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc4,0xfc,0x00,0x00,0x00,
+
+        7, // 0x4d 'M'
+        0x00,0x00,0x84,0xcc,0xfc,0xb4,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x4e 'N'
+        0x00,0x00,0xcc,0xcc,0xcc,0xec,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x4f 'O'
+        0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x00,0xf8,0xcc,0xcc,0xcc,0xcc,0xf8,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xdc,0x78,0x18,0x0c,0x00,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x00,0xf8,0xcc,0xcc,0xcc,0xcc,0xf8,0xd8,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x00,0x78,0xcc,0xcc,0xe0,0x70,0x38,0x1c,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x00,0xfc,0xb4,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x56 'V'
+        0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x00,0x00,0x00,
+
+        7, // 0x57 'W'
+        0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xb4,0xfc,0xcc,0x84,0x00,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x00,0xcc,0xcc,0xcc,0x78,0x30,0x78,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x00,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,
+
+        7, // 0x5a 'Z'
+        0x00,0x00,0xfc,0x8c,0x0c,0x18,0x30,0x60,0xc0,0xc0,0xc4,0xfc,0x00,0x00,0x00,
+
+        7, // 0x5b '['
+        0x00,0x78,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x78,0x00,0x00,
+
+        7, // 0x5c '\'
+        0x00,0x00,0xc0,0xc0,0x60,0x60,0x30,0x30,0x18,0x18,0x0c,0x0c,0x00,0x00,0x00,
+
+        7, // 0x5d ']'
+        0x00,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x00,0x00,
+
+        7, // 0x5e '^'
+        0x00,0x10,0x38,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+
+        7, // 0x60 '`'
+        0x00,0x30,0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x70,0xd8,0x18,0x78,0xd8,0xd8,0xd8,0x6c,0x00,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x00,0x60,0x60,0x60,0x78,0x6c,0x6c,0x6c,0x6c,0x6c,0x78,0x00,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x78,0xcc,0xc0,0xc0,0xc0,0xc0,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x00,0x18,0x18,0x18,0x78,0xd8,0xd8,0xd8,0xd8,0xd8,0x6c,0x00,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x78,0xcc,0xcc,0xfc,0xc0,0xc0,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x66 'f'
+        0x00,0x00,0x30,0x68,0x60,0x60,0xf0,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x6c,0xd8,0xd8,0xd8,0xd8,0xd8,0x78,0x18,0xd8,0x70,0x00,
+
+        7, // 0x68 'h'
+        0x00,0x00,0xc0,0xc0,0xc0,0xd8,0xec,0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x69 'i'
+        0x00,0x00,0x30,0x30,0x00,0x70,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,
+
+        7, // 0x6a 'j'
+        0x00,0x00,0x18,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0x70,0x00,
+
+        7, // 0x6b 'k'
+        0x00,0x00,0xc0,0xc0,0xcc,0xcc,0xcc,0xd8,0xf0,0xd8,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x6c 'l'
+        0x00,0x00,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,
+
+        7, // 0x6d 'm'
+        0x00,0x00,0x00,0x00,0xe8,0xfc,0xd4,0xd4,0xd4,0xc4,0xc4,0xc4,0x00,0x00,0x00,
+
+        7, // 0x6e 'n'
+        0x00,0x00,0x00,0x00,0xd8,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00,
+
+        7, // 0x6f 'o'
+        0x00,0x00,0x00,0x00,0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0xf8,0xcc,0xcc,0xcc,0xcc,0xcc,0xf8,0xc0,0xc0,0xc0,0x00,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x7c,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x0c,0x00,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0xd8,0xec,0xcc,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x78,0xcc,0xe0,0x70,0x38,0x1c,0xcc,0x78,0x00,0x00,0x00,
+
+        7, // 0x74 't'
+        0x00,0x00,0x20,0x60,0x60,0xf0,0x60,0x60,0x60,0x60,0x6c,0x38,0x00,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0xd8,0xd8,0xd8,0xd8,0xd8,0xd8,0xd8,0x6c,0x00,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x00,0x00,0x00,
+
+        7, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xb4,0xfc,0xcc,0x84,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0xcc,0xcc,0x78,0x30,0x78,0xcc,0xcc,0xcc,0x00,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x18,0xf0,0x00,
+
+        7, // 0x7a 'z'
+        0x00,0x00,0x00,0x00,0xfc,0x8c,0x18,0x30,0x60,0xc0,0xc4,0xfc,0x00,0x00,0x00,
+
+        7, // 0x7b '{'
+        0x00,0x1c,0x30,0x30,0x30,0x30,0x30,0xe0,0x30,0x30,0x30,0x30,0x1c,0x00,0x00,
+
+        7, // 0x7c '|'
+        0x00,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x00,0x00,
+
+        7, // 0x7d '}'
+        0x00,0xe0,0x30,0x30,0x30,0x30,0x30,0x1c,0x30,0x30,0x30,0x30,0xe0,0x00,0x00,
+
+        7, // 0x7e '~'
+        0x00,0x00,0x34,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7f ''
+        0x00,0x00,0x00,0x00,0x00,0x30,0x78,0xcc,0xcc,0xfc,0x00,0x00,0x00,0x00,0x00,
+        0
+    };
+
+    const int8u gse8x16[] =
+    {
+        16, 0, 32, 128-32,
+
+        0x00,0x00,0x11,0x00,0x22,0x00,0x33,0x00,0x44,0x00,0x55,0x00,0x66,0x00,0x77,0x00,0x88,0x00,
+        0x99,0x00,0xaa,0x00,0xbb,0x00,0xcc,0x00,0xdd,0x00,0xee,0x00,0xff,0x00,0x10,0x01,0x21,0x01,
+        0x32,0x01,0x43,0x01,0x54,0x01,0x65,0x01,0x76,0x01,0x87,0x01,0x98,0x01,0xa9,0x01,0xba,0x01,
+        0xcb,0x01,0xdc,0x01,0xed,0x01,0xfe,0x01,0x0f,0x02,0x20,0x02,0x31,0x02,0x42,0x02,0x53,0x02,
+        0x64,0x02,0x75,0x02,0x86,0x02,0x97,0x02,0xa8,0x02,0xb9,0x02,0xca,0x02,0xdb,0x02,0xec,0x02,
+        0xfd,0x02,0x0e,0x03,0x1f,0x03,0x30,0x03,0x41,0x03,0x52,0x03,0x63,0x03,0x74,0x03,0x85,0x03,
+        0x96,0x03,0xa7,0x03,0xb8,0x03,0xc9,0x03,0xda,0x03,0xeb,0x03,0xfc,0x03,0x0d,0x04,0x1e,0x04,
+        0x2f,0x04,0x40,0x04,0x51,0x04,0x62,0x04,0x73,0x04,0x84,0x04,0x95,0x04,0xa6,0x04,0xb7,0x04,
+        0xc8,0x04,0xd9,0x04,0xea,0x04,0xfb,0x04,0x0c,0x05,0x1d,0x05,0x2e,0x05,0x3f,0x05,0x50,0x05,
+        0x61,0x05,0x72,0x05,0x83,0x05,0x94,0x05,0xa5,0x05,0xb6,0x05,0xc7,0x05,0xd8,0x05,0xe9,0x05,
+        0xfa,0x05,0x0b,0x06,0x1c,0x06,0x2d,0x06,0x3e,0x06,0x4f,0x06,
+
+        8, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x21 '!'
+        0x00,0x00,0x10,0x38,0x38,0x38,0x38,0x10,0x10,0x00,0x10,0x10,0x00,0x00,0x00,0x00,
+
+        8, // 0x22 '"'
+        0x00,0x24,0x24,0x24,0x24,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x23 '#'
+        0x00,0x00,0x24,0x24,0x24,0x7e,0x24,0x24,0x7e,0x24,0x24,0x24,0x00,0x00,0x00,0x00,
+
+        8, // 0x24 '$'
+        0x00,0x14,0x14,0x3e,0x55,0x54,0x54,0x3e,0x15,0x15,0x55,0x3e,0x14,0x14,0x00,0x00,
+
+        8, // 0x25 '%'
+        0x00,0x00,0x32,0x56,0x6c,0x04,0x08,0x08,0x10,0x13,0x25,0x26,0x00,0x00,0x00,0x00,
+
+        8, // 0x26 '&'
+        0x00,0x00,0x18,0x24,0x24,0x24,0x18,0x28,0x45,0x46,0x44,0x3b,0x00,0x00,0x00,0x00,
+
+        8, // 0x27 '''
+        0x00,0x00,0x08,0x08,0x08,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x28 '('
+        0x00,0x04,0x08,0x10,0x10,0x20,0x20,0x20,0x20,0x10,0x10,0x08,0x04,0x00,0x00,0x00,
+
+        8, // 0x29 ')'
+        0x00,0x10,0x08,0x04,0x04,0x02,0x02,0x02,0x02,0x04,0x04,0x08,0x10,0x00,0x00,0x00,
+
+        8, // 0x2a '*'
+        0x00,0x00,0x00,0x00,0x66,0x24,0x18,0xff,0x18,0x24,0x66,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x2b '+'
+        0x00,0x00,0x00,0x00,0x08,0x08,0x08,0x7f,0x08,0x08,0x08,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x20,0x00,
+
+        8, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+
+        8, // 0x2f '/'
+        0x00,0x02,0x02,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,0x00,0x00,
+
+        8, // 0x30 '0'
+        0x00,0x00,0x3c,0x42,0x42,0x46,0x4a,0x52,0x62,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x31 '1'
+        0x00,0x00,0x08,0x08,0x18,0x38,0x08,0x08,0x08,0x08,0x08,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x32 '2'
+        0x00,0x00,0x3c,0x42,0x42,0x02,0x04,0x08,0x10,0x20,0x42,0x7e,0x00,0x00,0x00,0x00,
+
+        8, // 0x33 '3'
+        0x00,0x00,0x7e,0x42,0x04,0x08,0x1c,0x02,0x02,0x02,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x34 '4'
+        0x00,0x00,0x04,0x08,0x10,0x24,0x44,0x44,0x7e,0x04,0x04,0x0e,0x00,0x00,0x00,0x00,
+
+        8, // 0x35 '5'
+        0x00,0x00,0x7e,0x42,0x40,0x40,0x7c,0x02,0x02,0x02,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x36 '6'
+        0x00,0x00,0x1c,0x20,0x40,0x40,0x7c,0x42,0x42,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x37 '7'
+        0x00,0x00,0x7e,0x42,0x42,0x02,0x04,0x08,0x10,0x10,0x10,0x10,0x00,0x00,0x00,0x00,
+
+        8, // 0x38 '8'
+        0x00,0x00,0x3c,0x42,0x42,0x42,0x3c,0x42,0x42,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x39 '9'
+        0x00,0x00,0x3c,0x42,0x42,0x42,0x42,0x3e,0x02,0x02,0x04,0x38,0x00,0x00,0x00,0x00,
+
+        8, // 0x3a ':'
+        0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x3b ';'
+        0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x60,0x40,0x00,
+
+        8, // 0x3c '<'
+        0x00,0x00,0x00,0x02,0x04,0x08,0x10,0x20,0x10,0x08,0x04,0x02,0x00,0x00,0x00,0x00,
+
+        8, // 0x3d '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0x00,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x3e '>'
+        0x00,0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x04,0x08,0x10,0x20,0x00,0x00,0x00,0x00,
+
+        8, // 0x3f '?'
+        0x00,0x00,0x3c,0x42,0x42,0x42,0x04,0x08,0x08,0x00,0x08,0x08,0x00,0x00,0x00,0x00,
+
+        8, // 0x40 '@'
+        0x00,0x00,0x3c,0x42,0x01,0x39,0x49,0x49,0x49,0x49,0x49,0x36,0x00,0x00,0x00,0x00,
+
+        8, // 0x41 'A'
+        0x00,0x00,0x18,0x24,0x42,0x42,0x42,0x7e,0x42,0x42,0x42,0x42,0x00,0x00,0x00,0x00,
+
+        8, // 0x42 'B'
+        0x00,0x00,0x7c,0x22,0x22,0x22,0x3c,0x22,0x22,0x22,0x22,0x7c,0x00,0x00,0x00,0x00,
+
+        8, // 0x43 'C'
+        0x00,0x00,0x3c,0x42,0x42,0x40,0x40,0x40,0x40,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x44 'D'
+        0x00,0x00,0x7c,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x7c,0x00,0x00,0x00,0x00,
+
+        8, // 0x45 'E'
+        0x00,0x00,0x7e,0x22,0x20,0x28,0x38,0x28,0x20,0x20,0x22,0x7e,0x00,0x00,0x00,0x00,
+
+        8, // 0x46 'F'
+        0x00,0x00,0x7e,0x22,0x20,0x28,0x38,0x28,0x20,0x20,0x20,0x70,0x00,0x00,0x00,0x00,
+
+        8, // 0x47 'G'
+        0x00,0x00,0x3c,0x42,0x42,0x40,0x40,0x4e,0x42,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x48 'H'
+        0x00,0x00,0x42,0x42,0x42,0x42,0x7e,0x42,0x42,0x42,0x42,0x42,0x00,0x00,0x00,0x00,
+
+        8, // 0x49 'I'
+        0x00,0x00,0x1c,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x1c,0x00,0x00,0x00,0x00,
+
+        8, // 0x4a 'J'
+        0x00,0x00,0x0e,0x04,0x04,0x04,0x04,0x04,0x04,0x44,0x44,0x38,0x00,0x00,0x00,0x00,
+
+        8, // 0x4b 'K'
+        0x00,0x00,0x62,0x22,0x24,0x28,0x30,0x28,0x24,0x22,0x22,0x62,0x00,0x00,0x00,0x00,
+
+        8, // 0x4c 'L'
+        0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x22,0x7e,0x00,0x00,0x00,0x00,
+
+        8, // 0x4d 'M'
+        0x00,0x00,0x41,0x63,0x55,0x49,0x41,0x41,0x41,0x41,0x41,0x41,0x00,0x00,0x00,0x00,
+
+        8, // 0x4e 'N'
+        0x00,0x00,0x42,0x42,0x62,0x52,0x4a,0x46,0x42,0x42,0x42,0x42,0x00,0x00,0x00,0x00,
+
+        8, // 0x4f 'O'
+        0x00,0x00,0x3c,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x50 'P'
+        0x00,0x00,0x7c,0x22,0x22,0x22,0x22,0x3c,0x20,0x20,0x20,0x70,0x00,0x00,0x00,0x00,
+
+        8, // 0x51 'Q'
+        0x00,0x00,0x3c,0x42,0x42,0x42,0x42,0x42,0x42,0x4a,0x44,0x3a,0x02,0x00,0x00,0x00,
+
+        8, // 0x52 'R'
+        0x00,0x00,0x7c,0x22,0x22,0x22,0x22,0x3c,0x28,0x24,0x22,0x62,0x00,0x00,0x00,0x00,
+
+        8, // 0x53 'S'
+        0x00,0x00,0x3c,0x42,0x42,0x40,0x30,0x0c,0x02,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x54 'T'
+        0x00,0x00,0x7f,0x49,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x1c,0x00,0x00,0x00,0x00,
+
+        8, // 0x55 'U'
+        0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x56 'V'
+        0x00,0x00,0x41,0x41,0x41,0x41,0x22,0x22,0x14,0x14,0x08,0x08,0x00,0x00,0x00,0x00,
+
+        8, // 0x57 'W'
+        0x00,0x00,0x41,0x41,0x41,0x41,0x41,0x49,0x49,0x55,0x63,0x41,0x00,0x00,0x00,0x00,
+
+        8, // 0x58 'X'
+        0x00,0x00,0x42,0x42,0x42,0x24,0x18,0x18,0x24,0x42,0x42,0x42,0x00,0x00,0x00,0x00,
+
+        8, // 0x59 'Y'
+        0x00,0x00,0x22,0x22,0x22,0x22,0x14,0x08,0x08,0x08,0x08,0x1c,0x00,0x00,0x00,0x00,
+
+        8, // 0x5a 'Z'
+        0x00,0x00,0x7e,0x42,0x02,0x04,0x08,0x10,0x20,0x40,0x42,0x7e,0x00,0x00,0x00,0x00,
+
+        8, // 0x5b '['
+        0x00,0x1e,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x1e,0x00,0x00,0x00,
+
+        8, // 0x5c '\'
+        0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x02,0x02,0x00,0x00,0x00,
+
+        8, // 0x5d ']'
+        0x00,0x3c,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x3c,0x00,0x00,0x00,
+
+        8, // 0x5e '^'
+        0x00,0x00,0x08,0x14,0x22,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,
+
+        8, // 0x60 '`'
+        0x00,0x00,0x08,0x08,0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x44,0x04,0x3c,0x44,0x44,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x62 'b'
+        0x00,0x00,0x60,0x20,0x20,0x38,0x24,0x22,0x22,0x22,0x22,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x3c,0x42,0x40,0x40,0x40,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x64 'd'
+        0x00,0x00,0x0c,0x04,0x04,0x1c,0x24,0x44,0x44,0x44,0x44,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x3c,0x42,0x42,0x7e,0x40,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x66 'f'
+        0x00,0x00,0x0c,0x12,0x10,0x10,0x38,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,0x00,
+
+        8, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x3e,0x44,0x44,0x44,0x44,0x44,0x3c,0x04,0x44,0x38,0x00,
+
+        8, // 0x68 'h'
+        0x00,0x00,0x60,0x20,0x20,0x2c,0x32,0x22,0x22,0x22,0x22,0x62,0x00,0x00,0x00,0x00,
+
+        8, // 0x69 'i'
+        0x00,0x00,0x08,0x08,0x00,0x18,0x08,0x08,0x08,0x08,0x08,0x1c,0x00,0x00,0x00,0x00,
+
+        8, // 0x6a 'j'
+        0x00,0x00,0x04,0x04,0x00,0x0c,0x04,0x04,0x04,0x04,0x04,0x44,0x44,0x38,0x00,0x00,
+
+        8, // 0x6b 'k'
+        0x00,0x00,0x60,0x20,0x20,0x22,0x24,0x28,0x38,0x24,0x22,0x62,0x00,0x00,0x00,0x00,
+
+        8, // 0x6c 'l'
+        0x00,0x00,0x18,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x1c,0x00,0x00,0x00,0x00,
+
+        8, // 0x6d 'm'
+        0x00,0x00,0x00,0x00,0x00,0x76,0x49,0x49,0x49,0x49,0x41,0x41,0x00,0x00,0x00,0x00,
+
+        8, // 0x6e 'n'
+        0x00,0x00,0x00,0x00,0x00,0x5c,0x22,0x22,0x22,0x22,0x22,0x22,0x00,0x00,0x00,0x00,
+
+        8, // 0x6f 'o'
+        0x00,0x00,0x00,0x00,0x00,0x3c,0x42,0x42,0x42,0x42,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x7c,0x22,0x22,0x22,0x22,0x22,0x3c,0x20,0x20,0x70,0x00,
+
+        8, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x3e,0x44,0x44,0x44,0x44,0x44,0x3c,0x04,0x04,0x0e,0x00,
+
+        8, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x7c,0x22,0x22,0x20,0x20,0x20,0x70,0x00,0x00,0x00,0x00,
+
+        8, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x3c,0x42,0x40,0x3c,0x02,0x42,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x74 't'
+        0x00,0x00,0x10,0x10,0x10,0x7c,0x10,0x10,0x10,0x10,0x12,0x0c,0x00,0x00,0x00,0x00,
+
+        8, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x41,0x41,0x41,0x41,0x22,0x14,0x08,0x00,0x00,0x00,0x00,
+
+        8, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x41,0x41,0x41,0x49,0x49,0x55,0x22,0x00,0x00,0x00,0x00,
+
+        8, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x24,0x18,0x24,0x42,0x42,0x00,0x00,0x00,0x00,
+
+        8, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x3e,0x02,0x04,0x78,0x00,
+
+        8, // 0x7a 'z'
+        0x00,0x00,0x00,0x00,0x00,0x7e,0x44,0x08,0x10,0x20,0x42,0x7e,0x00,0x00,0x00,0x00,
+
+        8, // 0x7b '{'
+        0x00,0x06,0x08,0x08,0x08,0x08,0x08,0x30,0x08,0x08,0x08,0x08,0x08,0x06,0x00,0x00,
+
+        8, // 0x7c '|'
+        0x00,0x00,0x08,0x08,0x08,0x08,0x08,0x00,0x08,0x08,0x08,0x08,0x08,0x00,0x00,0x00,
+
+        8, // 0x7d '}'
+        0x00,0x30,0x08,0x08,0x08,0x08,0x08,0x06,0x08,0x08,0x08,0x08,0x08,0x30,0x00,0x00,
+
+        8, // 0x7e '~'
+        0x00,0x00,0x39,0x4e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x7f ''
+        0x00,0x00,0x00,0x00,0x00,0x08,0x14,0x22,0x41,0x41,0x7f,0x00,0x00,0x00,0x00,0x00,
+        0
+    };
+
+    const int8u gse8x16_bold[] =
+    {
+        16, 0, 32, 128-32,
+
+        0x00,0x00,0x11,0x00,0x22,0x00,0x33,0x00,0x44,0x00,0x55,0x00,0x66,0x00,0x77,0x00,0x88,0x00,
+        0x99,0x00,0xaa,0x00,0xbb,0x00,0xcc,0x00,0xdd,0x00,0xee,0x00,0xff,0x00,0x10,0x01,0x21,0x01,
+        0x32,0x01,0x43,0x01,0x54,0x01,0x65,0x01,0x76,0x01,0x87,0x01,0x98,0x01,0xa9,0x01,0xba,0x01,
+        0xcb,0x01,0xdc,0x01,0xed,0x01,0xfe,0x01,0x0f,0x02,0x20,0x02,0x31,0x02,0x42,0x02,0x53,0x02,
+        0x64,0x02,0x75,0x02,0x86,0x02,0x97,0x02,0xa8,0x02,0xb9,0x02,0xca,0x02,0xdb,0x02,0xec,0x02,
+        0xfd,0x02,0x0e,0x03,0x1f,0x03,0x30,0x03,0x41,0x03,0x52,0x03,0x63,0x03,0x74,0x03,0x85,0x03,
+        0x96,0x03,0xa7,0x03,0xb8,0x03,0xc9,0x03,0xda,0x03,0xeb,0x03,0xfc,0x03,0x0d,0x04,0x1e,0x04,
+        0x2f,0x04,0x40,0x04,0x51,0x04,0x62,0x04,0x73,0x04,0x84,0x04,0x95,0x04,0xa6,0x04,0xb7,0x04,
+        0xc8,0x04,0xd9,0x04,0xea,0x04,0xfb,0x04,0x0c,0x05,0x1d,0x05,0x2e,0x05,0x3f,0x05,0x50,0x05,
+        0x61,0x05,0x72,0x05,0x83,0x05,0x94,0x05,0xa5,0x05,0xb6,0x05,0xc7,0x05,0xd8,0x05,0xe9,0x05,
+        0xfa,0x05,0x0b,0x06,0x1c,0x06,0x2d,0x06,0x3e,0x06,0x4f,0x06,
+
+        8, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x21 '!'
+        0x00,0x00,0x18,0x3c,0x3c,0x3c,0x3c,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+
+        8, // 0x22 '"'
+        0x00,0x66,0x66,0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x23 '#'
+        0x00,0x00,0x66,0x66,0x66,0xff,0x66,0x66,0xff,0x66,0x66,0x66,0x00,0x00,0x00,0x00,
+
+        8, // 0x24 '$'
+        0x00,0x08,0x08,0x3e,0x6b,0x6b,0x68,0x3e,0x0b,0x6b,0x6b,0x3e,0x08,0x08,0x00,0x00,
+
+        8, // 0x25 '%'
+        0x00,0x00,0x66,0xbe,0xcc,0x0c,0x18,0x18,0x30,0x33,0x65,0x66,0x00,0x00,0x00,0x00,
+
+        8, // 0x26 '&'
+        0x00,0x00,0x1c,0x36,0x36,0x36,0x1c,0x3b,0x6e,0x66,0x66,0x3b,0x00,0x00,0x00,0x00,
+
+        8, // 0x27 '''
+        0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x28 '('
+        0x00,0x06,0x0c,0x18,0x18,0x30,0x30,0x30,0x30,0x18,0x18,0x0c,0x06,0x00,0x00,0x00,
+
+        8, // 0x29 ')'
+        0x00,0x30,0x18,0x0c,0x0c,0x06,0x06,0x06,0x06,0x0c,0x0c,0x18,0x30,0x00,0x00,0x00,
+
+        8, // 0x2a '*'
+        0x00,0x00,0x00,0x00,0x66,0x24,0x18,0xff,0x18,0x24,0x66,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x2b '+'
+        0x00,0x00,0x00,0x00,0x18,0x18,0x18,0xff,0x18,0x18,0x18,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x2c ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x20,0x00,
+
+        8, // 0x2d '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x2e '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,
+
+        8, // 0x2f '/'
+        0x00,0x03,0x03,0x06,0x06,0x0c,0x0c,0x18,0x18,0x30,0x30,0x60,0x60,0x00,0x00,0x00,
+
+        8, // 0x30 '0'
+        0x00,0x00,0x3e,0x63,0x63,0x67,0x6b,0x73,0x63,0x63,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x31 '1'
+        0x00,0x00,0x0c,0x0c,0x1c,0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3f,0x00,0x00,0x00,0x00,
+
+        8, // 0x32 '2'
+        0x00,0x00,0x3e,0x63,0x63,0x03,0x06,0x0c,0x18,0x30,0x61,0x7f,0x00,0x00,0x00,0x00,
+
+        8, // 0x33 '3'
+        0x00,0x00,0x7f,0x43,0x06,0x0c,0x1e,0x03,0x03,0x03,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x34 '4'
+        0x00,0x00,0x06,0x0c,0x18,0x32,0x66,0x66,0x7f,0x06,0x06,0x0f,0x00,0x00,0x00,0x00,
+
+        8, // 0x35 '5'
+        0x00,0x00,0x7f,0x61,0x60,0x60,0x7e,0x03,0x03,0x03,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x36 '6'
+        0x00,0x00,0x1e,0x30,0x60,0x60,0x7e,0x63,0x63,0x63,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x37 '7'
+        0x00,0x00,0x7f,0x63,0x63,0x03,0x06,0x0c,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00,
+
+        8, // 0x38 '8'
+        0x00,0x00,0x3e,0x63,0x63,0x63,0x3e,0x63,0x63,0x63,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x39 '9'
+        0x00,0x00,0x3e,0x63,0x63,0x63,0x63,0x3f,0x03,0x03,0x06,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x3a ':'
+        0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x3b ';'
+        0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x60,0x40,0x00,
+
+        8, // 0x3c '<'
+        0x00,0x00,0x00,0x06,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x06,0x00,0x00,0x00,0x00,
+
+        8, // 0x3d '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0x00,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x3e '>'
+        0x00,0x00,0x00,0x30,0x18,0x0c,0x06,0x03,0x06,0x0c,0x18,0x30,0x00,0x00,0x00,0x00,
+
+        8, // 0x3f '?'
+        0x00,0x00,0x3e,0x63,0x63,0x63,0x06,0x0c,0x0c,0x00,0x0c,0x0c,0x00,0x00,0x00,0x00,
+
+        8, // 0x40 '@'
+        0x00,0x00,0x7c,0x86,0x03,0x73,0xdb,0xdb,0xdb,0xdb,0xdb,0x6e,0x00,0x00,0x00,0x00,
+
+        8, // 0x41 'A'
+        0x00,0x00,0x08,0x1c,0x36,0x63,0x63,0x63,0x7f,0x63,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x42 'B'
+        0x00,0x00,0x7e,0x33,0x33,0x33,0x3e,0x33,0x33,0x33,0x33,0x7e,0x00,0x00,0x00,0x00,
+
+        8, // 0x43 'C'
+        0x00,0x00,0x1e,0x33,0x61,0x60,0x60,0x60,0x60,0x61,0x33,0x1e,0x00,0x00,0x00,0x00,
+
+        8, // 0x44 'D'
+        0x00,0x00,0x7c,0x36,0x33,0x33,0x33,0x33,0x33,0x33,0x36,0x7c,0x00,0x00,0x00,0x00,
+
+        8, // 0x45 'E'
+        0x00,0x00,0x7f,0x33,0x31,0x34,0x3c,0x34,0x30,0x31,0x33,0x7f,0x00,0x00,0x00,0x00,
+
+        8, // 0x46 'F'
+        0x00,0x00,0x7f,0x33,0x31,0x34,0x3c,0x34,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00,
+
+        8, // 0x47 'G'
+        0x00,0x00,0x1f,0x33,0x61,0x60,0x60,0x6f,0x63,0x63,0x33,0x1e,0x00,0x00,0x00,0x00,
+
+        8, // 0x48 'H'
+        0x00,0x00,0x63,0x63,0x63,0x63,0x7f,0x63,0x63,0x63,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x49 'I'
+        0x00,0x00,0x1e,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00,
+
+        8, // 0x4a 'J'
+        0x00,0x00,0x0f,0x06,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x4b 'K'
+        0x00,0x00,0x73,0x33,0x36,0x36,0x3c,0x36,0x36,0x33,0x33,0x73,0x00,0x00,0x00,0x00,
+
+        8, // 0x4c 'L'
+        0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x31,0x33,0x7f,0x00,0x00,0x00,0x00,
+
+        8, // 0x4d 'M'
+        0x00,0x00,0x63,0x63,0x77,0x77,0x7f,0x6b,0x6b,0x63,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x4e 'N'
+        0x00,0x00,0x63,0x63,0x73,0x7b,0x6f,0x67,0x63,0x63,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x4f 'O'
+        0x00,0x00,0x1c,0x36,0x63,0x63,0x63,0x63,0x63,0x63,0x36,0x1c,0x00,0x00,0x00,0x00,
+
+        8, // 0x50 'P'
+        0x00,0x00,0x7e,0x33,0x33,0x33,0x33,0x3e,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00,
+
+        8, // 0x51 'Q'
+        0x00,0x00,0x1c,0x36,0x63,0x63,0x63,0x63,0x63,0x6f,0x36,0x1e,0x03,0x00,0x00,0x00,
+
+        8, // 0x52 'R'
+        0x00,0x00,0x7e,0x33,0x33,0x33,0x33,0x3e,0x36,0x33,0x33,0x73,0x00,0x00,0x00,0x00,
+
+        8, // 0x53 'S'
+        0x00,0x00,0x3e,0x63,0x63,0x30,0x18,0x0c,0x06,0x63,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x54 'T'
+        0x00,0x00,0x3f,0x3f,0x2d,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00,
+
+        8, // 0x55 'U'
+        0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x56 'V'
+        0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x63,0x63,0x36,0x1c,0x08,0x00,0x00,0x00,0x00,
+
+        8, // 0x57 'W'
+        0x00,0x00,0x63,0x63,0x63,0x6b,0x6b,0x7f,0x77,0x77,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x58 'X'
+        0x00,0x00,0x63,0x63,0x63,0x36,0x1c,0x1c,0x36,0x63,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x59 'Y'
+        0x00,0x00,0x33,0x33,0x33,0x33,0x1e,0x0c,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00,
+
+        8, // 0x5a 'Z'
+        0x00,0x00,0x7f,0x63,0x43,0x06,0x0c,0x18,0x30,0x61,0x63,0x7f,0x00,0x00,0x00,0x00,
+
+        8, // 0x5b '['
+        0x00,0x1f,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00,
+
+        8, // 0x5c '\'
+        0x00,0x60,0x60,0x30,0x30,0x18,0x18,0x0c,0x0c,0x06,0x06,0x03,0x03,0x00,0x00,0x00,
+
+        8, // 0x5d ']'
+        0x00,0x7c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x7c,0x00,0x00,0x00,
+
+        8, // 0x5e '^'
+        0x00,0x00,0x08,0x1c,0x36,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5f '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,
+
+        8, // 0x60 '`'
+        0x00,0x00,0x18,0x18,0x18,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x3c,0x66,0x06,0x3e,0x66,0x66,0x3b,0x00,0x00,0x00,0x00,
+
+        8, // 0x62 'b'
+        0x00,0x00,0x70,0x30,0x30,0x3c,0x36,0x33,0x33,0x33,0x33,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x3e,0x63,0x63,0x60,0x60,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x64 'd'
+        0x00,0x00,0x0e,0x06,0x06,0x1e,0x36,0x66,0x66,0x66,0x66,0x3b,0x00,0x00,0x00,0x00,
+
+        8, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x3e,0x63,0x63,0x7f,0x60,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x66 'f'
+        0x00,0x00,0x0e,0x1b,0x1b,0x18,0x3c,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00,
+
+        8, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x3b,0x66,0x66,0x66,0x66,0x66,0x3e,0x06,0x66,0x3c,0x00,
+
+        8, // 0x68 'h'
+        0x00,0x00,0x70,0x30,0x30,0x36,0x3b,0x33,0x33,0x33,0x33,0x73,0x00,0x00,0x00,0x00,
+
+        8, // 0x69 'i'
+        0x00,0x00,0x0c,0x0c,0x00,0x1c,0x0c,0x0c,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00,
+
+        8, // 0x6a 'j'
+        0x00,0x00,0x06,0x06,0x00,0x0e,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3c,0x00,0x00,
+
+        8, // 0x6b 'k'
+        0x00,0x00,0x70,0x30,0x30,0x33,0x33,0x36,0x3c,0x36,0x33,0x73,0x00,0x00,0x00,0x00,
+
+        8, // 0x6c 'l'
+        0x00,0x00,0x1c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00,
+
+        8, // 0x6d 'm'
+        0x00,0x00,0x00,0x00,0x00,0x76,0x7f,0x6b,0x6b,0x6b,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x6e 'n'
+        0x00,0x00,0x00,0x00,0x00,0x6e,0x33,0x33,0x33,0x33,0x33,0x33,0x00,0x00,0x00,0x00,
+
+        8, // 0x6f 'o'
+        0x00,0x00,0x00,0x00,0x00,0x3e,0x63,0x63,0x63,0x63,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x6e,0x33,0x33,0x33,0x33,0x33,0x3e,0x30,0x30,0x78,0x00,
+
+        8, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x3b,0x66,0x66,0x66,0x66,0x66,0x3e,0x06,0x06,0x0f,0x00,
+
+        8, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x6e,0x3b,0x33,0x30,0x30,0x30,0x78,0x00,0x00,0x00,0x00,
+
+        8, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x3e,0x63,0x60,0x3e,0x03,0x63,0x3e,0x00,0x00,0x00,0x00,
+
+        8, // 0x74 't'
+        0x00,0x00,0x08,0x18,0x18,0x7e,0x18,0x18,0x18,0x18,0x1b,0x0e,0x00,0x00,0x00,0x00,
+
+        8, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x3b,0x00,0x00,0x00,0x00,
+
+        8, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x63,0x63,0x36,0x1c,0x08,0x00,0x00,0x00,0x00,
+
+        8, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x6b,0x6b,0x7f,0x36,0x36,0x00,0x00,0x00,0x00,
+
+        8, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x36,0x1c,0x36,0x63,0x63,0x00,0x00,0x00,0x00,
+
+        8, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x63,0x63,0x63,0x63,0x3f,0x03,0x06,0x7c,0x00,
+
+        8, // 0x7a 'z'
+        0x00,0x00,0x00,0x00,0x00,0x7f,0x63,0x06,0x0c,0x18,0x31,0x7f,0x00,0x00,0x00,0x00,
+
+        8, // 0x7b '{'
+        0x00,0x03,0x04,0x0c,0x0c,0x0c,0x08,0x30,0x08,0x0c,0x0c,0x0c,0x04,0x03,0x00,0x00,
+
+        8, // 0x7c '|'
+        0x00,0x00,0x0c,0x0c,0x0c,0x0c,0x0c,0x00,0x0c,0x0c,0x0c,0x0c,0x0c,0x00,0x00,0x00,
+
+        8, // 0x7d '}'
+        0x00,0x60,0x10,0x18,0x18,0x18,0x08,0x06,0x08,0x18,0x18,0x18,0x10,0x60,0x00,0x00,
+
+        8, // 0x7e '~'
+        0x00,0x00,0x3b,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x7f ''
+        0x00,0x00,0x00,0x00,0x00,0x08,0x1c,0x36,0x63,0x63,0x7f,0x00,0x00,0x00,0x00,0x00,
+        0
+    };
+
+    const int8u mcs11_prop[] =
+    {
+        11, 2, 32, 128-32,
+        0x00,0x00,0x0C,0x00,0x18,0x00,0x24,0x00,0x30,0x00,0x3C,0x00,0x48,0x00,0x54,0x00,0x60,0x00,
+        0x6C,0x00,0x78,0x00,0x84,0x00,0x90,0x00,0x9C,0x00,0xA8,0x00,0xB4,0x00,0xC0,0x00,0xCC,0x00,
+        0xD8,0x00,0xE4,0x00,0xF0,0x00,0xFC,0x00,0x08,0x01,0x14,0x01,0x20,0x01,0x2C,0x01,0x38,0x01,
+        0x44,0x01,0x50,0x01,0x5C,0x01,0x68,0x01,0x74,0x01,0x80,0x01,0x8C,0x01,0x98,0x01,0xA4,0x01,
+        0xB0,0x01,0xBC,0x01,0xC8,0x01,0xD4,0x01,0xE0,0x01,0xEC,0x01,0xF8,0x01,0x04,0x02,0x10,0x02,
+        0x1C,0x02,0x28,0x02,0x34,0x02,0x40,0x02,0x4C,0x02,0x58,0x02,0x64,0x02,0x70,0x02,0x7C,0x02,
+        0x88,0x02,0x94,0x02,0xA0,0x02,0xAC,0x02,0xB8,0x02,0xC4,0x02,0xD0,0x02,0xDC,0x02,0xE8,0x02,
+        0xF4,0x02,0x00,0x03,0x0C,0x03,0x18,0x03,0x24,0x03,0x30,0x03,0x3C,0x03,0x48,0x03,0x54,0x03,
+        0x60,0x03,0x6C,0x03,0x78,0x03,0x84,0x03,0x90,0x03,0x9C,0x03,0xA8,0x03,0xB4,0x03,0xC0,0x03,
+        0xCC,0x03,0xD8,0x03,0xE4,0x03,0xF0,0x03,0xFC,0x03,0x08,0x04,0x14,0x04,0x20,0x04,0x2C,0x04,
+        0x38,0x04,0x44,0x04,0x50,0x04,0x5C,0x04,0x68,0x04,0x74,0x04,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,
+
+        4, // 0x22 '"'
+        0x50,0x50,0xA0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x23 '#'
+        0x00,0x28,0x28,0x7C,0x28,0x28,0x28,0x7C,0x28,0x28,0x00,
+
+        6, // 0x24 '$'
+        0x10,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x10,
+
+        6, // 0x25 '%'
+        0x00,0x00,0x68,0xA8,0xD0,0x10,0x20,0x2C,0x54,0x58,0x00,
+
+        6, // 0x26 '&'
+        0x00,0x20,0x50,0x50,0x50,0x20,0x54,0x54,0x48,0x34,0x00,
+
+        3, // 0x27 '''
+        0x40,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x28 '('
+        0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,
+
+        5, // 0x29 ')'
+        0x40,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x20,0x20,0x40,
+
+        6, // 0x2A '*'
+        0x00,0x00,0x28,0x7C,0x38,0x7C,0x28,0x00,0x00,0x00,0x00,
+
+        6, // 0x2B '+'
+        0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0xC0,
+
+        6, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,
+
+        7, // 0x2F '/'
+        0x00,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,
+
+        6, // 0x30 '0'
+        0x00,0x38,0x44,0x44,0x54,0x54,0x54,0x44,0x44,0x38,0x00,
+
+        4, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        6, // 0x32 '2'
+        0x00,0x38,0x44,0x44,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,
+
+        6, // 0x33 '3'
+        0x00,0x38,0x44,0x04,0x04,0x38,0x04,0x04,0x44,0x38,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x08,0x18,0x18,0x28,0x28,0x48,0x7C,0x08,0x08,0x00,
+
+        6, // 0x35 '5'
+        0x00,0x7C,0x40,0x40,0x78,0x44,0x04,0x04,0x44,0x38,0x00,
+
+        6, // 0x36 '6'
+        0x00,0x38,0x44,0x40,0x40,0x78,0x44,0x44,0x44,0x38,0x00,
+
+        6, // 0x37 '7'
+        0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x20,0x00,
+
+        6, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,
+
+        6, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x44,0x3C,0x04,0x04,0x44,0x38,0x00,
+
+        4, // 0x3A ':'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x00,
+
+        4, // 0x3B ';'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0xC0,
+
+        6, // 0x3C '<'
+        0x00,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,
+
+        6, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,
+
+        6, // 0x3E '>'
+        0x00,0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x10,0x00,0x10,0x00,
+
+        6, // 0x40 '@'
+        0x00,0x38,0x44,0x44,0x5C,0x54,0x54,0x4C,0x40,0x38,0x00,
+
+        6, // 0x41 'A'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x00,
+
+        6, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x44,0x44,0x44,0x78,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x40,0x44,0x38,0x00,
+
+        6, // 0x44 'D'
+        0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x44,0x48,0x70,0x00,
+
+        6, // 0x45 'E'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x7C,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x40,0x00,
+
+        6, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x40,0x5C,0x44,0x44,0x4C,0x34,0x00,
+
+        6, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,
+
+        4, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x1C,0x08,0x08,0x08,0x08,0x08,0x08,0x48,0x30,0x00,
+
+        6, // 0x4B 'K'
+        0x00,0x44,0x48,0x50,0x60,0x60,0x50,0x48,0x44,0x44,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,
+
+        8, // 0x4D 'M'
+        0x00,0x41,0x63,0x55,0x49,0x49,0x41,0x41,0x41,0x41,0x00,
+
+        7, // 0x4E 'N'
+        0x00,0x42,0x42,0x62,0x52,0x4A,0x46,0x42,0x42,0x42,0x00,
+
+        6, // 0x4F 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,
+
+        6, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x40,0x00,
+
+        6, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,
+
+        6, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x44,0x44,0x44,0x44,0x00,
+
+        6, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x40,0x38,0x04,0x04,0x44,0x38,0x00,
+
+        6, // 0x54 'T'
+        0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,
+
+        6, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x00,
+
+        8, // 0x57 'W'
+        0x00,0x41,0x41,0x41,0x41,0x49,0x49,0x49,0x55,0x22,0x00,
+
+        6, // 0x58 'X'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,
+
+        6, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x10,0x00,
+
+        6, // 0x5A 'Z'
+        0x00,0x7C,0x04,0x04,0x08,0x10,0x20,0x40,0x40,0x7C,0x00,
+
+        5, // 0x5B '['
+        0x30,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x30,
+
+        7, // 0x5C '\'
+        0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,
+
+        4, // 0x5D ']'
+        0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,
+
+        6, // 0x5E '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,
+
+        4, // 0x60 '`'
+        0x00,0x40,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x44,0x44,0x3C,0x00,
+
+        6, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x40,0x44,0x38,0x00,
+
+        6, // 0x64 'd'
+        0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x00,
+
+        6, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x7C,0x40,0x44,0x38,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x10,0x20,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        6, // 0x67 'g'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x3C,0x04,0x44,0x38,
+
+        6, // 0x68 'h'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x44,0x00,
+
+        2, // 0x69 'i'
+        0x00,0x40,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        3, // 0x6A 'j'
+        0x00,0x20,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0xA0,0x40,
+
+        5, // 0x6B 'k'
+        0x00,0x40,0x40,0x48,0x50,0x60,0x60,0x50,0x48,0x48,0x00,
+
+        2, // 0x6C 'l'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        8, // 0x6D 'm'
+        0x00,0x00,0x00,0x76,0x49,0x49,0x49,0x49,0x41,0x41,0x00,
+
+        6, // 0x6E 'n'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x44,0x00,
+
+        6, // 0x6F 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00,
+
+        6, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,
+
+        6, // 0x71 'q'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x3C,0x04,0x04,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x24,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        6, // 0x73 's'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x38,0x00,
+
+        5, // 0x74 't'
+        0x00,0x20,0x20,0x70,0x20,0x20,0x20,0x20,0x28,0x10,0x00,
+
+        6, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x4C,0x34,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x28,0x28,0x10,0x10,0x00,
+
+        8, // 0x77 'w'
+        0x00,0x00,0x00,0x41,0x41,0x41,0x41,0x49,0x49,0x36,0x00,
+
+        6, // 0x78 'x'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,
+
+        6, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x3C,0x04,0x08,0x70,
+
+        6, // 0x7A 'z'
+        0x00,0x00,0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,
+
+        5, // 0x7B '{'
+        0x18,0x20,0x20,0x20,0x20,0xC0,0x20,0x20,0x20,0x20,0x18,
+
+        3, // 0x7C '|'
+        0x00,0x40,0x40,0x40,0x40,0x00,0x40,0x40,0x40,0x40,0x00,
+
+        5, // 0x7D '}'
+        0xC0,0x20,0x20,0x20,0x20,0x18,0x20,0x20,0x20,0x20,0xC0,
+
+        6, // 0x7E '~'
+        0x00,0x24,0x54,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x7F ''
+        0x00,0x10,0x38,0x6C,0x44,0x44,0x7C,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs11_prop_condensed[] =
+    {
+        11, 2, 32, 128-32,
+        0x00,0x00,0x0C,0x00,0x18,0x00,0x24,0x00,0x30,0x00,0x3C,0x00,0x48,0x00,0x54,0x00,0x60,0x00,
+        0x6C,0x00,0x78,0x00,0x84,0x00,0x90,0x00,0x9C,0x00,0xA8,0x00,0xB4,0x00,0xC0,0x00,0xCC,0x00,
+        0xD8,0x00,0xE4,0x00,0xF0,0x00,0xFC,0x00,0x08,0x01,0x14,0x01,0x20,0x01,0x2C,0x01,0x38,0x01,
+        0x44,0x01,0x50,0x01,0x5C,0x01,0x68,0x01,0x74,0x01,0x80,0x01,0x8C,0x01,0x98,0x01,0xA4,0x01,
+        0xB0,0x01,0xBC,0x01,0xC8,0x01,0xD4,0x01,0xE0,0x01,0xEC,0x01,0xF8,0x01,0x04,0x02,0x10,0x02,
+        0x1C,0x02,0x28,0x02,0x34,0x02,0x40,0x02,0x4C,0x02,0x58,0x02,0x64,0x02,0x70,0x02,0x7C,0x02,
+        0x88,0x02,0x94,0x02,0xA0,0x02,0xAC,0x02,0xB8,0x02,0xC4,0x02,0xD0,0x02,0xDC,0x02,0xE8,0x02,
+        0xF4,0x02,0x00,0x03,0x0C,0x03,0x18,0x03,0x24,0x03,0x30,0x03,0x3C,0x03,0x48,0x03,0x54,0x03,
+        0x60,0x03,0x6C,0x03,0x78,0x03,0x84,0x03,0x90,0x03,0x9C,0x03,0xA8,0x03,0xB4,0x03,0xC0,0x03,
+        0xCC,0x03,0xD8,0x03,0xE4,0x03,0xF0,0x03,0xFC,0x03,0x08,0x04,0x14,0x04,0x20,0x04,0x2C,0x04,
+        0x38,0x04,0x44,0x04,0x50,0x04,0x5C,0x04,0x68,0x04,0x74,0x04,
+
+        3, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        3, // 0x21 '!'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x40,0x00,
+
+        4, // 0x22 '"'
+        0x50,0x50,0xA0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x23 '#'
+        0x00,0x50,0x50,0xF8,0x50,0x50,0x50,0xF8,0x50,0x50,0x00,
+
+        5, // 0x24 '$'
+        0x00,0x40,0x60,0x90,0x80,0x60,0x10,0x90,0x60,0x20,0x00,
+
+        5, // 0x25 '%'
+        0x00,0x00,0x90,0x90,0x20,0x20,0x40,0x40,0x90,0x90,0x00,
+
+        5, // 0x26 '&'
+        0x00,0x40,0xA0,0xA0,0xA0,0x40,0xA8,0x90,0x90,0x68,0x00,
+
+        5, // 0x27 '''
+        0x00,0x00,0x20,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,
+
+        4, // 0x29 ')'
+        0x80,0x40,0x40,0x20,0x20,0x20,0x20,0x20,0x40,0x40,0x80,
+
+        5, // 0x2A '*'
+        0x00,0x00,0x90,0x60,0xF0,0x60,0x90,0x00,0x00,0x00,0x00,
+
+        5, // 0x2B '+'
+        0x00,0x00,0x00,0x20,0x20,0xF8,0x20,0x20,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0xC0,
+
+        5, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0x00,
+
+        6, // 0x2F '/'
+        0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80,0x00,
+
+        5, // 0x30 '0'
+        0x00,0x70,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0xE0,0x00,
+
+        3, // 0x31 '1'
+        0x00,0x40,0xC0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        5, // 0x32 '2'
+        0x00,0x60,0x90,0x90,0x10,0x10,0x20,0x40,0x80,0xF0,0x00,
+
+        5, // 0x33 '3'
+        0x00,0x60,0x90,0x10,0x10,0x60,0x10,0x10,0x90,0x60,0x00,
+
+        5, // 0x34 '4'
+        0x00,0x10,0x30,0x30,0x50,0x50,0x90,0xF0,0x10,0x10,0x00,
+
+        5, // 0x35 '5'
+        0x00,0xF0,0x80,0x80,0xE0,0x90,0x10,0x10,0x90,0x60,0x00,
+
+        5, // 0x36 '6'
+        0x00,0x60,0x90,0x80,0x80,0xE0,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x37 '7'
+        0x00,0xF0,0x10,0x10,0x10,0x20,0x20,0x40,0x40,0x40,0x00,
+
+        5, // 0x38 '8'
+        0x00,0x60,0x90,0x90,0x90,0x60,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x39 '9'
+        0x00,0x60,0x90,0x90,0x90,0x70,0x10,0x10,0x90,0x60,0x00,
+
+        4, // 0x3A ':'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x00,
+
+        4, // 0x3B ';'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0xC0,
+
+        6, // 0x3C '<'
+        0x00,0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10,0x08,0x00,
+
+        5, // 0x3D '='
+        0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0xF0,0x00,0x00,0x00,
+
+        6, // 0x3E '>'
+        0x00,0x80,0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x80,0x00,
+
+        5, // 0x3F '?'
+        0x00,0x60,0x90,0x10,0x10,0x20,0x40,0x00,0x40,0x00,0x00,
+
+        5, // 0x40 '@'
+        0x00,0x60,0x90,0x90,0xB0,0xB0,0xB0,0x80,0x80,0x70,0x00,
+
+        5, // 0x41 'A'
+        0x00,0x60,0x90,0x90,0x90,0xF0,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x42 'B'
+        0x00,0xE0,0x90,0x90,0x90,0xE0,0x90,0x90,0x90,0xE0,0x00,
+
+        5, // 0x43 'C'
+        0x00,0x60,0x90,0x80,0x80,0x80,0x80,0x80,0x90,0x60,0x00,
+
+        5, // 0x44 'D'
+        0x00,0xE0,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0xE0,0x00,
+
+        5, // 0x45 'E'
+        0x00,0xF0,0x80,0x80,0x80,0xF0,0x80,0x80,0x80,0xF0,0x00,
+
+        5, // 0x46 'F'
+        0x00,0xF0,0x80,0x80,0x80,0xF0,0x80,0x80,0x80,0x80,0x00,
+
+        5, // 0x47 'G'
+        0x00,0x70,0x80,0x80,0x80,0xB0,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x48 'H'
+        0x00,0x90,0x90,0x90,0x90,0xF0,0x90,0x90,0x90,0x90,0x00,
+
+        4, // 0x49 'I'
+        0x00,0xE0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xE0,0x00,
+
+        5, // 0x4A 'J'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0xA0,0xA0,0x40,0x00,
+
+        5, // 0x4B 'K'
+        0x00,0x90,0x90,0xA0,0xA0,0xC0,0xA0,0xA0,0x90,0x90,0x00,
+
+        5, // 0x4C 'L'
+        0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xF0,0x00,
+
+        6, // 0x4D 'M'
+        0x00,0x88,0xD8,0xA8,0xA8,0xA8,0x88,0x88,0x88,0x88,0x00,
+
+        5, // 0x4E 'N'
+        0x00,0x90,0x90,0xD0,0xD0,0xB0,0xB0,0x90,0x90,0x90,0x00,
+
+        5, // 0x4F 'O'
+        0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x50 'P'
+        0x00,0xE0,0x90,0x90,0x90,0x90,0xE0,0x80,0x80,0x80,0x00,
+
+        5, // 0x51 'Q'
+        0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x30,
+
+        5, // 0x52 'R'
+        0x00,0xE0,0x90,0x90,0x90,0x90,0xE0,0xA0,0x90,0x90,0x00,
+
+        5, // 0x53 'S'
+        0x00,0x60,0x90,0x80,0x80,0x60,0x10,0x10,0x90,0x60,0x00,
+
+        6, // 0x54 'T'
+        0x00,0xF8,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x55 'U'
+        0x00,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x88,0x88,0x88,0x88,0x50,0x50,0x50,0x20,0x20,0x00,
+
+        6, // 0x57 'W'
+        0x00,0x88,0x88,0x88,0xA8,0xA8,0xA8,0xA8,0xA8,0x50,0x00,
+
+        5, // 0x58 'X'
+        0x00,0x90,0x90,0x90,0x60,0x60,0x90,0x90,0x90,0x90,0x00,
+
+        6, // 0x59 'Y'
+        0x00,0x88,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x5A 'Z'
+        0x00,0xF0,0x10,0x20,0x20,0x40,0x40,0x80,0x80,0xF0,0x00,
+
+        4, // 0x5B '['
+        0x60,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x60,0x00,
+
+        6, // 0x5C '\'
+        0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,
+
+        4, // 0x5D ']'
+        0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,0x00,
+
+        5, // 0x5E '^'
+        0x00,0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,
+
+        5, // 0x60 '`'
+        0x00,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x61 'a'
+        0x00,0x00,0x00,0x60,0x90,0x10,0x70,0x90,0x90,0x70,0x00,
+
+        5, // 0x62 'b'
+        0x00,0x80,0x80,0x80,0xE0,0x90,0x90,0x90,0x90,0xE0,0x00,
+
+        5, // 0x63 'c'
+        0x00,0x00,0x00,0x60,0x90,0x80,0x80,0x80,0x90,0x60,0x00,
+
+        5, // 0x64 'd'
+        0x00,0x10,0x10,0x10,0x70,0x90,0x90,0x90,0x90,0x70,0x00,
+
+        5, // 0x65 'e'
+        0x00,0x00,0x00,0x60,0x90,0x90,0xF0,0x80,0x90,0x60,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x20,0x40,0x40,0xE0,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        5, // 0x67 'g'
+        0x00,0x00,0x00,0x70,0x90,0x90,0x90,0x70,0x10,0x90,0x60,
+
+        5, // 0x68 'h'
+        0x00,0x80,0x80,0x80,0xE0,0x90,0x90,0x90,0x90,0x90,0x00,
+
+        2, // 0x69 'i'
+        0x00,0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,
+
+        4, // 0x6A 'j'
+        0x00,0x20,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0xA0,0x40,
+
+        5, // 0x6B 'k'
+        0x00,0x80,0x80,0x90,0x90,0xA0,0xC0,0xA0,0x90,0x90,0x00,
+
+        2, // 0x6C 'l'
+        0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,
+
+        6, // 0x6D 'm'
+        0x00,0x00,0x00,0xD0,0xA8,0xA8,0xA8,0x88,0x88,0x88,0x00,
+
+        5, // 0x6E 'n'
+        0x00,0x00,0x00,0xA0,0xD0,0x90,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x6F 'o'
+        0x00,0x00,0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x70 'p'
+        0x00,0x00,0x00,0xE0,0x90,0x90,0x90,0x90,0xE0,0x80,0x80,
+
+        5, // 0x71 'q'
+        0x00,0x00,0x00,0x70,0x90,0x90,0x90,0x90,0x70,0x10,0x10,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0xB8,0x48,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        5, // 0x73 's'
+        0x00,0x00,0x00,0x60,0x90,0x40,0x20,0x10,0x90,0x60,0x00,
+
+        4, // 0x74 't'
+        0x00,0x40,0x40,0xE0,0x40,0x40,0x40,0x40,0x40,0x20,0x00,
+
+        5, // 0x75 'u'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0x90,0x90,0x70,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x88,0x88,0x88,0x50,0x50,0x20,0x20,0x00,
+
+        6, // 0x77 'w'
+        0x00,0x00,0x00,0x88,0x88,0x88,0xA8,0xA8,0xA8,0x50,0x00,
+
+        5, // 0x78 'x'
+        0x00,0x00,0x00,0x90,0x90,0x60,0x60,0x90,0x90,0x90,0x00,
+
+        5, // 0x79 'y'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0x70,0x10,0x20,0xC0,
+
+        5, // 0x7A 'z'
+        0x00,0x00,0x00,0xF0,0x10,0x20,0x40,0x80,0x80,0xF0,0x00,
+
+        5, // 0x7B '{'
+        0x30,0x40,0x40,0x40,0x40,0x80,0x40,0x40,0x40,0x40,0x30,
+
+        3, // 0x7C '|'
+        0x00,0x40,0x40,0x40,0x40,0x00,0x40,0x40,0x40,0x40,0x00,
+
+        5, // 0x7D '}'
+        0xC0,0x20,0x20,0x20,0x20,0x10,0x20,0x20,0x20,0x20,0xC0,
+
+        5, // 0x7E '~'
+        0x00,0x40,0xA8,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x7F ''
+        0x00,0x20,0x70,0xD8,0x88,0x88,0xF8,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs12_prop[] =
+    {
+        12, 3, 32, 128-32,
+        0x00,0x00,0x0D,0x00,0x1A,0x00,0x27,0x00,0x34,0x00,0x41,0x00,0x4E,0x00,0x5B,0x00,0x68,0x00,
+        0x75,0x00,0x82,0x00,0x8F,0x00,0x9C,0x00,0xA9,0x00,0xB6,0x00,0xC3,0x00,0xD0,0x00,0xDD,0x00,
+        0xEA,0x00,0xF7,0x00,0x04,0x01,0x11,0x01,0x1E,0x01,0x2B,0x01,0x38,0x01,0x45,0x01,0x52,0x01,
+        0x5F,0x01,0x6C,0x01,0x79,0x01,0x86,0x01,0x93,0x01,0xA0,0x01,0xAD,0x01,0xBA,0x01,0xC7,0x01,
+        0xD4,0x01,0xE1,0x01,0xEE,0x01,0xFB,0x01,0x08,0x02,0x15,0x02,0x22,0x02,0x2F,0x02,0x3C,0x02,
+        0x49,0x02,0x62,0x02,0x6F,0x02,0x7C,0x02,0x89,0x02,0x96,0x02,0xA3,0x02,0xB0,0x02,0xBD,0x02,
+        0xCA,0x02,0xD7,0x02,0xF0,0x02,0xFD,0x02,0x0A,0x03,0x17,0x03,0x24,0x03,0x31,0x03,0x3E,0x03,
+        0x4B,0x03,0x58,0x03,0x65,0x03,0x72,0x03,0x7F,0x03,0x8C,0x03,0x99,0x03,0xA6,0x03,0xB3,0x03,
+        0xC0,0x03,0xCD,0x03,0xDA,0x03,0xE7,0x03,0xF4,0x03,0x01,0x04,0x1A,0x04,0x27,0x04,0x34,0x04,
+        0x41,0x04,0x4E,0x04,0x5B,0x04,0x68,0x04,0x75,0x04,0x82,0x04,0x8F,0x04,0xA8,0x04,0xB5,0x04,
+        0xC2,0x04,0xCF,0x04,0xDC,0x04,0xE9,0x04,0xF6,0x04,0x03,0x05,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        4, // 0x22 '"'
+        0x50,0x50,0xA0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x23 '#'
+        0x28,0x28,0x28,0x7C,0x28,0x28,0x28,0x7C,0x28,0x28,0x28,0x00,
+
+        6, // 0x24 '$'
+        0x10,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x10,0x00,
+
+        7, // 0x25 '%'
+        0x32,0x54,0x64,0x08,0x08,0x10,0x10,0x26,0x2A,0x4C,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x30,0x48,0x48,0x48,0x30,0x4A,0x4A,0x44,0x3A,0x00,0x00,
+
+        3, // 0x27 '''
+        0x40,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,0x00,
+
+        5, // 0x29 ')'
+        0x40,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x20,0x20,0x40,0x00,
+
+        6, // 0x2A '*'
+        0x00,0x00,0x10,0x54,0x38,0x7C,0x38,0x54,0x10,0x00,0x00,0x00,
+
+        6, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x40,0x80,
+
+        6, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        7, // 0x2F '/'
+        0x00,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x38,0x44,0x44,0x54,0x54,0x54,0x44,0x44,0x38,0x00,0x00,
+
+        4, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x38,0x44,0x04,0x04,0x38,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x08,0x18,0x28,0x28,0x48,0x48,0x7C,0x08,0x08,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x7C,0x40,0x40,0x78,0x44,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x38,0x44,0x40,0x78,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x37 '7'
+        0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x20,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x44,0x3C,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        4, // 0x3A ':'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        4, // 0x3B ';'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x40,0x80,
+
+        6, // 0x3C '<'
+        0x00,0x00,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,
+
+        6, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,
+
+        6, // 0x3E '>'
+        0x00,0x00,0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x38,0x44,0x44,0x5C,0x54,0x54,0x4C,0x40,0x38,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x44,0x48,0x70,0x00,0x00,
+
+        6, // 0x45 'E'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x40,0x5C,0x44,0x44,0x4C,0x34,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x1C,0x08,0x08,0x08,0x08,0x08,0x48,0x48,0x30,0x00,0x00,
+
+        6, // 0x4B 'K'
+        0x00,0x44,0x48,0x50,0x60,0x60,0x50,0x48,0x44,0x44,0x00,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        9, // 0x4D 'M'
+        0x00,0x00,0x41,0x00,0x63,0x00,0x55,0x00,0x49,0x00,0x49,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x4E 'N'
+        0x00,0x44,0x64,0x64,0x54,0x54,0x4C,0x4C,0x44,0x44,0x00,0x00,
+
+        7, // 0x4F 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x48,0x44,0x44,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x40,0x38,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x54 'T'
+        0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        9, // 0x57 'W'
+        0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x49,0x00,0x49,0x00,0x55,0x00,0x22,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x5A 'Z'
+        0x00,0x7C,0x04,0x04,0x08,0x10,0x20,0x40,0x40,0x7C,0x00,0x00,
+
+        4, // 0x5B '['
+        0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,0x00,
+
+        7, // 0x5C '\'
+        0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,
+
+        4, // 0x5D ']'
+        0xE0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0xE0,0x00,
+
+        6, // 0x5E '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,
+
+        4, // 0x60 '`'
+        0x00,0x40,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x7C,0x40,0x44,0x38,0x00,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x30,0x40,0xE0,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x78,
+
+        7, // 0x68 'h'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x40,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x10,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x90,0x60,
+
+        6, // 0x6B 'k'
+        0x00,0x40,0x40,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        9, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x76,0x00,0x49,0x00,0x49,0x00,0x49,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x6E 'n'
+        0x00,0x00,0x00,0x58,0x64,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x6F 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x40,0x40,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x04,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x24,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x38,0x00,0x00,
+
+        5, // 0x74 't'
+        0x00,0x20,0x20,0x70,0x20,0x20,0x20,0x20,0x20,0x18,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x4C,0x34,0x00,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        9, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x49,0x00,0x49,0x00,0x49,0x00,0x36,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x3C,0x08,0x70,
+
+        6, // 0x7A 'z'
+        0x00,0x00,0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        5, // 0x7B '{'
+        0x18,0x20,0x20,0x20,0x20,0xC0,0x20,0x20,0x20,0x20,0x18,0x00,
+
+        3, // 0x7C '|'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        5, // 0x7D '}'
+        0xC0,0x20,0x20,0x20,0x20,0x18,0x20,0x20,0x20,0x20,0xC0,0x00,
+
+        7, // 0x7E '~'
+        0x00,0x60,0x92,0x92,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7F ''
+        0x00,0x10,0x38,0x6C,0x44,0x44,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs13_prop[] =
+    {
+        13, 4, 32, 128-32,
+        0x00,0x00,0x0E,0x00,0x1C,0x00,0x2A,0x00,0x38,0x00,0x46,0x00,0x54,0x00,0x62,0x00,0x70,0x00,
+        0x7E,0x00,0x8C,0x00,0x9A,0x00,0xA8,0x00,0xB6,0x00,0xC4,0x00,0xD2,0x00,0xE0,0x00,0xEE,0x00,
+        0xFC,0x00,0x0A,0x01,0x18,0x01,0x26,0x01,0x34,0x01,0x42,0x01,0x50,0x01,0x5E,0x01,0x6C,0x01,
+        0x7A,0x01,0x88,0x01,0x96,0x01,0xA4,0x01,0xB2,0x01,0xC0,0x01,0xCE,0x01,0xDC,0x01,0xEA,0x01,
+        0xF8,0x01,0x06,0x02,0x14,0x02,0x22,0x02,0x30,0x02,0x3E,0x02,0x4C,0x02,0x5A,0x02,0x68,0x02,
+        0x76,0x02,0x91,0x02,0x9F,0x02,0xAD,0x02,0xBB,0x02,0xC9,0x02,0xD7,0x02,0xE5,0x02,0xF3,0x02,
+        0x01,0x03,0x0F,0x03,0x2A,0x03,0x38,0x03,0x46,0x03,0x54,0x03,0x62,0x03,0x70,0x03,0x7E,0x03,
+        0x8C,0x03,0x9A,0x03,0xA8,0x03,0xB6,0x03,0xC4,0x03,0xD2,0x03,0xE0,0x03,0xEE,0x03,0xFC,0x03,
+        0x0A,0x04,0x18,0x04,0x26,0x04,0x34,0x04,0x42,0x04,0x50,0x04,0x6B,0x04,0x79,0x04,0x87,0x04,
+        0x95,0x04,0xA3,0x04,0xB1,0x04,0xBF,0x04,0xCD,0x04,0xDB,0x04,0xE9,0x04,0x04,0x05,0x12,0x05,
+        0x20,0x05,0x2E,0x05,0x3C,0x05,0x4A,0x05,0x58,0x05,0x66,0x05,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        4, // 0x22 '"'
+        0x00,0x50,0x50,0xA0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x23 '#'
+        0x00,0x28,0x28,0x28,0x7C,0x28,0x28,0x28,0x7C,0x28,0x28,0x28,0x00,
+
+        6, // 0x24 '$'
+        0x00,0x10,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x10,0x00,
+
+        7, // 0x25 '%'
+        0x00,0x32,0x54,0x64,0x08,0x08,0x10,0x10,0x26,0x2A,0x4C,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x30,0x48,0x48,0x48,0x30,0x4A,0x4A,0x44,0x3A,0x00,0x00,0x00,
+
+        3, // 0x27 '''
+        0x00,0x40,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,0x00,0x00,
+
+        5, // 0x29 ')'
+        0x40,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x20,0x20,0x40,0x00,0x00,
+
+        6, // 0x2A '*'
+        0x00,0x00,0x10,0x54,0x38,0x7C,0x38,0x54,0x10,0x00,0x00,0x00,0x00,
+
+        6, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x20,0x40,0x80,
+
+        6, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,
+
+        7, // 0x2F '/'
+        0x00,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x38,0x44,0x44,0x54,0x54,0x54,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        4, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x38,0x44,0x04,0x04,0x38,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x08,0x18,0x28,0x28,0x48,0x48,0x7C,0x08,0x08,0x00,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x7C,0x40,0x40,0x78,0x44,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x38,0x44,0x40,0x78,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        6, // 0x37 '7'
+        0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x20,0x00,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x44,0x3C,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        4, // 0x3A ':'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,
+
+        4, // 0x3B ';'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x20,0x40,0x80,
+
+        6, // 0x3C '<'
+        0x00,0x00,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+
+        6, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x3E '>'
+        0x00,0x00,0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x10,0x00,0x10,0x00,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x38,0x44,0x44,0x5C,0x54,0x54,0x4C,0x40,0x38,0x00,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x44,0x44,0x44,0x78,0x00,0x00,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x44,0x48,0x70,0x00,0x00,0x00,
+
+        6, // 0x45 'E'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x7C,0x00,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x40,0x5C,0x44,0x44,0x4C,0x34,0x00,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x1C,0x08,0x08,0x08,0x08,0x08,0x48,0x48,0x30,0x00,0x00,0x00,
+
+        6, // 0x4B 'K'
+        0x00,0x44,0x48,0x50,0x60,0x60,0x50,0x48,0x44,0x44,0x00,0x00,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,0x00,
+
+        9, // 0x4D 'M'
+        0x00,0x00,0x41,0x00,0x63,0x00,0x55,0x00,0x49,0x00,0x49,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x4E 'N'
+        0x00,0x44,0x64,0x64,0x54,0x54,0x4C,0x4C,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x4F 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x48,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x40,0x38,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        6, // 0x54 'T'
+        0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x00,0x00,0x00,
+
+        9, // 0x57 'W'
+        0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x49,0x00,0x49,0x00,0x55,0x00,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        6, // 0x5A 'Z'
+        0x00,0x7C,0x04,0x04,0x08,0x10,0x20,0x40,0x40,0x7C,0x00,0x00,0x00,
+
+        4, // 0x5B '['
+        0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,0x00,0x00,
+
+        7, // 0x5C '\'
+        0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,0x00,
+
+        4, // 0x5D ']'
+        0xE0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0xE0,0x00,0x00,
+
+        6, // 0x5E '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,
+
+        4, // 0x60 '`'
+        0x00,0x40,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x44,0x44,0x3C,0x00,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x00,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x00,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x7C,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x30,0x40,0xE0,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x44,0x38,
+
+        7, // 0x68 'h'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x40,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x10,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x90,0x60,0x00,
+
+        6, // 0x6B 'k'
+        0x00,0x40,0x40,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        9, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x76,0x00,0x49,0x00,0x49,0x00,0x49,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x6E 'n'
+        0x00,0x00,0x00,0x58,0x64,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x6F 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x40,0x40,0x40,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x04,0x04,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x24,0x20,0x20,0x20,0x20,0x70,0x00,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        5, // 0x74 't'
+        0x00,0x20,0x20,0x70,0x20,0x20,0x20,0x20,0x20,0x18,0x00,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x4C,0x34,0x00,0x00,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,0x00,
+
+        9, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x49,0x00,0x49,0x00,0x49,0x00,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x08,0x70,
+
+        6, // 0x7A 'z'
+        0x00,0x00,0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,0x00,
+
+        5, // 0x7B '{'
+        0x18,0x20,0x20,0x20,0x20,0xC0,0x20,0x20,0x20,0x20,0x18,0x00,0x00,
+
+        3, // 0x7C '|'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        5, // 0x7D '}'
+        0xC0,0x20,0x20,0x20,0x20,0x18,0x20,0x20,0x20,0x20,0xC0,0x00,0x00,
+
+        7, // 0x7E '~'
+        0x00,0x60,0x92,0x92,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7F ''
+        0x00,0x10,0x38,0x6C,0x44,0x44,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs5x10_mono[] =
+    {
+        10, 2, 32, 128-32,
+        0x00,0x00,0x0B,0x00,0x16,0x00,0x21,0x00,0x2C,0x00,0x37,0x00,0x42,0x00,0x4D,0x00,0x58,0x00,
+        0x63,0x00,0x6E,0x00,0x79,0x00,0x84,0x00,0x8F,0x00,0x9A,0x00,0xA5,0x00,0xB0,0x00,0xBB,0x00,
+        0xC6,0x00,0xD1,0x00,0xDC,0x00,0xE7,0x00,0xF2,0x00,0xFD,0x00,0x08,0x01,0x13,0x01,0x1E,0x01,
+        0x29,0x01,0x34,0x01,0x3F,0x01,0x4A,0x01,0x55,0x01,0x60,0x01,0x6B,0x01,0x76,0x01,0x81,0x01,
+        0x8C,0x01,0x97,0x01,0xA2,0x01,0xAD,0x01,0xB8,0x01,0xC3,0x01,0xCE,0x01,0xD9,0x01,0xE4,0x01,
+        0xEF,0x01,0xFA,0x01,0x05,0x02,0x10,0x02,0x1B,0x02,0x26,0x02,0x31,0x02,0x3C,0x02,0x47,0x02,
+        0x52,0x02,0x5D,0x02,0x68,0x02,0x73,0x02,0x7E,0x02,0x89,0x02,0x94,0x02,0x9F,0x02,0xAA,0x02,
+        0xB5,0x02,0xC0,0x02,0xCB,0x02,0xD6,0x02,0xE1,0x02,0xEC,0x02,0xF7,0x02,0x02,0x03,0x0D,0x03,
+        0x18,0x03,0x23,0x03,0x2E,0x03,0x39,0x03,0x44,0x03,0x4F,0x03,0x5A,0x03,0x65,0x03,0x70,0x03,
+        0x7B,0x03,0x86,0x03,0x91,0x03,0x9C,0x03,0xA7,0x03,0xB2,0x03,0xBD,0x03,0xC8,0x03,0xD3,0x03,
+        0xDE,0x03,0xE9,0x03,0xF4,0x03,0xFF,0x03,0x0A,0x04,0x15,0x04,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x50,0x50,0xA0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x23 '#'
+        0x00,0x50,0x50,0xF8,0x50,0x50,0x50,0xF8,0x50,0x50,
+
+        5, // 0x24 '$'
+        0x00,0x40,0x60,0x90,0x80,0x60,0x10,0x90,0x60,0x20,
+
+        5, // 0x25 '%'
+        0x00,0x00,0x90,0x90,0x20,0x20,0x40,0x40,0x90,0x90,
+
+        5, // 0x26 '&'
+        0x00,0x40,0xA0,0xA0,0xA0,0x40,0xA8,0x90,0x90,0x68,
+
+        5, // 0x27 '''
+        0x00,0x20,0x20,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x20,0x20,0x10,
+
+        5, // 0x29 ')'
+        0x40,0x20,0x20,0x10,0x10,0x10,0x10,0x20,0x20,0x40,
+
+        5, // 0x2A '*'
+        0x00,0x00,0x90,0x60,0xF0,0x60,0x90,0x00,0x00,0x00,
+
+        5, // 0x2B '+'
+        0x00,0x00,0x00,0x20,0x20,0xF8,0x20,0x20,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0xC0,
+
+        5, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,
+
+        5, // 0x2F '/'
+        0x00,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x00,
+
+        5, // 0x30 '0'
+        0x00,0x70,0x90,0x90,0x90,0x90,0x90,0x90,0xE0,0x00,
+
+        5, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x32 '2'
+        0x00,0x60,0x90,0x90,0x10,0x20,0x40,0x80,0xF0,0x00,
+
+        5, // 0x33 '3'
+        0x00,0x60,0x90,0x10,0x60,0x10,0x10,0x90,0x60,0x00,
+
+        5, // 0x34 '4'
+        0x00,0x10,0x30,0x50,0x50,0x90,0xF0,0x10,0x10,0x00,
+
+        5, // 0x35 '5'
+        0x00,0xF0,0x80,0x80,0xE0,0x10,0x10,0x90,0x60,0x00,
+
+        5, // 0x36 '6'
+        0x00,0x60,0x80,0x80,0xE0,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x37 '7'
+        0x00,0xF0,0x10,0x10,0x20,0x20,0x40,0x40,0x40,0x00,
+
+        5, // 0x38 '8'
+        0x00,0x60,0x90,0x90,0x60,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x39 '9'
+        0x00,0x60,0x90,0x90,0x90,0x70,0x10,0x10,0x60,0x00,
+
+        5, // 0x3A ':'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,
+
+        5, // 0x3B ';'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0xC0,
+
+        5, // 0x3C '<'
+        0x00,0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10,0x08,
+
+        5, // 0x3D '='
+        0x00,0x00,0x00,0x00,0xF0,0x00,0xF0,0x00,0x00,0x00,
+
+        5, // 0x3E '>'
+        0x00,0x80,0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x80,
+
+        5, // 0x3F '?'
+        0x00,0x60,0x90,0x10,0x10,0x20,0x40,0x00,0x40,0x00,
+
+        5, // 0x40 '@'
+        0x00,0x60,0x90,0x90,0xB0,0xB0,0x80,0x80,0x70,0x00,
+
+        5, // 0x41 'A'
+        0x00,0x60,0x90,0x90,0x90,0xF0,0x90,0x90,0x90,0x00,
+
+        5, // 0x42 'B'
+        0x00,0xE0,0x90,0x90,0xE0,0x90,0x90,0x90,0xE0,0x00,
+
+        5, // 0x43 'C'
+        0x00,0x60,0x90,0x80,0x80,0x80,0x80,0x90,0x60,0x00,
+
+        5, // 0x44 'D'
+        0x00,0xE0,0x90,0x90,0x90,0x90,0x90,0x90,0xE0,0x00,
+
+        5, // 0x45 'E'
+        0x00,0xF0,0x80,0x80,0xF0,0x80,0x80,0x80,0xF0,0x00,
+
+        5, // 0x46 'F'
+        0x00,0xF0,0x80,0x80,0xF0,0x80,0x80,0x80,0x80,0x00,
+
+        5, // 0x47 'G'
+        0x00,0x60,0x90,0x80,0x80,0xB0,0x90,0x90,0x60,0x00,
+
+        5, // 0x48 'H'
+        0x00,0x90,0x90,0x90,0x90,0xF0,0x90,0x90,0x90,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x4A 'J'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0xA0,0x40,0x00,
+
+        5, // 0x4B 'K'
+        0x00,0x90,0xA0,0xA0,0xC0,0xC0,0xA0,0xA0,0x90,0x00,
+
+        5, // 0x4C 'L'
+        0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xF0,0x00,
+
+        5, // 0x4D 'M'
+        0x00,0x90,0x90,0xF0,0xF0,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x4E 'N'
+        0x00,0x90,0x90,0xD0,0xD0,0xB0,0xB0,0x90,0x90,0x00,
+
+        5, // 0x4F 'O'
+        0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x50 'P'
+        0x00,0xE0,0x90,0x90,0x90,0xE0,0x80,0x80,0x80,0x00,
+
+        5, // 0x51 'Q'
+        0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x30,
+
+        5, // 0x52 'R'
+        0x00,0xE0,0x90,0x90,0x90,0xE0,0xA0,0x90,0x90,0x00,
+
+        5, // 0x53 'S'
+        0x00,0x60,0x90,0x80,0x60,0x10,0x90,0x90,0x60,0x00,
+
+        5, // 0x54 'T'
+        0x00,0xF8,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x55 'U'
+        0x00,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x56 'V'
+        0x00,0x90,0x90,0x90,0x50,0x50,0x50,0x20,0x20,0x00,
+
+        5, // 0x57 'W'
+        0x00,0x90,0x90,0x90,0x90,0x90,0xF0,0xF0,0x90,0x00,
+
+        5, // 0x58 'X'
+        0x00,0x90,0x90,0x90,0x60,0x60,0x90,0x90,0x90,0x00,
+
+        5, // 0x59 'Y'
+        0x00,0x88,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x5A 'Z'
+        0x00,0xF0,0x10,0x20,0x20,0x40,0x40,0x80,0xF0,0x00,
+
+        5, // 0x5B '['
+        0x60,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x60,
+
+        5, // 0x5C '\'
+        0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,
+
+        5, // 0x5D ']'
+        0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,
+
+        5, // 0x5E '^'
+        0x00,0x20,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,
+
+        5, // 0x60 '`'
+        0x00,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x61 'a'
+        0x00,0x00,0x00,0x60,0x10,0x70,0x90,0x90,0x70,0x00,
+
+        5, // 0x62 'b'
+        0x00,0x80,0x80,0xE0,0x90,0x90,0x90,0x90,0xE0,0x00,
+
+        5, // 0x63 'c'
+        0x00,0x00,0x00,0x60,0x90,0x80,0x80,0x90,0x60,0x00,
+
+        5, // 0x64 'd'
+        0x00,0x10,0x10,0x70,0x90,0x90,0x90,0x90,0x70,0x00,
+
+        5, // 0x65 'e'
+        0x00,0x00,0x00,0x60,0x90,0x90,0xF0,0x80,0x70,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x30,0x40,0xE0,0x40,0x40,0x40,0x40,0x40,0x00,
+
+        5, // 0x67 'g'
+        0x00,0x00,0x00,0x70,0x90,0x90,0x90,0x70,0x10,0xE0,
+
+        5, // 0x68 'h'
+        0x00,0x80,0x80,0xE0,0x90,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x69 'i'
+        0x00,0x20,0x00,0x60,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x20,0x00,0x60,0x20,0x20,0x20,0x20,0x20,0xC0,
+
+        5, // 0x6B 'k'
+        0x00,0x80,0x80,0x90,0xA0,0xC0,0xA0,0x90,0x90,0x00,
+
+        5, // 0x6C 'l'
+        0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,
+
+        5, // 0x6D 'm'
+        0x00,0x00,0x00,0x90,0xF0,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x6E 'n'
+        0x00,0x00,0x00,0xE0,0x90,0x90,0x90,0x90,0x90,0x00,
+
+        5, // 0x6F 'o'
+        0x00,0x00,0x00,0x60,0x90,0x90,0x90,0x90,0x60,0x00,
+
+        5, // 0x70 'p'
+        0x00,0x00,0x00,0xE0,0x90,0x90,0x90,0xE0,0x80,0x80,
+
+        5, // 0x71 'q'
+        0x00,0x00,0x00,0x70,0x90,0x90,0x90,0x70,0x10,0x10,
+
+        5, // 0x72 'r'
+        0x00,0x00,0x00,0xB0,0x50,0x40,0x40,0x40,0xE0,0x00,
+
+        5, // 0x73 's'
+        0x00,0x00,0x00,0x60,0x90,0x40,0x20,0x90,0x60,0x00,
+
+        5, // 0x74 't'
+        0x00,0x40,0x40,0xE0,0x40,0x40,0x40,0x50,0x20,0x00,
+
+        5, // 0x75 'u'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0x90,0x70,0x00,
+
+        5, // 0x76 'v'
+        0x00,0x00,0x00,0x90,0x90,0x50,0x50,0x20,0x20,0x00,
+
+        5, // 0x77 'w'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0xF0,0x90,0x00,
+
+        5, // 0x78 'x'
+        0x00,0x00,0x00,0x90,0x90,0x60,0x60,0x90,0x90,0x00,
+
+        5, // 0x79 'y'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0x70,0x10,0xE0,
+
+        5, // 0x7A 'z'
+        0x00,0x00,0x00,0xF0,0x10,0x20,0x40,0x80,0xF0,0x00,
+
+        5, // 0x7B '{'
+        0x30,0x40,0x40,0x40,0x80,0x40,0x40,0x40,0x40,0x30,
+
+        5, // 0x7C '|'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+
+        5, // 0x7D '}'
+        0xC0,0x20,0x20,0x20,0x10,0x20,0x20,0x20,0x20,0xC0,
+
+        5, // 0x7E '~'
+        0x00,0x40,0xA8,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x7F ''
+        0x00,0x20,0x70,0xD8,0x88,0x88,0xF8,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs5x11_mono[] =
+    {
+        11, 3, 32, 128-32,
+        0x00,0x00,0x0C,0x00,0x18,0x00,0x24,0x00,0x30,0x00,0x3C,0x00,0x48,0x00,0x54,0x00,0x60,0x00,
+        0x6C,0x00,0x78,0x00,0x84,0x00,0x90,0x00,0x9C,0x00,0xA8,0x00,0xB4,0x00,0xC0,0x00,0xCC,0x00,
+        0xD8,0x00,0xE4,0x00,0xF0,0x00,0xFC,0x00,0x08,0x01,0x14,0x01,0x20,0x01,0x2C,0x01,0x38,0x01,
+        0x44,0x01,0x50,0x01,0x5C,0x01,0x68,0x01,0x74,0x01,0x80,0x01,0x8C,0x01,0x98,0x01,0xA4,0x01,
+        0xB0,0x01,0xBC,0x01,0xC8,0x01,0xD4,0x01,0xE0,0x01,0xEC,0x01,0xF8,0x01,0x04,0x02,0x10,0x02,
+        0x1C,0x02,0x28,0x02,0x34,0x02,0x40,0x02,0x4C,0x02,0x58,0x02,0x64,0x02,0x70,0x02,0x7C,0x02,
+        0x88,0x02,0x94,0x02,0xA0,0x02,0xAC,0x02,0xB8,0x02,0xC4,0x02,0xD0,0x02,0xDC,0x02,0xE8,0x02,
+        0xF4,0x02,0x00,0x03,0x0C,0x03,0x18,0x03,0x24,0x03,0x30,0x03,0x3C,0x03,0x48,0x03,0x54,0x03,
+        0x60,0x03,0x6C,0x03,0x78,0x03,0x84,0x03,0x90,0x03,0x9C,0x03,0xA8,0x03,0xB4,0x03,0xC0,0x03,
+        0xCC,0x03,0xD8,0x03,0xE4,0x03,0xF0,0x03,0xFC,0x03,0x08,0x04,0x14,0x04,0x20,0x04,0x2C,0x04,
+        0x38,0x04,0x44,0x04,0x50,0x04,0x5C,0x04,0x68,0x04,0x74,0x04,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x50,0x50,0xA0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x23 '#'
+        0x00,0x50,0x50,0xF8,0x50,0x50,0x50,0xF8,0x50,0x50,0x00,
+
+        5, // 0x24 '$'
+        0x00,0x40,0x60,0x90,0x80,0x60,0x10,0x90,0x60,0x20,0x00,
+
+        5, // 0x25 '%'
+        0x00,0x00,0x90,0x90,0x20,0x20,0x40,0x40,0x90,0x90,0x00,
+
+        5, // 0x26 '&'
+        0x00,0x40,0xA0,0xA0,0x40,0xA8,0x90,0x90,0x68,0x00,0x00,
+
+        5, // 0x27 '''
+        0x00,0x20,0x20,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x00,0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x20,0x20,0x10,
+
+        5, // 0x29 ')'
+        0x00,0x40,0x20,0x20,0x10,0x10,0x10,0x10,0x20,0x20,0x40,
+
+        5, // 0x2A '*'
+        0x00,0x00,0x90,0x60,0xF0,0x60,0x90,0x00,0x00,0x00,0x00,
+
+        5, // 0x2B '+'
+        0x00,0x00,0x00,0x20,0x20,0xF8,0x20,0x20,0x00,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x40,0x80,
+
+        5, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        5, // 0x2F '/'
+        0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80,0x00,
+
+        5, // 0x30 '0'
+        0x00,0x70,0x90,0x90,0x90,0x90,0x90,0x90,0xE0,0x00,0x00,
+
+        5, // 0x31 '1'
+        0x00,0x20,0x60,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        5, // 0x32 '2'
+        0x00,0x60,0x90,0x90,0x10,0x20,0x40,0x80,0xF0,0x00,0x00,
+
+        5, // 0x33 '3'
+        0x00,0x60,0x90,0x10,0x60,0x10,0x10,0x90,0x60,0x00,0x00,
+
+        5, // 0x34 '4'
+        0x00,0x10,0x30,0x50,0x50,0x90,0xF8,0x10,0x10,0x00,0x00,
+
+        5, // 0x35 '5'
+        0x00,0xF0,0x80,0xE0,0x90,0x10,0x10,0x90,0x60,0x00,0x00,
+
+        5, // 0x36 '6'
+        0x00,0x60,0x90,0x80,0xE0,0x90,0x90,0x90,0x60,0x00,0x00,
+
+        5, // 0x37 '7'
+        0x00,0xF0,0x10,0x10,0x20,0x20,0x40,0x40,0x40,0x00,0x00,
+
+        5, // 0x38 '8'
+        0x00,0x60,0x90,0x90,0x60,0x90,0x90,0x90,0x60,0x00,0x00,
+
+        5, // 0x39 '9'
+        0x00,0x60,0x90,0x90,0x90,0x70,0x10,0x90,0x60,0x00,0x00,
+
+        5, // 0x3A ':'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        5, // 0x3B ';'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x40,0x80,
+
+        5, // 0x3C '<'
+        0x00,0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10,0x08,0x00,
+
+        5, // 0x3D '='
+        0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0xF0,0x00,0x00,0x00,
+
+        5, // 0x3E '>'
+        0x00,0x80,0x40,0x20,0x10,0x08,0x10,0x20,0x40,0x80,0x00,
+
+        5, // 0x3F '?'
+        0x00,0x60,0x90,0x10,0x10,0x20,0x40,0x00,0x40,0x00,0x00,
+
+        5, // 0x40 '@'
+        0x00,0x60,0x90,0x90,0xB0,0xB0,0x80,0x80,0x70,0x00,0x00,
+
+        5, // 0x41 'A'
+        0x00,0x60,0x90,0x90,0x90,0xF0,0x90,0x90,0x90,0x00,0x00,
+
+        5, // 0x42 'B'
+        0x00,0xE0,0x90,0x90,0xE0,0x90,0x90,0x90,0xE0,0x00,0x00,
+
+        5, // 0x43 'C'
+        0x00,0x60,0x90,0x80,0x80,0x80,0x80,0x90,0x60,0x00,0x00,
+
+        5, // 0x44 'D'
+        0x00,0xE0,0x90,0x90,0x90,0x90,0x90,0x90,0xE0,0x00,0x00,
+
+        5, // 0x45 'E'
+        0x00,0xF0,0x80,0x80,0xE0,0x80,0x80,0x80,0xF0,0x00,0x00,
+
+        5, // 0x46 'F'
+        0x00,0xF0,0x80,0x80,0xE0,0x80,0x80,0x80,0x80,0x00,0x00,
+
+        5, // 0x47 'G'
+        0x00,0x60,0x90,0x80,0x80,0xB0,0x90,0x90,0x60,0x00,0x00,
+
+        5, // 0x48 'H'
+        0x00,0x90,0x90,0x90,0xF0,0x90,0x90,0x90,0x90,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        5, // 0x4A 'J'
+        0x00,0x70,0x20,0x20,0x20,0x20,0xA0,0xA0,0x40,0x00,0x00,
+
+        5, // 0x4B 'K'
+        0x00,0x90,0xA0,0xA0,0xC0,0xA0,0xA0,0x90,0x90,0x00,0x00,
+
+        5, // 0x4C 'L'
+        0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xF0,0x00,0x00,
+
+        5, // 0x4D 'M'
+        0x00,0x90,0xF0,0xF0,0x90,0x90,0x90,0x90,0x90,0x00,0x00,
+
+        5, // 0x4E 'N'
+        0x00,0x90,0x90,0xD0,0xD0,0xB0,0xB0,0x90,0x90,0x00,0x00,
+
+        5, // 0x4F 'O'
+        0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x00,0x00,
+
+        5, // 0x50 'P'
+        0x00,0xE0,0x90,0x90,0x90,0xE0,0x80,0x80,0x80,0x00,0x00,
+
+        5, // 0x51 'Q'
+        0x00,0x60,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x30,0x00,
+
+        5, // 0x52 'R'
+        0x00,0xE0,0x90,0x90,0x90,0xE0,0xA0,0x90,0x90,0x00,0x00,
+
+        5, // 0x53 'S'
+        0x00,0x60,0x90,0x80,0x60,0x10,0x90,0x90,0x60,0x00,0x00,
+
+        5, // 0x54 'T'
+        0x00,0xF8,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        5, // 0x55 'U'
+        0x00,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x60,0x00,0x00,
+
+        5, // 0x56 'V'
+        0x00,0x90,0x90,0x90,0x50,0x50,0x50,0x20,0x20,0x00,0x00,
+
+        5, // 0x57 'W'
+        0x00,0x90,0x90,0x90,0x90,0x90,0xF0,0xF0,0x90,0x00,0x00,
+
+        5, // 0x58 'X'
+        0x00,0x90,0x90,0x90,0x60,0x60,0x90,0x90,0x90,0x00,0x00,
+
+        5, // 0x59 'Y'
+        0x00,0x88,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x00,0x00,
+
+        5, // 0x5A 'Z'
+        0x00,0xF0,0x10,0x20,0x20,0x40,0x40,0x80,0xF0,0x00,0x00,
+
+        5, // 0x5B '['
+        0x00,0x60,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x60,
+
+        5, // 0x5C '\'
+        0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,
+
+        5, // 0x5D ']'
+        0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,
+
+        5, // 0x5E '^'
+        0x00,0x20,0x50,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,
+
+        5, // 0x60 '`'
+        0x00,0x40,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x61 'a'
+        0x00,0x00,0x00,0x60,0x10,0x70,0x90,0x90,0x70,0x00,0x00,
+
+        5, // 0x62 'b'
+        0x00,0x80,0x80,0xE0,0x90,0x90,0x90,0x90,0xE0,0x00,0x00,
+
+        5, // 0x63 'c'
+        0x00,0x00,0x00,0x60,0x90,0x80,0x80,0x90,0x60,0x00,0x00,
+
+        5, // 0x64 'd'
+        0x00,0x10,0x10,0x70,0x90,0x90,0x90,0x90,0x70,0x00,0x00,
+
+        5, // 0x65 'e'
+        0x00,0x00,0x00,0x60,0x90,0x90,0xF0,0x80,0x70,0x00,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x30,0x40,0xE0,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        5, // 0x67 'g'
+        0x00,0x00,0x00,0x70,0x90,0x90,0x90,0x90,0x70,0x10,0xE0,
+
+        5, // 0x68 'h'
+        0x00,0x80,0x80,0xE0,0x90,0x90,0x90,0x90,0x90,0x00,0x00,
+
+        5, // 0x69 'i'
+        0x00,0x20,0x00,0x60,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x20,0x00,0x60,0x20,0x20,0x20,0x20,0x20,0xA0,0x40,
+
+        5, // 0x6B 'k'
+        0x00,0x80,0x80,0x90,0xA0,0xC0,0xA0,0x90,0x90,0x00,0x00,
+
+        5, // 0x6C 'l'
+        0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        5, // 0x6D 'm'
+        0x00,0x00,0x00,0x90,0xF0,0x90,0x90,0x90,0x90,0x00,0x00,
+
+        5, // 0x6E 'n'
+        0x00,0x00,0x00,0xE0,0x90,0x90,0x90,0x90,0x90,0x00,0x00,
+
+        5, // 0x6F 'o'
+        0x00,0x00,0x00,0x60,0x90,0x90,0x90,0x90,0x60,0x00,0x00,
+
+        5, // 0x70 'p'
+        0x00,0x00,0x00,0xE0,0x90,0x90,0x90,0x90,0xE0,0x80,0x80,
+
+        5, // 0x71 'q'
+        0x00,0x00,0x00,0x70,0x90,0x90,0x90,0x90,0x70,0x10,0x10,
+
+        5, // 0x72 'r'
+        0x00,0x00,0x00,0xA0,0x50,0x40,0x40,0x40,0xE0,0x00,0x00,
+
+        5, // 0x73 's'
+        0x00,0x00,0x00,0x60,0x90,0x40,0x20,0x90,0x60,0x00,0x00,
+
+        5, // 0x74 't'
+        0x00,0x40,0x40,0xE0,0x40,0x40,0x40,0x40,0x30,0x00,0x00,
+
+        5, // 0x75 'u'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0x90,0x70,0x00,0x00,
+
+        5, // 0x76 'v'
+        0x00,0x00,0x00,0x90,0x90,0x50,0x50,0x20,0x20,0x00,0x00,
+
+        5, // 0x77 'w'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0xF0,0x90,0x00,0x00,
+
+        5, // 0x78 'x'
+        0x00,0x00,0x00,0x90,0x90,0x60,0x60,0x90,0x90,0x00,0x00,
+
+        5, // 0x79 'y'
+        0x00,0x00,0x00,0x90,0x90,0x90,0x90,0x90,0x70,0x10,0xE0,
+
+        5, // 0x7A 'z'
+        0x00,0x00,0x00,0xF0,0x10,0x20,0x40,0x80,0xF0,0x00,0x00,
+
+        5, // 0x7B '{'
+        0x30,0x40,0x40,0x40,0x40,0x80,0x40,0x40,0x40,0x40,0x30,
+
+        5, // 0x7C '|'
+        0x00,0x20,0x20,0x20,0x20,0x00,0x20,0x20,0x20,0x20,0x00,
+
+        5, // 0x7D '}'
+        0xC0,0x20,0x20,0x20,0x20,0x10,0x20,0x20,0x20,0x20,0xC0,
+
+        5, // 0x7E '~'
+        0x00,0x40,0xA8,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x7F ''
+        0x00,0x20,0x70,0xD8,0x88,0x88,0xF8,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs6x10_mono[] =
+    {
+        10, 3, 32, 128-32,
+        0x00,0x00,0x0B,0x00,0x16,0x00,0x21,0x00,0x2C,0x00,0x37,0x00,0x42,0x00,0x4D,0x00,0x58,0x00,
+        0x63,0x00,0x6E,0x00,0x79,0x00,0x84,0x00,0x8F,0x00,0x9A,0x00,0xA5,0x00,0xB0,0x00,0xBB,0x00,
+        0xC6,0x00,0xD1,0x00,0xDC,0x00,0xE7,0x00,0xF2,0x00,0xFD,0x00,0x08,0x01,0x13,0x01,0x1E,0x01,
+        0x29,0x01,0x34,0x01,0x3F,0x01,0x4A,0x01,0x55,0x01,0x60,0x01,0x6B,0x01,0x76,0x01,0x81,0x01,
+        0x8C,0x01,0x97,0x01,0xA2,0x01,0xAD,0x01,0xB8,0x01,0xC3,0x01,0xCE,0x01,0xD9,0x01,0xE4,0x01,
+        0xEF,0x01,0xFA,0x01,0x05,0x02,0x10,0x02,0x1B,0x02,0x26,0x02,0x31,0x02,0x3C,0x02,0x47,0x02,
+        0x52,0x02,0x5D,0x02,0x68,0x02,0x73,0x02,0x7E,0x02,0x89,0x02,0x94,0x02,0x9F,0x02,0xAA,0x02,
+        0xB5,0x02,0xC0,0x02,0xCB,0x02,0xD6,0x02,0xE1,0x02,0xEC,0x02,0xF7,0x02,0x02,0x03,0x0D,0x03,
+        0x18,0x03,0x23,0x03,0x2E,0x03,0x39,0x03,0x44,0x03,0x4F,0x03,0x5A,0x03,0x65,0x03,0x70,0x03,
+        0x7B,0x03,0x86,0x03,0x91,0x03,0x9C,0x03,0xA7,0x03,0xB2,0x03,0xBD,0x03,0xC8,0x03,0xD3,0x03,
+        0xDE,0x03,0xE9,0x03,0xF4,0x03,0xFF,0x03,0x0A,0x04,0x15,0x04,
+
+        6, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x10,0x10,0x10,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        6, // 0x22 '"'
+        0x00,0x28,0x28,0x50,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x23 '#'
+        0x00,0x28,0x28,0x7C,0x28,0x28,0x7C,0x28,0x28,0x00,
+
+        6, // 0x24 '$'
+        0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x00,
+
+        6, // 0x25 '%'
+        0x00,0x08,0xC8,0xD0,0x10,0x20,0x2C,0x4C,0x40,0x00,
+
+        6, // 0x26 '&'
+        0x00,0x20,0x50,0x50,0x24,0x54,0x48,0x34,0x00,0x00,
+
+        6, // 0x27 '''
+        0x00,0x10,0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x28 '('
+        0x08,0x10,0x10,0x20,0x20,0x20,0x10,0x10,0x08,0x00,
+
+        6, // 0x29 ')'
+        0x20,0x10,0x10,0x08,0x08,0x08,0x10,0x10,0x20,0x00,
+
+        6, // 0x2A '*'
+        0x00,0x00,0x28,0x7C,0x38,0x7C,0x28,0x00,0x00,0x00,
+
+        6, // 0x2B '+'
+        0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,
+
+        6, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x20,0x40,
+
+        6, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        6, // 0x2F '/'
+        0x00,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,
+
+        6, // 0x30 '0'
+        0x00,0x38,0x44,0x4C,0x54,0x64,0x44,0x38,0x00,0x00,
+
+        6, // 0x31 '1'
+        0x00,0x10,0x30,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x32 '2'
+        0x00,0x38,0x44,0x04,0x18,0x20,0x40,0x7C,0x00,0x00,
+
+        6, // 0x33 '3'
+        0x00,0x38,0x44,0x04,0x38,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x08,0x18,0x28,0x48,0x7C,0x08,0x08,0x00,0x00,
+
+        6, // 0x35 '5'
+        0x00,0x7C,0x40,0x40,0x78,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x36 '6'
+        0x00,0x38,0x40,0x40,0x78,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x37 '7'
+        0x00,0x7C,0x04,0x08,0x10,0x20,0x20,0x20,0x00,0x00,
+
+        6, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x3C,0x04,0x04,0x38,0x00,0x00,
+
+        6, // 0x3A ':'
+        0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        6, // 0x3B ';'
+        0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x20,0x40,
+
+        6, // 0x3C '<'
+        0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,
+
+        6, // 0x3D '='
+        0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,
+
+        6, // 0x3E '>'
+        0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x38,0x44,0x04,0x18,0x10,0x00,0x10,0x00,0x00,
+
+        6, // 0x40 '@'
+        0x00,0x38,0x44,0x5C,0x54,0x5C,0x40,0x38,0x00,0x00,
+
+        6, // 0x41 'A'
+        0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x00,0x00,
+
+        6, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x78,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        6, // 0x44 'D'
+        0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x45 'E'
+        0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        6, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x4C,0x44,0x44,0x3C,0x00,0x00,
+
+        6, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x49 'I'
+        0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x1C,0x08,0x08,0x08,0x48,0x48,0x30,0x00,0x00,
+
+        6, // 0x4B 'K'
+        0x00,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x4D 'M'
+        0x00,0x44,0x6C,0x54,0x54,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x4E 'N'
+        0x00,0x44,0x44,0x64,0x54,0x4C,0x44,0x44,0x00,0x00,
+
+        6, // 0x4F 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        6, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,
+
+        6, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x78,0x48,0x44,0x44,0x00,0x00,
+
+        6, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x54 'T'
+        0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x28,0x10,0x00,0x00,
+
+        6, // 0x57 'W'
+        0x00,0x44,0x44,0x54,0x54,0x54,0x54,0x28,0x00,0x00,
+
+        6, // 0x58 'X'
+        0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,
+
+        6, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x5A 'Z'
+        0x00,0x78,0x08,0x10,0x20,0x40,0x40,0x78,0x00,0x00,
+
+        6, // 0x5B '['
+        0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x38,0x00,
+
+        6, // 0x5C '\'
+        0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,
+
+        6, // 0x5D ']'
+        0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x38,0x00,
+
+        6, // 0x5E '^'
+        0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,
+
+        6, // 0x60 '`'
+        0x00,0x10,0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x3C,0x00,0x00,
+
+        6, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x3C,0x00,0x00,
+
+        6, // 0x64 'd'
+        0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        6, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x78,0x40,0x3C,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x0C,0x10,0x10,0x38,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x67 'g'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x3C,0x04,0x38,
+
+        6, // 0x68 'h'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x69 'i'
+        0x00,0x10,0x00,0x30,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x6A 'j'
+        0x00,0x08,0x00,0x18,0x08,0x08,0x08,0x08,0x48,0x30,
+
+        6, // 0x6B 'k'
+        0x00,0x40,0x40,0x48,0x50,0x60,0x50,0x48,0x00,0x00,
+
+        6, // 0x6C 'l'
+        0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x6D 'm'
+        0x00,0x00,0x00,0x68,0x54,0x54,0x44,0x44,0x00,0x00,
+
+        6, // 0x6E 'n'
+        0x00,0x00,0x00,0x58,0x64,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x6F 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x78,0x40,0x40,
+
+        6, // 0x71 'q'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x3C,0x04,0x04,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x24,0x20,0x20,0x70,0x00,0x00,
+
+        6, // 0x73 's'
+        0x00,0x00,0x00,0x38,0x40,0x38,0x04,0x78,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x10,0x10,0x38,0x10,0x10,0x14,0x08,0x00,0x00,
+
+        6, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x4C,0x34,0x00,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x28,0x10,0x00,0x00,
+
+        6, // 0x77 'w'
+        0x00,0x00,0x00,0x44,0x44,0x54,0x7C,0x28,0x00,0x00,
+
+        6, // 0x78 'x'
+        0x00,0x00,0x00,0x48,0x48,0x30,0x48,0x48,0x00,0x00,
+
+        6, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x3C,0x04,0x38,
+
+        6, // 0x7A 'z'
+        0x00,0x00,0x00,0x78,0x08,0x30,0x40,0x78,0x00,0x00,
+
+        6, // 0x7B '{'
+        0x18,0x20,0x20,0x20,0xC0,0x20,0x20,0x20,0x18,0x00,
+
+        6, // 0x7C '|'
+        0x10,0x10,0x10,0x10,0x00,0x10,0x10,0x10,0x10,0x00,
+
+        6, // 0x7D '}'
+        0x60,0x10,0x10,0x10,0x0C,0x10,0x10,0x10,0x60,0x00,
+
+        6, // 0x7E '~'
+        0x00,0x48,0xA8,0x90,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x7F ''
+        0x00,0x10,0x38,0x6C,0x44,0x44,0x7C,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs6x11_mono[] =
+    {
+        11, 3, 32, 128-32,
+        0x00,0x00,0x0C,0x00,0x18,0x00,0x24,0x00,0x30,0x00,0x3C,0x00,0x48,0x00,0x54,0x00,0x60,0x00,
+        0x6C,0x00,0x78,0x00,0x84,0x00,0x90,0x00,0x9C,0x00,0xA8,0x00,0xB4,0x00,0xC0,0x00,0xCC,0x00,
+        0xD8,0x00,0xE4,0x00,0xF0,0x00,0xFC,0x00,0x08,0x01,0x14,0x01,0x20,0x01,0x2C,0x01,0x38,0x01,
+        0x44,0x01,0x50,0x01,0x5C,0x01,0x68,0x01,0x74,0x01,0x80,0x01,0x8C,0x01,0x98,0x01,0xA4,0x01,
+        0xB0,0x01,0xBC,0x01,0xC8,0x01,0xD4,0x01,0xE0,0x01,0xEC,0x01,0xF8,0x01,0x04,0x02,0x10,0x02,
+        0x1C,0x02,0x28,0x02,0x34,0x02,0x40,0x02,0x4C,0x02,0x58,0x02,0x64,0x02,0x70,0x02,0x7C,0x02,
+        0x88,0x02,0x94,0x02,0xA0,0x02,0xAC,0x02,0xB8,0x02,0xC4,0x02,0xD0,0x02,0xDC,0x02,0xE8,0x02,
+        0xF4,0x02,0x00,0x03,0x0C,0x03,0x18,0x03,0x24,0x03,0x30,0x03,0x3C,0x03,0x48,0x03,0x54,0x03,
+        0x60,0x03,0x6C,0x03,0x78,0x03,0x84,0x03,0x90,0x03,0x9C,0x03,0xA8,0x03,0xB4,0x03,0xC0,0x03,
+        0xCC,0x03,0xD8,0x03,0xE4,0x03,0xF0,0x03,0xFC,0x03,0x08,0x04,0x14,0x04,0x20,0x04,0x2C,0x04,
+        0x38,0x04,0x44,0x04,0x50,0x04,0x5C,0x04,0x68,0x04,0x74,0x04,
+
+        6, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        6, // 0x22 '"'
+        0x00,0x28,0x28,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x23 '#'
+        0x00,0x28,0x28,0x7C,0x28,0x28,0x7C,0x28,0x28,0x00,0x00,
+
+        6, // 0x24 '$'
+        0x00,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x00,
+
+        6, // 0x25 '%'
+        0x00,0x68,0xA8,0xD0,0x10,0x20,0x2C,0x54,0x58,0x00,0x00,
+
+        6, // 0x26 '&'
+        0x00,0x20,0x50,0x50,0x20,0x54,0x54,0x48,0x34,0x00,0x00,
+
+        6, // 0x27 '''
+        0x00,0x10,0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x28 '('
+        0x08,0x10,0x10,0x20,0x20,0x20,0x20,0x10,0x10,0x08,0x00,
+
+        6, // 0x29 ')'
+        0x20,0x10,0x10,0x08,0x08,0x08,0x08,0x10,0x10,0x20,0x00,
+
+        6, // 0x2A '*'
+        0x00,0x00,0x28,0x7C,0x38,0x7C,0x28,0x00,0x00,0x00,0x00,
+
+        6, // 0x2B '+'
+        0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,
+
+        6, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x20,0x40,
+
+        6, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        6, // 0x2F '/'
+        0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,
+
+        6, // 0x30 '0'
+        0x00,0x38,0x44,0x44,0x54,0x54,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x31 '1'
+        0x00,0x10,0x30,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x32 '2'
+        0x00,0x38,0x44,0x44,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        6, // 0x33 '3'
+        0x00,0x38,0x44,0x04,0x38,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x08,0x18,0x28,0x28,0x48,0x7C,0x08,0x08,0x00,0x00,
+
+        6, // 0x35 '5'
+        0x00,0x7C,0x40,0x78,0x44,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x36 '6'
+        0x00,0x38,0x44,0x40,0x78,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x37 '7'
+        0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x00,0x00,
+
+        6, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x3C,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x3A ':'
+        0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        6, // 0x3B ';'
+        0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x20,0x40,
+
+        6, // 0x3C '<'
+        0x00,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,
+
+        6, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,
+
+        6, // 0x3E '>'
+        0x00,0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x38,0x44,0x04,0x08,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        6, // 0x40 '@'
+        0x00,0x38,0x44,0x5C,0x54,0x54,0x4C,0x40,0x38,0x00,0x00,
+
+        6, // 0x41 'A'
+        0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x78,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        6, // 0x44 'D'
+        0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x48,0x70,0x00,0x00,
+
+        6, // 0x45 'E'
+        0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        6, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x40,0x5C,0x44,0x4C,0x34,0x00,0x00,
+
+        6, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x49 'I'
+        0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x1C,0x08,0x08,0x08,0x08,0x48,0x48,0x30,0x00,0x00,
+
+        6, // 0x4B 'K'
+        0x00,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x44,0x00,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x4D 'M'
+        0x00,0x44,0x6C,0x54,0x54,0x54,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x4E 'N'
+        0x00,0x44,0x64,0x64,0x54,0x54,0x4C,0x4C,0x44,0x00,0x00,
+
+        6, // 0x4F 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        6, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,
+
+        6, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x48,0x44,0x44,0x00,0x00,
+
+        6, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x38,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        6, // 0x54 'T'
+        0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        6, // 0x57 'W'
+        0x00,0x44,0x44,0x54,0x54,0x54,0x54,0x54,0x28,0x00,0x00,
+
+        6, // 0x58 'X'
+        0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x5A 'Z'
+        0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x5B '['
+        0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x38,0x00,
+
+        6, // 0x5C '\'
+        0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,
+
+        6, // 0x5D ']'
+        0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x38,0x00,
+
+        6, // 0x5E '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,
+
+        6, // 0x60 '`'
+        0x00,0x20,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x44,0x3C,0x00,0x00,
+
+        6, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        6, // 0x64 'd'
+        0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        6, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x7C,0x40,0x44,0x38,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x0C,0x10,0x38,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        6, // 0x67 'g'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x3C,0x04,0x78,
+
+        6, // 0x68 'h'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x69 'i'
+        0x00,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x6A 'j'
+        0x00,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x50,0x20,
+
+        6, // 0x6B 'k'
+        0x00,0x40,0x40,0x4C,0x50,0x60,0x50,0x48,0x44,0x00,0x00,
+
+        6, // 0x6C 'l'
+        0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        6, // 0x6D 'm'
+        0x00,0x00,0x00,0x68,0x54,0x54,0x54,0x44,0x44,0x00,0x00,
+
+        6, // 0x6E 'n'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        6, // 0x6F 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        6, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,
+
+        6, // 0x71 'q'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x3C,0x04,0x04,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x24,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        6, // 0x73 's'
+        0x00,0x00,0x00,0x38,0x44,0x30,0x08,0x44,0x38,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x20,0x20,0x70,0x20,0x20,0x20,0x20,0x18,0x00,0x00,
+
+        6, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x4C,0x34,0x00,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        6, // 0x77 'w'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x54,0x7C,0x28,0x00,0x00,
+
+        6, // 0x78 'x'
+        0x00,0x00,0x00,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,
+
+        6, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x3C,0x08,0x70,
+
+        6, // 0x7A 'z'
+        0x00,0x00,0x00,0x7C,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        6, // 0x7B '{'
+        0x18,0x20,0x20,0x20,0xC0,0xC0,0x20,0x20,0x20,0x18,0x00,
+
+        6, // 0x7C '|'
+        0x00,0x10,0x10,0x10,0x10,0x00,0x10,0x10,0x10,0x10,0x00,
+
+        6, // 0x7D '}'
+        0x60,0x10,0x10,0x10,0x0C,0x0C,0x10,0x10,0x10,0x60,0x00,
+
+        6, // 0x7E '~'
+        0x00,0x24,0x54,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x7F ''
+        0x00,0x10,0x38,0x6C,0x44,0x44,0x7C,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs7x12_mono_high[] =
+    {
+        12, 3, 32, 128-32,
+        0x00,0x00,0x0D,0x00,0x1A,0x00,0x27,0x00,0x34,0x00,0x41,0x00,0x4E,0x00,0x5B,0x00,0x68,0x00,
+        0x75,0x00,0x82,0x00,0x8F,0x00,0x9C,0x00,0xA9,0x00,0xB6,0x00,0xC3,0x00,0xD0,0x00,0xDD,0x00,
+        0xEA,0x00,0xF7,0x00,0x04,0x01,0x11,0x01,0x1E,0x01,0x2B,0x01,0x38,0x01,0x45,0x01,0x52,0x01,
+        0x5F,0x01,0x6C,0x01,0x79,0x01,0x86,0x01,0x93,0x01,0xA0,0x01,0xAD,0x01,0xBA,0x01,0xC7,0x01,
+        0xD4,0x01,0xE1,0x01,0xEE,0x01,0xFB,0x01,0x08,0x02,0x15,0x02,0x22,0x02,0x2F,0x02,0x3C,0x02,
+        0x49,0x02,0x56,0x02,0x63,0x02,0x70,0x02,0x7D,0x02,0x8A,0x02,0x97,0x02,0xA4,0x02,0xB1,0x02,
+        0xBE,0x02,0xCB,0x02,0xD8,0x02,0xE5,0x02,0xF2,0x02,0xFF,0x02,0x0C,0x03,0x19,0x03,0x26,0x03,
+        0x33,0x03,0x40,0x03,0x4D,0x03,0x5A,0x03,0x67,0x03,0x74,0x03,0x81,0x03,0x8E,0x03,0x9B,0x03,
+        0xA8,0x03,0xB5,0x03,0xC2,0x03,0xCF,0x03,0xDC,0x03,0xE9,0x03,0xF6,0x03,0x03,0x04,0x10,0x04,
+        0x1D,0x04,0x2A,0x04,0x37,0x04,0x44,0x04,0x51,0x04,0x5E,0x04,0x6B,0x04,0x78,0x04,0x85,0x04,
+        0x92,0x04,0x9F,0x04,0xAC,0x04,0xB9,0x04,0xC6,0x04,0xD3,0x04,
+
+        7, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x21 '!'
+        0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x28,0x28,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x23 '#'
+        0x24,0x24,0x24,0x7E,0x24,0x24,0x24,0x7E,0x24,0x24,0x24,0x00,
+
+        7, // 0x24 '$'
+        0x10,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x10,0x00,
+
+        7, // 0x25 '%'
+        0x32,0x54,0x64,0x08,0x08,0x10,0x10,0x26,0x2A,0x4C,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x20,0x50,0x50,0x50,0x20,0x54,0x54,0x48,0x34,0x00,0x00,
+
+        7, // 0x27 '''
+        0x10,0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x08,0x10,0x10,0x20,0x20,0x20,0x20,0x20,0x10,0x10,0x08,0x00,
+
+        7, // 0x29 ')'
+        0x20,0x10,0x10,0x08,0x08,0x08,0x08,0x08,0x10,0x10,0x20,0x00,
+
+        7, // 0x2A '*'
+        0x00,0x00,0x10,0x54,0x38,0x7C,0x38,0x54,0x10,0x00,0x00,0x00,
+
+        7, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x20,0x40,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        7, // 0x2F '/'
+        0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x38,0x44,0x44,0x54,0x54,0x54,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x10,0x30,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x38,0x44,0x04,0x04,0x38,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x08,0x18,0x28,0x28,0x48,0x48,0x7C,0x08,0x08,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x7C,0x40,0x40,0x78,0x44,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x38,0x44,0x40,0x78,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x20,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x44,0x3C,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x3A ':'
+        0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x30,0x30,0x00,0x00,
+
+        7, // 0x3B ';'
+        0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x30,0x30,0x20,0x40,
+
+        7, // 0x3C '<'
+        0x00,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+
+        7, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,
+
+        7, // 0x3E '>'
+        0x00,0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,0x00,
+
+        7, // 0x3F '?'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x38,0x44,0x44,0x5C,0x54,0x54,0x4C,0x40,0x38,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        7, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x44,0x48,0x70,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        7, // 0x46 'F'
+        0x00,0x7C,0x40,0x40,0x40,0x78,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x40,0x5C,0x44,0x44,0x4C,0x34,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x49 'I'
+        0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x4A 'J'
+        0x00,0x1C,0x08,0x08,0x08,0x08,0x08,0x48,0x48,0x30,0x00,0x00,
+
+        7, // 0x4B 'K'
+        0x00,0x44,0x48,0x50,0x60,0x60,0x50,0x48,0x44,0x44,0x00,0x00,
+
+        7, // 0x4C 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        7, // 0x4D 'M'
+        0x00,0x44,0x6C,0x6C,0x54,0x54,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x4E 'N'
+        0x00,0x44,0x64,0x64,0x54,0x54,0x4C,0x4C,0x44,0x44,0x00,0x00,
+
+        7, // 0x4F 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x48,0x44,0x44,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x40,0x38,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        7, // 0x57 'W'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x54,0x54,0x28,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x5A 'Z'
+        0x00,0x7C,0x04,0x04,0x08,0x10,0x20,0x40,0x40,0x7C,0x00,0x00,
+
+        7, // 0x5B '['
+        0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x38,0x00,
+
+        7, // 0x5C '\'
+        0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,
+
+        7, // 0x5D ']'
+        0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x38,0x00,
+
+        7, // 0x5E '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,
+
+        7, // 0x60 '`'
+        0x00,0x20,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x7C,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x66 'f'
+        0x00,0x0C,0x10,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x78,
+
+        7, // 0x68 'h'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x69 'i'
+        0x00,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x6A 'j'
+        0x00,0x08,0x00,0x18,0x08,0x08,0x08,0x08,0x08,0x08,0x48,0x30,
+
+        7, // 0x6B 'k'
+        0x00,0x40,0x40,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,
+
+        7, // 0x6C 'l'
+        0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x6D 'm'
+        0x00,0x00,0x00,0x68,0x54,0x54,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x6E 'n'
+        0x00,0x00,0x00,0x58,0x64,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x6F 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x78,0x40,0x40,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x04,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x24,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x74 't'
+        0x00,0x20,0x20,0x70,0x20,0x20,0x20,0x20,0x24,0x18,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x4C,0x34,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        7, // 0x77 'w'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x54,0x54,0x28,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x3C,0x08,0x70,
+
+        7, // 0x7A 'z'
+        0x00,0x00,0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        7, // 0x7B '{'
+        0x18,0x20,0x20,0x20,0x20,0xC0,0x20,0x20,0x20,0x20,0x18,0x00,
+
+        7, // 0x7C '|'
+        0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,
+
+        7, // 0x7D '}'
+        0x60,0x10,0x10,0x10,0x10,0x0C,0x10,0x10,0x10,0x10,0x60,0x00,
+
+        7, // 0x7E '~'
+        0x00,0x60,0x92,0x92,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7F ''
+        0x00,0x10,0x38,0x6C,0x44,0x44,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u mcs7x12_mono_low[] =
+    {
+        12, 4, 32, 128-32,
+        0x00,0x00,0x0D,0x00,0x1A,0x00,0x27,0x00,0x34,0x00,0x41,0x00,0x4E,0x00,0x5B,0x00,0x68,0x00,
+        0x75,0x00,0x82,0x00,0x8F,0x00,0x9C,0x00,0xA9,0x00,0xB6,0x00,0xC3,0x00,0xD0,0x00,0xDD,0x00,
+        0xEA,0x00,0xF7,0x00,0x04,0x01,0x11,0x01,0x1E,0x01,0x2B,0x01,0x38,0x01,0x45,0x01,0x52,0x01,
+        0x5F,0x01,0x6C,0x01,0x79,0x01,0x86,0x01,0x93,0x01,0xA0,0x01,0xAD,0x01,0xBA,0x01,0xC7,0x01,
+        0xD4,0x01,0xE1,0x01,0xEE,0x01,0xFB,0x01,0x08,0x02,0x15,0x02,0x22,0x02,0x2F,0x02,0x3C,0x02,
+        0x49,0x02,0x56,0x02,0x63,0x02,0x70,0x02,0x7D,0x02,0x8A,0x02,0x97,0x02,0xA4,0x02,0xB1,0x02,
+        0xBE,0x02,0xCB,0x02,0xD8,0x02,0xE5,0x02,0xF2,0x02,0xFF,0x02,0x0C,0x03,0x19,0x03,0x26,0x03,
+        0x33,0x03,0x40,0x03,0x4D,0x03,0x5A,0x03,0x67,0x03,0x74,0x03,0x81,0x03,0x8E,0x03,0x9B,0x03,
+        0xA8,0x03,0xB5,0x03,0xC2,0x03,0xCF,0x03,0xDC,0x03,0xE9,0x03,0xF6,0x03,0x03,0x04,0x10,0x04,
+        0x1D,0x04,0x2A,0x04,0x37,0x04,0x44,0x04,0x51,0x04,0x5E,0x04,0x6B,0x04,0x78,0x04,0x85,0x04,
+        0x92,0x04,0x9F,0x04,0xAC,0x04,0xB9,0x04,0xC6,0x04,0xD3,0x04,
+
+        7, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x21 '!'
+        0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x28,0x28,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x23 '#'
+        0x00,0x28,0x28,0x7C,0x28,0x28,0x28,0x7C,0x28,0x28,0x00,0x00,
+
+        7, // 0x24 '$'
+        0x00,0x10,0x38,0x54,0x50,0x38,0x14,0x54,0x38,0x10,0x00,0x00,
+
+        7, // 0x25 '%'
+        0x34,0x54,0x68,0x08,0x10,0x10,0x20,0x2C,0x54,0x58,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x20,0x50,0x50,0x20,0x54,0x54,0x48,0x34,0x00,0x00,0x00,
+
+        7, // 0x27 '''
+        0x00,0x10,0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x08,0x10,0x10,0x20,0x20,0x20,0x20,0x20,0x10,0x10,0x08,0x00,
+
+        7, // 0x29 ')'
+        0x20,0x10,0x10,0x08,0x08,0x08,0x08,0x08,0x10,0x10,0x20,0x00,
+
+        7, // 0x2A '*'
+        0x00,0x00,0x10,0x54,0x38,0x7C,0x38,0x54,0x10,0x00,0x00,0x00,
+
+        7, // 0x2B '+'
+        0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,0x00,
+
+        7, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x20,0x40,0x00,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x2F '/'
+        0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x00,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x38,0x44,0x44,0x54,0x54,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x10,0x30,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x38,0x44,0x44,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x38,0x44,0x04,0x38,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x08,0x18,0x28,0x28,0x48,0x7C,0x08,0x08,0x00,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x7C,0x40,0x78,0x44,0x04,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x38,0x44,0x40,0x78,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x00,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x38,0x44,0x44,0x44,0x3C,0x04,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x3A ':'
+        0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x3B ';'
+        0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x20,0x40,0x00,
+
+        7, // 0x3C '<'
+        0x00,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
+
+        7, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,
+
+        7, // 0x3E '>'
+        0x00,0x40,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x40,0x00,0x00,
+
+        7, // 0x3F '?'
+        0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        7, // 0x40 '@'
+        0x00,0x38,0x44,0x44,0x5C,0x54,0x4C,0x40,0x38,0x00,0x00,0x00,
+
+        7, // 0x41 'A'
+        0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x78,0x44,0x44,0x78,0x44,0x44,0x44,0x78,0x00,0x00,0x00,
+
+        7, // 0x43 'C'
+        0x00,0x38,0x44,0x40,0x40,0x40,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x70,0x48,0x44,0x44,0x44,0x44,0x48,0x70,0x00,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x40,0x7C,0x00,0x00,0x00,
+
+        7, // 0x46 'F'
+        0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x38,0x44,0x40,0x40,0x4C,0x44,0x4C,0x34,0x00,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x49 'I'
+        0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x4A 'J'
+        0x00,0x1C,0x08,0x08,0x08,0x08,0x48,0x48,0x30,0x00,0x00,0x00,
+
+        7, // 0x4B 'K'
+        0x00,0x44,0x48,0x50,0x60,0x60,0x50,0x48,0x44,0x00,0x00,0x00,
+
+        7, // 0x4C 'L'
+        0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,0x00,
+
+        7, // 0x4D 'M'
+        0x00,0x44,0x6C,0x54,0x54,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x4E 'N'
+        0x00,0x44,0x64,0x64,0x54,0x54,0x4C,0x4C,0x44,0x00,0x00,0x00,
+
+        7, // 0x4F 'O'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x51 'Q'
+        0x00,0x38,0x44,0x44,0x44,0x44,0x54,0x48,0x34,0x00,0x00,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x78,0x44,0x44,0x44,0x78,0x48,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x56 'V'
+        0x00,0x44,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x57 'W'
+        0x00,0x44,0x44,0x44,0x44,0x44,0x54,0x54,0x28,0x00,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x5A 'Z'
+        0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x40,0x7C,0x00,0x00,0x00,
+
+        7, // 0x5B '['
+        0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x38,0x00,
+
+        7, // 0x5C '\'
+        0x00,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,
+
+        7, // 0x5D ']'
+        0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x38,0x00,
+
+        7, // 0x5E '^'
+        0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,
+
+        7, // 0x60 '`'
+        0x00,0x20,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x44,0x3C,0x00,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x78,0x00,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x44,0x3C,0x00,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x38,0x44,0x7C,0x40,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x66 'f'
+        0x00,0x0C,0x10,0x38,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x3C,0x04,0x44,0x38,
+
+        7, // 0x68 'h'
+        0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x69 'i'
+        0x00,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x6A 'j'
+        0x00,0x08,0x00,0x18,0x08,0x08,0x08,0x08,0x08,0x48,0x48,0x30,
+
+        7, // 0x6B 'k'
+        0x00,0x40,0x40,0x4C,0x50,0x60,0x50,0x48,0x44,0x00,0x00,0x00,
+
+        7, // 0x6C 'l'
+        0x00,0x30,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,
+
+        7, // 0x6D 'm'
+        0x00,0x00,0x00,0x68,0x54,0x54,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x6E 'n'
+        0x00,0x00,0x00,0x58,0x64,0x44,0x44,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x6F 'o'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,0x40,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x3C,0x04,0x04,0x04,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0x58,0x24,0x20,0x20,0x20,0x70,0x00,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x38,0x44,0x30,0x08,0x44,0x38,0x00,0x00,0x00,
+
+        7, // 0x74 't'
+        0x00,0x20,0x20,0x70,0x20,0x20,0x20,0x24,0x18,0x00,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x4C,0x34,0x00,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x77 'w'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x54,0x54,0x28,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x3C,0x04,0x08,0x70,
+
+        7, // 0x7A 'z'
+        0x00,0x00,0x00,0x7C,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,0x00,
+
+        7, // 0x7B '{'
+        0x18,0x20,0x20,0x20,0x20,0xC0,0x20,0x20,0x20,0x20,0x18,0x00,
+
+        7, // 0x7C '|'
+        0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,
+
+        7, // 0x7D '}'
+        0x60,0x10,0x10,0x10,0x10,0x0C,0x10,0x10,0x10,0x10,0x60,0x00,
+
+        7, // 0x7E '~'
+        0x00,0x24,0x54,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x7F ''
+        0x00,0x10,0x38,0x6C,0x44,0x44,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana12[] =
+    {
+        12, 3, 32, 128-32,
+        0x00,0x00,0x0D,0x00,0x1A,0x00,0x27,0x00,0x34,0x00,0x41,0x00,0x5A,0x00,0x67,0x00,0x74,0x00,
+        0x81,0x00,0x8E,0x00,0x9B,0x00,0xA8,0x00,0xB5,0x00,0xC2,0x00,0xCF,0x00,0xDC,0x00,0xE9,0x00,
+        0xF6,0x00,0x03,0x01,0x10,0x01,0x1D,0x01,0x2A,0x01,0x37,0x01,0x44,0x01,0x51,0x01,0x5E,0x01,
+        0x6B,0x01,0x78,0x01,0x85,0x01,0x92,0x01,0x9F,0x01,0xAC,0x01,0xC5,0x01,0xD2,0x01,0xDF,0x01,
+        0xEC,0x01,0xF9,0x01,0x06,0x02,0x13,0x02,0x20,0x02,0x2D,0x02,0x3A,0x02,0x47,0x02,0x54,0x02,
+        0x61,0x02,0x7A,0x02,0x87,0x02,0xA0,0x02,0xAD,0x02,0xC6,0x02,0xD3,0x02,0xE0,0x02,0xED,0x02,
+        0xFA,0x02,0x07,0x03,0x20,0x03,0x2D,0x03,0x3A,0x03,0x47,0x03,0x54,0x03,0x61,0x03,0x6E,0x03,
+        0x7B,0x03,0x88,0x03,0x95,0x03,0xA2,0x03,0xAF,0x03,0xBC,0x03,0xC9,0x03,0xD6,0x03,0xE3,0x03,
+        0xF0,0x03,0xFD,0x03,0x0A,0x04,0x17,0x04,0x24,0x04,0x31,0x04,0x4A,0x04,0x57,0x04,0x64,0x04,
+        0x71,0x04,0x7E,0x04,0x8B,0x04,0x98,0x04,0xA5,0x04,0xB2,0x04,0xBF,0x04,0xCC,0x04,0xD9,0x04,
+        0xE6,0x04,0xF3,0x04,0x00,0x05,0x0D,0x05,0x1A,0x05,0x27,0x05,
+
+        3, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x00,0x50,0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x28,0x7C,0x28,0x7C,0x28,0x00,0x00,0x00,
+
+        7, // 0x24 '$'
+        0x00,0x00,0x10,0x10,0x3C,0x50,0x30,0x18,0x14,0x78,0x10,0x10,
+
+        11, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x00,0x4A,0x00,0x4A,0x00,0x35,0x80,0x0A,0x40,0x0A,0x40,0x11,0x80,0x00,0x00,0x00,0x00,
+
+        7, // 0x26 '&'
+        0x00,0x00,0x00,0x30,0x48,0x48,0x32,0x4A,0x44,0x3A,0x00,0x00,
+
+        3, // 0x27 '''
+        0x00,0x00,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x28 '('
+        0x00,0x00,0x10,0x20,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x10,
+
+        4, // 0x29 ')'
+        0x00,0x00,0x80,0x40,0x20,0x20,0x20,0x20,0x20,0x20,0x40,0x80,
+
+        7, // 0x2A '*'
+        0x00,0x10,0x54,0x38,0x54,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,
+
+        3, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x80,0x00,
+
+        5, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,
+
+        3, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x00,0x00,
+
+        4, // 0x2F '/'
+        0x00,0x00,0x10,0x10,0x20,0x20,0x40,0x40,0x40,0x80,0x80,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x00,0x00,0x10,0x30,0x10,0x10,0x10,0x10,0x38,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x00,0x00,0x38,0x44,0x04,0x08,0x10,0x20,0x7C,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x00,0x00,0x38,0x44,0x04,0x18,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x00,0x00,0x08,0x18,0x28,0x48,0x7C,0x08,0x08,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x00,0x00,0x7C,0x40,0x78,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x00,0x00,0x18,0x20,0x40,0x78,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0x00,0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x3C,0x04,0x08,0x30,0x00,0x00,
+
+        4, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x00,
+
+        4, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x00,0x40,0x40,0x80,0x00,
+
+        7, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x04,0x18,0x60,0x18,0x04,0x00,0x00,0x00,
+
+        7, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x7C,0x00,0x00,0x00,0x00,
+
+        7, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x40,0x30,0x0C,0x30,0x40,0x00,0x00,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x00,0x00,0x70,0x08,0x08,0x10,0x20,0x00,0x20,0x00,0x00,
+
+        10, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x20,0x80,0x4E,0x80,0x52,0x80,0x52,0x80,0x4D,0x00,0x20,0x00,0x1F,0x00,0x00,0x00,
+
+        8, // 0x41 'A'
+        0x00,0x00,0x00,0x18,0x18,0x24,0x24,0x7E,0x42,0x42,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x00,0x00,0x70,0x48,0x48,0x78,0x44,0x44,0x78,0x00,0x00,
+
+        8, // 0x43 'C'
+        0x00,0x00,0x00,0x1C,0x22,0x40,0x40,0x40,0x22,0x1C,0x00,0x00,
+
+        8, // 0x44 'D'
+        0x00,0x00,0x00,0x78,0x44,0x42,0x42,0x42,0x44,0x78,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0x00,0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x00,0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        8, // 0x47 'G'
+        0x00,0x00,0x00,0x1C,0x22,0x40,0x4E,0x42,0x22,0x1C,0x00,0x00,
+
+        8, // 0x48 'H'
+        0x00,0x00,0x00,0x42,0x42,0x42,0x7E,0x42,0x42,0x42,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        5, // 0x4A 'J'
+        0x00,0x00,0x00,0x30,0x10,0x10,0x10,0x10,0x10,0xE0,0x00,0x00,
+
+        7, // 0x4B 'K'
+        0x00,0x00,0x00,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        9, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x55,0x00,0x55,0x00,0x49,0x00,0x49,0x00,0x41,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x4E 'N'
+        0x00,0x00,0x00,0x42,0x62,0x52,0x4A,0x46,0x42,0x42,0x00,0x00,
+
+        9, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x78,0x40,0x40,0x00,0x00,
+
+        9, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x04,0x00,0x03,0x00,
+
+        7, // 0x52 'R'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x78,0x50,0x48,0x44,0x00,0x00,
+
+        7, // 0x53 'S'
+        0x00,0x00,0x00,0x38,0x44,0x40,0x38,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x00,0x00,0xFE,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        8, // 0x55 'U'
+        0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,
+
+        8, // 0x56 'V'
+        0x00,0x00,0x00,0x42,0x42,0x42,0x24,0x24,0x18,0x18,0x00,0x00,
+
+        9, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x49,0x00,0x49,0x00,0x55,0x00,0x55,0x00,0x22,0x00,0x22,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x00,0x00,0x44,0x44,0x28,0x28,0x10,0x10,0x10,0x00,0x00,
+
+        7, // 0x5A 'Z'
+        0x00,0x00,0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        4, // 0x5B '['
+        0x00,0x00,0x60,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x60,
+
+        4, // 0x5C '\'
+        0x00,0x00,0x80,0x80,0x40,0x40,0x40,0x20,0x20,0x10,0x10,0x00,
+
+        4, // 0x5D ']'
+        0x00,0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x60,
+
+        7, // 0x5E '^'
+        0x00,0x00,0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,
+
+        6, // 0x60 '`'
+        0x00,0x00,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x30,0x08,0x38,0x48,0x38,0x00,0x00,
+
+        6, // 0x62 'b'
+        0x00,0x00,0x40,0x40,0x40,0x70,0x48,0x48,0x48,0x70,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x40,0x40,0x38,0x00,0x00,
+
+        6, // 0x64 'd'
+        0x00,0x00,0x08,0x08,0x08,0x38,0x48,0x48,0x48,0x38,0x00,0x00,
+
+        6, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x30,0x48,0x78,0x40,0x38,0x00,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x00,0x30,0x40,0x40,0xE0,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        6, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x48,0x48,0x48,0x38,0x08,0x30,
+
+        6, // 0x68 'h'
+        0x00,0x00,0x40,0x40,0x40,0x70,0x48,0x48,0x48,0x48,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x00,0x00,0x40,0x00,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        3, // 0x6A 'j'
+        0x00,0x00,0x00,0x40,0x00,0xC0,0x40,0x40,0x40,0x40,0x40,0x80,
+
+        6, // 0x6B 'k'
+        0x00,0x00,0x40,0x40,0x40,0x48,0x50,0x60,0x50,0x48,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        9, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x76,0x00,0x49,0x00,0x49,0x00,0x49,0x00,0x49,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x70,0x48,0x48,0x48,0x48,0x00,0x00,
+
+        6, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x30,0x48,0x48,0x48,0x30,0x00,0x00,
+
+        6, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x70,0x48,0x48,0x48,0x70,0x40,0x40,
+
+        6, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x48,0x48,0x48,0x38,0x08,0x08,
+
+        4, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x50,0x60,0x40,0x40,0x40,0x00,0x00,
+
+        6, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x30,0x08,0x70,0x00,0x00,
+
+        4, // 0x74 't'
+        0x00,0x00,0x00,0x00,0x40,0xF0,0x40,0x40,0x40,0x30,0x00,0x00,
+
+        6, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x48,0x48,0x48,0x48,0x38,0x00,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x48,0x48,0x48,0x30,0x30,0x00,0x00,
+
+        7, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x54,0x54,0x28,0x28,0x00,0x00,
+
+        6, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x48,0x48,0x30,0x48,0x48,0x00,0x00,
+
+        6, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x48,0x48,0x48,0x30,0x10,0x20,0x20,
+
+        5, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x70,0x10,0x20,0x40,0x70,0x00,0x00,
+
+        6, // 0x7B '{'
+        0x00,0x00,0x18,0x20,0x20,0x20,0x20,0xC0,0x20,0x20,0x20,0x18,
+
+        5, // 0x7C '|'
+        0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+
+        6, // 0x7D '}'
+        0x00,0x00,0x60,0x10,0x10,0x10,0x10,0x0C,0x10,0x10,0x10,0x60,
+
+        7, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x58,0x00,0x00,0x00,0x00,
+
+        9, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana12_bold[] =
+    {
+        12, 3, 32, 128-32,
+        0x00,0x00,0x0D,0x00,0x1A,0x00,0x27,0x00,0x34,0x00,0x41,0x00,0x5A,0x00,0x67,0x00,0x74,0x00,
+        0x81,0x00,0x8E,0x00,0x9B,0x00,0xA8,0x00,0xB5,0x00,0xC2,0x00,0xCF,0x00,0xDC,0x00,0xE9,0x00,
+        0xF6,0x00,0x03,0x01,0x10,0x01,0x1D,0x01,0x2A,0x01,0x37,0x01,0x44,0x01,0x51,0x01,0x5E,0x01,
+        0x6B,0x01,0x78,0x01,0x85,0x01,0x92,0x01,0x9F,0x01,0xAC,0x01,0xC5,0x01,0xD2,0x01,0xDF,0x01,
+        0xEC,0x01,0xF9,0x01,0x06,0x02,0x13,0x02,0x20,0x02,0x2D,0x02,0x3A,0x02,0x47,0x02,0x54,0x02,
+        0x61,0x02,0x6E,0x02,0x7B,0x02,0x88,0x02,0x95,0x02,0xA2,0x02,0xAF,0x02,0xBC,0x02,0xC9,0x02,
+        0xD6,0x02,0xE3,0x02,0xFC,0x02,0x09,0x03,0x16,0x03,0x23,0x03,0x30,0x03,0x3D,0x03,0x4A,0x03,
+        0x57,0x03,0x64,0x03,0x71,0x03,0x7E,0x03,0x8B,0x03,0x98,0x03,0xA5,0x03,0xB2,0x03,0xBF,0x03,
+        0xCC,0x03,0xD9,0x03,0xE6,0x03,0xF3,0x03,0x00,0x04,0x0D,0x04,0x26,0x04,0x33,0x04,0x40,0x04,
+        0x4D,0x04,0x5A,0x04,0x67,0x04,0x74,0x04,0x81,0x04,0x8E,0x04,0x9B,0x04,0xB4,0x04,0xC1,0x04,
+        0xCE,0x04,0xDB,0x04,0xE8,0x04,0xF5,0x04,0x02,0x05,0x0F,0x05,
+
+        3, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x00,0x60,0x00,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x00,0xD8,0xD8,0xD8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x23 '#'
+        0x00,0x00,0x00,0x14,0x14,0x7E,0x28,0xFC,0x50,0x50,0x00,0x00,
+
+        6, // 0x24 '$'
+        0x00,0x00,0x20,0x20,0x70,0xE8,0xE0,0x38,0xB8,0x70,0x20,0x20,
+
+        11, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x00,0x94,0x00,0x94,0x00,0x69,0x80,0x0A,0x40,0x0A,0x40,0x11,0x80,0x00,0x00,0x00,0x00,
+
+        8, // 0x26 '&'
+        0x00,0x00,0x00,0x70,0xD8,0xD8,0x76,0xDC,0xCC,0x76,0x00,0x00,
+
+        3, // 0x27 '''
+        0x00,0x00,0xC0,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x00,0x00,0x30,0x60,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x60,0x30,
+
+        5, // 0x29 ')'
+        0x00,0x00,0xC0,0x60,0x30,0x30,0x30,0x30,0x30,0x30,0x60,0xC0,
+
+        6, // 0x2A '*'
+        0x00,0x00,0x20,0xA8,0x70,0xA8,0x20,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,0x00,
+
+        3, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0x80,0x00,
+
+        4, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x00,0x00,
+
+        3, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0x00,0x00,
+
+        6, // 0x2F '/'
+        0x00,0x00,0x08,0x08,0x10,0x10,0x20,0x40,0x40,0x80,0x80,0x00,
+
+        6, // 0x30 '0'
+        0x00,0x00,0x00,0x70,0xD8,0xD8,0xD8,0xD8,0xD8,0x70,0x00,0x00,
+
+        6, // 0x31 '1'
+        0x00,0x00,0x00,0x30,0x70,0x30,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        6, // 0x32 '2'
+        0x00,0x00,0x00,0x70,0x98,0x18,0x30,0x60,0xC0,0xF8,0x00,0x00,
+
+        6, // 0x33 '3'
+        0x00,0x00,0x00,0x70,0x98,0x18,0x70,0x18,0x98,0x70,0x00,0x00,
+
+        6, // 0x34 '4'
+        0x00,0x00,0x00,0x18,0x38,0x58,0x98,0xFC,0x18,0x18,0x00,0x00,
+
+        6, // 0x35 '5'
+        0x00,0x00,0x00,0xF8,0xC0,0xF0,0x18,0x18,0x98,0x70,0x00,0x00,
+
+        6, // 0x36 '6'
+        0x00,0x00,0x00,0x70,0xC0,0xF0,0xD8,0xD8,0xD8,0x70,0x00,0x00,
+
+        6, // 0x37 '7'
+        0x00,0x00,0x00,0xF8,0x18,0x30,0x30,0x60,0x60,0xC0,0x00,0x00,
+
+        6, // 0x38 '8'
+        0x00,0x00,0x00,0x70,0xD8,0xD8,0x70,0xD8,0xD8,0x70,0x00,0x00,
+
+        6, // 0x39 '9'
+        0x00,0x00,0x00,0x70,0xD8,0xD8,0xD8,0x78,0x18,0x70,0x00,0x00,
+
+        4, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x60,0x60,0x00,0x00,
+
+        4, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x60,0x60,0x40,0x00,
+
+        8, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x04,0x18,0x60,0x60,0x18,0x04,0x00,0x00,
+
+        8, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x7C,0x00,0x00,0x00,0x00,
+
+        8, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x40,0x30,0x0C,0x0C,0x30,0x40,0x00,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x00,0x00,0xF0,0x18,0x18,0x30,0x60,0x00,0x60,0x00,0x00,
+
+        9, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x42,0x00,0x9D,0x00,0xA5,0x00,0xA5,0x00,0x9E,0x00,0x40,0x00,0x3C,0x00,0x00,0x00,
+
+        8, // 0x41 'A'
+        0x00,0x00,0x00,0x38,0x38,0x6C,0x6C,0x7C,0xC6,0xC6,0x00,0x00,
+
+        7, // 0x42 'B'
+        0x00,0x00,0x00,0xF8,0xCC,0xCC,0xF8,0xCC,0xCC,0xF8,0x00,0x00,
+
+        6, // 0x43 'C'
+        0x00,0x00,0x00,0x70,0xC8,0xC0,0xC0,0xC0,0xC8,0x70,0x00,0x00,
+
+        7, // 0x44 'D'
+        0x00,0x00,0x00,0xF8,0xCC,0xCC,0xCC,0xCC,0xCC,0xF8,0x00,0x00,
+
+        6, // 0x45 'E'
+        0x00,0x00,0x00,0xF8,0xC0,0xC0,0xF8,0xC0,0xC0,0xF8,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x00,0x00,0xF8,0xC0,0xC0,0xF8,0xC0,0xC0,0xC0,0x00,0x00,
+
+        7, // 0x47 'G'
+        0x00,0x00,0x00,0x78,0xC4,0xC0,0xC0,0xDC,0xCC,0x7C,0x00,0x00,
+
+        7, // 0x48 'H'
+        0x00,0x00,0x00,0xCC,0xCC,0xCC,0xFC,0xCC,0xCC,0xCC,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x00,0x00,0xF0,0x60,0x60,0x60,0x60,0x60,0xF0,0x00,0x00,
+
+        5, // 0x4A 'J'
+        0x00,0x00,0x00,0x70,0x30,0x30,0x30,0x30,0x30,0xE0,0x00,0x00,
+
+        7, // 0x4B 'K'
+        0x00,0x00,0x00,0xCC,0xD8,0xF0,0xE0,0xF0,0xD8,0xCC,0x00,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xF8,0x00,0x00,
+
+        8, // 0x4D 'M'
+        0x00,0x00,0x00,0x82,0xC6,0xEE,0xB6,0xB6,0x86,0x86,0x00,0x00,
+
+        7, // 0x4E 'N'
+        0x00,0x00,0x00,0x84,0xC4,0xE4,0xB4,0x9C,0x8C,0x84,0x00,0x00,
+
+        8, // 0x4F 'O'
+        0x00,0x00,0x00,0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x00,0x00,0xF8,0xCC,0xCC,0xCC,0xF8,0xC0,0xC0,0x00,0x00,
+
+        8, // 0x51 'Q'
+        0x00,0x00,0x00,0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x18,0x0E,
+
+        7, // 0x52 'R'
+        0x00,0x00,0x00,0xF8,0xCC,0xCC,0xF8,0xD8,0xCC,0xC6,0x00,0x00,
+
+        6, // 0x53 'S'
+        0x00,0x00,0x00,0x70,0xC8,0xC0,0x70,0x18,0x98,0x70,0x00,0x00,
+
+        6, // 0x54 'T'
+        0x00,0x00,0x00,0xFC,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,
+
+        7, // 0x55 'U'
+        0x00,0x00,0x00,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0x78,0x00,0x00,
+
+        7, // 0x56 'V'
+        0x00,0x00,0x00,0xCC,0xCC,0x78,0x78,0x78,0x30,0x30,0x00,0x00,
+
+        11, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0xCC,0xC0,0xCC,0xC0,0x6D,0x80,0x6D,0x80,0x73,0x80,0x33,0x00,0x33,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x58 'X'
+        0x00,0x00,0x00,0xCC,0xCC,0x78,0x30,0x78,0xCC,0xCC,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x00,0x00,0xCC,0xCC,0x78,0x30,0x30,0x30,0x30,0x00,0x00,
+
+        6, // 0x5A 'Z'
+        0x00,0x00,0x00,0xF8,0x18,0x30,0x60,0xC0,0xC0,0xF8,0x00,0x00,
+
+        5, // 0x5B '['
+        0x00,0x00,0x70,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x70,
+
+        6, // 0x5C '\'
+        0x00,0x00,0x80,0x80,0x40,0x40,0x20,0x10,0x10,0x08,0x08,0x00,
+
+        5, // 0x5D ']'
+        0x00,0x00,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x70,
+
+        8, // 0x5E '^'
+        0x00,0x00,0x00,0x18,0x3C,0x66,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,
+
+        6, // 0x60 '`'
+        0x00,0x00,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x70,0x18,0x78,0xD8,0x78,0x00,0x00,
+
+        6, // 0x62 'b'
+        0x00,0x00,0xC0,0xC0,0xC0,0xF0,0xD8,0xD8,0xD8,0xF0,0x00,0x00,
+
+        5, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x70,0xC0,0xC0,0xC0,0x70,0x00,0x00,
+
+        6, // 0x64 'd'
+        0x00,0x00,0x18,0x18,0x18,0x78,0xD8,0xD8,0xD8,0x78,0x00,0x00,
+
+        6, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x70,0xD8,0xF8,0xC0,0x78,0x00,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x00,0x38,0x60,0x60,0xF8,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        6, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x78,0xD8,0xD8,0xD8,0x78,0x18,0x70,
+
+        6, // 0x68 'h'
+        0x00,0x00,0xC0,0xC0,0xC0,0xF0,0xD8,0xD8,0xD8,0xD8,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x00,0x00,0xC0,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,
+
+        4, // 0x6A 'j'
+        0x00,0x00,0x00,0x60,0x00,0xE0,0x60,0x60,0x60,0x60,0x60,0xC0,
+
+        6, // 0x6B 'k'
+        0x00,0x00,0xC0,0xC0,0xC0,0xD8,0xD8,0xF0,0xD8,0xD8,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,
+
+        9, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF6,0x00,0xDB,0x00,0xDB,0x00,0xDB,0x00,0xDB,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0xF0,0xD8,0xD8,0xD8,0xD8,0x00,0x00,
+
+        6, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x70,0xD8,0xD8,0xD8,0x70,0x00,0x00,
+
+        6, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0xF0,0xD8,0xD8,0xD8,0xF0,0xC0,0xC0,
+
+        6, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x78,0xD8,0xD8,0xD8,0x78,0x18,0x18,
+
+        4, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0xD0,0xE0,0xC0,0xC0,0xC0,0x00,0x00,
+
+        5, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x70,0xC0,0xF0,0x30,0xE0,0x00,0x00,
+
+        5, // 0x74 't'
+        0x00,0x00,0x00,0x60,0x60,0xF8,0x60,0x60,0x60,0x38,0x00,0x00,
+
+        6, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0xD8,0xD8,0xD8,0xD8,0x78,0x00,0x00,
+
+        6, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0xD8,0xD8,0xD8,0x70,0x70,0x00,0x00,
+
+        9, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xDB,0x00,0xDB,0x00,0xDB,0x00,0x66,0x00,0x66,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0xD8,0xD8,0x70,0xD8,0xD8,0x00,0x00,
+
+        6, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0xD8,0xD8,0xD8,0x70,0x70,0x30,0x60,
+
+        5, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0xF0,0x30,0x60,0xC0,0xF0,0x00,0x00,
+
+        6, // 0x7B '{'
+        0x00,0x00,0x18,0x30,0x30,0x30,0xE0,0x30,0x30,0x30,0x30,0x18,
+
+        5, // 0x7C '|'
+        0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+
+        6, // 0x7D '}'
+        0x00,0x00,0xC0,0x60,0x60,0x60,0x38,0x60,0x60,0x60,0x60,0xC0,
+
+        8, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x92,0x8C,0x00,0x00,0x00,
+
+        9, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana13[] =
+    {
+        13, 3, 32, 128-32,
+        0x00,0x00,0x0E,0x00,0x1C,0x00,0x2A,0x00,0x45,0x00,0x53,0x00,0x6E,0x00,0x7C,0x00,0x8A,0x00,
+        0x98,0x00,0xA6,0x00,0xB4,0x00,0xCF,0x00,0xDD,0x00,0xEB,0x00,0xF9,0x00,0x07,0x01,0x15,0x01,
+        0x23,0x01,0x31,0x01,0x3F,0x01,0x4D,0x01,0x5B,0x01,0x69,0x01,0x77,0x01,0x85,0x01,0x93,0x01,
+        0xA1,0x01,0xAF,0x01,0xCA,0x01,0xE5,0x01,0x00,0x02,0x0E,0x02,0x29,0x02,0x37,0x02,0x45,0x02,
+        0x60,0x02,0x7B,0x02,0x89,0x02,0x97,0x02,0xB2,0x02,0xC0,0x02,0xCE,0x02,0xDC,0x02,0xEA,0x02,
+        0xF8,0x02,0x13,0x03,0x21,0x03,0x3C,0x03,0x4A,0x03,0x65,0x03,0x73,0x03,0x81,0x03,0x8F,0x03,
+        0x9D,0x03,0xAB,0x03,0xC6,0x03,0xD4,0x03,0xE2,0x03,0xF0,0x03,0xFE,0x03,0x0C,0x04,0x1A,0x04,
+        0x35,0x04,0x43,0x04,0x51,0x04,0x5F,0x04,0x6D,0x04,0x7B,0x04,0x89,0x04,0x97,0x04,0xA5,0x04,
+        0xB3,0x04,0xC1,0x04,0xCF,0x04,0xDD,0x04,0xEB,0x04,0xF9,0x04,0x14,0x05,0x22,0x05,0x30,0x05,
+        0x3E,0x05,0x4C,0x05,0x5A,0x05,0x68,0x05,0x76,0x05,0x84,0x05,0x92,0x05,0xAD,0x05,0xBB,0x05,
+        0xC9,0x05,0xD7,0x05,0xE5,0x05,0xF3,0x05,0x01,0x06,0x1C,0x06,
+
+        4, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x00,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x00,0x50,0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0x00,0x0A,0x00,0x3F,0x00,0x14,0x00,0x14,0x00,0x7E,0x00,0x28,0x00,0x28,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x24 '$'
+        0x00,0x00,0x10,0x10,0x3C,0x50,0x50,0x38,0x14,0x14,0x78,0x10,0x10,
+
+        12, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x00,0x49,0x00,0x4A,0x00,0x32,0x00,0x04,0xC0,0x05,0x20,0x09,0x20,0x08,0xC0,0x00,0x00,0x00,0x00,
+
+        8, // 0x26 '&'
+        0x00,0x00,0x00,0x30,0x48,0x48,0x32,0x4A,0x44,0x46,0x39,0x00,0x00,
+
+        3, // 0x27 '''
+        0x00,0x00,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x00,0x00,0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,
+
+        5, // 0x29 ')'
+        0x00,0x00,0x40,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x20,0x20,0x40,
+
+        7, // 0x2A '*'
+        0x00,0x00,0x10,0x54,0x38,0x54,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x7F,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x40,
+
+        5, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,
+
+        5, // 0x2F '/'
+        0x00,0x00,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80,0x00,
+
+        7, // 0x30 '0'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x31 '1'
+        0x00,0x00,0x00,0x10,0x70,0x10,0x10,0x10,0x10,0x10,0x7C,0x00,0x00,
+
+        7, // 0x32 '2'
+        0x00,0x00,0x00,0x38,0x44,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        7, // 0x33 '3'
+        0x00,0x00,0x00,0x38,0x44,0x04,0x18,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x34 '4'
+        0x00,0x00,0x00,0x08,0x18,0x28,0x48,0x88,0xFC,0x08,0x08,0x00,0x00,
+
+        7, // 0x35 '5'
+        0x00,0x00,0x00,0x7C,0x40,0x40,0x78,0x04,0x04,0x44,0x38,0x00,0x00,
+
+        7, // 0x36 '6'
+        0x00,0x00,0x00,0x18,0x20,0x40,0x78,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x37 '7'
+        0x00,0x00,0x00,0x7C,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x00,0x00,
+
+        7, // 0x38 '8'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x39 '9'
+        0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x3C,0x04,0x08,0x30,0x00,0x00,
+
+        5, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x00,0x00,
+
+        5, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x40,
+
+        9, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x18,0x00,0x60,0x00,0x18,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x3F '?'
+        0x00,0x00,0x00,0x70,0x08,0x08,0x10,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        10, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x20,0x80,0x4E,0x80,0x52,0x80,0x52,0x80,0x52,0x80,0x4D,0x00,0x20,0x00,0x1E,0x00,0x00,0x00,
+
+        8, // 0x41 'A'
+        0x00,0x00,0x00,0x18,0x18,0x24,0x24,0x24,0x7E,0x42,0x42,0x00,0x00,
+
+        8, // 0x42 'B'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x7C,0x42,0x42,0x42,0x7C,0x00,0x00,
+
+        9, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x42,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x45 'E'
+        0x00,0x00,0x00,0x7C,0x40,0x40,0x7C,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        6, // 0x46 'F'
+        0x00,0x00,0x00,0x7C,0x40,0x40,0x78,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        9, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x00,0x40,0x00,0x47,0x00,0x41,0x00,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x48 'H'
+        0x00,0x00,0x00,0x42,0x42,0x42,0x7E,0x42,0x42,0x42,0x42,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        5, // 0x4A 'J'
+        0x00,0x00,0x00,0x70,0x10,0x10,0x10,0x10,0x10,0x10,0xE0,0x00,0x00,
+
+        8, // 0x4B 'K'
+        0x00,0x00,0x00,0x42,0x44,0x48,0x50,0x70,0x48,0x44,0x42,0x00,0x00,
+
+        6, // 0x4C 'L'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7C,0x00,0x00,
+
+        9, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x55,0x00,0x55,0x00,0x49,0x00,0x49,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x4E 'N'
+        0x00,0x00,0x00,0x62,0x62,0x52,0x52,0x4A,0x4A,0x46,0x46,0x00,0x00,
+
+        9, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x50 'P'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x78,0x40,0x40,0x40,0x00,0x00,
+
+        9, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x04,0x00,0x03,0x00,
+
+        8, // 0x52 'R'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x78,0x48,0x44,0x42,0x00,0x00,
+
+        8, // 0x53 'S'
+        0x00,0x00,0x00,0x3C,0x42,0x40,0x30,0x0C,0x02,0x42,0x3C,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x00,0x00,0xFE,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        8, // 0x55 'U'
+        0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,
+
+        8, // 0x56 'V'
+        0x00,0x00,0x00,0x42,0x42,0x42,0x24,0x24,0x24,0x18,0x18,0x00,0x00,
+
+        11, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x40,0x44,0x40,0x2A,0x80,0x2A,0x80,0x2A,0x80,0x2A,0x80,0x11,0x00,0x11,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x58 'X'
+        0x00,0x00,0x00,0x42,0x42,0x24,0x18,0x18,0x24,0x42,0x42,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x00,0x00,0x82,0x44,0x28,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        8, // 0x5A 'Z'
+        0x00,0x00,0x00,0x7E,0x02,0x04,0x08,0x10,0x20,0x40,0x7E,0x00,0x00,
+
+        5, // 0x5B '['
+        0x00,0x00,0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,
+
+        5, // 0x5C '\'
+        0x00,0x00,0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x00,
+
+        5, // 0x5D ']'
+        0x00,0x00,0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x70,
+
+        9, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x14,0x00,0x22,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,
+
+        7, // 0x60 '`'
+        0x00,0x00,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x04,0x3C,0x44,0x44,0x3C,0x00,0x00,
+
+        7, // 0x62 'b'
+        0x00,0x00,0x40,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x78,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        7, // 0x64 'd'
+        0x00,0x00,0x04,0x04,0x04,0x3C,0x44,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        7, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x44,0x7C,0x40,0x44,0x38,0x00,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x00,0x30,0x40,0x40,0xF0,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x3C,0x04,0x38,
+
+        7, // 0x68 'h'
+        0x00,0x00,0x40,0x40,0x40,0x78,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x00,0x40,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        4, // 0x6A 'j'
+        0x00,0x00,0x20,0x00,0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0xC0,
+
+        7, // 0x6B 'k'
+        0x00,0x00,0x40,0x40,0x40,0x44,0x48,0x50,0x70,0x48,0x44,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        11, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7B,0x80,0x44,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x00,0x00,0x00,0x00,
+
+        7, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x44,0x00,0x00,
+
+        7, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x38,0x00,0x00,
+
+        7, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x44,0x78,0x40,0x40,
+
+        7, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x3C,0x04,0x04,
+
+        5, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x58,0x60,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        6, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x60,0x18,0x08,0x70,0x00,0x00,
+
+        4, // 0x74 't'
+        0x00,0x00,0x00,0x40,0x40,0xF0,0x40,0x40,0x40,0x40,0x30,0x00,0x00,
+
+        7, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x3C,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x44,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        9, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x49,0x00,0x49,0x00,0x55,0x00,0x55,0x00,0x22,0x00,0x22,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x28,0x10,0x10,0x28,0x44,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x28,0x28,0x28,0x10,0x10,0x10,0x20,
+
+        6, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x78,0x08,0x10,0x20,0x40,0x78,0x00,0x00,
+
+        7, // 0x7B '{'
+        0x00,0x00,0x0C,0x10,0x10,0x10,0x10,0x60,0x10,0x10,0x10,0x10,0x0C,
+
+        5, // 0x7C '|'
+        0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+
+        7, // 0x7D '}'
+        0x00,0x00,0x60,0x10,0x10,0x10,0x10,0x0C,0x10,0x10,0x10,0x10,0x60,
+
+        9, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x00,0x49,0x00,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x7F,0x80,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana13_bold[] =
+    {
+        13, 3, 32, 128-32,
+        0x00,0x00,0x0E,0x00,0x1C,0x00,0x2A,0x00,0x45,0x00,0x53,0x00,0x6E,0x00,0x89,0x00,0x97,0x00,
+        0xA5,0x00,0xB3,0x00,0xC1,0x00,0xDC,0x00,0xEA,0x00,0xF8,0x00,0x06,0x01,0x14,0x01,0x22,0x01,
+        0x30,0x01,0x3E,0x01,0x4C,0x01,0x5A,0x01,0x68,0x01,0x76,0x01,0x84,0x01,0x92,0x01,0xA0,0x01,
+        0xAE,0x01,0xBC,0x01,0xD7,0x01,0xF2,0x01,0x0D,0x02,0x1B,0x02,0x36,0x02,0x51,0x02,0x5F,0x02,
+        0x6D,0x02,0x88,0x02,0x96,0x02,0xA4,0x02,0xBF,0x02,0xDA,0x02,0xE8,0x02,0xF6,0x02,0x04,0x03,
+        0x12,0x03,0x2D,0x03,0x48,0x03,0x63,0x03,0x71,0x03,0x8C,0x03,0x9A,0x03,0xA8,0x03,0xB6,0x03,
+        0xD1,0x03,0xDF,0x03,0xFA,0x03,0x08,0x04,0x16,0x04,0x24,0x04,0x32,0x04,0x40,0x04,0x4E,0x04,
+        0x69,0x04,0x77,0x04,0x85,0x04,0x93,0x04,0xA1,0x04,0xAF,0x04,0xBD,0x04,0xCB,0x04,0xD9,0x04,
+        0xE7,0x04,0xF5,0x04,0x03,0x05,0x11,0x05,0x1F,0x05,0x2D,0x05,0x48,0x05,0x56,0x05,0x64,0x05,
+        0x72,0x05,0x80,0x05,0x8E,0x05,0x9C,0x05,0xAA,0x05,0xB8,0x05,0xC6,0x05,0xE1,0x05,0xEF,0x05,
+        0xFD,0x05,0x0B,0x06,0x19,0x06,0x27,0x06,0x35,0x06,0x50,0x06,
+
+        4, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x21 '!'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x60,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x00,0x6C,0x6C,0x6C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0x00,0x0A,0x00,0x3F,0x00,0x14,0x00,0x14,0x00,0x7E,0x00,0x28,0x00,0x28,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x24 '$'
+        0x00,0x00,0x08,0x08,0x3C,0x6A,0x68,0x3C,0x16,0x56,0x3C,0x10,0x10,
+
+        14, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x80,0x6C,0x80,0x6D,0x00,0x6D,0x70,0x3A,0xD8,0x02,0xD8,0x04,0xD8,0x04,0x70,0x00,0x00,0x00,0x00,
+
+        10, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x6C,0x00,0x6C,0x00,0x39,0x80,0x6D,0x00,0x66,0x00,0x63,0x00,0x3D,0x80,0x00,0x00,0x00,0x00,
+
+        4, // 0x27 '''
+        0x00,0x00,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x28 '('
+        0x00,0x00,0x18,0x30,0x30,0x60,0x60,0x60,0x60,0x60,0x30,0x30,0x18,
+
+        6, // 0x29 ')'
+        0x00,0x00,0x60,0x30,0x30,0x18,0x18,0x18,0x18,0x18,0x30,0x30,0x60,
+
+        8, // 0x2A '*'
+        0x00,0x00,0x10,0x54,0x38,0x54,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x7F,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x40,
+
+        6, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        8, // 0x2F '/'
+        0x00,0x00,0x06,0x06,0x0C,0x0C,0x18,0x18,0x18,0x30,0x30,0x60,0x60,
+
+        8, // 0x30 '0'
+        0x00,0x00,0x00,0x3C,0x66,0x66,0x66,0x66,0x66,0x66,0x3C,0x00,0x00,
+
+        8, // 0x31 '1'
+        0x00,0x00,0x00,0x18,0x38,0x18,0x18,0x18,0x18,0x18,0x3C,0x00,0x00,
+
+        8, // 0x32 '2'
+        0x00,0x00,0x00,0x3C,0x66,0x06,0x0C,0x18,0x30,0x60,0x7E,0x00,0x00,
+
+        8, // 0x33 '3'
+        0x00,0x00,0x00,0x3C,0x66,0x06,0x1C,0x06,0x06,0x66,0x3C,0x00,0x00,
+
+        8, // 0x34 '4'
+        0x00,0x00,0x00,0x04,0x0C,0x1C,0x2C,0x4C,0x7E,0x0C,0x0C,0x00,0x00,
+
+        8, // 0x35 '5'
+        0x00,0x00,0x00,0x3E,0x30,0x30,0x3C,0x06,0x06,0x66,0x3C,0x00,0x00,
+
+        8, // 0x36 '6'
+        0x00,0x00,0x00,0x1C,0x30,0x60,0x7C,0x66,0x66,0x66,0x3C,0x00,0x00,
+
+        8, // 0x37 '7'
+        0x00,0x00,0x00,0x7E,0x06,0x0C,0x0C,0x18,0x18,0x30,0x30,0x00,0x00,
+
+        8, // 0x38 '8'
+        0x00,0x00,0x00,0x3C,0x66,0x66,0x3C,0x66,0x66,0x66,0x3C,0x00,0x00,
+
+        8, // 0x39 '9'
+        0x00,0x00,0x00,0x3C,0x66,0x66,0x66,0x3E,0x06,0x0C,0x38,0x00,0x00,
+
+        4, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        4, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x60,0x40,
+
+        9, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x18,0x00,0x06,0x00,0x01,0x00,0x06,0x00,0x18,0x00,0x60,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x3F '?'
+        0x00,0x00,0x00,0x38,0x4C,0x0C,0x18,0x30,0x30,0x00,0x30,0x00,0x00,
+
+        11, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x80,0x20,0x40,0x4F,0x40,0x5B,0x40,0x5B,0x40,0x5B,0x40,0x4F,0x80,0x20,0x00,0x1F,0x00,0x00,0x00,
+
+        9, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x1C,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x7F,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x42 'B'
+        0x00,0x00,0x00,0x7C,0x66,0x66,0x7C,0x66,0x66,0x66,0x7C,0x00,0x00,
+
+        8, // 0x43 'C'
+        0x00,0x00,0x00,0x3C,0x62,0x60,0x60,0x60,0x60,0x62,0x3C,0x00,0x00,
+
+        9, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x66,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x66,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x45 'E'
+        0x00,0x00,0x00,0x7E,0x60,0x60,0x7E,0x60,0x60,0x60,0x7E,0x00,0x00,
+
+        8, // 0x46 'F'
+        0x00,0x00,0x00,0x7E,0x60,0x60,0x7E,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        9, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x61,0x00,0x60,0x00,0x60,0x00,0x67,0x00,0x63,0x00,0x63,0x00,0x3F,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7F,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x49 'I'
+        0x00,0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x00,0x00,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0xF0,0x00,0x00,
+
+        8, // 0x4B 'K'
+        0x00,0x00,0x00,0x66,0x6C,0x78,0x70,0x70,0x78,0x6C,0x66,0x00,0x00,
+
+        7, // 0x4C 'L'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x7E,0x00,0x00,
+
+        10, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x80,0x71,0x80,0x7B,0x80,0x5D,0x80,0x49,0x80,0x41,0x80,0x41,0x80,0x41,0x80,0x00,0x00,0x00,0x00,
+
+        9, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x61,0x00,0x71,0x00,0x59,0x00,0x4D,0x00,0x47,0x00,0x43,0x00,0x41,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x50 'P'
+        0x00,0x00,0x00,0x7C,0x66,0x66,0x66,0x7C,0x60,0x60,0x60,0x00,0x00,
+
+        9, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x0C,0x00,0x07,0x00,
+
+        8, // 0x52 'R'
+        0x00,0x00,0x00,0x7C,0x66,0x66,0x66,0x7C,0x6C,0x66,0x63,0x00,0x00,
+
+        8, // 0x53 'S'
+        0x00,0x00,0x00,0x3C,0x62,0x60,0x7C,0x3E,0x06,0x46,0x3C,0x00,0x00,
+
+        8, // 0x54 'T'
+        0x00,0x00,0x00,0xFF,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,
+
+        9, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x56 'V'
+        0x00,0x00,0x00,0x66,0x66,0x66,0x3C,0x3C,0x3C,0x18,0x18,0x00,0x00,
+
+        12, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x60,0x66,0x60,0x66,0x60,0x36,0xC0,0x3F,0xC0,0x39,0xC0,0x19,0x80,0x19,0x80,0x00,0x00,0x00,0x00,
+
+        8, // 0x58 'X'
+        0x00,0x00,0x00,0x66,0x66,0x3C,0x18,0x18,0x3C,0x66,0x66,0x00,0x00,
+
+        8, // 0x59 'Y'
+        0x00,0x00,0x00,0x66,0x66,0x3C,0x3C,0x18,0x18,0x18,0x18,0x00,0x00,
+
+        8, // 0x5A 'Z'
+        0x00,0x00,0x00,0x7E,0x06,0x0E,0x1C,0x38,0x70,0x60,0x7E,0x00,0x00,
+
+        6, // 0x5B '['
+        0x00,0x00,0x78,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x78,
+
+        8, // 0x5C '\'
+        0x00,0x00,0x60,0x60,0x30,0x30,0x18,0x18,0x18,0x0C,0x0C,0x06,0x06,
+
+        6, // 0x5D ']'
+        0x00,0x00,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,
+
+        10, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+
+        8, // 0x60 '`'
+        0x00,0x00,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x06,0x3E,0x66,0x66,0x3E,0x00,0x00,
+
+        8, // 0x62 'b'
+        0x00,0x00,0x60,0x60,0x60,0x7C,0x66,0x66,0x66,0x66,0x7C,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x60,0x60,0x60,0x60,0x3C,0x00,0x00,
+
+        8, // 0x64 'd'
+        0x00,0x00,0x06,0x06,0x06,0x3E,0x66,0x66,0x66,0x66,0x3E,0x00,0x00,
+
+        8, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x66,0x7E,0x60,0x62,0x3C,0x00,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x00,0x38,0x60,0x60,0xF8,0x60,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        8, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x3E,0x66,0x66,0x66,0x66,0x3E,0x06,0x3C,
+
+        8, // 0x68 'h'
+        0x00,0x00,0x60,0x60,0x60,0x7C,0x66,0x66,0x66,0x66,0x66,0x00,0x00,
+
+        4, // 0x69 'i'
+        0x00,0x00,0x00,0x60,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x00,0x00,0x30,0x00,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0xE0,
+
+        8, // 0x6B 'k'
+        0x00,0x00,0x60,0x60,0x60,0x66,0x6C,0x78,0x78,0x6C,0x66,0x00,0x00,
+
+        4, // 0x6C 'l'
+        0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        12, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7D,0xC0,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x00,0x00,0x00,0x00,
+
+        8, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x66,0x66,0x66,0x66,0x66,0x00,0x00,
+
+        8, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x66,0x66,0x66,0x66,0x3C,0x00,0x00,
+
+        8, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x66,0x66,0x66,0x66,0x7C,0x60,0x60,
+
+        8, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x3E,0x66,0x66,0x66,0x66,0x3E,0x06,0x06,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x6C,0x7C,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x60,0x78,0x3C,0x0C,0x78,0x00,0x00,
+
+        5, // 0x74 't'
+        0x00,0x00,0x00,0x60,0x60,0xF8,0x60,0x60,0x60,0x60,0x38,0x00,0x00,
+
+        8, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x3E,0x00,0x00,
+
+        8, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x3C,0x3C,0x18,0x00,0x00,
+
+        10, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6D,0x80,0x6D,0x80,0x6D,0x80,0x6D,0x80,0x33,0x00,0x33,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x3C,0x3C,0x66,0x66,0x00,0x00,
+
+        8, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x3C,0x3C,0x18,0x18,0x30,0x30,
+
+        7, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x0C,0x18,0x30,0x60,0x7C,0x00,0x00,
+
+        8, // 0x7B '{'
+        0x00,0x00,0x0E,0x18,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x18,0x0E,
+
+        6, // 0x7C '|'
+        0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,
+
+        8, // 0x7D '}'
+        0x00,0x00,0x70,0x18,0x18,0x18,0x18,0x0E,0x18,0x18,0x18,0x18,0x70,
+
+        9, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x00,0x49,0x00,0x49,0x00,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x7F,0x80,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana14[] =
+    {
+        14, 3, 32, 128-32,
+        0x00,0x00,0x0F,0x00,0x1E,0x00,0x2D,0x00,0x4A,0x00,0x59,0x00,0x76,0x00,0x93,0x00,0xA2,0x00,
+        0xB1,0x00,0xC0,0x00,0xCF,0x00,0xEC,0x00,0xFB,0x00,0x0A,0x01,0x19,0x01,0x28,0x01,0x37,0x01,
+        0x46,0x01,0x55,0x01,0x64,0x01,0x73,0x01,0x82,0x01,0x91,0x01,0xA0,0x01,0xAF,0x01,0xBE,0x01,
+        0xCD,0x01,0xDC,0x01,0xF9,0x01,0x16,0x02,0x33,0x02,0x42,0x02,0x5F,0x02,0x6E,0x02,0x7D,0x02,
+        0x9A,0x02,0xB7,0x02,0xC6,0x02,0xD5,0x02,0xF2,0x02,0x0F,0x03,0x1E,0x03,0x2D,0x03,0x3C,0x03,
+        0x4B,0x03,0x68,0x03,0x85,0x03,0xA2,0x03,0xB1,0x03,0xCE,0x03,0xDD,0x03,0xEC,0x03,0xFB,0x03,
+        0x18,0x04,0x27,0x04,0x44,0x04,0x53,0x04,0x62,0x04,0x71,0x04,0x80,0x04,0x8F,0x04,0x9E,0x04,
+        0xBB,0x04,0xCA,0x04,0xD9,0x04,0xE8,0x04,0xF7,0x04,0x06,0x05,0x15,0x05,0x24,0x05,0x33,0x05,
+        0x42,0x05,0x51,0x05,0x60,0x05,0x6F,0x05,0x7E,0x05,0x8D,0x05,0xAA,0x05,0xB9,0x05,0xC8,0x05,
+        0xD7,0x05,0xE6,0x05,0xF5,0x05,0x04,0x06,0x13,0x06,0x22,0x06,0x31,0x06,0x4E,0x06,0x5D,0x06,
+        0x6C,0x06,0x7B,0x06,0x8A,0x06,0x99,0x06,0xA8,0x06,0xC5,0x06,
+
+        4, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x00,0x00,
+
+        6, // 0x22 '"'
+        0x00,0x00,0x48,0x48,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x09,0x00,0x09,0x00,0x12,0x00,0x3F,0x80,0x12,0x00,0x12,0x00,0x7F,0x00,0x24,0x00,0x24,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x24 '$'
+        0x00,0x00,0x10,0x10,0x3E,0x50,0x50,0x30,0x1C,0x12,0x12,0x7C,0x10,0x10,
+
+        13, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x80,0x49,0x00,0x49,0x00,0x4A,0x00,0x32,0x60,0x02,0x90,0x04,0x90,0x04,0x90,0x08,0x60,0x00,0x00,0x00,0x00,
+
+        10, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x44,0x00,0x44,0x00,0x39,0x00,0x45,0x00,0x42,0x00,0x43,0x00,0x3C,0x80,0x00,0x00,0x00,0x00,
+
+        3, // 0x27 '''
+        0x00,0x00,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x28 '('
+        0x00,0x00,0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,
+
+        5, // 0x29 ')'
+        0x00,0x00,0x40,0x20,0x20,0x10,0x10,0x10,0x10,0x10,0x10,0x20,0x20,0x40,
+
+        8, // 0x2A '*'
+        0x00,0x00,0x10,0x54,0x38,0x54,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x7F,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x40,
+
+        5, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,
+
+        5, // 0x2F '/'
+        0x00,0x00,0x08,0x08,0x10,0x10,0x10,0x20,0x20,0x20,0x40,0x40,0x40,0x80,
+
+        8, // 0x30 '0'
+        0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,
+
+        8, // 0x31 '1'
+        0x00,0x00,0x00,0x08,0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x3E,0x00,0x00,
+
+        8, // 0x32 '2'
+        0x00,0x00,0x00,0x3C,0x42,0x42,0x02,0x04,0x18,0x20,0x40,0x7E,0x00,0x00,
+
+        8, // 0x33 '3'
+        0x00,0x00,0x00,0x3C,0x42,0x02,0x02,0x1C,0x02,0x02,0x42,0x3C,0x00,0x00,
+
+        8, // 0x34 '4'
+        0x00,0x00,0x00,0x04,0x0C,0x14,0x24,0x44,0x7F,0x04,0x04,0x04,0x00,0x00,
+
+        8, // 0x35 '5'
+        0x00,0x00,0x00,0x7E,0x40,0x40,0x7C,0x02,0x02,0x02,0x42,0x3C,0x00,0x00,
+
+        8, // 0x36 '6'
+        0x00,0x00,0x00,0x1C,0x20,0x40,0x7C,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,
+
+        8, // 0x37 '7'
+        0x00,0x00,0x00,0x7E,0x02,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x00,0x00,
+
+        8, // 0x38 '8'
+        0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x3C,0x42,0x42,0x42,0x3C,0x00,0x00,
+
+        8, // 0x39 '9'
+        0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x42,0x3E,0x02,0x04,0x38,0x00,0x00,
+
+        5, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,0x20,0x20,0x00,0x00,
+
+        5, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,0x20,0x20,0x20,0x40,
+
+        9, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x18,0x00,0x06,0x00,0x01,0x00,0x06,0x00,0x18,0x00,0x60,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x3F '?'
+        0x00,0x00,0x00,0x38,0x44,0x04,0x04,0x08,0x10,0x10,0x00,0x10,0x00,0x00,
+
+        12, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x27,0x40,0x49,0x20,0x49,0x20,0x49,0x20,0x49,0x20,0x27,0xC0,0x30,0x00,0x0F,0x00,0x00,0x00,
+
+        8, // 0x41 'A'
+        0x00,0x00,0x00,0x18,0x18,0x24,0x24,0x42,0x42,0x7E,0x81,0x81,0x00,0x00,
+
+        8, // 0x42 'B'
+        0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x7C,0x42,0x42,0x42,0x7C,0x00,0x00,
+
+        9, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x42,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x45 'E'
+        0x00,0x00,0x00,0x7E,0x40,0x40,0x40,0x7E,0x40,0x40,0x40,0x7E,0x00,0x00,
+
+        7, // 0x46 'F'
+        0x00,0x00,0x00,0x7E,0x40,0x40,0x40,0x7C,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        9, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x00,0x40,0x00,0x47,0x00,0x41,0x00,0x41,0x00,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x7F,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,
+
+        5, // 0x4A 'J'
+        0x00,0x00,0x00,0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0xE0,0x00,0x00,
+
+        8, // 0x4B 'K'
+        0x00,0x00,0x00,0x42,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x42,0x00,0x00,
+
+        7, // 0x4C 'L'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7E,0x00,0x00,
+
+        10, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x52,0x80,0x52,0x80,0x52,0x80,0x4C,0x80,0x4C,0x80,0x40,0x80,0x40,0x80,0x00,0x00,0x00,0x00,
+
+        9, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x00,0x61,0x00,0x51,0x00,0x51,0x00,0x49,0x00,0x45,0x00,0x45,0x00,0x43,0x00,0x43,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x50 'P'
+        0x00,0x00,0x00,0x7C,0x42,0x42,0x42,0x42,0x7C,0x40,0x40,0x40,0x00,0x00,
+
+        10, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x02,0x00,0x01,0x80,
+
+        8, // 0x52 'R'
+        0x00,0x00,0x00,0x7C,0x42,0x42,0x42,0x7C,0x48,0x44,0x42,0x41,0x00,0x00,
+
+        8, // 0x53 'S'
+        0x00,0x00,0x00,0x3C,0x42,0x40,0x40,0x3C,0x02,0x02,0x42,0x3C,0x00,0x00,
+
+        7, // 0x54 'T'
+        0x00,0x00,0x00,0xFE,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        9, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x56 'V'
+        0x00,0x00,0x00,0x81,0x81,0x42,0x42,0x42,0x24,0x24,0x18,0x18,0x00,0x00,
+
+        13, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x10,0x42,0x10,0x45,0x10,0x45,0x10,0x25,0x20,0x28,0xA0,0x28,0xA0,0x10,0x40,0x10,0x40,0x00,0x00,0x00,0x00,
+
+        8, // 0x58 'X'
+        0x00,0x00,0x00,0x42,0x42,0x24,0x18,0x18,0x18,0x24,0x42,0x42,0x00,0x00,
+
+        7, // 0x59 'Y'
+        0x00,0x00,0x00,0x82,0x44,0x44,0x28,0x10,0x10,0x10,0x10,0x10,0x00,0x00,
+
+        8, // 0x5A 'Z'
+        0x00,0x00,0x00,0x7E,0x02,0x04,0x08,0x10,0x10,0x20,0x40,0x7E,0x00,0x00,
+
+        5, // 0x5B '['
+        0x00,0x00,0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x70,
+
+        5, // 0x5C '\'
+        0x00,0x00,0x80,0x80,0x40,0x40,0x40,0x20,0x20,0x10,0x10,0x10,0x08,0x08,
+
+        5, // 0x5D ']'
+        0x00,0x00,0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x70,
+
+        10, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x12,0x00,0x21,0x00,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+
+        8, // 0x60 '`'
+        0x00,0x00,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x02,0x02,0x3E,0x42,0x42,0x3E,0x00,0x00,
+
+        8, // 0x62 'b'
+        0x00,0x00,0x40,0x40,0x40,0x5C,0x62,0x42,0x42,0x42,0x42,0x7C,0x00,0x00,
+
+        6, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x38,0x44,0x40,0x40,0x40,0x44,0x38,0x00,0x00,
+
+        8, // 0x64 'd'
+        0x00,0x00,0x02,0x02,0x02,0x3E,0x42,0x42,0x42,0x42,0x46,0x3A,0x00,0x00,
+
+        8, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x7E,0x40,0x42,0x3C,0x00,0x00,
+
+        4, // 0x66 'f'
+        0x00,0x00,0x30,0x40,0x40,0xF0,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        8, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x3E,0x42,0x42,0x42,0x42,0x46,0x3A,0x02,0x3C,
+
+        8, // 0x68 'h'
+        0x00,0x00,0x40,0x40,0x40,0x5C,0x62,0x42,0x42,0x42,0x42,0x42,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x00,0x40,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        4, // 0x6A 'j'
+        0x00,0x00,0x20,0x00,0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0xC0,
+
+        7, // 0x6B 'k'
+        0x00,0x00,0x40,0x40,0x40,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        11, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7B,0x80,0x44,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x00,0x00,0x00,0x00,
+
+        8, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x5C,0x62,0x42,0x42,0x42,0x42,0x42,0x00,0x00,
+
+        8, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,
+
+        8, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x5C,0x62,0x42,0x42,0x42,0x42,0x7C,0x40,0x40,
+
+        8, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x3E,0x42,0x42,0x42,0x42,0x46,0x3A,0x02,0x02,
+
+        5, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x58,0x60,0x40,0x40,0x40,0x40,0x40,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x40,0x40,0x38,0x04,0x04,0x78,0x00,0x00,
+
+        5, // 0x74 't'
+        0x00,0x00,0x00,0x40,0x40,0xF8,0x40,0x40,0x40,0x40,0x40,0x38,0x00,0x00,
+
+        8, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x46,0x3A,0x00,0x00,
+
+        7, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x00,0x00,
+
+        11, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x40,0x44,0x40,0x2A,0x80,0x2A,0x80,0x2A,0x80,0x11,0x00,0x11,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,
+
+        7, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x44,0x44,0x28,0x28,0x28,0x10,0x10,0x10,0x20,
+
+        7, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,
+
+        8, // 0x7B '{'
+        0x00,0x00,0x0C,0x10,0x10,0x10,0x10,0x60,0x10,0x10,0x10,0x10,0x10,0x0C,
+
+        5, // 0x7C '|'
+        0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+
+        8, // 0x7D '}'
+        0x00,0x00,0x30,0x08,0x08,0x08,0x08,0x06,0x08,0x08,0x08,0x08,0x08,0x30,
+
+        10, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x80,0x4C,0x80,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xE0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3F,0xE0,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana14_bold[] =
+    {
+        14, 3, 32, 128-32,
+        0x00,0x00,0x0F,0x00,0x1E,0x00,0x2D,0x00,0x4A,0x00,0x67,0x00,0x84,0x00,0xA1,0x00,0xB0,0x00,
+        0xBF,0x00,0xCE,0x00,0xEB,0x00,0x08,0x01,0x17,0x01,0x26,0x01,0x35,0x01,0x44,0x01,0x61,0x01,
+        0x7E,0x01,0x9B,0x01,0xB8,0x01,0xD5,0x01,0xF2,0x01,0x0F,0x02,0x2C,0x02,0x49,0x02,0x66,0x02,
+        0x75,0x02,0x84,0x02,0xA1,0x02,0xBE,0x02,0xDB,0x02,0xEA,0x02,0x07,0x03,0x24,0x03,0x41,0x03,
+        0x5E,0x03,0x7B,0x03,0x8A,0x03,0x99,0x03,0xB6,0x03,0xD3,0x03,0xE2,0x03,0xF1,0x03,0x0E,0x04,
+        0x1D,0x04,0x3A,0x04,0x57,0x04,0x74,0x04,0x91,0x04,0xAE,0x04,0xCB,0x04,0xE8,0x04,0xF7,0x04,
+        0x14,0x05,0x31,0x05,0x4E,0x05,0x6B,0x05,0x88,0x05,0x97,0x05,0xA6,0x05,0xB5,0x05,0xC4,0x05,
+        0xE1,0x05,0xFE,0x05,0x1B,0x06,0x2A,0x06,0x39,0x06,0x48,0x06,0x57,0x06,0x66,0x06,0x75,0x06,
+        0x84,0x06,0x93,0x06,0xA2,0x06,0xB1,0x06,0xC0,0x06,0xCF,0x06,0xEC,0x06,0xFB,0x06,0x0A,0x07,
+        0x19,0x07,0x28,0x07,0x37,0x07,0x46,0x07,0x55,0x07,0x64,0x07,0x73,0x07,0x90,0x07,0x9F,0x07,
+        0xAE,0x07,0xBD,0x07,0xDA,0x07,0xE9,0x07,0x06,0x08,0x23,0x08,
+
+        4, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x60,0x60,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x00,0x6C,0x6C,0x6C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x09,0x00,0x09,0x00,0x3F,0x80,0x3F,0x80,0x12,0x00,0x7F,0x00,0x7F,0x00,0x24,0x00,0x24,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x24 '$'
+        0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x3E,0x00,0x69,0x00,0x68,0x00,0x7E,0x00,0x3F,0x00,0x0B,0x00,0x4B,0x00,0x3E,0x00,0x08,0x00,0x08,0x00,
+
+        15, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x6C,0x40,0x6C,0x80,0x6C,0xB8,0x6D,0x6C,0x3A,0x6C,0x02,0x6C,0x04,0x6C,0x04,0x38,0x00,0x00,0x00,0x00,
+
+        10, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x6C,0x00,0x6C,0x00,0x6C,0x00,0x39,0x80,0x6D,0x00,0x66,0x00,0x63,0x00,0x3D,0x80,0x00,0x00,0x00,0x00,
+
+        4, // 0x27 '''
+        0x00,0x00,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x00,0x00,0x18,0x30,0x30,0x60,0x60,0x60,0x60,0x60,0x60,0x30,0x30,0x18,
+
+        7, // 0x29 ')'
+        0x00,0x00,0x30,0x18,0x18,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x18,0x18,0x30,
+
+        9, // 0x2A '*'
+        0x00,0x00,0x00,0x00,0x08,0x00,0x2A,0x00,0x1C,0x00,0x1C,0x00,0x2A,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x7F,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x40,
+
+        6, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        8, // 0x2F '/'
+        0x00,0x00,0x06,0x06,0x0C,0x0C,0x0C,0x18,0x18,0x30,0x30,0x30,0x60,0x60,
+
+        9, // 0x30 '0'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x31 '1'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x3C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x3F,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x32 '2'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x03,0x00,0x03,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x30,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x33 '3'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x03,0x00,0x03,0x00,0x1E,0x00,0x03,0x00,0x03,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x34 '4'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x0E,0x00,0x16,0x00,0x16,0x00,0x26,0x00,0x46,0x00,0x7F,0x00,0x06,0x00,0x06,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x35 '5'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x30,0x00,0x30,0x00,0x3E,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x36 '6'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x30,0x00,0x60,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x37 '7'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x30,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x38 '8'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x39 '9'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3F,0x00,0x03,0x00,0x06,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x00,0x00,
+
+        5, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x60,0x60,0x60,0x40,
+
+        10, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x06,0x00,0x18,0x00,0x60,0x00,0x60,0x00,0x18,0x00,0x06,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x3F '?'
+        0x00,0x00,0x00,0x38,0x4C,0x0C,0x18,0x30,0x30,0x00,0x30,0x30,0x00,0x00,
+
+        12, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x2F,0x40,0x5B,0x20,0x5B,0x20,0x5B,0x20,0x5B,0x20,0x2F,0xC0,0x30,0x00,0x0F,0x00,0x00,0x00,
+
+        9, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x1C,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x7F,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x42 'B'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x66,0x00,0x66,0x00,0x66,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x31,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x31,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x45 'E'
+        0x00,0x00,0x00,0x7E,0x60,0x60,0x60,0x7E,0x60,0x60,0x60,0x7E,0x00,0x00,
+
+        8, // 0x46 'F'
+        0x00,0x00,0x00,0x7E,0x60,0x60,0x60,0x7E,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        10, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x30,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x67,0x80,0x61,0x80,0x31,0x80,0x1F,0x80,0x00,0x00,0x00,0x00,
+
+        10, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x7F,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x00,0x00,0x00,0x00,
+
+        6, // 0x49 'I'
+        0x00,0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,
+
+        7, // 0x4A 'J'
+        0x00,0x00,0x00,0x7C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF8,0x00,0x00,
+
+        9, // 0x4B 'K'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x66,0x00,0x6C,0x00,0x78,0x00,0x70,0x00,0x78,0x00,0x6C,0x00,0x66,0x00,0x63,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x4C 'L'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x7F,0x00,0x00,
+
+        11, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x71,0xC0,0x71,0xC0,0x5A,0xC0,0x5A,0xC0,0x4C,0xC0,0x4C,0xC0,0x40,0xC0,0x40,0xC0,0x00,0x00,0x00,0x00,
+
+        10, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x80,0x70,0x80,0x58,0x80,0x58,0x80,0x4C,0x80,0x46,0x80,0x46,0x80,0x43,0x80,0x41,0x80,0x00,0x00,0x00,0x00,
+
+        11, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x50 'P'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7E,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x06,0x00,0x03,0xC0,
+
+        9, // 0x52 'R'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7E,0x00,0x6C,0x00,0x66,0x00,0x63,0x00,0x61,0x80,0x00,0x00,0x00,0x00,
+
+        9, // 0x53 'S'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x61,0x00,0x60,0x00,0x70,0x00,0x3E,0x00,0x07,0x00,0x03,0x00,0x43,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x54 'T'
+        0x00,0x00,0x00,0xFF,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,
+
+        10, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x3F,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x56 'V'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x1C,0x00,0x1C,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x18,0x63,0x18,0x63,0x18,0x33,0x30,0x37,0xB0,0x34,0xB0,0x1C,0xE0,0x18,0x60,0x18,0x60,0x00,0x00,0x00,0x00,
+
+        9, // 0x58 'X'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x1C,0x00,0x1C,0x00,0x1C,0x00,0x36,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x59 'Y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5A 'Z'
+        0x00,0x00,0x00,0x7E,0x0C,0x0C,0x18,0x18,0x30,0x30,0x60,0x7E,0x00,0x00,
+
+        6, // 0x5B '['
+        0x00,0x00,0x78,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x78,
+
+        8, // 0x5C '\'
+        0x00,0x00,0x60,0x60,0x30,0x30,0x30,0x18,0x18,0x0C,0x0C,0x0C,0x06,0x06,
+
+        6, // 0x5D ']'
+        0x00,0x00,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,
+
+        10, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x80,
+
+        9, // 0x60 '`'
+        0x00,0x00,0x00,0x00,0x30,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x06,0x3E,0x66,0x66,0x66,0x3E,0x00,0x00,
+
+        8, // 0x62 'b'
+        0x00,0x00,0x60,0x60,0x60,0x7C,0x66,0x66,0x66,0x66,0x66,0x7C,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x62,0x60,0x60,0x60,0x62,0x3C,0x00,0x00,
+
+        8, // 0x64 'd'
+        0x00,0x00,0x06,0x06,0x06,0x3E,0x66,0x66,0x66,0x66,0x66,0x3E,0x00,0x00,
+
+        8, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x66,0x66,0x7E,0x60,0x62,0x3C,0x00,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x00,0x38,0x60,0x60,0xF8,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        8, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x3E,0x66,0x66,0x66,0x66,0x66,0x3E,0x06,0x3C,
+
+        8, // 0x68 'h'
+        0x00,0x00,0x60,0x60,0x60,0x7C,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,
+
+        4, // 0x69 'i'
+        0x00,0x00,0x60,0x60,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x00,0x30,0x30,0x00,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0xE0,
+
+        8, // 0x6B 'k'
+        0x00,0x00,0x60,0x60,0x60,0x66,0x6C,0x78,0x78,0x6C,0x66,0x63,0x00,0x00,
+
+        4, // 0x6C 'l'
+        0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        12, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6C,0xC0,0x77,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x66,0x60,0x00,0x00,0x00,0x00,
+
+        8, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,
+
+        8, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x66,0x66,0x66,0x66,0x66,0x3C,0x00,0x00,
+
+        8, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x66,0x66,0x66,0x66,0x66,0x7C,0x60,0x60,
+
+        8, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x3E,0x66,0x66,0x66,0x66,0x66,0x3E,0x06,0x06,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x6C,0x7C,0x60,0x60,0x60,0x60,0x60,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x3C,0x60,0x60,0x38,0x0C,0x0C,0x78,0x00,0x00,
+
+        5, // 0x74 't'
+        0x00,0x00,0x00,0x60,0x60,0xF8,0x60,0x60,0x60,0x60,0x60,0x38,0x00,0x00,
+
+        8, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x66,0x66,0x3E,0x00,0x00,
+
+        8, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x3C,0x3C,0x3C,0x18,0x00,0x00,
+
+        12, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x60,0x66,0x60,0x66,0x60,0x69,0x60,0x39,0xC0,0x30,0xC0,0x30,0xC0,0x00,0x00,0x00,0x00,
+
+        8, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x3C,0x18,0x3C,0x66,0x66,0x00,0x00,
+
+        8, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x66,0x66,0x66,0x3C,0x3C,0x3C,0x18,0x18,0x30,
+
+        7, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x7C,0x0C,0x18,0x38,0x30,0x60,0x7C,0x00,0x00,
+
+        9, // 0x7B '{'
+        0x00,0x00,0x00,0x00,0x0E,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x70,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x0E,0x00,
+
+        6, // 0x7C '|'
+        0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,
+
+        9, // 0x7D '}'
+        0x00,0x00,0x00,0x00,0x38,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x07,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x38,0x00,
+
+        10, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x80,0x48,0x80,0x44,0x80,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xE0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3F,0xE0,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana16[] =
+    {
+        16, 4, 32, 128-32,
+        0x00,0x00,0x11,0x00,0x22,0x00,0x33,0x00,0x54,0x00,0x65,0x00,0x86,0x00,0xA7,0x00,0xB8,0x00,
+        0xC9,0x00,0xDA,0x00,0xFB,0x00,0x1C,0x01,0x2D,0x01,0x3E,0x01,0x4F,0x01,0x60,0x01,0x71,0x01,
+        0x82,0x01,0x93,0x01,0xA4,0x01,0xB5,0x01,0xC6,0x01,0xD7,0x01,0xE8,0x01,0xF9,0x01,0x0A,0x02,
+        0x1B,0x02,0x2C,0x02,0x4D,0x02,0x6E,0x02,0x8F,0x02,0xA0,0x02,0xC1,0x02,0xE2,0x02,0xF3,0x02,
+        0x14,0x03,0x35,0x03,0x46,0x03,0x57,0x03,0x78,0x03,0x99,0x03,0xAA,0x03,0xBB,0x03,0xCC,0x03,
+        0xDD,0x03,0xFE,0x03,0x1F,0x04,0x40,0x04,0x51,0x04,0x72,0x04,0x93,0x04,0xB4,0x04,0xD5,0x04,
+        0xF6,0x04,0x17,0x05,0x38,0x05,0x59,0x05,0x7A,0x05,0x9B,0x05,0xAC,0x05,0xBD,0x05,0xCE,0x05,
+        0xEF,0x05,0x00,0x06,0x11,0x06,0x22,0x06,0x33,0x06,0x44,0x06,0x55,0x06,0x66,0x06,0x77,0x06,
+        0x88,0x06,0x99,0x06,0xAA,0x06,0xBB,0x06,0xCC,0x06,0xDD,0x06,0xFE,0x06,0x0F,0x07,0x20,0x07,
+        0x31,0x07,0x42,0x07,0x53,0x07,0x64,0x07,0x75,0x07,0x86,0x07,0x97,0x07,0xB8,0x07,0xC9,0x07,
+        0xDA,0x07,0xEB,0x07,0xFC,0x07,0x0D,0x08,0x1E,0x08,0x3F,0x08,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x21 '!'
+        0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        5, // 0x22 '"'
+        0x00,0x00,0x00,0x50,0x50,0x50,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09,0x00,0x09,0x00,0x3F,0x80,0x12,0x00,0x12,0x00,0x7F,0x00,0x24,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x24 '$'
+        0x00,0x00,0x00,0x10,0x10,0x3E,0x50,0x50,0x30,0x1C,0x12,0x12,0x7C,0x10,0x10,0x00,
+
+        13, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x44,0x80,0x45,0x00,0x45,0x00,0x3A,0xE0,0x05,0x10,0x05,0x10,0x09,0x10,0x10,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x44,0x00,0x44,0x00,0x38,0x80,0x45,0x00,0x42,0x00,0x46,0x00,0x39,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        3, // 0x27 '''
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x28 '('
+        0x00,0x00,0x00,0x08,0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,0x08,
+
+        6, // 0x29 ')'
+        0x00,0x00,0x00,0x40,0x20,0x10,0x10,0x08,0x08,0x08,0x08,0x08,0x10,0x10,0x20,0x40,
+
+        9, // 0x2A '*'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x2A,0x00,0x1C,0x00,0x2A,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x7F,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x40,0x00,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        6, // 0x2F '/'
+        0x00,0x00,0x00,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80,0x00,
+
+        8, // 0x30 '0'
+        0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,0x00,
+
+        8, // 0x31 '1'
+        0x00,0x00,0x00,0x00,0x08,0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x3E,0x00,0x00,0x00,
+
+        8, // 0x32 '2'
+        0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x02,0x04,0x18,0x20,0x40,0x7E,0x00,0x00,0x00,
+
+        8, // 0x33 '3'
+        0x00,0x00,0x00,0x00,0x3C,0x42,0x02,0x02,0x1C,0x02,0x02,0x42,0x3C,0x00,0x00,0x00,
+
+        8, // 0x34 '4'
+        0x00,0x00,0x00,0x00,0x04,0x0C,0x14,0x24,0x44,0x7F,0x04,0x04,0x04,0x00,0x00,0x00,
+
+        8, // 0x35 '5'
+        0x00,0x00,0x00,0x00,0x3E,0x20,0x20,0x20,0x3C,0x02,0x02,0x42,0x3C,0x00,0x00,0x00,
+
+        8, // 0x36 '6'
+        0x00,0x00,0x00,0x00,0x1C,0x20,0x40,0x7C,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,0x00,
+
+        8, // 0x37 '7'
+        0x00,0x00,0x00,0x00,0x7E,0x02,0x04,0x04,0x08,0x08,0x10,0x10,0x10,0x00,0x00,0x00,
+
+        8, // 0x38 '8'
+        0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x3C,0x42,0x42,0x42,0x3C,0x00,0x00,0x00,
+
+        8, // 0x39 '9'
+        0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x42,0x3E,0x02,0x04,0x38,0x00,0x00,0x00,
+
+        6, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        6, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,0x20,0x20,0x20,0x40,0x00,
+
+        9, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x18,0x00,0x06,0x00,0x01,0x00,0x06,0x00,0x18,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x3F '?'
+        0x00,0x00,0x00,0x00,0x38,0x44,0x04,0x08,0x10,0x10,0x00,0x10,0x10,0x00,0x00,0x00,
+
+        13, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x10,0x40,0x27,0xA0,0x48,0x90,0x48,0x90,0x48,0x90,0x48,0x90,0x48,0x90,0x27,0xE0,0x10,0x00,0x0F,0x80,0x00,0x00,
+
+        9, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x14,0x00,0x14,0x00,0x22,0x00,0x22,0x00,0x3E,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x42 'B'
+        0x00,0x00,0x00,0x00,0x78,0x44,0x44,0x44,0x7C,0x42,0x42,0x42,0x7C,0x00,0x00,0x00,
+
+        9, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x42,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x45 'E'
+        0x00,0x00,0x00,0x00,0x7E,0x40,0x40,0x40,0x7E,0x40,0x40,0x40,0x7E,0x00,0x00,0x00,
+
+        8, // 0x46 'F'
+        0x00,0x00,0x00,0x00,0x7E,0x40,0x40,0x40,0x7C,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        9, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x47,0x00,0x41,0x00,0x21,0x00,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x7F,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x00,0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x00,0x00,0x00,0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0xF0,0x00,0x00,0x00,
+
+        8, // 0x4B 'K'
+        0x00,0x00,0x00,0x00,0x42,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x42,0x00,0x00,0x00,
+
+        7, // 0x4C 'L'
+        0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7E,0x00,0x00,0x00,
+
+        11, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x60,0xC0,0x51,0x40,0x51,0x40,0x4A,0x40,0x4A,0x40,0x44,0x40,0x44,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x00,0x61,0x00,0x51,0x00,0x51,0x00,0x49,0x00,0x45,0x00,0x45,0x00,0x43,0x00,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x50 'P'
+        0x00,0x00,0x00,0x00,0x7C,0x42,0x42,0x42,0x42,0x7C,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        10, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x02,0x00,0x01,0x80,0x00,0x00,
+
+        9, // 0x52 'R'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x44,0x00,0x78,0x00,0x44,0x00,0x42,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x53 'S'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x41,0x00,0x40,0x00,0x40,0x00,0x3E,0x00,0x01,0x00,0x01,0x00,0x41,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x54 'T'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x56 'V'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x22,0x00,0x14,0x00,0x14,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x10,0x42,0x10,0x45,0x10,0x45,0x10,0x25,0x20,0x28,0xA0,0x28,0xA0,0x10,0x40,0x10,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x58 'X'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x14,0x00,0x08,0x00,0x14,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x59 'Y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x22,0x00,0x22,0x00,0x14,0x00,0x14,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x5A 'Z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x01,0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x10,0x00,0x20,0x00,0x40,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5B '['
+        0x00,0x00,0x00,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x38,0x00,
+
+        6, // 0x5C '\'
+        0x00,0x00,0x00,0x80,0x80,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x00,
+
+        6, // 0x5D ']'
+        0x00,0x00,0x00,0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x70,0x00,
+
+        11, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x0A,0x00,0x11,0x00,0x20,0x80,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,
+
+        8, // 0x60 '`'
+        0x00,0x00,0x00,0x10,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x02,0x02,0x3E,0x42,0x42,0x3E,0x00,0x00,0x00,
+
+        8, // 0x62 'b'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x5C,0x62,0x42,0x42,0x42,0x42,0x7C,0x00,0x00,0x00,
+
+        8, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x40,0x40,0x40,0x42,0x3C,0x00,0x00,0x00,
+
+        8, // 0x64 'd'
+        0x00,0x00,0x00,0x02,0x02,0x02,0x3E,0x42,0x42,0x42,0x42,0x46,0x3A,0x00,0x00,0x00,
+
+        8, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x7E,0x40,0x42,0x3C,0x00,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x00,0x00,0x1C,0x20,0x20,0x78,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,0x00,
+
+        8, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x42,0x42,0x42,0x42,0x46,0x3A,0x02,0x02,0x3C,
+
+        8, // 0x68 'h'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x5C,0x62,0x42,0x42,0x42,0x42,0x42,0x00,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x00,0x00,0x40,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        4, // 0x6A 'j'
+        0x00,0x00,0x00,0x20,0x00,0x00,0x60,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0xC0,
+
+        7, // 0x6B 'k'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x44,0x48,0x50,0x60,0x50,0x48,0x44,0x00,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        11, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x59,0x80,0x66,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x44,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x5C,0x62,0x42,0x42,0x42,0x42,0x42,0x00,0x00,0x00,
+
+        8, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,0x00,
+
+        8, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x5C,0x62,0x42,0x42,0x42,0x42,0x7C,0x40,0x40,0x40,
+
+        8, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x42,0x42,0x42,0x42,0x46,0x3A,0x02,0x02,0x02,
+
+        5, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x60,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        7, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x40,0x40,0x38,0x04,0x04,0x78,0x00,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x00,0x00,0x00,0x20,0x20,0x78,0x20,0x20,0x20,0x20,0x20,0x18,0x00,0x00,0x00,
+
+        8, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x46,0x3A,0x00,0x00,0x00,
+
+        8, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x24,0x24,0x24,0x18,0x18,0x00,0x00,0x00,
+
+        11, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x40,0x44,0x40,0x2A,0x80,0x2A,0x80,0x2A,0x80,0x11,0x00,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,0x00,0x00,
+
+        8, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x24,0x24,0x24,0x18,0x18,0x10,0x10,0x20,
+
+        7, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x04,0x08,0x10,0x20,0x40,0x7C,0x00,0x00,0x00,
+
+        8, // 0x7B '{'
+        0x00,0x00,0x00,0x0C,0x10,0x10,0x10,0x10,0x60,0x10,0x10,0x10,0x10,0x10,0x0C,0x00,
+
+        7, // 0x7C '|'
+        0x00,0x00,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,
+
+        8, // 0x7D '}'
+        0x00,0x00,0x00,0x30,0x08,0x08,0x08,0x08,0x06,0x08,0x08,0x08,0x08,0x08,0x30,0x00,
+
+        11, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x80,0x4C,0x80,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xF0,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x3F,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana16_bold[] =
+    {
+        16, 4, 32, 128-32,
+        0x00,0x00,0x11,0x00,0x22,0x00,0x33,0x00,0x54,0x00,0x75,0x00,0xA6,0x00,0xC7,0x00,0xD8,0x00,
+        0xE9,0x00,0xFA,0x00,0x1B,0x01,0x3C,0x01,0x4D,0x01,0x5E,0x01,0x6F,0x01,0x90,0x01,0xB1,0x01,
+        0xD2,0x01,0xF3,0x01,0x14,0x02,0x35,0x02,0x56,0x02,0x77,0x02,0x98,0x02,0xB9,0x02,0xDA,0x02,
+        0xEB,0x02,0xFC,0x02,0x1D,0x03,0x3E,0x03,0x5F,0x03,0x70,0x03,0x91,0x03,0xB2,0x03,0xD3,0x03,
+        0xF4,0x03,0x15,0x04,0x36,0x04,0x57,0x04,0x78,0x04,0x99,0x04,0xAA,0x04,0xBB,0x04,0xDC,0x04,
+        0xED,0x04,0x0E,0x05,0x2F,0x05,0x50,0x05,0x71,0x05,0x92,0x05,0xB3,0x05,0xD4,0x05,0xE5,0x05,
+        0x06,0x06,0x27,0x06,0x48,0x06,0x69,0x06,0x8A,0x06,0xAB,0x06,0xBC,0x06,0xDD,0x06,0xEE,0x06,
+        0x0F,0x07,0x30,0x07,0x51,0x07,0x72,0x07,0x93,0x07,0xA4,0x07,0xC5,0x07,0xE6,0x07,0xF7,0x07,
+        0x18,0x08,0x39,0x08,0x4A,0x08,0x5B,0x08,0x6C,0x08,0x7D,0x08,0x9E,0x08,0xBF,0x08,0xE0,0x08,
+        0x01,0x09,0x22,0x09,0x33,0x09,0x44,0x09,0x55,0x09,0x76,0x09,0x97,0x09,0xB8,0x09,0xD9,0x09,
+        0xFA,0x09,0x0B,0x0A,0x2C,0x0A,0x3D,0x0A,0x5E,0x0A,0x7F,0x0A,
+
+        4, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x00,0x00,0x6C,0x6C,0x6C,0x6C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09,0x00,0x09,0x00,0x3F,0x80,0x3F,0x80,0x12,0x00,0x7F,0x00,0x7F,0x00,0x24,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x24 '$'
+        0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x3E,0x00,0x69,0x00,0x68,0x00,0x78,0x00,0x3E,0x00,0x0F,0x00,0x0B,0x00,0x4B,0x00,0x3E,0x00,0x08,0x00,0x08,0x00,0x00,0x00,
+
+        17, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x20,0x00,0x66,0x20,0x00,0x66,0x40,0x00,0x66,0x5E,0x00,0x66,0xB3,0x00,0x3D,0x33,0x00,0x01,0x33,0x00,0x02,0x33,0x00,0x02,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x66,0x00,0x66,0x00,0x66,0xC0,0x3C,0xC0,0x66,0x80,0x63,0x00,0x63,0x80,0x3C,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x27 '''
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x00,0x00,0x00,0x0C,0x18,0x30,0x30,0x60,0x60,0x60,0x60,0x60,0x30,0x30,0x18,0x0C,
+
+        7, // 0x29 ')'
+        0x00,0x00,0x00,0x60,0x30,0x18,0x18,0x0C,0x0C,0x0C,0x0C,0x0C,0x18,0x18,0x30,0x60,
+
+        9, // 0x2A '*'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x49,0x00,0x2A,0x00,0x1C,0x00,0x2A,0x00,0x49,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x3F,0x80,0x04,0x00,0x04,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x60,0x60,0xC0,0xC0,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        9, // 0x2F '/'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x30,0x00,0x30,0x00,0x60,0x00,0x60,0x00,0x00,0x00,
+
+        9, // 0x30 '0'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x31 '1'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x3C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x32 '2'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x03,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x30,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x33 '3'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x03,0x00,0x0E,0x00,0x03,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x34 '4'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x0E,0x00,0x16,0x00,0x26,0x00,0x46,0x00,0x7F,0x80,0x06,0x00,0x06,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x35 '5'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x30,0x00,0x30,0x00,0x3E,0x00,0x03,0x00,0x03,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x36 '6'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x30,0x00,0x60,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x37 '7'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x03,0x00,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x38 '8'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x39 '9'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3F,0x00,0x03,0x00,0x06,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        5, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x38,0x30,0x30,0x60,0x60,
+
+        11, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x80,0x00,0x00,0x00,0x00,0x3F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x18,0x00,0x06,0x00,0x01,0x80,0x00,0x40,0x01,0x80,0x06,0x00,0x18,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x3F '?'
+        0x00,0x00,0x00,0x00,0x3C,0x66,0x06,0x0C,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,
+
+        13, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x30,0x60,0x27,0xA0,0x4D,0x90,0x4D,0x90,0x4D,0x90,0x4D,0x90,0x27,0xE0,0x30,0x00,0x0F,0x80,0x00,0x00,0x00,0x00,
+
+        10, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x0C,0x00,0x1E,0x00,0x1E,0x00,0x33,0x00,0x33,0x00,0x7F,0x80,0x61,0x80,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x42 'B'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7F,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x61,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x61,0x80,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x45 'E'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x46 'F'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x61,0x80,0x60,0x00,0x60,0x00,0x63,0x80,0x61,0x80,0x31,0x80,0x1F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x7F,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x49 'I'
+        0x00,0x00,0x00,0x00,0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x78,0x00,0x00,0x00,
+
+        7, // 0x4A 'J'
+        0x00,0x00,0x00,0x00,0x7C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF8,0x00,0x00,0x00,
+
+        9, // 0x4B 'K'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x66,0x00,0x6C,0x00,0x78,0x00,0x78,0x00,0x6C,0x00,0x66,0x00,0x63,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x4C 'L'
+        0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x7F,0x00,0x00,0x00,
+
+        12, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0xE0,0x70,0xE0,0x59,0x60,0x59,0x60,0x4E,0x60,0x4E,0x60,0x44,0x60,0x44,0x60,0x40,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x80,0x70,0x80,0x58,0x80,0x58,0x80,0x4C,0x80,0x46,0x80,0x46,0x80,0x43,0x80,0x43,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x50 'P'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7E,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x03,0x00,0x01,0xC0,0x00,0x00,
+
+        9, // 0x52 'R'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7E,0x00,0x6C,0x00,0x66,0x00,0x63,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x53 'S'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x70,0x00,0x3E,0x00,0x07,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x54 'T'
+        0x00,0x00,0x00,0x00,0xFF,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,
+
+        10, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x56 'V'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x00,0x33,0x00,0x1E,0x00,0x1E,0x00,0x0C,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x18,0x63,0x18,0x63,0x18,0x33,0x30,0x37,0xB0,0x34,0xB0,0x1C,0xE0,0x18,0x60,0x18,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x58 'X'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x33,0x00,0x33,0x00,0x1E,0x00,0x0C,0x00,0x1E,0x00,0x33,0x00,0x33,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x59 'Y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x5A 'Z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x30,0x00,0x30,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5B '['
+        0x00,0x00,0x00,0x78,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x78,0x00,
+
+        9, // 0x5C '\'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x30,0x00,0x30,0x00,0x18,0x00,0x18,0x00,0x0C,0x00,0x0C,0x00,0x06,0x00,0x06,0x00,0x03,0x00,0x03,0x00,0x00,0x00,
+
+        6, // 0x5D ']'
+        0x00,0x00,0x00,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x00,
+
+        10, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x80,0x00,0x00,
+
+        9, // 0x60 '`'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x03,0x00,0x3F,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x62 'b'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x6E,0x00,0x73,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x63,0x60,0x60,0x60,0x63,0x3E,0x00,0x00,0x00,
+
+        9, // 0x64 'd'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x03,0x00,0x03,0x00,0x3F,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x67,0x00,0x3B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x7F,0x00,0x60,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x66 'f'
+        0x00,0x00,0x00,0x38,0x60,0x60,0xF8,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        9, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x67,0x00,0x3B,0x00,0x03,0x00,0x03,0x00,0x3E,0x00,
+
+        9, // 0x68 'h'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x6E,0x00,0x73,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x69 'i'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x00,0x00,0x30,0x30,0x00,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0xE0,
+
+        8, // 0x6B 'k'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x66,0x6C,0x78,0x78,0x6C,0x66,0x63,0x00,0x00,0x00,
+
+        4, // 0x6C 'l'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        14, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x70,0x73,0x98,0x63,0x18,0x63,0x18,0x63,0x18,0x63,0x18,0x63,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x00,0x73,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x00,0x73,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x7E,0x00,0x60,0x00,0x60,0x00,0x60,0x00,
+
+        9, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x67,0x00,0x3B,0x00,0x03,0x00,0x03,0x00,0x03,0x00,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x6C,0x7C,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        8, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x60,0x70,0x3C,0x0E,0x06,0x7C,0x00,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x00,0x00,0x00,0x60,0x60,0xF8,0x60,0x60,0x60,0x60,0x60,0x38,0x00,0x00,0x00,
+
+        9, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x67,0x00,0x3B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x36,0x00,0x1C,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x60,0x66,0x60,0x66,0x60,0x69,0x60,0x39,0xC0,0x30,0xC0,0x30,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x1C,0x00,0x36,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x36,0x00,0x1C,0x00,0x1C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,
+
+        8, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x06,0x0C,0x18,0x30,0x60,0x7E,0x00,0x00,0x00,
+
+        9, // 0x7B '{'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x70,0x00,0x18,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x07,0x00,0x00,0x00,
+
+        8, // 0x7C '|'
+        0x00,0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,
+
+        9, // 0x7D '}'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x0C,0x00,0x07,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x70,0x00,0x00,0x00,
+
+        11, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x44,0x40,0x44,0x40,0x43,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xF0,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x20,0x10,0x3F,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana17[] =
+    {
+        17, 4, 32, 128-32,
+        0x00,0x00,0x12,0x00,0x24,0x00,0x36,0x00,0x59,0x00,0x7C,0x00,0x9F,0x00,0xC2,0x00,0xD4,0x00,
+        0xE6,0x00,0xF8,0x00,0x1B,0x01,0x3E,0x01,0x50,0x01,0x62,0x01,0x74,0x01,0x86,0x01,0xA9,0x01,
+        0xCC,0x01,0xEF,0x01,0x12,0x02,0x35,0x02,0x58,0x02,0x7B,0x02,0x9E,0x02,0xC1,0x02,0xE4,0x02,
+        0xF6,0x02,0x08,0x03,0x2B,0x03,0x4E,0x03,0x71,0x03,0x83,0x03,0xA6,0x03,0xC9,0x03,0xEC,0x03,
+        0x0F,0x04,0x32,0x04,0x55,0x04,0x67,0x04,0x8A,0x04,0xAD,0x04,0xBF,0x04,0xD1,0x04,0xF4,0x04,
+        0x06,0x05,0x29,0x05,0x4C,0x05,0x6F,0x05,0x81,0x05,0xA4,0x05,0xC7,0x05,0xEA,0x05,0x0D,0x06,
+        0x30,0x06,0x53,0x06,0x76,0x06,0x99,0x06,0xBC,0x06,0xDF,0x06,0xF1,0x06,0x03,0x07,0x15,0x07,
+        0x38,0x07,0x5B,0x07,0x7E,0x07,0x90,0x07,0xB3,0x07,0xC5,0x07,0xE8,0x07,0xFA,0x07,0x0C,0x08,
+        0x2F,0x08,0x52,0x08,0x64,0x08,0x76,0x08,0x88,0x08,0x9A,0x08,0xBD,0x08,0xE0,0x08,0x03,0x09,
+        0x26,0x09,0x49,0x09,0x5B,0x09,0x6D,0x09,0x7F,0x09,0xA2,0x09,0xB4,0x09,0xD7,0x09,0xFA,0x09,
+        0x0C,0x0A,0x1E,0x0A,0x41,0x0A,0x53,0x0A,0x76,0x0A,0x99,0x0A,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        6, // 0x22 '"'
+        0x00,0x00,0x00,0x48,0x48,0x48,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x80,0x04,0x80,0x09,0x00,0x3F,0xC0,0x09,0x00,0x12,0x00,0x7F,0x80,0x12,0x00,0x24,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x24 '$'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x3E,0x00,0x49,0x00,0x48,0x00,0x48,0x00,0x3E,0x00,0x09,0x00,0x09,0x00,0x49,0x00,0x3E,0x00,0x08,0x00,0x08,0x00,0x00,0x00,
+
+        15, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x20,0x44,0x40,0x44,0x80,0x44,0x80,0x45,0x38,0x39,0x44,0x02,0x44,0x04,0x44,0x04,0x44,0x08,0x38,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x42,0x00,0x42,0x00,0x44,0x00,0x38,0x80,0x44,0x80,0x42,0x80,0x41,0x00,0x22,0x80,0x1C,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x27 '''
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x28 '('
+        0x00,0x00,0x00,0x08,0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,0x08,
+
+        6, // 0x29 ')'
+        0x00,0x00,0x00,0x40,0x20,0x10,0x10,0x08,0x08,0x08,0x08,0x08,0x08,0x10,0x10,0x20,0x40,
+
+        9, // 0x2A '*'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x49,0x00,0x2A,0x00,0x1C,0x00,0x2A,0x00,0x49,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x7F,0xC0,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x40,0x00,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        6, // 0x2F '/'
+        0x00,0x00,0x00,0x04,0x08,0x08,0x08,0x10,0x10,0x20,0x20,0x20,0x40,0x40,0x80,0x80,0x00,
+
+        9, // 0x30 '0'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x31 '1'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x38,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x32 '2'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x41,0x00,0x01,0x00,0x01,0x00,0x02,0x00,0x0C,0x00,0x10,0x00,0x20,0x00,0x40,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x33 '3'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x41,0x00,0x01,0x00,0x02,0x00,0x1C,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x34 '4'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x06,0x00,0x0A,0x00,0x12,0x00,0x22,0x00,0x42,0x00,0x7F,0x80,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x35 '5'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x7C,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x36 '6'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x30,0x00,0x20,0x00,0x40,0x00,0x7C,0x00,0x42,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x37 '7'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x01,0x00,0x02,0x00,0x02,0x00,0x04,0x00,0x04,0x00,0x08,0x00,0x10,0x00,0x10,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x38 '8'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x3E,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x39 '9'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x21,0x00,0x1F,0x00,0x01,0x00,0x02,0x00,0x06,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        6, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x40,0x00,
+
+        11, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x06,0x00,0x18,0x00,0x60,0x00,0x60,0x00,0x18,0x00,0x06,0x00,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xC0,0x00,0x00,0x00,0x00,0x3F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0xC0,0x00,0xC0,0x03,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x3F '?'
+        0x00,0x00,0x00,0x00,0x3C,0x42,0x02,0x02,0x0C,0x10,0x10,0x00,0x10,0x10,0x00,0x00,0x00,
+
+        14, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0xC0,0x18,0x20,0x20,0x10,0x27,0xC8,0x48,0x48,0x48,0x48,0x48,0x48,0x48,0x48,0x27,0xF0,0x20,0x00,0x18,0x00,0x07,0xC0,0x00,0x00,
+
+        10, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x12,0x00,0x12,0x00,0x21,0x00,0x21,0x00,0x21,0x00,0x7F,0x80,0x40,0x80,0x80,0x40,0x80,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x42 'B'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x7E,0x00,0x41,0x00,0x40,0x80,0x40,0x80,0x41,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0x80,0x20,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x20,0x00,0x30,0x80,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x41,0x80,0x40,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x41,0x80,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x45 'E'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x7F,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x46 'F'
+        0x00,0x00,0x00,0x00,0x7F,0x40,0x40,0x40,0x7E,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        11, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x20,0x40,0x40,0x00,0x40,0x00,0x43,0xC0,0x40,0x40,0x20,0x40,0x30,0x40,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x7F,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x00,0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,0x00,
+
+        6, // 0x4A 'J'
+        0x00,0x00,0x00,0x00,0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0xF0,0x00,0x00,0x00,
+
+        10, // 0x4B 'K'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x42,0x00,0x44,0x00,0x48,0x00,0x50,0x00,0x68,0x00,0x44,0x00,0x42,0x00,0x41,0x00,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x4C 'L'
+        0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7F,0x00,0x00,0x00,
+
+        11, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x60,0xC0,0x51,0x40,0x51,0x40,0x4A,0x40,0x4A,0x40,0x44,0x40,0x44,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x80,0x60,0x80,0x50,0x80,0x48,0x80,0x48,0x80,0x44,0x80,0x44,0x80,0x42,0x80,0x41,0x80,0x41,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x31,0x80,0x20,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x80,0x31,0x80,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x50 'P'
+        0x00,0x00,0x00,0x00,0x7C,0x42,0x41,0x41,0x42,0x7C,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        11, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x31,0x80,0x20,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x80,0x31,0x80,0x0E,0x00,0x02,0x00,0x02,0x00,0x01,0xC0,
+
+        10, // 0x52 'R'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x42,0x00,0x42,0x00,0x42,0x00,0x44,0x00,0x78,0x00,0x44,0x00,0x42,0x00,0x41,0x00,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x53 'S'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x20,0x80,0x40,0x00,0x40,0x00,0x38,0x00,0x07,0x00,0x00,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x54 'T'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x80,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x56 'V'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x40,0x80,0x40,0x40,0x80,0x40,0x80,0x21,0x00,0x21,0x00,0x21,0x00,0x12,0x00,0x12,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        15, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x04,0x41,0x04,0x22,0x88,0x22,0x88,0x22,0x88,0x14,0x50,0x14,0x50,0x14,0x50,0x08,0x20,0x08,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x58 'X'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x21,0x00,0x12,0x00,0x12,0x00,0x0C,0x00,0x0C,0x00,0x12,0x00,0x12,0x00,0x21,0x00,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x59 'Y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x41,0x00,0x22,0x00,0x22,0x00,0x14,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x5A 'Z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x00,0x80,0x01,0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x10,0x00,0x20,0x00,0x40,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x5B '['
+        0x00,0x00,0x00,0x3C,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3C,
+
+        6, // 0x5C '\'
+        0x00,0x00,0x00,0x80,0x40,0x40,0x40,0x20,0x20,0x10,0x10,0x10,0x08,0x08,0x08,0x04,0x00,
+
+        6, // 0x5D ']'
+        0x00,0x00,0x00,0x78,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x78,
+
+        11, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x0A,0x00,0x11,0x00,0x20,0x80,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x80,0x00,0x00,
+
+        9, // 0x60 '`'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x22,0x02,0x3E,0x42,0x42,0x46,0x3A,0x00,0x00,0x00,
+
+        9, // 0x62 'b'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x5C,0x00,0x62,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x22,0x40,0x40,0x40,0x40,0x22,0x1C,0x00,0x00,0x00,
+
+        9, // 0x64 'd'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x1F,0x00,0x21,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x23,0x00,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x24,0x42,0x7E,0x40,0x40,0x22,0x1C,0x00,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x00,0x00,0x1C,0x20,0x20,0x7C,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,0x00,
+
+        9, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x21,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x23,0x00,0x1D,0x00,0x01,0x00,0x22,0x00,0x1C,0x00,
+
+        9, // 0x68 'h'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x5E,0x00,0x61,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x00,0x00,0x00,0x10,0x00,0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0xE0,
+
+        8, // 0x6B 'k'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x42,0x44,0x48,0x50,0x70,0x48,0x44,0x42,0x00,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        13, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5C,0xE0,0x63,0x10,0x42,0x10,0x42,0x10,0x42,0x10,0x42,0x10,0x42,0x10,0x42,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5E,0x00,0x61,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5C,0x00,0x62,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x40,0x00,0x40,0x00,0x40,0x00,
+
+        9, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x21,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x23,0x00,0x1D,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x5C,0x60,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        8, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x40,0x30,0x0C,0x02,0x42,0x3C,0x00,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x00,0x00,0x00,0x20,0x20,0x7C,0x20,0x20,0x20,0x20,0x20,0x20,0x1C,0x00,0x00,0x00,
+
+        9, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x43,0x00,0x3D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x24,0x24,0x24,0x18,0x18,0x18,0x00,0x00,0x00,
+
+        11, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x40,0x44,0x40,0x2A,0x80,0x2A,0x80,0x2A,0x80,0x2A,0x80,0x11,0x00,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x22,0x00,0x14,0x00,0x08,0x00,0x08,0x00,0x14,0x00,0x22,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x24,0x24,0x24,0x18,0x18,0x18,0x10,0x10,0x20,
+
+        8, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x02,0x04,0x08,0x10,0x20,0x40,0x7E,0x00,0x00,0x00,
+
+        9, // 0x7B '{'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x60,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x07,0x00,
+
+        6, // 0x7C '|'
+        0x00,0x00,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
+
+        9, // 0x7D '}'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x03,0x00,0x04,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x70,0x00,
+
+        11, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x44,0x40,0x44,0x40,0x43,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xF8,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x3F,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana17_bold[] =
+    {
+        17, 4, 32, 128-32,
+        0x00,0x00,0x12,0x00,0x24,0x00,0x36,0x00,0x59,0x00,0x7C,0x00,0xB0,0x00,0xD3,0x00,0xE5,0x00,
+        0xF7,0x00,0x09,0x01,0x2C,0x01,0x4F,0x01,0x61,0x01,0x73,0x01,0x85,0x01,0xA8,0x01,0xCB,0x01,
+        0xEE,0x01,0x11,0x02,0x34,0x02,0x57,0x02,0x7A,0x02,0x9D,0x02,0xC0,0x02,0xE3,0x02,0x06,0x03,
+        0x18,0x03,0x2A,0x03,0x4D,0x03,0x70,0x03,0x93,0x03,0xB6,0x03,0xD9,0x03,0xFC,0x03,0x1F,0x04,
+        0x42,0x04,0x65,0x04,0x88,0x04,0xAB,0x04,0xCE,0x04,0xF1,0x04,0x03,0x05,0x15,0x05,0x38,0x05,
+        0x5B,0x05,0x7E,0x05,0xA1,0x05,0xC4,0x05,0xE7,0x05,0x0A,0x06,0x2D,0x06,0x50,0x06,0x73,0x06,
+        0x96,0x06,0xB9,0x06,0xDC,0x06,0xFF,0x06,0x22,0x07,0x45,0x07,0x57,0x07,0x7A,0x07,0x8C,0x07,
+        0xAF,0x07,0xD2,0x07,0xF5,0x07,0x18,0x08,0x3B,0x08,0x4D,0x08,0x70,0x08,0x93,0x08,0xA5,0x08,
+        0xC8,0x08,0xEB,0x08,0xFD,0x08,0x0F,0x09,0x32,0x09,0x44,0x09,0x67,0x09,0x8A,0x09,0xAD,0x09,
+        0xD0,0x09,0xF3,0x09,0x05,0x0A,0x17,0x0A,0x29,0x0A,0x4C,0x0A,0x6F,0x0A,0x92,0x0A,0xB5,0x0A,
+        0xD8,0x0A,0xEA,0x0A,0x0D,0x0B,0x1F,0x0B,0x42,0x0B,0x65,0x0B,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        8, // 0x22 '"'
+        0x00,0x00,0x00,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x40,0x04,0x40,0x3F,0xE0,0x3F,0xE0,0x08,0x80,0x11,0x00,0x7F,0xC0,0x7F,0xC0,0x22,0x00,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x24 '$'
+        0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x1F,0x00,0x34,0x80,0x64,0x00,0x74,0x00,0x3C,0x00,0x0F,0x00,0x0B,0x80,0x09,0x80,0x4B,0x00,0x3E,0x00,0x08,0x00,0x08,0x00,0x00,0x00,
+
+        18, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x08,0x00,0x66,0x10,0x00,0x66,0x20,0x00,0x66,0x2F,0x00,0x66,0x59,0x80,0x66,0x99,0x80,0x3D,0x19,0x80,0x01,0x19,0x80,0x02,0x19,0x80,0x04,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x33,0x00,0x36,0x00,0x1C,0x60,0x36,0x60,0x63,0x60,0x61,0xC0,0x31,0xC0,0x1F,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x27 '''
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x28 '('
+        0x00,0x00,0x00,0x0C,0x18,0x30,0x30,0x60,0x60,0x60,0x60,0x60,0x60,0x30,0x30,0x18,0x0C,
+
+        8, // 0x29 ')'
+        0x00,0x00,0x00,0x30,0x18,0x0C,0x0C,0x06,0x06,0x06,0x06,0x06,0x06,0x0C,0x0C,0x18,0x30,
+
+        10, // 0x2A '*'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x49,0x00,0x2A,0x00,0x1C,0x00,0x2A,0x00,0x49,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x7F,0xC0,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x60,0x60,0xC0,0xC0,0x00,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        10, // 0x2F '/'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x01,0x80,0x03,0x00,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x30,0x00,0x30,0x00,0x60,0x00,0x60,0x00,0x00,0x00,
+
+        10, // 0x30 '0'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x31 '1'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x3C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x32 '2'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x61,0x80,0x61,0x80,0x01,0x80,0x03,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x30,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x33 '3'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x61,0x80,0x61,0x80,0x01,0x80,0x0F,0x00,0x03,0x00,0x01,0x80,0x61,0x80,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x34 '4'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x07,0x00,0x0B,0x00,0x13,0x00,0x23,0x00,0x43,0x00,0x7F,0xC0,0x03,0x00,0x03,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x35 '5'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x80,0x30,0x00,0x30,0x00,0x3E,0x00,0x03,0x00,0x01,0x80,0x01,0x80,0x61,0x80,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x36 '6'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x38,0x00,0x30,0x00,0x6E,0x00,0x73,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x37 '7'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x01,0x80,0x03,0x00,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x38 '8'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x3F,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x39 '9'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x80,0x1D,0x80,0x03,0x00,0x07,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        6, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x38,0x30,0x30,0x60,0x60,0x00,
+
+        12, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x18,0x00,0x06,0x00,0x01,0x80,0x00,0x40,0x01,0x80,0x06,0x00,0x18,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3F '?'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x03,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0xC0,0x18,0x20,0x20,0x10,0x27,0xC8,0x4C,0xC8,0x4C,0xC8,0x4C,0xC8,0x4C,0xC8,0x27,0xF0,0x20,0x00,0x18,0x00,0x07,0xC0,0x00,0x00,
+
+        11, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x1B,0x00,0x1B,0x00,0x31,0x80,0x3F,0x80,0x31,0x80,0x60,0xC0,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x42 'B'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x7F,0x00,0x61,0x80,0x60,0xC0,0x60,0xC0,0x61,0x80,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x30,0xC0,0x30,0xC0,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x30,0xC0,0x30,0xC0,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x61,0x80,0x61,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x61,0x80,0x61,0x80,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x45 'E'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x46 'F'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x30,0xC0,0x30,0xC0,0x60,0x00,0x60,0x00,0x63,0xC0,0x60,0xC0,0x30,0xC0,0x30,0xC0,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x7F,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x49 'I'
+        0x00,0x00,0x00,0x00,0x7E,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x7E,0x00,0x00,0x00,
+
+        8, // 0x4A 'J'
+        0x00,0x00,0x00,0x00,0x3E,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x0C,0xF8,0x00,0x00,0x00,
+
+        11, // 0x4B 'K'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x61,0x80,0x63,0x00,0x66,0x00,0x6C,0x00,0x7C,0x00,0x76,0x00,0x63,0x00,0x61,0x80,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x4C 'L'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x70,0x70,0x70,0x70,0xF0,0x58,0xB0,0x59,0xB0,0x4D,0x30,0x4F,0x30,0x46,0x30,0x46,0x30,0x40,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x40,0x70,0x40,0x58,0x40,0x4C,0x40,0x4C,0x40,0x46,0x40,0x43,0x40,0x43,0x40,0x41,0xC0,0x40,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x30,0xC0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x30,0xC0,0x30,0xC0,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x50 'P'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x63,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7E,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x30,0xC0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x30,0xC0,0x30,0xC0,0x0F,0x80,0x03,0x00,0x03,0x00,0x01,0xE0,
+
+        11, // 0x52 'R'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x61,0x80,0x60,0xC0,0x60,0xC0,0x61,0x80,0x7F,0x00,0x63,0x00,0x61,0x80,0x60,0xC0,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x53 'S'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x61,0x80,0x60,0x00,0x3E,0x00,0x1F,0x00,0x01,0x80,0x61,0x80,0x63,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x54 'T'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x56 'V'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x31,0x80,0x31,0x80,0x1B,0x00,0x1B,0x00,0x0E,0x00,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        16, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x86,0x61,0x86,0x63,0xC6,0x32,0x4C,0x36,0x6C,0x36,0x6C,0x34,0x2C,0x1C,0x38,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x58 'X'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x31,0x80,0x31,0x80,0x1B,0x00,0x0E,0x00,0x0E,0x00,0x1B,0x00,0x31,0x80,0x31,0x80,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x59 'Y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x5A 'Z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x01,0x80,0x03,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x30,0x00,0x60,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5B '['
+        0x00,0x00,0x00,0x3E,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3E,
+
+        10, // 0x5C '\'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x30,0x00,0x30,0x00,0x18,0x00,0x18,0x00,0x0C,0x00,0x06,0x00,0x06,0x00,0x03,0x00,0x03,0x00,0x01,0x80,0x01,0x80,0x00,0x00,
+
+        8, // 0x5D ']'
+        0x00,0x00,0x00,0x7C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x7C,
+
+        12, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x0E,0x00,0x1B,0x00,0x31,0x80,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xC0,0x00,0x00,
+
+        10, // 0x60 '`'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x03,0x00,0x03,0x00,0x3F,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x62 'b'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x6E,0x00,0x73,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x33,0x60,0x60,0x60,0x60,0x33,0x1E,0x00,0x00,0x00,
+
+        10, // 0x64 'd'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x01,0x80,0x01,0x80,0x1F,0x80,0x31,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x80,0x1D,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x63,0x00,0x7F,0x00,0x60,0x00,0x60,0x00,0x33,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x00,0x00,0x1C,0x30,0x30,0x7C,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        10, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x80,0x31,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x80,0x1D,0x80,0x01,0x80,0x03,0x00,0x3E,0x00,
+
+        10, // 0x68 'h'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x6F,0x00,0x71,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x69 'i'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        6, // 0x6A 'j'
+        0x00,0x00,0x00,0x18,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xF0,
+
+        9, // 0x6B 'k'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x63,0x00,0x66,0x00,0x6C,0x00,0x78,0x00,0x7C,0x00,0x66,0x00,0x63,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x6C 'l'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        14, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x70,0x73,0x98,0x63,0x18,0x63,0x18,0x63,0x18,0x63,0x18,0x63,0x18,0x63,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6F,0x00,0x71,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x00,0x73,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7E,0x00,0x60,0x00,0x60,0x00,0x60,0x00,
+
+        10, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x80,0x31,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x80,0x1D,0x80,0x01,0x80,0x01,0x80,0x01,0x80,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x7E,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        8, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x62,0x60,0x7C,0x3E,0x06,0x46,0x3C,0x00,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x00,0x00,0x00,0x60,0x60,0xFC,0x60,0x60,0x60,0x60,0x60,0x60,0x3C,0x00,0x00,0x00,
+
+        10, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x80,0x3D,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x1C,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x18,0x63,0x18,0x33,0x30,0x37,0xB0,0x34,0xB0,0x1C,0xE0,0x1C,0xE0,0x0C,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x1C,0x00,0x1C,0x00,0x36,0x00,0x63,0x00,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x00,0x63,0x00,0x63,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x1C,0x00,0x1C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,
+
+        8, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x06,0x0C,0x18,0x18,0x30,0x60,0x7E,0x00,0x00,0x00,
+
+        10, // 0x7B '{'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x80,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x70,0x00,0x18,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x07,0x80,
+
+        8, // 0x7C '|'
+        0x00,0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+
+        10, // 0x7D '}'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x06,0x00,0x03,0x80,0x06,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x78,0x00,
+
+        12, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x20,0x24,0x20,0x46,0x20,0x42,0x40,0x41,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xF8,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x3F,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana18[] =
+    {
+        18, 4, 32, 128-32,
+        0x00,0x00,0x13,0x00,0x26,0x00,0x39,0x00,0x5E,0x00,0x83,0x00,0xA8,0x00,0xCD,0x00,0xE0,0x00,
+        0xF3,0x00,0x06,0x01,0x2B,0x01,0x50,0x01,0x63,0x01,0x76,0x01,0x89,0x01,0x9C,0x01,0xC1,0x01,
+        0xE6,0x01,0x0B,0x02,0x30,0x02,0x55,0x02,0x7A,0x02,0x9F,0x02,0xC4,0x02,0xE9,0x02,0x0E,0x03,
+        0x21,0x03,0x34,0x03,0x59,0x03,0x7E,0x03,0xA3,0x03,0xB6,0x03,0xDB,0x03,0x00,0x04,0x25,0x04,
+        0x4A,0x04,0x6F,0x04,0x94,0x04,0xB9,0x04,0xDE,0x04,0x03,0x05,0x16,0x05,0x29,0x05,0x4E,0x05,
+        0x61,0x05,0x86,0x05,0xAB,0x05,0xD0,0x05,0xF5,0x05,0x1A,0x06,0x3F,0x06,0x64,0x06,0x89,0x06,
+        0xAE,0x06,0xD3,0x06,0xF8,0x06,0x1D,0x07,0x42,0x07,0x67,0x07,0x7A,0x07,0x8D,0x07,0xA0,0x07,
+        0xC5,0x07,0xEA,0x07,0x0F,0x08,0x34,0x08,0x59,0x08,0x6C,0x08,0x91,0x08,0xB6,0x08,0xC9,0x08,
+        0xEE,0x08,0x13,0x09,0x26,0x09,0x39,0x09,0x5E,0x09,0x71,0x09,0x96,0x09,0xBB,0x09,0xE0,0x09,
+        0x05,0x0A,0x2A,0x0A,0x3D,0x0A,0x50,0x0A,0x63,0x0A,0x88,0x0A,0xAD,0x0A,0xD2,0x0A,0xF7,0x0A,
+        0x1C,0x0B,0x41,0x0B,0x66,0x0B,0x79,0x0B,0x9E,0x0B,0xC3,0x0B,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        7, // 0x22 '"'
+        0x00,0x00,0x00,0x48,0x48,0x48,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x80,0x04,0x80,0x09,0x00,0x3F,0xC0,0x09,0x00,0x11,0x00,0x12,0x00,0x7F,0x80,0x12,0x00,0x24,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x24 '$'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x3E,0x00,0x49,0x00,0x48,0x00,0x48,0x00,0x38,0x00,0x0E,0x00,0x09,0x00,0x09,0x00,0x49,0x00,0x3E,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
+
+        16, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x20,0x44,0x40,0x44,0x40,0x44,0x80,0x44,0x80,0x38,0x9C,0x01,0x22,0x01,0x22,0x02,0x22,0x02,0x22,0x04,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x21,0x00,0x21,0x00,0x1E,0x40,0x24,0x40,0x42,0x40,0x41,0x40,0x40,0x80,0x21,0x40,0x1E,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x27 '''
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x28 '('
+        0x00,0x00,0x00,0x08,0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x20,0x10,0x08,
+
+        7, // 0x29 ')'
+        0x00,0x00,0x00,0x20,0x10,0x08,0x08,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x08,0x08,0x10,0x20,
+
+        10, // 0x2A '*'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x49,0x00,0x2A,0x00,0x1C,0x00,0x2A,0x00,0x49,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x3F,0xE0,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x20,0x40,0x40,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x00,0x00,0x00,
+
+        7, // 0x2F '/'
+        0x00,0x00,0x00,0x02,0x04,0x04,0x04,0x08,0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x40,0x80,0x00,
+
+        10, // 0x30 '0'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x31 '1'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x1C,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x32 '2'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x41,0x00,0x00,0x80,0x00,0x80,0x00,0x80,0x01,0x00,0x02,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x33 '3'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x40,0x80,0x00,0x80,0x01,0x00,0x0E,0x00,0x01,0x00,0x00,0x80,0x00,0x80,0x00,0x80,0x41,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x34 '4'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x03,0x00,0x05,0x00,0x09,0x00,0x11,0x00,0x21,0x00,0x41,0x00,0x7F,0xC0,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x35 '5'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x80,0x20,0x00,0x20,0x00,0x20,0x00,0x3E,0x00,0x01,0x00,0x00,0x80,0x00,0x80,0x00,0x80,0x41,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x36 '6'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x10,0x00,0x20,0x00,0x40,0x00,0x5E,0x00,0x61,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x37 '7'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x01,0x00,0x02,0x00,0x02,0x00,0x04,0x00,0x04,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x10,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x38 '8'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x39 '9'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x20,0x80,0x1F,0x80,0x00,0x80,0x01,0x00,0x02,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x00,
+
+        7, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x20,0x20,
+
+        12, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0x0C,0x00,0x30,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xE0,0x00,0x00,0x00,0x00,0x3F,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0xC0,0x00,0xC0,0x03,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x3F '?'
+        0x00,0x00,0x00,0x00,0x3C,0x42,0x02,0x02,0x04,0x08,0x10,0x10,0x00,0x10,0x10,0x00,0x00,0x00,
+
+        15, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x80,0x18,0x60,0x20,0x10,0x23,0xD0,0x44,0x48,0x48,0x48,0x48,0x48,0x48,0x48,0x44,0x48,0x23,0xF0,0x20,0x00,0x18,0x00,0x07,0xC0,0x00,0x00,
+
+        10, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x21,0x00,0x21,0x00,0x40,0x80,0x7F,0x80,0x40,0x80,0x80,0x40,0x80,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x42 'B'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x7E,0x00,0x41,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x41,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x20,0x40,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x20,0x40,0x30,0xC0,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x41,0x80,0x40,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x41,0x80,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x45 'E'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x7F,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x46 'F'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x40,0x00,0x40,0x00,0x40,0x00,0x7F,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x30,0x60,0x20,0x20,0x40,0x00,0x40,0x00,0x41,0xE0,0x40,0x20,0x40,0x20,0x20,0x20,0x30,0x20,0x0F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7F,0xC0,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x49 'I'
+        0x00,0x00,0x00,0x00,0x70,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x00,0x00,0x00,
+
+        7, // 0x4A 'J'
+        0x00,0x00,0x00,0x00,0x3C,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x08,0xF0,0x00,0x00,0x00,
+
+        10, // 0x4B 'K'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x41,0x00,0x42,0x00,0x44,0x00,0x48,0x00,0x50,0x00,0x68,0x00,0x44,0x00,0x42,0x00,0x41,0x00,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x4C 'L'
+        0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7F,0x00,0x00,0x00,
+
+        13, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x50,0x50,0x50,0x50,0x48,0x90,0x48,0x90,0x45,0x10,0x45,0x10,0x42,0x10,0x42,0x10,0x40,0x10,0x40,0x10,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x60,0x40,0x50,0x40,0x48,0x40,0x48,0x40,0x44,0x40,0x42,0x40,0x42,0x40,0x41,0x40,0x40,0xC0,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x20,0x40,0x40,0x20,0x40,0x20,0x40,0x20,0x40,0x20,0x40,0x20,0x20,0x40,0x30,0xC0,0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x50 'P'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x41,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x41,0x00,0x7E,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x30,0xC0,0x20,0x40,0x40,0x20,0x40,0x20,0x40,0x20,0x40,0x20,0x40,0x20,0x20,0x40,0x30,0xC0,0x0F,0x00,0x01,0x00,0x01,0x00,0x00,0xE0,
+
+        10, // 0x52 'R'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x42,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x42,0x00,0x41,0x00,0x40,0x80,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x53 'S'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x20,0x80,0x40,0x00,0x40,0x00,0x20,0x00,0x1E,0x00,0x01,0x00,0x00,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x54 'T'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x80,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x20,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x56 'V'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x40,0x80,0x40,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x21,0x00,0x12,0x00,0x12,0x00,0x12,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        15, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x04,0x41,0x04,0x22,0x88,0x22,0x88,0x22,0x88,0x12,0x90,0x14,0x50,0x14,0x50,0x14,0x50,0x08,0x20,0x08,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x58 'X'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x21,0x00,0x21,0x00,0x12,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x12,0x00,0x21,0x00,0x21,0x00,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x59 'Y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x41,0x00,0x22,0x00,0x22,0x00,0x14,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x5A 'Z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x00,0x80,0x01,0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x20,0x00,0x40,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x5B '['
+        0x00,0x00,0x00,0x3C,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3C,
+
+        7, // 0x5C '\'
+        0x00,0x00,0x00,0x80,0x40,0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x04,0x02,0x00,
+
+        7, // 0x5D ']'
+        0x00,0x00,0x00,0x78,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x78,
+
+        12, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x09,0x00,0x10,0x80,0x20,0x40,0x40,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xC0,0x00,0x00,
+
+        10, // 0x60 '`'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x01,0x00,0x3F,0x00,0x41,0x00,0x41,0x00,0x43,0x00,0x3D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x62 'b'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x5C,0x00,0x62,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x21,0x40,0x40,0x40,0x40,0x21,0x1E,0x00,0x00,0x00,
+
+        9, // 0x64 'd'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x1F,0x00,0x21,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x23,0x00,0x1D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x22,0x00,0x41,0x00,0x7F,0x00,0x40,0x00,0x40,0x00,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x00,0x00,0x1C,0x20,0x20,0x20,0x7C,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,0x00,
+
+        9, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x21,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x23,0x00,0x1D,0x00,0x01,0x00,0x22,0x00,0x1C,0x00,
+
+        9, // 0x68 'h'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x5E,0x00,0x61,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        3, // 0x69 'i'
+        0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        5, // 0x6A 'j'
+        0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x70,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0xE0,
+
+        9, // 0x6B 'k'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x42,0x00,0x44,0x00,0x48,0x00,0x50,0x00,0x68,0x00,0x44,0x00,0x42,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        3, // 0x6C 'l'
+        0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        15, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2E,0x70,0x31,0x88,0x21,0x08,0x21,0x08,0x21,0x08,0x21,0x08,0x21,0x08,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5E,0x00,0x61,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x21,0x00,0x40,0x80,0x40,0x80,0x40,0x80,0x40,0x80,0x21,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5C,0x00,0x62,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x42,0x00,0x7C,0x00,0x40,0x00,0x40,0x00,0x40,0x00,
+
+        9, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x21,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x23,0x00,0x1D,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
+
+        6, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5C,0x60,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,
+
+        8, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x40,0x30,0x0C,0x02,0x42,0x3C,0x00,0x00,0x00,
+
+        6, // 0x74 't'
+        0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x7C,0x20,0x20,0x20,0x20,0x20,0x20,0x1C,0x00,0x00,0x00,
+
+        9, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x41,0x00,0x43,0x00,0x3D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x22,0x00,0x22,0x00,0x14,0x00,0x14,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x10,0x42,0x10,0x25,0x20,0x25,0x20,0x28,0xA0,0x28,0xA0,0x10,0x40,0x10,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x22,0x00,0x14,0x00,0x08,0x00,0x08,0x00,0x14,0x00,0x22,0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x41,0x00,0x41,0x00,0x22,0x00,0x22,0x00,0x22,0x00,0x14,0x00,0x14,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x10,0x00,
+
+        9, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x10,0x00,0x20,0x00,0x40,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x7B '{'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x60,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x07,0x00,
+
+        7, // 0x7C '|'
+        0x00,0x00,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
+
+        10, // 0x7D '}'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x02,0x00,0x01,0x80,0x02,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x38,0x00,
+
+        12, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x20,0x24,0x20,0x42,0x40,0x41,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        15, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xF8,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x3F,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+    const int8u verdana18_bold[] =
+    {
+        18, 4, 32, 128-32,
+        0x00,0x00,0x13,0x00,0x26,0x00,0x4B,0x00,0x70,0x00,0x95,0x00,0xCC,0x00,0xF1,0x00,0x04,0x01,
+        0x17,0x01,0x2A,0x01,0x4F,0x01,0x74,0x01,0x87,0x01,0x9A,0x01,0xAD,0x01,0xD2,0x01,0xF7,0x01,
+        0x1C,0x02,0x41,0x02,0x66,0x02,0x8B,0x02,0xB0,0x02,0xD5,0x02,0xFA,0x02,0x1F,0x03,0x44,0x03,
+        0x57,0x03,0x6A,0x03,0x8F,0x03,0xB4,0x03,0xD9,0x03,0xFE,0x03,0x23,0x04,0x48,0x04,0x6D,0x04,
+        0x92,0x04,0xB7,0x04,0xDC,0x04,0x01,0x05,0x26,0x05,0x4B,0x05,0x5E,0x05,0x71,0x05,0x96,0x05,
+        0xBB,0x05,0xE0,0x05,0x05,0x06,0x2A,0x06,0x4F,0x06,0x74,0x06,0x99,0x06,0xBE,0x06,0xE3,0x06,
+        0x08,0x07,0x2D,0x07,0x52,0x07,0x77,0x07,0x9C,0x07,0xC1,0x07,0xD4,0x07,0xF9,0x07,0x0C,0x08,
+        0x31,0x08,0x56,0x08,0x7B,0x08,0xA0,0x08,0xC5,0x08,0xD8,0x08,0xFD,0x08,0x22,0x09,0x35,0x09,
+        0x5A,0x09,0x7F,0x09,0x92,0x09,0xA5,0x09,0xCA,0x09,0xDD,0x09,0x02,0x0A,0x27,0x0A,0x4C,0x0A,
+        0x71,0x0A,0x96,0x0A,0xA9,0x0A,0xCE,0x0A,0xE1,0x0A,0x06,0x0B,0x2B,0x0B,0x50,0x0B,0x75,0x0B,
+        0x9A,0x0B,0xBF,0x0B,0xE4,0x0B,0xF7,0x0B,0x1C,0x0C,0x41,0x0C,
+
+        5, // 0x20 ' '
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x21 '!'
+        0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x30,0x30,0x00,0x00,0x00,
+
+        9, // 0x22 '"'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x23 '#'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x20,0x04,0x20,0x08,0x40,0x3F,0xF0,0x3F,0xF0,0x08,0x40,0x10,0x80,0x7F,0xE0,0x7F,0xE0,0x21,0x00,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x24 '$'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x1F,0x80,0x34,0xC0,0x64,0xC0,0x64,0x00,0x3C,0x00,0x07,0x80,0x04,0xC0,0x64,0xC0,0x65,0x80,0x3F,0x00,0x04,0x00,0x04,0x00,0x00,0x00,
+
+        19, // 0x25 '%'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x08,0x00,0x63,0x10,0x00,0x63,0x10,0x00,0x63,0x20,0x00,0x63,0x2F,0x80,0x63,0x58,0xC0,0x3E,0x98,0xC0,0x00,0x98,0xC0,0x01,0x18,0xC0,0x01,0x18,0xC0,0x02,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x26 '&'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x33,0x00,0x33,0x00,0x1E,0x60,0x36,0x60,0x63,0x60,0x61,0xC0,0x60,0xC0,0x30,0xE0,0x1F,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x27 '''
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x28 '('
+        0x00,0x00,0x00,0x06,0x0C,0x18,0x30,0x30,0x60,0x60,0x60,0x60,0x60,0x30,0x30,0x18,0x0C,0x06,
+
+        8, // 0x29 ')'
+        0x00,0x00,0x00,0x60,0x30,0x18,0x0C,0x0C,0x06,0x06,0x06,0x06,0x06,0x0C,0x0C,0x18,0x30,0x60,
+
+        11, // 0x2A '*'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x24,0x80,0x15,0x00,0x0E,0x00,0x15,0x00,0x24,0x80,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x2B '+'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x3F,0xE0,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2C ','
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x60,0x60,0x60,0xC0,0xC0,
+
+        7, // 0x2D '-'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        5, // 0x2E '.'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        10, // 0x2F '/'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x01,0x80,0x03,0x00,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x30,0x00,0x30,0x00,0x60,0x00,0x60,0x00,0x00,0x00,
+
+        11, // 0x30 '0'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x31 '1'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x1E,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x1F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x32 '2'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x61,0x80,0x60,0xC0,0x00,0xC0,0x01,0x80,0x03,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x30,0x00,0x7F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x33 '3'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x61,0x80,0x60,0xC0,0x00,0xC0,0x01,0x80,0x0F,0x00,0x01,0x80,0x00,0xC0,0x60,0xC0,0x61,0x80,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x34 '4'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x03,0x80,0x05,0x80,0x09,0x80,0x11,0x80,0x21,0x80,0x41,0x80,0x7F,0xE0,0x01,0x80,0x01,0x80,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x35 '5'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xC0,0x30,0x00,0x30,0x00,0x30,0x00,0x3F,0x00,0x01,0x80,0x00,0xC0,0x00,0xC0,0x60,0xC0,0x61,0x80,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x36 '6'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x18,0x00,0x30,0x00,0x60,0x00,0x6F,0x00,0x71,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x37 '7'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0xC0,0x00,0xC0,0x01,0x80,0x01,0x80,0x03,0x00,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x38 '8'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x39 '9'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x31,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0xC0,0x1E,0xC0,0x00,0xC0,0x01,0x80,0x03,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x3A ':'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        6, // 0x3B ';'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x00,0x00,0x38,0x30,0x30,0x30,0x60,0x60,
+
+        13, // 0x3C '<'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0xC0,0x03,0x00,0x0C,0x00,0x30,0x00,0x30,0x00,0x0C,0x00,0x03,0x00,0x00,0xC0,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x3D '='
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x3E '>'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x18,0x00,0x06,0x00,0x01,0x80,0x00,0x60,0x00,0x60,0x01,0x80,0x06,0x00,0x18,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        9, // 0x3F '?'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x63,0x00,0x03,0x00,0x03,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x40 '@'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x80,0x18,0x60,0x20,0x10,0x27,0xD0,0x4C,0xC8,0x4C,0xC8,0x4C,0xC8,0x4C,0xC8,0x4C,0xC8,0x27,0xF0,0x20,0x00,0x18,0x00,0x07,0xC0,0x00,0x00,
+
+        12, // 0x41 'A'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x06,0x00,0x0F,0x00,0x0F,0x00,0x19,0x80,0x19,0x80,0x30,0xC0,0x3F,0xC0,0x30,0xC0,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x42 'B'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7F,0x00,0x61,0x80,0x60,0xC0,0x60,0xC0,0x61,0x80,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x43 'C'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x38,0xC0,0x30,0xC0,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x30,0xC0,0x38,0xC0,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x44 'D'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x61,0xC0,0x60,0xC0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0xC0,0x61,0xC0,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x45 'E'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x46 'F'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x80,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x47 'G'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0xC0,0x38,0x60,0x30,0x60,0x60,0x00,0x60,0x00,0x63,0xE0,0x60,0x60,0x60,0x60,0x30,0x60,0x38,0x60,0x0F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x48 'H'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x7F,0xE0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x49 'I'
+        0x00,0x00,0x00,0x00,0x7E,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x7E,0x00,0x00,0x00,
+
+        8, // 0x4A 'J'
+        0x00,0x00,0x00,0x00,0x3E,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x0C,0xF8,0x00,0x00,0x00,
+
+        12, // 0x4B 'K'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0xC0,0x61,0x80,0x63,0x00,0x66,0x00,0x6C,0x00,0x7E,0x00,0x73,0x00,0x61,0x80,0x60,0xC0,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x4C 'L'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x4D 'M'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x38,0x70,0x38,0x70,0x78,0x58,0x58,0x58,0xD8,0x4C,0x98,0x4D,0x98,0x47,0x18,0x47,0x18,0x42,0x18,0x40,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x4E 'N'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x20,0x70,0x20,0x58,0x20,0x4C,0x20,0x4C,0x20,0x46,0x20,0x43,0x20,0x43,0x20,0x41,0xA0,0x40,0xE0,0x40,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x4F 'O'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x38,0xE0,0x30,0x60,0x60,0x30,0x60,0x30,0x60,0x30,0x60,0x30,0x60,0x30,0x30,0x60,0x38,0xE0,0x0F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x50 'P'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x61,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x61,0x80,0x7F,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        13, // 0x51 'Q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x80,0x38,0xE0,0x30,0x60,0x60,0x30,0x60,0x30,0x60,0x30,0x60,0x30,0x60,0x30,0x30,0x60,0x38,0xE0,0x0F,0x80,0x03,0x00,0x03,0x80,0x01,0xF0,
+
+        12, // 0x52 'R'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x61,0x80,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x61,0x80,0x7F,0x00,0x61,0x80,0x60,0xC0,0x60,0x60,0x60,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x53 'S'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x80,0x30,0xC0,0x60,0xC0,0x60,0x00,0x7C,0x00,0x3F,0x80,0x03,0xC0,0x00,0xC0,0x60,0xC0,0x61,0x80,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x54 'T'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        12, // 0x55 'U'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x30,0xC0,0x1F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x56 'V'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x60,0xC0,0x60,0xC0,0x31,0x80,0x31,0x80,0x31,0x80,0x1B,0x00,0x1B,0x00,0x1B,0x00,0x0E,0x00,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        16, // 0x57 'W'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x86,0x61,0x86,0x63,0xC6,0x33,0xCC,0x32,0x4C,0x32,0x4C,0x1E,0x78,0x1C,0x38,0x1C,0x38,0x0C,0x30,0x0C,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x58 'X'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xC0,0x31,0x80,0x31,0x80,0x1B,0x00,0x0E,0x00,0x0E,0x00,0x0E,0x00,0x1B,0x00,0x31,0x80,0x31,0x80,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x59 'Y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x1E,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x5A 'Z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x80,0x01,0x80,0x03,0x00,0x06,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,0x30,0x00,0x60,0x00,0x7F,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x5B '['
+        0x00,0x00,0x00,0x3E,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3E,
+
+        10, // 0x5C '\'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x30,0x00,0x30,0x00,0x18,0x00,0x18,0x00,0x0C,0x00,0x0C,0x00,0x06,0x00,0x06,0x00,0x03,0x00,0x03,0x00,0x01,0x80,0x01,0x80,0x00,0x00,
+
+        8, // 0x5D ']'
+        0x00,0x00,0x00,0x7C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x7C,
+
+        13, // 0x5E '^'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x0F,0x00,0x19,0x80,0x30,0xC0,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x5F '_'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xE0,0x00,0x00,
+
+        11, // 0x60 '`'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x61 'a'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x01,0x80,0x01,0x80,0x3F,0x80,0x61,0x80,0x61,0x80,0x63,0x80,0x3D,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x62 'b'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x6E,0x00,0x73,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        8, // 0x63 'c'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x33,0x60,0x60,0x60,0x60,0x33,0x1E,0x00,0x00,0x00,
+
+        10, // 0x64 'd'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x01,0x80,0x01,0x80,0x01,0x80,0x1F,0x80,0x31,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x80,0x1D,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x65 'e'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x7F,0x80,0x60,0x00,0x60,0x00,0x31,0x80,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        6, // 0x66 'f'
+        0x00,0x00,0x00,0x1C,0x30,0x30,0x30,0x7C,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x00,
+
+        10, // 0x67 'g'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x80,0x31,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x80,0x1D,0x80,0x01,0x80,0x03,0x00,0x3E,0x00,
+
+        10, // 0x68 'h'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x6F,0x00,0x71,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x69 'i'
+        0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        6, // 0x6A 'j'
+        0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xF0,
+
+        10, // 0x6B 'k'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x61,0x80,0x63,0x00,0x66,0x00,0x6C,0x00,0x7E,0x00,0x73,0x00,0x61,0x80,0x60,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        4, // 0x6C 'l'
+        0x00,0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        16, // 0x6D 'm'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6F,0x3C,0x71,0xC6,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x61,0x86,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x6E 'n'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6F,0x00,0x71,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x6F 'o'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,0x33,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x00,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x70 'p'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x00,0x73,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x00,0x7E,0x00,0x60,0x00,0x60,0x00,0x60,0x00,
+
+        10, // 0x71 'q'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x80,0x31,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x33,0x80,0x1D,0x80,0x01,0x80,0x01,0x80,0x01,0x80,
+
+        7, // 0x72 'r'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6E,0x7E,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,
+
+        9, // 0x73 's'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x61,0x00,0x60,0x00,0x7E,0x00,0x3F,0x00,0x03,0x00,0x43,0x00,0x3E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        7, // 0x74 't'
+        0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x7E,0x30,0x30,0x30,0x30,0x30,0x30,0x1E,0x00,0x00,0x00,
+
+        10, // 0x75 'u'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x61,0x80,0x63,0x80,0x3D,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x76 'v'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x33,0x00,0x33,0x00,0x33,0x00,0x1E,0x00,0x1E,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        14, // 0x77 'w'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x18,0x63,0x18,0x63,0x18,0x37,0xB0,0x34,0xB0,0x3C,0xF0,0x18,0x60,0x18,0x60,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x78 'x'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x33,0x00,0x33,0x00,0x1E,0x00,0x1E,0x00,0x33,0x00,0x33,0x00,0x61,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        10, // 0x79 'y'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x80,0x61,0x80,0x33,0x00,0x33,0x00,0x33,0x00,0x1E,0x00,0x1E,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x18,0x00,
+
+        9, // 0x7A 'z'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x00,0x03,0x00,0x06,0x00,0x0C,0x00,0x18,0x00,0x30,0x00,0x60,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        11, // 0x7B '{'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x80,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x18,0x00,0x70,0x00,0x18,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x0C,0x00,0x07,0x80,
+
+        8, // 0x7C '|'
+        0x00,0x00,0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+
+        11, // 0x7D '}'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x03,0x00,0x01,0xC0,0x03,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x06,0x00,0x3C,0x00,
+
+        13, // 0x7E '~'
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x10,0x24,0x10,0x42,0x10,0x41,0x20,0x40,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        15, // 0x7F ''
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xF8,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x3F,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,
+
+        0
+    };
+
+}
+
diff --git a/agg/source/agg_gsv_text.cpp b/agg/source/agg_gsv_text.cpp
new file mode 100755
index 000000000000..fd522cd8de08
--- /dev/null
+++ b/agg/source/agg_gsv_text.cpp
@@ -0,0 +1,688 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Class gsv_text
+//
+//----------------------------------------------------------------------------
+#include <string.h>
+#include <stdio.h>
+#include "agg_gsv_text.h"
+
+
+namespace agg
+{
+    int8u gsv_default_font[] =
+    {
+        0x40,0x00,0x6c,0x0f,0x15,0x00,0x0e,0x00,0xf9,0xff,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x0d,0x0a,0x0d,0x0a,0x46,0x6f,0x6e,0x74,0x20,0x28,
+        0x63,0x29,0x20,0x4d,0x69,0x63,0x72,0x6f,0x50,0x72,
+        0x6f,0x66,0x20,0x32,0x37,0x20,0x53,0x65,0x70,0x74,
+        0x65,0x6d,0x62,0x2e,0x31,0x39,0x38,0x39,0x00,0x0d,
+        0x0a,0x0d,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x02,0x00,0x12,0x00,0x34,0x00,0x46,0x00,0x94,0x00,
+        0xd0,0x00,0x2e,0x01,0x3e,0x01,0x64,0x01,0x8a,0x01,
+        0x98,0x01,0xa2,0x01,0xb4,0x01,0xba,0x01,0xc6,0x01,
+        0xcc,0x01,0xf0,0x01,0xfa,0x01,0x18,0x02,0x38,0x02,
+        0x44,0x02,0x68,0x02,0x98,0x02,0xa2,0x02,0xde,0x02,
+        0x0e,0x03,0x24,0x03,0x40,0x03,0x48,0x03,0x52,0x03,
+        0x5a,0x03,0x82,0x03,0xec,0x03,0xfa,0x03,0x26,0x04,
+        0x4c,0x04,0x6a,0x04,0x7c,0x04,0x8a,0x04,0xb6,0x04,
+        0xc4,0x04,0xca,0x04,0xe0,0x04,0xee,0x04,0xf8,0x04,
+        0x0a,0x05,0x18,0x05,0x44,0x05,0x5e,0x05,0x8e,0x05,
+        0xac,0x05,0xd6,0x05,0xe0,0x05,0xf6,0x05,0x00,0x06,
+        0x12,0x06,0x1c,0x06,0x28,0x06,0x36,0x06,0x48,0x06,
+        0x4e,0x06,0x60,0x06,0x6e,0x06,0x74,0x06,0x84,0x06,
+        0xa6,0x06,0xc8,0x06,0xe6,0x06,0x08,0x07,0x2c,0x07,
+        0x3c,0x07,0x68,0x07,0x7c,0x07,0x8c,0x07,0xa2,0x07,
+        0xb0,0x07,0xb6,0x07,0xd8,0x07,0xec,0x07,0x10,0x08,
+        0x32,0x08,0x54,0x08,0x64,0x08,0x88,0x08,0x98,0x08,
+        0xac,0x08,0xb6,0x08,0xc8,0x08,0xd2,0x08,0xe4,0x08,
+        0xf2,0x08,0x3e,0x09,0x48,0x09,0x94,0x09,0xc2,0x09,
+        0xc4,0x09,0xd0,0x09,0xe2,0x09,0x04,0x0a,0x0e,0x0a,
+        0x26,0x0a,0x34,0x0a,0x4a,0x0a,0x66,0x0a,0x70,0x0a,
+        0x7e,0x0a,0x8e,0x0a,0x9a,0x0a,0xa6,0x0a,0xb4,0x0a,
+        0xd8,0x0a,0xe2,0x0a,0xf6,0x0a,0x18,0x0b,0x22,0x0b,
+        0x32,0x0b,0x56,0x0b,0x60,0x0b,0x6e,0x0b,0x7c,0x0b,
+        0x8a,0x0b,0x9c,0x0b,0x9e,0x0b,0xb2,0x0b,0xc2,0x0b,
+        0xd8,0x0b,0xf4,0x0b,0x08,0x0c,0x30,0x0c,0x56,0x0c,
+        0x72,0x0c,0x90,0x0c,0xb2,0x0c,0xce,0x0c,0xe2,0x0c,
+        0xfe,0x0c,0x10,0x0d,0x26,0x0d,0x36,0x0d,0x42,0x0d,
+        0x4e,0x0d,0x5c,0x0d,0x78,0x0d,0x8c,0x0d,0x8e,0x0d,
+        0x90,0x0d,0x92,0x0d,0x94,0x0d,0x96,0x0d,0x98,0x0d,
+        0x9a,0x0d,0x9c,0x0d,0x9e,0x0d,0xa0,0x0d,0xa2,0x0d,
+        0xa4,0x0d,0xa6,0x0d,0xa8,0x0d,0xaa,0x0d,0xac,0x0d,
+        0xae,0x0d,0xb0,0x0d,0xb2,0x0d,0xb4,0x0d,0xb6,0x0d,
+        0xb8,0x0d,0xba,0x0d,0xbc,0x0d,0xbe,0x0d,0xc0,0x0d,
+        0xc2,0x0d,0xc4,0x0d,0xc6,0x0d,0xc8,0x0d,0xca,0x0d,
+        0xcc,0x0d,0xce,0x0d,0xd0,0x0d,0xd2,0x0d,0xd4,0x0d,
+        0xd6,0x0d,0xd8,0x0d,0xda,0x0d,0xdc,0x0d,0xde,0x0d,
+        0xe0,0x0d,0xe2,0x0d,0xe4,0x0d,0xe6,0x0d,0xe8,0x0d,
+        0xea,0x0d,0xec,0x0d,0x0c,0x0e,0x26,0x0e,0x48,0x0e,
+        0x64,0x0e,0x88,0x0e,0x92,0x0e,0xa6,0x0e,0xb4,0x0e,
+        0xd0,0x0e,0xee,0x0e,0x02,0x0f,0x16,0x0f,0x26,0x0f,
+        0x3c,0x0f,0x58,0x0f,0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,
+        0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,
+        0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,
+        0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,0x6c,0x0f,0x10,0x80,
+        0x05,0x95,0x00,0x72,0x00,0xfb,0xff,0x7f,0x01,0x7f,
+        0x01,0x01,0xff,0x01,0x05,0xfe,0x05,0x95,0xff,0x7f,
+        0x00,0x7a,0x01,0x86,0xff,0x7a,0x01,0x87,0x01,0x7f,
+        0xfe,0x7a,0x0a,0x87,0xff,0x7f,0x00,0x7a,0x01,0x86,
+        0xff,0x7a,0x01,0x87,0x01,0x7f,0xfe,0x7a,0x05,0xf2,
+        0x0b,0x95,0xf9,0x64,0x0d,0x9c,0xf9,0x64,0xfa,0x91,
+        0x0e,0x00,0xf1,0xfa,0x0e,0x00,0x04,0xfc,0x08,0x99,
+        0x00,0x63,0x04,0x9d,0x00,0x63,0x04,0x96,0xff,0x7f,
+        0x01,0x7f,0x01,0x01,0x00,0x01,0xfe,0x02,0xfd,0x01,
+        0xfc,0x00,0xfd,0x7f,0xfe,0x7e,0x00,0x7e,0x01,0x7e,
+        0x01,0x7f,0x02,0x7f,0x06,0x7e,0x02,0x7f,0x02,0x7e,
+        0xf2,0x89,0x02,0x7e,0x02,0x7f,0x06,0x7e,0x02,0x7f,
+        0x01,0x7f,0x01,0x7e,0x00,0x7c,0xfe,0x7e,0xfd,0x7f,
+        0xfc,0x00,0xfd,0x01,0xfe,0x02,0x00,0x01,0x01,0x01,
+        0x01,0x7f,0xff,0x7f,0x10,0xfd,0x15,0x95,0xee,0x6b,
+        0x05,0x95,0x02,0x7e,0x00,0x7e,0xff,0x7e,0xfe,0x7f,
+        0xfe,0x00,0xfe,0x02,0x00,0x02,0x01,0x02,0x02,0x01,
+        0x02,0x00,0x02,0x7f,0x03,0x7f,0x03,0x00,0x03,0x01,
+        0x02,0x01,0xfc,0xf2,0xfe,0x7f,0xff,0x7e,0x00,0x7e,
+        0x02,0x7e,0x02,0x00,0x02,0x01,0x01,0x02,0x00,0x02,
+        0xfe,0x02,0xfe,0x00,0x07,0xf9,0x15,0x8d,0xff,0x7f,
+        0x01,0x7f,0x01,0x01,0x00,0x01,0xff,0x01,0xff,0x00,
+        0xff,0x7f,0xff,0x7e,0xfe,0x7b,0xfe,0x7d,0xfe,0x7e,
+        0xfe,0x7f,0xfd,0x00,0xfd,0x01,0xff,0x02,0x00,0x03,
+        0x01,0x02,0x06,0x04,0x02,0x02,0x01,0x02,0x00,0x02,
+        0xff,0x02,0xfe,0x01,0xfe,0x7f,0xff,0x7e,0x00,0x7e,
+        0x01,0x7d,0x02,0x7d,0x05,0x79,0x02,0x7e,0x03,0x7f,
+        0x01,0x00,0x01,0x01,0x00,0x01,0xf1,0xfe,0xfe,0x01,
+        0xff,0x02,0x00,0x03,0x01,0x02,0x02,0x02,0x00,0x86,
+        0x01,0x7e,0x08,0x75,0x02,0x7e,0x02,0x7f,0x05,0x80,
+        0x05,0x93,0xff,0x01,0x01,0x01,0x01,0x7f,0x00,0x7e,
+        0xff,0x7e,0xff,0x7f,0x06,0xf1,0x0b,0x99,0xfe,0x7e,
+        0xfe,0x7d,0xfe,0x7c,0xff,0x7b,0x00,0x7c,0x01,0x7b,
+        0x02,0x7c,0x02,0x7d,0x02,0x7e,0xfe,0x9e,0xfe,0x7c,
+        0xff,0x7d,0xff,0x7b,0x00,0x7c,0x01,0x7b,0x01,0x7d,
+        0x02,0x7c,0x05,0x85,0x03,0x99,0x02,0x7e,0x02,0x7d,
+        0x02,0x7c,0x01,0x7b,0x00,0x7c,0xff,0x7b,0xfe,0x7c,
+        0xfe,0x7d,0xfe,0x7e,0x02,0x9e,0x02,0x7c,0x01,0x7d,
+        0x01,0x7b,0x00,0x7c,0xff,0x7b,0xff,0x7d,0xfe,0x7c,
+        0x09,0x85,0x08,0x95,0x00,0x74,0xfb,0x89,0x0a,0x7a,
+        0x00,0x86,0xf6,0x7a,0x0d,0xf4,0x0d,0x92,0x00,0x6e,
+        0xf7,0x89,0x12,0x00,0x04,0xf7,0x06,0x81,0xff,0x7f,
+        0xff,0x01,0x01,0x01,0x01,0x7f,0x00,0x7e,0xff,0x7e,
+        0xff,0x7f,0x06,0x84,0x04,0x89,0x12,0x00,0x04,0xf7,
+        0x05,0x82,0xff,0x7f,0x01,0x7f,0x01,0x01,0xff,0x01,
+        0x05,0xfe,0x00,0xfd,0x0e,0x18,0x00,0xeb,0x09,0x95,
+        0xfd,0x7f,0xfe,0x7d,0xff,0x7b,0x00,0x7d,0x01,0x7b,
+        0x02,0x7d,0x03,0x7f,0x02,0x00,0x03,0x01,0x02,0x03,
+        0x01,0x05,0x00,0x03,0xff,0x05,0xfe,0x03,0xfd,0x01,
+        0xfe,0x00,0x0b,0xeb,0x06,0x91,0x02,0x01,0x03,0x03,
+        0x00,0x6b,0x09,0x80,0x04,0x90,0x00,0x01,0x01,0x02,
+        0x01,0x01,0x02,0x01,0x04,0x00,0x02,0x7f,0x01,0x7f,
+        0x01,0x7e,0x00,0x7e,0xff,0x7e,0xfe,0x7d,0xf6,0x76,
+        0x0e,0x00,0x03,0x80,0x05,0x95,0x0b,0x00,0xfa,0x78,
+        0x03,0x00,0x02,0x7f,0x01,0x7f,0x01,0x7d,0x00,0x7e,
+        0xff,0x7d,0xfe,0x7e,0xfd,0x7f,0xfd,0x00,0xfd,0x01,
+        0xff,0x01,0xff,0x02,0x11,0xfc,0x0d,0x95,0xf6,0x72,
+        0x0f,0x00,0xfb,0x8e,0x00,0x6b,0x07,0x80,0x0f,0x95,
+        0xf6,0x00,0xff,0x77,0x01,0x01,0x03,0x01,0x03,0x00,
+        0x03,0x7f,0x02,0x7e,0x01,0x7d,0x00,0x7e,0xff,0x7d,
+        0xfe,0x7e,0xfd,0x7f,0xfd,0x00,0xfd,0x01,0xff,0x01,
+        0xff,0x02,0x11,0xfc,0x10,0x92,0xff,0x02,0xfd,0x01,
+        0xfe,0x00,0xfd,0x7f,0xfe,0x7d,0xff,0x7b,0x00,0x7b,
+        0x01,0x7c,0x02,0x7e,0x03,0x7f,0x01,0x00,0x03,0x01,
+        0x02,0x02,0x01,0x03,0x00,0x01,0xff,0x03,0xfe,0x02,
+        0xfd,0x01,0xff,0x00,0xfd,0x7f,0xfe,0x7e,0xff,0x7d,
+        0x10,0xf9,0x11,0x95,0xf6,0x6b,0xfc,0x95,0x0e,0x00,
+        0x03,0xeb,0x08,0x95,0xfd,0x7f,0xff,0x7e,0x00,0x7e,
+        0x01,0x7e,0x02,0x7f,0x04,0x7f,0x03,0x7f,0x02,0x7e,
+        0x01,0x7e,0x00,0x7d,0xff,0x7e,0xff,0x7f,0xfd,0x7f,
+        0xfc,0x00,0xfd,0x01,0xff,0x01,0xff,0x02,0x00,0x03,
+        0x01,0x02,0x02,0x02,0x03,0x01,0x04,0x01,0x02,0x01,
+        0x01,0x02,0x00,0x02,0xff,0x02,0xfd,0x01,0xfc,0x00,
+        0x0c,0xeb,0x10,0x8e,0xff,0x7d,0xfe,0x7e,0xfd,0x7f,
+        0xff,0x00,0xfd,0x01,0xfe,0x02,0xff,0x03,0x00,0x01,
+        0x01,0x03,0x02,0x02,0x03,0x01,0x01,0x00,0x03,0x7f,
+        0x02,0x7e,0x01,0x7c,0x00,0x7b,0xff,0x7b,0xfe,0x7d,
+        0xfd,0x7f,0xfe,0x00,0xfd,0x01,0xff,0x02,0x10,0xfd,
+        0x05,0x8e,0xff,0x7f,0x01,0x7f,0x01,0x01,0xff,0x01,
+        0x00,0xf4,0xff,0x7f,0x01,0x7f,0x01,0x01,0xff,0x01,
+        0x05,0xfe,0x05,0x8e,0xff,0x7f,0x01,0x7f,0x01,0x01,
+        0xff,0x01,0x01,0xf3,0xff,0x7f,0xff,0x01,0x01,0x01,
+        0x01,0x7f,0x00,0x7e,0xff,0x7e,0xff,0x7f,0x06,0x84,
+        0x14,0x92,0xf0,0x77,0x10,0x77,0x04,0x80,0x04,0x8c,
+        0x12,0x00,0xee,0xfa,0x12,0x00,0x04,0xfa,0x04,0x92,
+        0x10,0x77,0xf0,0x77,0x14,0x80,0x03,0x90,0x00,0x01,
+        0x01,0x02,0x01,0x01,0x02,0x01,0x04,0x00,0x02,0x7f,
+        0x01,0x7f,0x01,0x7e,0x00,0x7e,0xff,0x7e,0xff,0x7f,
+        0xfc,0x7e,0x00,0x7d,0x00,0xfb,0xff,0x7f,0x01,0x7f,
+        0x01,0x01,0xff,0x01,0x09,0xfe,0x12,0x8d,0xff,0x02,
+        0xfe,0x01,0xfd,0x00,0xfe,0x7f,0xff,0x7f,0xff,0x7d,
+        0x00,0x7d,0x01,0x7e,0x02,0x7f,0x03,0x00,0x02,0x01,
+        0x01,0x02,0xfb,0x88,0xfe,0x7e,0xff,0x7d,0x00,0x7d,
+        0x01,0x7e,0x01,0x7f,0x07,0x8b,0xff,0x78,0x00,0x7e,
+        0x02,0x7f,0x02,0x00,0x02,0x02,0x01,0x03,0x00,0x02,
+        0xff,0x03,0xff,0x02,0xfe,0x02,0xfe,0x01,0xfd,0x01,
+        0xfd,0x00,0xfd,0x7f,0xfe,0x7f,0xfe,0x7e,0xff,0x7e,
+        0xff,0x7d,0x00,0x7d,0x01,0x7d,0x01,0x7e,0x02,0x7e,
+        0x02,0x7f,0x03,0x7f,0x03,0x00,0x03,0x01,0x02,0x01,
+        0x01,0x01,0xfe,0x8d,0xff,0x78,0x00,0x7e,0x01,0x7f,
+        0x08,0xfb,0x09,0x95,0xf8,0x6b,0x08,0x95,0x08,0x6b,
+        0xf3,0x87,0x0a,0x00,0x04,0xf9,0x04,0x95,0x00,0x6b,
+        0x00,0x95,0x09,0x00,0x03,0x7f,0x01,0x7f,0x01,0x7e,
+        0x00,0x7e,0xff,0x7e,0xff,0x7f,0xfd,0x7f,0xf7,0x80,
+        0x09,0x00,0x03,0x7f,0x01,0x7f,0x01,0x7e,0x00,0x7d,
+        0xff,0x7e,0xff,0x7f,0xfd,0x7f,0xf7,0x00,0x11,0x80,
+        0x12,0x90,0xff,0x02,0xfe,0x02,0xfe,0x01,0xfc,0x00,
+        0xfe,0x7f,0xfe,0x7e,0xff,0x7e,0xff,0x7d,0x00,0x7b,
+        0x01,0x7d,0x01,0x7e,0x02,0x7e,0x02,0x7f,0x04,0x00,
+        0x02,0x01,0x02,0x02,0x01,0x02,0x03,0xfb,0x04,0x95,
+        0x00,0x6b,0x00,0x95,0x07,0x00,0x03,0x7f,0x02,0x7e,
+        0x01,0x7e,0x01,0x7d,0x00,0x7b,0xff,0x7d,0xff,0x7e,
+        0xfe,0x7e,0xfd,0x7f,0xf9,0x00,0x11,0x80,0x04,0x95,
+        0x00,0x6b,0x00,0x95,0x0d,0x00,0xf3,0xf6,0x08,0x00,
+        0xf8,0xf5,0x0d,0x00,0x02,0x80,0x04,0x95,0x00,0x6b,
+        0x00,0x95,0x0d,0x00,0xf3,0xf6,0x08,0x00,0x06,0xf5,
+        0x12,0x90,0xff,0x02,0xfe,0x02,0xfe,0x01,0xfc,0x00,
+        0xfe,0x7f,0xfe,0x7e,0xff,0x7e,0xff,0x7d,0x00,0x7b,
+        0x01,0x7d,0x01,0x7e,0x02,0x7e,0x02,0x7f,0x04,0x00,
+        0x02,0x01,0x02,0x02,0x01,0x02,0x00,0x03,0xfb,0x80,
+        0x05,0x00,0x03,0xf8,0x04,0x95,0x00,0x6b,0x0e,0x95,
+        0x00,0x6b,0xf2,0x8b,0x0e,0x00,0x04,0xf5,0x04,0x95,
+        0x00,0x6b,0x04,0x80,0x0c,0x95,0x00,0x70,0xff,0x7d,
+        0xff,0x7f,0xfe,0x7f,0xfe,0x00,0xfe,0x01,0xff,0x01,
+        0xff,0x03,0x00,0x02,0x0e,0xf9,0x04,0x95,0x00,0x6b,
+        0x0e,0x95,0xf2,0x72,0x05,0x85,0x09,0x74,0x03,0x80,
+        0x04,0x95,0x00,0x6b,0x00,0x80,0x0c,0x00,0x01,0x80,
+        0x04,0x95,0x00,0x6b,0x00,0x95,0x08,0x6b,0x08,0x95,
+        0xf8,0x6b,0x08,0x95,0x00,0x6b,0x04,0x80,0x04,0x95,
+        0x00,0x6b,0x00,0x95,0x0e,0x6b,0x00,0x95,0x00,0x6b,
+        0x04,0x80,0x09,0x95,0xfe,0x7f,0xfe,0x7e,0xff,0x7e,
+        0xff,0x7d,0x00,0x7b,0x01,0x7d,0x01,0x7e,0x02,0x7e,
+        0x02,0x7f,0x04,0x00,0x02,0x01,0x02,0x02,0x01,0x02,
+        0x01,0x03,0x00,0x05,0xff,0x03,0xff,0x02,0xfe,0x02,
+        0xfe,0x01,0xfc,0x00,0x0d,0xeb,0x04,0x95,0x00,0x6b,
+        0x00,0x95,0x09,0x00,0x03,0x7f,0x01,0x7f,0x01,0x7e,
+        0x00,0x7d,0xff,0x7e,0xff,0x7f,0xfd,0x7f,0xf7,0x00,
+        0x11,0xf6,0x09,0x95,0xfe,0x7f,0xfe,0x7e,0xff,0x7e,
+        0xff,0x7d,0x00,0x7b,0x01,0x7d,0x01,0x7e,0x02,0x7e,
+        0x02,0x7f,0x04,0x00,0x02,0x01,0x02,0x02,0x01,0x02,
+        0x01,0x03,0x00,0x05,0xff,0x03,0xff,0x02,0xfe,0x02,
+        0xfe,0x01,0xfc,0x00,0x03,0xef,0x06,0x7a,0x04,0x82,
+        0x04,0x95,0x00,0x6b,0x00,0x95,0x09,0x00,0x03,0x7f,
+        0x01,0x7f,0x01,0x7e,0x00,0x7e,0xff,0x7e,0xff,0x7f,
+        0xfd,0x7f,0xf7,0x00,0x07,0x80,0x07,0x75,0x03,0x80,
+        0x11,0x92,0xfe,0x02,0xfd,0x01,0xfc,0x00,0xfd,0x7f,
+        0xfe,0x7e,0x00,0x7e,0x01,0x7e,0x01,0x7f,0x02,0x7f,
+        0x06,0x7e,0x02,0x7f,0x01,0x7f,0x01,0x7e,0x00,0x7d,
+        0xfe,0x7e,0xfd,0x7f,0xfc,0x00,0xfd,0x01,0xfe,0x02,
+        0x11,0xfd,0x08,0x95,0x00,0x6b,0xf9,0x95,0x0e,0x00,
+        0x01,0xeb,0x04,0x95,0x00,0x71,0x01,0x7d,0x02,0x7e,
+        0x03,0x7f,0x02,0x00,0x03,0x01,0x02,0x02,0x01,0x03,
+        0x00,0x0f,0x04,0xeb,0x01,0x95,0x08,0x6b,0x08,0x95,
+        0xf8,0x6b,0x09,0x80,0x02,0x95,0x05,0x6b,0x05,0x95,
+        0xfb,0x6b,0x05,0x95,0x05,0x6b,0x05,0x95,0xfb,0x6b,
+        0x07,0x80,0x03,0x95,0x0e,0x6b,0x00,0x95,0xf2,0x6b,
+        0x11,0x80,0x01,0x95,0x08,0x76,0x00,0x75,0x08,0x95,
+        0xf8,0x76,0x09,0xf5,0x11,0x95,0xf2,0x6b,0x00,0x95,
+        0x0e,0x00,0xf2,0xeb,0x0e,0x00,0x03,0x80,0x03,0x93,
+        0x00,0x6c,0x01,0x94,0x00,0x6c,0xff,0x94,0x05,0x00,
+        0xfb,0xec,0x05,0x00,0x02,0x81,0x00,0x95,0x0e,0x68,
+        0x00,0x83,0x06,0x93,0x00,0x6c,0x01,0x94,0x00,0x6c,
+        0xfb,0x94,0x05,0x00,0xfb,0xec,0x05,0x00,0x03,0x81,
+        0x03,0x87,0x08,0x05,0x08,0x7b,0xf0,0x80,0x08,0x04,
+        0x08,0x7c,0x03,0xf9,0x01,0x80,0x10,0x00,0x01,0x80,
+        0x06,0x95,0xff,0x7f,0xff,0x7e,0x00,0x7e,0x01,0x7f,
+        0x01,0x01,0xff,0x01,0x05,0xef,0x0f,0x8e,0x00,0x72,
+        0x00,0x8b,0xfe,0x02,0xfe,0x01,0xfd,0x00,0xfe,0x7f,
+        0xfe,0x7e,0xff,0x7d,0x00,0x7e,0x01,0x7d,0x02,0x7e,
+        0x02,0x7f,0x03,0x00,0x02,0x01,0x02,0x02,0x04,0xfd,
+        0x04,0x95,0x00,0x6b,0x00,0x8b,0x02,0x02,0x02,0x01,
+        0x03,0x00,0x02,0x7f,0x02,0x7e,0x01,0x7d,0x00,0x7e,
+        0xff,0x7d,0xfe,0x7e,0xfe,0x7f,0xfd,0x00,0xfe,0x01,
+        0xfe,0x02,0x0f,0xfd,0x0f,0x8b,0xfe,0x02,0xfe,0x01,
+        0xfd,0x00,0xfe,0x7f,0xfe,0x7e,0xff,0x7d,0x00,0x7e,
+        0x01,0x7d,0x02,0x7e,0x02,0x7f,0x03,0x00,0x02,0x01,
+        0x02,0x02,0x03,0xfd,0x0f,0x95,0x00,0x6b,0x00,0x8b,
+        0xfe,0x02,0xfe,0x01,0xfd,0x00,0xfe,0x7f,0xfe,0x7e,
+        0xff,0x7d,0x00,0x7e,0x01,0x7d,0x02,0x7e,0x02,0x7f,
+        0x03,0x00,0x02,0x01,0x02,0x02,0x04,0xfd,0x03,0x88,
+        0x0c,0x00,0x00,0x02,0xff,0x02,0xff,0x01,0xfe,0x01,
+        0xfd,0x00,0xfe,0x7f,0xfe,0x7e,0xff,0x7d,0x00,0x7e,
+        0x01,0x7d,0x02,0x7e,0x02,0x7f,0x03,0x00,0x02,0x01,
+        0x02,0x02,0x03,0xfd,0x0a,0x95,0xfe,0x00,0xfe,0x7f,
+        0xff,0x7d,0x00,0x6f,0xfd,0x8e,0x07,0x00,0x03,0xf2,
+        0x0f,0x8e,0x00,0x70,0xff,0x7d,0xff,0x7f,0xfe,0x7f,
+        0xfd,0x00,0xfe,0x01,0x09,0x91,0xfe,0x02,0xfe,0x01,
+        0xfd,0x00,0xfe,0x7f,0xfe,0x7e,0xff,0x7d,0x00,0x7e,
+        0x01,0x7d,0x02,0x7e,0x02,0x7f,0x03,0x00,0x02,0x01,
+        0x02,0x02,0x04,0xfd,0x04,0x95,0x00,0x6b,0x00,0x8a,
+        0x03,0x03,0x02,0x01,0x03,0x00,0x02,0x7f,0x01,0x7d,
+        0x00,0x76,0x04,0x80,0x03,0x95,0x01,0x7f,0x01,0x01,
+        0xff,0x01,0xff,0x7f,0x01,0xf9,0x00,0x72,0x04,0x80,
+        0x05,0x95,0x01,0x7f,0x01,0x01,0xff,0x01,0xff,0x7f,
+        0x01,0xf9,0x00,0x6f,0xff,0x7d,0xfe,0x7f,0xfe,0x00,
+        0x09,0x87,0x04,0x95,0x00,0x6b,0x0a,0x8e,0xf6,0x76,
+        0x04,0x84,0x07,0x78,0x02,0x80,0x04,0x95,0x00,0x6b,
+        0x04,0x80,0x04,0x8e,0x00,0x72,0x00,0x8a,0x03,0x03,
+        0x02,0x01,0x03,0x00,0x02,0x7f,0x01,0x7d,0x00,0x76,
+        0x00,0x8a,0x03,0x03,0x02,0x01,0x03,0x00,0x02,0x7f,
+        0x01,0x7d,0x00,0x76,0x04,0x80,0x04,0x8e,0x00,0x72,
+        0x00,0x8a,0x03,0x03,0x02,0x01,0x03,0x00,0x02,0x7f,
+        0x01,0x7d,0x00,0x76,0x04,0x80,0x08,0x8e,0xfe,0x7f,
+        0xfe,0x7e,0xff,0x7d,0x00,0x7e,0x01,0x7d,0x02,0x7e,
+        0x02,0x7f,0x03,0x00,0x02,0x01,0x02,0x02,0x01,0x03,
+        0x00,0x02,0xff,0x03,0xfe,0x02,0xfe,0x01,0xfd,0x00,
+        0x0b,0xf2,0x04,0x8e,0x00,0x6b,0x00,0x92,0x02,0x02,
+        0x02,0x01,0x03,0x00,0x02,0x7f,0x02,0x7e,0x01,0x7d,
+        0x00,0x7e,0xff,0x7d,0xfe,0x7e,0xfe,0x7f,0xfd,0x00,
+        0xfe,0x01,0xfe,0x02,0x0f,0xfd,0x0f,0x8e,0x00,0x6b,
+        0x00,0x92,0xfe,0x02,0xfe,0x01,0xfd,0x00,0xfe,0x7f,
+        0xfe,0x7e,0xff,0x7d,0x00,0x7e,0x01,0x7d,0x02,0x7e,
+        0x02,0x7f,0x03,0x00,0x02,0x01,0x02,0x02,0x04,0xfd,
+        0x04,0x8e,0x00,0x72,0x00,0x88,0x01,0x03,0x02,0x02,
+        0x02,0x01,0x03,0x00,0x01,0xf2,0x0e,0x8b,0xff,0x02,
+        0xfd,0x01,0xfd,0x00,0xfd,0x7f,0xff,0x7e,0x01,0x7e,
+        0x02,0x7f,0x05,0x7f,0x02,0x7f,0x01,0x7e,0x00,0x7f,
+        0xff,0x7e,0xfd,0x7f,0xfd,0x00,0xfd,0x01,0xff,0x02,
+        0x0e,0xfd,0x05,0x95,0x00,0x6f,0x01,0x7d,0x02,0x7f,
+        0x02,0x00,0xf8,0x8e,0x07,0x00,0x03,0xf2,0x04,0x8e,
+        0x00,0x76,0x01,0x7d,0x02,0x7f,0x03,0x00,0x02,0x01,
+        0x03,0x03,0x00,0x8a,0x00,0x72,0x04,0x80,0x02,0x8e,
+        0x06,0x72,0x06,0x8e,0xfa,0x72,0x08,0x80,0x03,0x8e,
+        0x04,0x72,0x04,0x8e,0xfc,0x72,0x04,0x8e,0x04,0x72,
+        0x04,0x8e,0xfc,0x72,0x07,0x80,0x03,0x8e,0x0b,0x72,
+        0x00,0x8e,0xf5,0x72,0x0e,0x80,0x02,0x8e,0x06,0x72,
+        0x06,0x8e,0xfa,0x72,0xfe,0x7c,0xfe,0x7e,0xfe,0x7f,
+        0xff,0x00,0x0f,0x87,0x0e,0x8e,0xf5,0x72,0x00,0x8e,
+        0x0b,0x00,0xf5,0xf2,0x0b,0x00,0x03,0x80,0x09,0x99,
+        0xfe,0x7f,0xff,0x7f,0xff,0x7e,0x00,0x7e,0x01,0x7e,
+        0x01,0x7f,0x01,0x7e,0x00,0x7e,0xfe,0x7e,0x01,0x8e,
+        0xff,0x7e,0x00,0x7e,0x01,0x7e,0x01,0x7f,0x01,0x7e,
+        0x00,0x7e,0xff,0x7e,0xfc,0x7e,0x04,0x7e,0x01,0x7e,
+        0x00,0x7e,0xff,0x7e,0xff,0x7f,0xff,0x7e,0x00,0x7e,
+        0x01,0x7e,0xff,0x8e,0x02,0x7e,0x00,0x7e,0xff,0x7e,
+        0xff,0x7f,0xff,0x7e,0x00,0x7e,0x01,0x7e,0x01,0x7f,
+        0x02,0x7f,0x05,0x87,0x04,0x95,0x00,0x77,0x00,0xfd,
+        0x00,0x77,0x04,0x80,0x05,0x99,0x02,0x7f,0x01,0x7f,
+        0x01,0x7e,0x00,0x7e,0xff,0x7e,0xff,0x7f,0xff,0x7e,
+        0x00,0x7e,0x02,0x7e,0xff,0x8e,0x01,0x7e,0x00,0x7e,
+        0xff,0x7e,0xff,0x7f,0xff,0x7e,0x00,0x7e,0x01,0x7e,
+        0x04,0x7e,0xfc,0x7e,0xff,0x7e,0x00,0x7e,0x01,0x7e,
+        0x01,0x7f,0x01,0x7e,0x00,0x7e,0xff,0x7e,0x01,0x8e,
+        0xfe,0x7e,0x00,0x7e,0x01,0x7e,0x01,0x7f,0x01,0x7e,
+        0x00,0x7e,0xff,0x7e,0xff,0x7f,0xfe,0x7f,0x09,0x87,
+        0x03,0x86,0x00,0x02,0x01,0x03,0x02,0x01,0x02,0x00,
+        0x02,0x7f,0x04,0x7d,0x02,0x7f,0x02,0x00,0x02,0x01,
+        0x01,0x02,0xee,0xfe,0x01,0x02,0x02,0x01,0x02,0x00,
+        0x02,0x7f,0x04,0x7d,0x02,0x7f,0x02,0x00,0x02,0x01,
+        0x01,0x03,0x00,0x02,0x03,0xf4,0x10,0x80,0x03,0x80,
+        0x07,0x15,0x08,0x6b,0xfe,0x85,0xf5,0x00,0x10,0xfb,
+        0x0d,0x95,0xf6,0x00,0x00,0x6b,0x0a,0x00,0x02,0x02,
+        0x00,0x08,0xfe,0x02,0xf6,0x00,0x0e,0xf4,0x03,0x80,
+        0x00,0x15,0x0a,0x00,0x02,0x7e,0x00,0x7e,0x00,0x7d,
+        0x00,0x7e,0xfe,0x7f,0xf6,0x00,0x0a,0x80,0x02,0x7e,
+        0x01,0x7e,0x00,0x7d,0xff,0x7d,0xfe,0x7f,0xf6,0x00,
+        0x10,0x80,0x03,0x80,0x00,0x15,0x0c,0x00,0xff,0x7e,
+        0x03,0xed,0x03,0xfd,0x00,0x03,0x02,0x00,0x00,0x12,
+        0x02,0x03,0x0a,0x00,0x00,0x6b,0x02,0x00,0x00,0x7d,
+        0xfe,0x83,0xf4,0x00,0x11,0x80,0x0f,0x80,0xf4,0x00,
+        0x00,0x15,0x0c,0x00,0xff,0xf6,0xf5,0x00,0x0f,0xf5,
+        0x04,0x95,0x07,0x76,0x00,0x0a,0x07,0x80,0xf9,0x76,
+        0x00,0x75,0xf8,0x80,0x07,0x0c,0x09,0xf4,0xf9,0x0c,
+        0x09,0xf4,0x03,0x92,0x02,0x03,0x07,0x00,0x03,0x7d,
+        0x00,0x7b,0xfc,0x7e,0x04,0x7d,0x00,0x7a,0xfd,0x7e,
+        0xf9,0x00,0xfe,0x02,0x06,0x89,0x02,0x00,0x06,0xf5,
+        0x03,0x95,0x00,0x6b,0x0c,0x15,0x00,0x6b,0x02,0x80,
+        0x03,0x95,0x00,0x6b,0x0c,0x15,0x00,0x6b,0xf8,0x96,
+        0x03,0x00,0x07,0xea,0x03,0x80,0x00,0x15,0x0c,0x80,
+        0xf7,0x76,0xfd,0x00,0x03,0x80,0x0a,0x75,0x03,0x80,
+        0x03,0x80,0x07,0x13,0x02,0x02,0x03,0x00,0x00,0x6b,
+        0x02,0x80,0x03,0x80,0x00,0x15,0x09,0x6b,0x09,0x15,
+        0x00,0x6b,0x03,0x80,0x03,0x80,0x00,0x15,0x00,0xf6,
+        0x0d,0x00,0x00,0x8a,0x00,0x6b,0x03,0x80,0x07,0x80,
+        0xfd,0x00,0xff,0x03,0x00,0x04,0x00,0x07,0x00,0x04,
+        0x01,0x02,0x03,0x01,0x06,0x00,0x03,0x7f,0x01,0x7e,
+        0x01,0x7c,0x00,0x79,0xff,0x7c,0xff,0x7d,0xfd,0x00,
+        0xfa,0x00,0x0e,0x80,0x03,0x80,0x00,0x15,0x0c,0x00,
+        0x00,0x6b,0x02,0x80,0x03,0x80,0x00,0x15,0x0a,0x00,
+        0x02,0x7f,0x01,0x7d,0x00,0x7b,0xff,0x7e,0xfe,0x7f,
+        0xf6,0x00,0x10,0xf7,0x11,0x8f,0xff,0x03,0xff,0x02,
+        0xfe,0x01,0xfa,0x00,0xfd,0x7f,0xff,0x7e,0x00,0x7c,
+        0x00,0x79,0x00,0x7b,0x01,0x7e,0x03,0x00,0x06,0x00,
+        0x02,0x00,0x01,0x03,0x01,0x02,0x03,0xfb,0x03,0x95,
+        0x0c,0x00,0xfa,0x80,0x00,0x6b,0x09,0x80,0x03,0x95,
+        0x00,0x77,0x06,0x7a,0x06,0x06,0x00,0x09,0xfa,0xf1,
+        0xfa,0x7a,0x0e,0x80,0x03,0x87,0x00,0x0b,0x02,0x02,
+        0x03,0x00,0x02,0x7e,0x01,0x02,0x04,0x00,0x02,0x7e,
+        0x00,0x75,0xfe,0x7e,0xfc,0x00,0xff,0x01,0xfe,0x7f,
+        0xfd,0x00,0xfe,0x02,0x07,0x8e,0x00,0x6b,0x09,0x80,
+        0x03,0x80,0x0e,0x15,0xf2,0x80,0x0e,0x6b,0x03,0x80,
+        0x03,0x95,0x00,0x6b,0x0e,0x00,0x00,0x7d,0xfe,0x98,
+        0x00,0x6b,0x05,0x80,0x03,0x95,0x00,0x75,0x02,0x7d,
+        0x0a,0x00,0x00,0x8e,0x00,0x6b,0x02,0x80,0x03,0x95,
+        0x00,0x6b,0x10,0x00,0x00,0x15,0xf8,0x80,0x00,0x6b,
+        0x0a,0x80,0x03,0x95,0x00,0x6b,0x10,0x00,0x00,0x15,
+        0xf8,0x80,0x00,0x6b,0x0a,0x00,0x00,0x7d,0x02,0x83,
+        0x10,0x80,0x03,0x95,0x00,0x6b,0x09,0x00,0x03,0x02,
+        0x00,0x08,0xfd,0x02,0xf7,0x00,0x0e,0x89,0x00,0x6b,
+        0x03,0x80,0x03,0x95,0x00,0x6b,0x09,0x00,0x03,0x02,
+        0x00,0x08,0xfd,0x02,0xf7,0x00,0x0e,0xf4,0x03,0x92,
+        0x02,0x03,0x07,0x00,0x03,0x7d,0x00,0x70,0xfd,0x7e,
+        0xf9,0x00,0xfe,0x02,0x03,0x89,0x09,0x00,0x02,0xf5,
+        0x03,0x80,0x00,0x15,0x00,0xf5,0x07,0x00,0x00,0x08,
+        0x02,0x03,0x06,0x00,0x02,0x7d,0x00,0x70,0xfe,0x7e,
+        0xfa,0x00,0xfe,0x02,0x00,0x08,0x0c,0xf6,0x0f,0x80,
+        0x00,0x15,0xf6,0x00,0xfe,0x7d,0x00,0x79,0x02,0x7e,
+        0x0a,0x00,0xf4,0xf7,0x07,0x09,0x07,0xf7,0x03,0x8c,
+        0x01,0x02,0x01,0x01,0x05,0x00,0x02,0x7f,0x01,0x7e,
+        0x00,0x74,0x00,0x86,0xff,0x01,0xfe,0x01,0xfb,0x00,
+        0xff,0x7f,0xff,0x7f,0x00,0x7c,0x01,0x7e,0x01,0x00,
+        0x05,0x00,0x02,0x00,0x01,0x02,0x03,0xfe,0x04,0x8e,
+        0x02,0x01,0x04,0x00,0x02,0x7f,0x01,0x7e,0x00,0x77,
+        0xff,0x7e,0xfe,0x7f,0xfc,0x00,0xfe,0x01,0xff,0x02,
+        0x00,0x09,0x01,0x02,0x02,0x02,0x03,0x01,0x02,0x01,
+        0x01,0x01,0x01,0x02,0x02,0xeb,0x03,0x80,0x00,0x15,
+        0x03,0x00,0x02,0x7e,0x00,0x7b,0xfe,0x7e,0xfd,0x00,
+        0x03,0x80,0x04,0x00,0x03,0x7e,0x00,0x78,0xfd,0x7e,
+        0xf9,0x00,0x0c,0x80,0x03,0x8c,0x02,0x02,0x02,0x01,
+        0x03,0x00,0x02,0x7f,0x01,0x7d,0xfe,0x7e,0xf9,0x7d,
+        0xff,0x7e,0x00,0x7d,0x03,0x7f,0x02,0x00,0x03,0x01,
+        0x02,0x01,0x02,0xfe,0x0d,0x8c,0xff,0x02,0xfe,0x01,
+        0xfc,0x00,0xfe,0x7f,0xff,0x7e,0x00,0x77,0x01,0x7e,
+        0x02,0x7f,0x04,0x00,0x02,0x01,0x01,0x02,0x00,0x0f,
+        0xff,0x02,0xfe,0x01,0xf9,0x00,0x0c,0xeb,0x03,0x88,
+        0x0a,0x00,0x00,0x02,0x00,0x03,0xfe,0x02,0xfa,0x00,
+        0xff,0x7e,0xff,0x7d,0x00,0x7b,0x01,0x7c,0x01,0x7f,
+        0x06,0x00,0x02,0x02,0x03,0xfe,0x03,0x8f,0x06,0x77,
+        0x06,0x09,0xfa,0x80,0x00,0x71,0xff,0x87,0xfb,0x79,
+        0x07,0x87,0x05,0x79,0x02,0x80,0x03,0x8d,0x02,0x02,
+        0x06,0x00,0x02,0x7e,0x00,0x7d,0xfc,0x7d,0x04,0x7e,
+        0x00,0x7d,0xfe,0x7e,0xfa,0x00,0xfe,0x02,0x04,0x85,
+        0x02,0x00,0x06,0xf9,0x03,0x8f,0x00,0x73,0x01,0x7e,
+        0x07,0x00,0x02,0x02,0x00,0x0d,0x00,0xf3,0x01,0x7e,
+        0x03,0x80,0x03,0x8f,0x00,0x73,0x01,0x7e,0x07,0x00,
+        0x02,0x02,0x00,0x0d,0x00,0xf3,0x01,0x7e,0xf8,0x90,
+        0x03,0x00,0x08,0xf0,0x03,0x80,0x00,0x15,0x00,0xf3,
+        0x02,0x00,0x06,0x07,0xfa,0xf9,0x07,0x78,0x03,0x80,
+        0x03,0x80,0x04,0x0c,0x02,0x03,0x04,0x00,0x00,0x71,
+        0x02,0x80,0x03,0x80,0x00,0x0f,0x06,0x77,0x06,0x09,
+        0x00,0x71,0x02,0x80,0x03,0x80,0x00,0x0f,0x0a,0xf1,
+        0x00,0x0f,0xf6,0xf8,0x0a,0x00,0x02,0xf9,0x05,0x80,
+        0xff,0x01,0xff,0x04,0x00,0x05,0x01,0x03,0x01,0x02,
+        0x06,0x00,0x02,0x7e,0x00,0x7d,0x00,0x7b,0x00,0x7c,
+        0xfe,0x7f,0xfa,0x00,0x0b,0x80,0x03,0x80,0x00,0x0f,
+        0x00,0xfb,0x01,0x03,0x01,0x02,0x05,0x00,0x02,0x7e,
+        0x01,0x7d,0x00,0x76,0x03,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,0x10,0x80,
+        0x10,0x80,0x0a,0x8f,0x02,0x7f,0x01,0x7e,0x00,0x76,
+        0xff,0x7f,0xfe,0x7f,0xfb,0x00,0xff,0x01,0xff,0x01,
+        0x00,0x0a,0x01,0x02,0x01,0x01,0x05,0x00,0xf9,0x80,
+        0x00,0x6b,0x0c,0x86,0x0d,0x8a,0xff,0x03,0xfe,0x02,
+        0xfb,0x00,0xff,0x7e,0xff,0x7d,0x00,0x7b,0x01,0x7c,
+        0x01,0x7f,0x05,0x00,0x02,0x01,0x01,0x03,0x03,0xfc,
+        0x03,0x80,0x00,0x0f,0x00,0xfb,0x01,0x03,0x01,0x02,
+        0x04,0x00,0x01,0x7e,0x01,0x7d,0x00,0x76,0x00,0x8a,
+        0x01,0x03,0x02,0x02,0x03,0x00,0x02,0x7e,0x01,0x7d,
+        0x00,0x76,0x03,0x80,0x03,0x8f,0x00,0x74,0x01,0x7e,
+        0x02,0x7f,0x04,0x00,0x02,0x01,0x01,0x01,0x00,0x8d,
+        0x00,0x6e,0xff,0x7e,0xfe,0x7f,0xfb,0x00,0xfe,0x01,
+        0x0c,0x85,0x03,0x8d,0x01,0x02,0x03,0x00,0x02,0x7e,
+        0x01,0x02,0x03,0x00,0x02,0x7e,0x00,0x74,0xfe,0x7f,
+        0xfd,0x00,0xff,0x01,0xfe,0x7f,0xfd,0x00,0xff,0x01,
+        0x00,0x0c,0x06,0x82,0x00,0x6b,0x08,0x86,0x03,0x80,
+        0x0a,0x0f,0xf6,0x80,0x0a,0x71,0x03,0x80,0x03,0x8f,
+        0x00,0x73,0x01,0x7e,0x07,0x00,0x02,0x02,0x00,0x0d,
+        0x00,0xf3,0x01,0x7e,0x00,0x7e,0x03,0x82,0x03,0x8f,
+        0x00,0x79,0x02,0x7e,0x08,0x00,0x00,0x89,0x00,0x71,
+        0x02,0x80,0x03,0x8f,0x00,0x73,0x01,0x7e,0x03,0x00,
+        0x02,0x02,0x00,0x0d,0x00,0xf3,0x01,0x7e,0x03,0x00,
+        0x02,0x02,0x00,0x0d,0x00,0xf3,0x01,0x7e,0x03,0x80,
+        0x03,0x8f,0x00,0x73,0x01,0x7e,0x03,0x00,0x02,0x02,
+        0x00,0x0d,0x00,0xf3,0x01,0x7e,0x03,0x00,0x02,0x02,
+        0x00,0x0d,0x00,0xf3,0x01,0x7e,0x00,0x7e,0x03,0x82,
+        0x03,0x8d,0x00,0x02,0x02,0x00,0x00,0x71,0x08,0x00,
+        0x02,0x02,0x00,0x06,0xfe,0x02,0xf8,0x00,0x0c,0xf6,
+        0x03,0x8f,0x00,0x71,0x07,0x00,0x02,0x02,0x00,0x06,
+        0xfe,0x02,0xf9,0x00,0x0c,0x85,0x00,0x71,0x02,0x80,
+        0x03,0x8f,0x00,0x71,0x07,0x00,0x03,0x02,0x00,0x06,
+        0xfd,0x02,0xf9,0x00,0x0c,0xf6,0x03,0x8d,0x02,0x02,
+        0x06,0x00,0x02,0x7e,0x00,0x75,0xfe,0x7e,0xfa,0x00,
+        0xfe,0x02,0x04,0x85,0x06,0x00,0x02,0xf9,0x03,0x80,
+        0x00,0x0f,0x00,0xf8,0x04,0x00,0x00,0x06,0x02,0x02,
+        0x04,0x00,0x02,0x7e,0x00,0x75,0xfe,0x7e,0xfc,0x00,
+        0xfe,0x02,0x00,0x05,0x0a,0xf9,0x0d,0x80,0x00,0x0f,
+        0xf7,0x00,0xff,0x7e,0x00,0x7b,0x01,0x7e,0x09,0x00,
+        0xf6,0xfa,0x04,0x06,0x08,0xfa
+    };
+
+
+
+    //-------------------------------------------------------------------------
+    gsv_text::~gsv_text()
+    {
+        if(m_loaded_font) delete [] m_loaded_font;
+        if(m_text_buf)    delete [] m_text_buf;
+    }
+
+
+    //-------------------------------------------------------------------------
+    gsv_text::gsv_text() :
+      m_x(0.0),
+      m_y(0.0),
+      m_start_x(0.0),
+      m_width(10.0),
+      m_height(0.0),
+      m_space(0.0),
+      m_line_space(0.0),
+      m_text(m_chr),
+      m_text_buf(0),
+      m_buf_size(0),
+      m_cur_chr(m_chr),
+      m_font(gsv_default_font),
+      m_loaded_font(0),
+      m_status(initial),
+      m_big_endian(false),
+      m_flip(false)
+    {
+        m_chr[0] = m_chr[1] = 0;
+
+        int t = 1;
+        if(*(char*)&t == 0) m_big_endian = true;
+    }
+
+
+
+    //-------------------------------------------------------------------------
+    void gsv_text::font(const void* _font)
+    {
+        m_font = _font;
+        if(m_font == 0) m_font = m_loaded_font;
+    }
+
+    //-------------------------------------------------------------------------
+    void gsv_text::size(double height, double width)
+    {
+        m_height = height;
+        m_width  = width;
+    }
+
+    //-------------------------------------------------------------------------
+    void gsv_text::space(double _space)
+    {
+        m_space = _space;
+    }
+
+    //-------------------------------------------------------------------------
+    void gsv_text::line_space(double _line_space)
+    {
+        m_line_space = _line_space;
+    }
+
+    //-------------------------------------------------------------------------
+    void gsv_text::start_point(double x, double y)
+    {
+        m_x = m_start_x = x;
+        m_y = y;
+        //if(m_flip) m_y += m_height;
+    }
+
+
+    //-------------------------------------------------------------------------
+    void gsv_text::load_font(const char* file)
+    {
+        if(m_loaded_font) delete [] m_loaded_font;
+        m_loaded_font = 0;
+
+        FILE* fd = fopen(file, "rb");
+        if(fd)
+        {
+            unsigned len;
+
+            fseek(fd, 0l, SEEK_END);
+            len = ftell(fd);
+            fseek(fd, 0l, SEEK_SET);
+            if(len > 0)
+            {
+                m_loaded_font = new char [len];
+                fread(m_loaded_font, 1, len, fd);
+                m_font = m_loaded_font;
+            }
+            fclose(fd);
+        }
+    }
+
+
+    //-------------------------------------------------------------------------
+    void gsv_text::text(const char* _text)
+    {
+        if(_text == 0)
+        {
+            m_chr[0] = 0;
+            m_text = m_chr;
+            return;
+        }
+        unsigned new_size = strlen(_text) + 1;
+        if(new_size > m_buf_size)
+        {
+            if(m_text_buf) delete [] m_text_buf;
+            m_text_buf = new char [m_buf_size = new_size];
+        }
+        memcpy(m_text_buf, _text, new_size);
+        m_text = m_text_buf;
+    }
+
+
+
+    //-------------------------------------------------------------------------
+    void gsv_text::rewind(unsigned)
+    {
+        m_status = initial;
+        if(m_font == 0) return;
+
+        m_indices = (int8u*)m_font;
+        double base_height = value(m_indices + 4);
+        m_indices += value(m_indices);
+        m_glyphs = (int8*)(m_indices + 257*2);
+        m_h = m_height / base_height;
+        m_w = (m_width == 0.0) ? m_h : m_width / base_height;
+        if(m_flip) m_h = -m_h;
+        m_cur_chr = m_text;
+    }
+
+
+    //-------------------------------------------------------------------------
+    unsigned gsv_text::vertex(double* x, double* y)
+    {
+        unsigned idx;
+        int8 yc, yf;
+        int dx, dy;
+        bool quit = false;
+
+
+        while(!quit)
+        {
+            switch(m_status)
+            {
+            case initial:
+                if(m_font == 0)
+                {
+                    quit = true;
+                    break;
+                }
+                m_status = next_char;
+
+            case next_char:
+                if(*m_cur_chr == 0)
+                {
+                    quit = true;
+                    break;
+                }
+                idx = (*m_cur_chr++) & 0xFF;
+                if(idx == '\n')
+                {
+                    m_x = m_start_x;
+                    m_y -= m_flip ? -m_height - m_line_space : m_height + m_line_space;
+                    break;
+                }
+                idx <<= 1;
+                m_bglyph = m_glyphs + value(m_indices + idx);
+                m_eglyph = m_glyphs + value(m_indices + idx + 2);
+                m_status = start_glyph;
+
+            case start_glyph:
+                *x = m_x;
+                *y = m_y;
+                m_status = glyph;
+                return path_cmd_move_to;
+
+            case glyph:
+                if(m_bglyph >= m_eglyph)
+                {
+                    m_status = next_char;
+                    m_x += m_space;
+                    break;
+                }
+                dx = int(*m_bglyph++);
+                yf = (yc = *m_bglyph++) & 0x80;
+                yc <<= 1;
+                yc >>= 1;
+                dy = int(yc);
+                m_x += double(dx) * m_w;
+                m_y += double(dy) * m_h;
+                *x = m_x;
+                *y = m_y;
+                return yf ? path_cmd_move_to : path_cmd_line_to;
+            }
+
+        }
+        return path_cmd_stop;
+    }
+
+
+
+}
diff --git a/agg/source/agg_image_filters.cpp b/agg/source/agg_image_filters.cpp
new file mode 100755
index 000000000000..28dd0654eeb4
--- /dev/null
+++ b/agg/source/agg_image_filters.cpp
@@ -0,0 +1,120 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Filtering class image_filter_lut implemantation
+//
+//----------------------------------------------------------------------------
+
+
+#include "agg_image_filters.h"
+
+
+namespace agg
+{
+
+    //--------------------------------------------------------------------
+    image_filter_lut::~image_filter_lut()
+    {
+        delete [] m_weight_array;
+    }
+
+
+    //--------------------------------------------------------------------
+    image_filter_lut::image_filter_lut() :
+        m_weight_array(0),
+        m_max_size(0)
+    {}
+
+    //--------------------------------------------------------------------
+    void image_filter_lut::realloc(double _radius)
+    {
+        m_radius = _radius;
+        m_diameter = unsigned(ceil(_radius)) * 2;
+        m_start = -int(m_diameter / 2 - 1);
+        unsigned size = m_diameter << image_subpixel_shift;
+        if(size > m_max_size)
+        {
+            delete [] m_weight_array;
+            m_weight_array = new int16 [size];
+            m_max_size = size;
+        }
+    }
+
+
+
+    //--------------------------------------------------------------------
+    // This function normalizes integer values and corrects the rounding
+    // errors. It doesn't do anything with the source floating point values
+    // (m_weight_array_dbl), it corrects only integers according to the rule
+    // of 1.0 which means that any sum of pixel weights must be equal to 1.0.
+    // So, the filter function must produce a graph of the proper shape.
+    //--------------------------------------------------------------------
+    void image_filter_lut::normalize()
+    {
+        unsigned i;
+        int flip = 1;
+
+        for(i = 0; i < image_subpixel_size; i++)
+        {
+            for(;;)
+            {
+                int sum = 0;
+                unsigned j;
+                for(j = 0; j < m_diameter; j++)
+                {
+                    sum += m_weight_array[j * image_subpixel_size + i];
+                }
+
+                if(sum == image_filter_size) break;
+
+                double k = double(image_filter_size) / double(sum);
+                sum = 0;
+                for(j = 0; j < m_diameter; j++)
+                {
+                    sum += m_weight_array[j * image_subpixel_size + i] =
+                        int16(m_weight_array[j * image_subpixel_size + i] * k);
+                }
+
+                sum -= image_filter_size;
+                int16 inc = (sum > 0) ? -1 : 1;
+
+                for(j = 0; j < m_diameter && sum; j++)
+                {
+                    flip ^= 1;
+                    unsigned idx = flip ? m_diameter/2 + j/2 : m_diameter/2 - j/2;
+                    int v = m_weight_array[idx * image_subpixel_size + i];
+                    if(v < image_filter_size)
+                    {
+                        m_weight_array[idx * image_subpixel_size + i] =
+                            m_weight_array[idx * image_subpixel_size + i] + inc;
+                        sum += inc;
+                    }
+                }
+            }
+        }
+
+        unsigned pivot = m_diameter << (image_subpixel_shift - 1);
+
+        for(i = 0; i < pivot; i++)
+        {
+            m_weight_array[pivot + i] = m_weight_array[pivot - i];
+        }
+        unsigned end = (diameter() << image_subpixel_shift) - 1;
+        m_weight_array[0] = m_weight_array[end];
+    }
+
+
+}
+
diff --git a/agg/source/agg_line_aa_basics.cpp b/agg/source/agg_line_aa_basics.cpp
new file mode 100755
index 000000000000..34103178d7b7
--- /dev/null
+++ b/agg/source/agg_line_aa_basics.cpp
@@ -0,0 +1,82 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_line_aa_basics.h"
+
+namespace agg
+{
+    //-------------------------------------------------------------------------
+    // The number of the octant is determined as a 3-bit value as follows:
+    // bit 0 = vertical flag
+    // bit 1 = sx < 0
+    // bit 2 = sy < 0
+    //
+    // [N] shows the number of the orthogonal quadrant
+    // <M> shows the number of the diagonal quadrant
+    //               <1>
+    //   [1]          |          [0]
+    //       . (3)011 | 001(1) .
+    //         .      |      .
+    //           .    |    .
+    //             .  |  .
+    //    (2)010     .|.     000(0)
+    // <2> ----------.+.----------- <0>
+    //    (6)110   .  |  .   100(4)
+    //           .    |    .
+    //         .      |      .
+    //       .        |        .
+    //         (7)111 | 101(5)
+    //   [2]          |          [3]
+    //               <3>
+    //                                                  0,1,2,3,4,5,6,7
+    int8u line_parameters::s_orthogonal_quadrant[8] = { 0,0,1,1,3,3,2,2 };
+    int8u line_parameters::s_diagonal_quadrant[8]   = { 0,1,2,1,0,3,2,3 };
+
+
+
+    //-------------------------------------------------------------------------
+    void bisectrix(const line_parameters& l1,
+                   const line_parameters& l2,
+                   int* x, int* y)
+    {
+        double k = double(l2.len) / double(l1.len);
+        double tx = l2.x2 - (l2.x1 - l1.x1) * k;
+        double ty = l2.y2 - (l2.y1 - l1.y1) * k;
+
+        //All bisectrices must be on the right of the line
+        //If the next point is on the left (l1 => l2.2)
+        //then the bisectix should be rotated by 180 degrees.
+        if(double(l2.x2 - l2.x1) * double(l2.y1 - l1.y1) <
+           double(l2.y2 - l2.y1) * double(l2.x1 - l1.x1) + 100.0)
+        {
+            tx -= (tx - l2.x1) * 2.0;
+            ty -= (ty - l2.y1) * 2.0;
+        }
+
+        // Check if the bisectrix is too short
+        double dx = tx - l2.x1;
+        double dy = ty - l2.y1;
+        if((int)sqrt(dx * dx + dy * dy) < line_subpixel_size)
+        {
+            *x = (l2.x1 + l2.x1 + (l2.y1 - l1.y1) + (l2.y2 - l2.y1)) >> 1;
+            *y = (l2.y1 + l2.y1 - (l2.x1 - l1.x1) - (l2.x2 - l2.x1)) >> 1;
+            return;
+        }
+        *x = int(tx);
+        *y = int(ty);
+    }
+
+}
diff --git a/agg/source/agg_line_profile_aa.cpp b/agg/source/agg_line_profile_aa.cpp
new file mode 100755
index 000000000000..1374475b663f
--- /dev/null
+++ b/agg/source/agg_line_profile_aa.cpp
@@ -0,0 +1,117 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include "agg_renderer_outline_aa.h"
+
+namespace agg
+{
+
+    //---------------------------------------------------------------------
+    void line_profile_aa::width(double w)
+    {
+        if(w < 0.0) w = 0.0;
+
+        if(w < m_smoother_width) w += w;
+        else                     w += m_smoother_width;
+
+        w *= 0.5;
+
+        w -= m_smoother_width;
+        double s = m_smoother_width;
+        if(w < 0.0)
+        {
+            s += w;
+            w = 0.0;
+        }
+        set(w, s);
+    }
+
+
+    //---------------------------------------------------------------------
+    line_profile_aa::value_type* line_profile_aa::profile(double w)
+    {
+        m_subpixel_width = int(w * subpixel_size);
+        unsigned size = m_subpixel_width + subpixel_size * 6;
+        if(size > m_size)
+        {
+            delete [] m_profile;
+            m_profile = new value_type[m_size = size];
+        }
+        return m_profile;
+    }
+
+
+    //---------------------------------------------------------------------
+    void line_profile_aa::set(double center_width, double _smoother_width)
+    {
+        double base_val = 1.0;
+        if(center_width == 0.0)   center_width = 1.0 / subpixel_size;
+        if(_smoother_width == 0.0) _smoother_width = 1.0 / subpixel_size;
+
+        double _width = center_width + _smoother_width;
+        if(_width < m_min_width)
+        {
+            double k = _width / m_min_width;
+            base_val *= k;
+            center_width /= k;
+            _smoother_width /= k;
+        }
+
+        value_type* ch = profile(center_width + _smoother_width);
+
+        unsigned subpixel_center_width = unsigned(center_width * subpixel_size);
+        unsigned subpixel_smoother_width = unsigned(_smoother_width * subpixel_size);
+
+        value_type* ch_center   = ch + subpixel_size*2;
+        value_type* ch_smoother = ch_center + subpixel_center_width;
+
+        unsigned i;
+
+        unsigned val = m_gamma[unsigned(base_val * aa_mask)];
+        ch = ch_center;
+        for(i = 0; i < subpixel_center_width; i++)
+        {
+            *ch++ = (value_type)val;
+        }
+
+        for(i = 0; i < subpixel_smoother_width; i++)
+        {
+            *ch_smoother++ =
+                m_gamma[unsigned((base_val -
+                                  base_val *
+                                  (double(i) / subpixel_smoother_width)) * aa_mask)];
+        }
+
+        unsigned n_smoother = profile_size() -
+                              subpixel_smoother_width -
+                              subpixel_center_width -
+                              subpixel_size*2;
+
+        val = m_gamma[0];
+        for(i = 0; i < n_smoother; i++)
+        {
+            *ch_smoother++ = (value_type)val;
+        }
+
+        ch = ch_center;
+        for(i = 0; i < subpixel_size*2; i++)
+        {
+            *--ch = *ch_center++;
+        }
+    }
+
+
+}
+
diff --git a/agg/source/agg_path_storage.cpp b/agg/source/agg_path_storage.cpp
new file mode 100755
index 000000000000..60eafffff14f
--- /dev/null
+++ b/agg/source/agg_path_storage.cpp
@@ -0,0 +1,525 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Class path_storage
+//
+//----------------------------------------------------------------------------
+#include <string.h>
+#include <math.h>
+#include "agg_path_storage.h"
+#include "agg_math.h"
+#include "agg_bezier_arc.h"
+
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    path_storage::~path_storage()
+    {
+        if(m_total_blocks)
+        {
+            double** coord_blk = m_coord_blocks + m_total_blocks - 1;
+            while(m_total_blocks--)
+            {
+                delete [] *coord_blk;
+                --coord_blk;
+            }
+            delete [] m_coord_blocks;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    path_storage::path_storage() :
+        m_total_vertices(0),
+        m_total_blocks(0),
+        m_max_blocks(0),
+        m_coord_blocks(0),
+        m_cmd_blocks(0),
+        m_iterator(0)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    path_storage::path_storage(const path_storage& ps) :
+        m_total_vertices(0),
+        m_total_blocks(0),
+        m_max_blocks(0),
+        m_coord_blocks(0),
+        m_cmd_blocks(0),
+        m_iterator(0)
+    {
+        copy_from(ps);
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::remove_all()
+    {
+        m_total_vertices = 0;
+        m_iterator = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::copy_from(const path_storage& ps)
+    {
+        remove_all();
+        unsigned i;
+        for(i = 0; i < ps.total_vertices(); i++)
+        {
+            double x, y;
+            unsigned cmd = ps.vertex(i, &x, &y);
+            add_vertex(x, y, cmd);
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::allocate_block(unsigned nb)
+    {
+        if(nb >= m_max_blocks)
+        {
+            double** new_coords =
+                new double* [(m_max_blocks + block_pool) * 2];
+
+            unsigned char** new_cmds =
+                (unsigned char**)(new_coords + m_max_blocks + block_pool);
+
+            if(m_coord_blocks)
+            {
+                memcpy(new_coords,
+                       m_coord_blocks,
+                       m_max_blocks * sizeof(double*));
+
+                memcpy(new_cmds,
+                       m_cmd_blocks,
+                       m_max_blocks * sizeof(unsigned char*));
+
+                delete [] m_coord_blocks;
+            }
+            m_coord_blocks = new_coords;
+            m_cmd_blocks = new_cmds;
+            m_max_blocks += block_pool;
+        }
+        m_coord_blocks[nb] =
+            new double [block_size * 2 +
+                        block_size /
+                        (sizeof(double) / sizeof(unsigned char))];
+
+        m_cmd_blocks[nb]  =
+            (unsigned char*)(m_coord_blocks[nb] + block_size * 2);
+
+        m_total_blocks++;
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::rewind(unsigned path_id)
+    {
+        m_iterator = path_id;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void path_storage::arc_to(double rx, double ry,
+                              double angle,
+                              bool large_arc_flag,
+                              bool sweep_flag,
+                              double x, double y)
+    {
+        if(m_total_vertices && is_vertex(command(m_total_vertices - 1)))
+        {
+            const double epsilon = 1e-30;
+            double x0 = 0.0;
+            double y0 = 0.0;
+            last_vertex(&x0, &y0);
+
+            rx = fabs(rx);
+            ry = fabs(ry);
+
+            // Ensure radii are valid
+            //-------------------------
+            if(rx < epsilon || ry < epsilon)
+            {
+                line_to(x, y);
+                return;
+            }
+
+            if(calc_distance(x0, y0, x, y) < epsilon)
+            {
+                // If the endpoints (x, y) and (x0, y0) are identical, then this
+                // is equivalent to omitting the elliptical arc segment entirely.
+                return;
+            }
+            bezier_arc_svg a(x0, y0, rx, ry, angle, large_arc_flag, sweep_flag, x, y);
+            if(a.radii_ok())
+            {
+                add_path(a, 0, true);
+            }
+            else
+            {
+                line_to(x, y);
+            }
+        }
+        else
+        {
+            move_to(x, y);
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::arc_rel(double rx, double ry,
+                               double angle,
+                               bool large_arc_flag,
+                               bool sweep_flag,
+                               double dx, double dy)
+    {
+        rel_to_abs(&dx, &dy);
+        arc_to(rx, ry, angle, large_arc_flag, sweep_flag, dx, dy);
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::curve3(double x_ctrl, double y_ctrl,
+                              double x_to,   double y_to)
+    {
+        add_vertex(x_ctrl, y_ctrl, path_cmd_curve3);
+        add_vertex(x_to,   y_to,   path_cmd_curve3);
+    }
+
+    //------------------------------------------------------------------------
+    void path_storage::curve3_rel(double dx_ctrl, double dy_ctrl,
+                                  double dx_to,   double dy_to)
+    {
+        rel_to_abs(&dx_ctrl, &dy_ctrl);
+        rel_to_abs(&dx_to,   &dy_to);
+        add_vertex(dx_ctrl, dy_ctrl, path_cmd_curve3);
+        add_vertex(dx_to,   dy_to,   path_cmd_curve3);
+    }
+
+    //------------------------------------------------------------------------
+    void path_storage::curve3(double x_to, double y_to)
+    {
+        double x0 = 0;
+        double y0 = 0;
+        if(is_vertex(last_vertex(&x0, &y0)))
+        {
+            double x_ctrl = 0;
+            double y_ctrl = 0;
+            unsigned cmd = prev_vertex(&x_ctrl, &y_ctrl);
+            if(is_curve(cmd))
+            {
+                x_ctrl = x0 + x0 - x_ctrl;
+                y_ctrl = y0 + y0 - y_ctrl;
+            }
+            else
+            {
+                x_ctrl = x0;
+                y_ctrl = y0;
+            }
+            curve3(x_ctrl, y_ctrl, x_to, y_to);
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::curve3_rel(double dx_to, double dy_to)
+    {
+        rel_to_abs(&dx_to, &dy_to);
+        curve3(dx_to, dy_to);
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::curve4(double x_ctrl1, double y_ctrl1,
+                              double x_ctrl2, double y_ctrl2,
+                              double x_to,    double y_to)
+    {
+        add_vertex(x_ctrl1, y_ctrl1, path_cmd_curve4);
+        add_vertex(x_ctrl2, y_ctrl2, path_cmd_curve4);
+        add_vertex(x_to,    y_to,    path_cmd_curve4);
+    }
+
+    //------------------------------------------------------------------------
+    void path_storage::curve4_rel(double dx_ctrl1, double dy_ctrl1,
+                                  double dx_ctrl2, double dy_ctrl2,
+                                  double dx_to,    double dy_to)
+    {
+        rel_to_abs(&dx_ctrl1, &dy_ctrl1);
+        rel_to_abs(&dx_ctrl2, &dy_ctrl2);
+        rel_to_abs(&dx_to,    &dy_to);
+        add_vertex(dx_ctrl1, dy_ctrl1, path_cmd_curve4);
+        add_vertex(dx_ctrl2, dy_ctrl2, path_cmd_curve4);
+        add_vertex(dx_to,    dy_to,    path_cmd_curve4);
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::curve4(double x_ctrl2, double y_ctrl2,
+                              double x_to,    double y_to)
+    {
+        double x0 = 0;
+        double y0 = 0;
+        if(is_vertex(last_vertex(&x0, &y0)))
+        {
+            double x_ctrl1 = 0;
+            double y_ctrl1 = 0;
+            unsigned cmd = prev_vertex(&x_ctrl1, &y_ctrl1);
+            if(is_curve(cmd))
+            {
+                x_ctrl1 = x0 + x0 - x_ctrl1;
+                y_ctrl1 = y0 + y0 - y_ctrl1;
+            }
+            else
+            {
+                x_ctrl1 = x0;
+                y_ctrl1 = y0;
+            }
+            curve4(x_ctrl1, y_ctrl1, x_ctrl2, y_ctrl2, x_to, y_to);
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::curve4_rel(double dx_ctrl2, double dy_ctrl2,
+                                  double dx_to,    double dy_to)
+    {
+        rel_to_abs(&dx_ctrl2, &dy_ctrl2);
+        rel_to_abs(&dx_to,    &dy_to);
+        curve4(dx_ctrl2, dy_ctrl2, dx_to, dy_to);
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::end_poly(unsigned flags)
+    {
+        if(m_total_vertices)
+        {
+            if(is_vertex(command(m_total_vertices - 1)))
+            {
+                add_vertex(0.0, 0.0, path_cmd_end_poly | flags);
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned path_storage::start_new_path()
+    {
+        if(m_total_vertices)
+        {
+            if(!is_stop(command(m_total_vertices - 1)))
+            {
+                add_vertex(0.0, 0.0, path_cmd_stop);
+            }
+        }
+        return m_total_vertices;
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::add_poly(const double* vertices, unsigned num,
+                                bool solid_path, unsigned end_flags)
+    {
+        if(num)
+        {
+            if(!solid_path)
+            {
+                move_to(vertices[0], vertices[1]);
+                vertices += 2;
+                --num;
+            }
+            while(num--)
+            {
+                line_to(vertices[0], vertices[1]);
+                vertices += 2;
+            }
+            if(end_flags) end_poly(end_flags);
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned path_storage::perceive_polygon_orientation(unsigned idx,
+                                                        double xs, double ys,
+                                                        unsigned* orientation)
+    {
+        unsigned i;
+        double sum = 0.0;
+        double x, y, xn, yn;
+
+        x = xs;
+        y = ys;
+        for(i = idx; i < m_total_vertices; ++i)
+        {
+            if(is_next_poly(vertex(i, &xn, &yn))) break;
+            sum += x * yn - y * xn;
+            x = xn;
+            y = yn;
+        }
+        if(i > idx) sum += x * ys - y * xs;
+        *orientation = path_flags_none;
+        if(sum != 0.0)
+        {
+            *orientation = (sum < 0.0) ? path_flags_cw : path_flags_ccw;
+        }
+        return i;
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::reverse_polygon(unsigned _start, unsigned _end)
+    {
+        unsigned i;
+        unsigned tmp_cmd = command(_start);
+
+        // Shift all commands to one position
+        for(i = _start; i < _end; i++)
+        {
+            modify_command(i, command(i + 1));
+        }
+
+        // Assign starting command to the ending command
+        modify_command(_end, tmp_cmd);
+
+        // Reverse the polygon
+        while(_end > _start)
+        {
+            unsigned start_nb = _start >> block_shift;
+            unsigned end_nb   = _end   >> block_shift;
+            double* start_ptr = m_coord_blocks[start_nb] + ((_start & block_mask) << 1);
+            double* end_ptr   = m_coord_blocks[end_nb]   + ((_end   & block_mask) << 1);
+            double tmp_xy;
+
+            tmp_xy       = *start_ptr;
+            *start_ptr++ = *end_ptr;
+            *end_ptr++   = tmp_xy;
+
+            tmp_xy       = *start_ptr;
+            *start_ptr   = *end_ptr;
+            *end_ptr     = tmp_xy;
+
+            tmp_cmd = m_cmd_blocks[start_nb][_start & block_mask];
+            m_cmd_blocks[start_nb][_start & block_mask] = m_cmd_blocks[end_nb][_end & block_mask];
+            m_cmd_blocks[end_nb][_end & block_mask] = (unsigned char)tmp_cmd;
+
+            ++_start;
+            --_end;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned path_storage::arrange_orientations(unsigned path_id,
+                                                path_flags_e new_orientation)
+    {
+        unsigned _end = m_total_vertices;
+        if(m_total_vertices && new_orientation != path_flags_none)
+        {
+            unsigned start = path_id;
+
+            double xs, ys;
+            unsigned cmd = vertex(start, &xs, &ys);
+            unsigned inc = 0;
+            for(;;)
+            {
+                unsigned orientation;
+                _end = perceive_polygon_orientation(start + 1, xs, ys,
+                                                   &orientation);
+                if(_end > start + 2 &&
+                   orientation &&
+                   orientation != unsigned(new_orientation))
+                {
+                    reverse_polygon(start + inc, _end - 1);
+                }
+                if(_end >= m_total_vertices) break;
+                cmd = command(_end);
+                if(is_stop(cmd))
+                {
+                    ++_end;
+                    break;
+                }
+                if(is_end_poly(cmd))
+                {
+                    inc = 1;
+                    modify_command(_end, set_orientation(cmd, new_orientation));
+                }
+                else
+                {
+                    cmd = vertex(++_end, &xs, &ys);
+                    inc = 0;
+                }
+                start = _end;
+            }
+        }
+        return _end;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void path_storage::arrange_orientations_all_paths(path_flags_e new_orientation)
+    {
+        if(new_orientation != path_flags_none)
+        {
+            unsigned start = 0;
+            while(start < m_total_vertices)
+            {
+                start = arrange_orientations(start, new_orientation);
+            }
+        }
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void path_storage::flip_x(double x1, double x2)
+    {
+        unsigned i;
+        double x, y;
+        for(i = 0; i < m_total_vertices; i++)
+        {
+            unsigned cmd = vertex(i, &x, &y);
+            if(is_vertex(cmd))
+            {
+                modify_vertex(i, x2 - x + x1, y);
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void path_storage::flip_y(double y1, double y2)
+    {
+        unsigned i;
+        double x, y;
+        for(i = 0; i < m_total_vertices; i++)
+        {
+            unsigned cmd = vertex(i, &x, &y);
+            if(is_vertex(cmd))
+            {
+                modify_vertex(i, x, y2 - y + y1);
+            }
+        }
+    }
+
+
+}
+
diff --git a/agg/source/agg_rasterizer_scanline_aa.cpp b/agg/source/agg_rasterizer_scanline_aa.cpp
new file mode 100755
index 000000000000..421c0187d0aa
--- /dev/null
+++ b/agg/source/agg_rasterizer_scanline_aa.cpp
@@ -0,0 +1,621 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+// The author gratefully acknowleges the support of David Turner,
+// Robert Wilhelm, and Werner Lemberg - the authors of the FreeType
+// libray - in producing this work. See http://www.freetype.org for details.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Class outline_aa - implementation.
+//
+// Initially the rendering algorithm was designed by David Turner and the
+// other authors of the FreeType library - see the above notice. I nearly
+// created a similar renderer, but still I was far from David's work.
+// I completely redesigned the original code and adapted it for Anti-Grain
+// ideas. Two functions - render_line and render_hline are the core of
+// the algorithm - they calculate the exact coverage of each pixel cell
+// of the polygon. I left these functions almost as is, because there's
+// no way to improve the perfection - hats off to David and his group!
+//
+// All other code is very different from the original.
+//
+//----------------------------------------------------------------------------
+
+#include <string.h>
+#include "agg_rasterizer_scanline_aa.h"
+
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    AGG_INLINE void cell_aa::set_cover(int c, int a)
+    {
+        cover = c;
+        area = a;
+    }
+
+    //------------------------------------------------------------------------
+    AGG_INLINE void cell_aa::add_cover(int c, int a)
+    {
+        cover += c;
+        area += a;
+    }
+
+    //------------------------------------------------------------------------
+    AGG_INLINE void cell_aa::set_coord(int cx, int cy)
+    {
+        x = int16(cx);
+        y = int16(cy);
+        packed_coord = (cy << 16) + cx;
+    }
+
+    //------------------------------------------------------------------------
+    AGG_INLINE void cell_aa::set(int cx, int cy, int c, int a)
+    {
+        x = int16(cx);
+        y = int16(cy);
+        packed_coord = (cy << 16) + cx;
+        cover = c;
+        area = a;
+    }
+
+    //------------------------------------------------------------------------
+    outline_aa::~outline_aa()
+    {
+        delete [] m_sorted_cells;
+        if(m_num_blocks)
+        {
+            cell_aa** ptr = m_cells + m_num_blocks - 1;
+            while(m_num_blocks--)
+            {
+                delete [] *ptr;
+                ptr--;
+            }
+            delete [] m_cells;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    outline_aa::outline_aa() :
+        m_num_blocks(0),
+        m_max_blocks(0),
+        m_cur_block(0),
+        m_num_cells(0),
+        m_cells(0),
+        m_cur_cell_ptr(0),
+        m_sorted_cells(0),
+        m_sorted_size(0),
+        m_cur_x(0),
+        m_cur_y(0),
+        m_min_x(0x7FFFFFFF),
+        m_min_y(0x7FFFFFFF),
+        m_max_x(-0x7FFFFFFF),
+        m_max_y(-0x7FFFFFFF),
+        m_sorted(false)
+    {
+        m_cur_cell.set(0x7FFF, 0x7FFF, 0, 0);
+    }
+
+
+    //------------------------------------------------------------------------
+    void outline_aa::reset()
+    {
+        m_num_cells = 0;
+        m_cur_block = 0;
+        m_cur_cell.set(0x7FFF, 0x7FFF, 0, 0);
+        m_sorted = false;
+        m_min_x =  0x7FFFFFFF;
+        m_min_y =  0x7FFFFFFF;
+        m_max_x = -0x7FFFFFFF;
+        m_max_y = -0x7FFFFFFF;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void outline_aa::allocate_block()
+    {
+        if(m_cur_block >= m_num_blocks)
+        {
+            if(m_num_blocks >= m_max_blocks)
+            {
+                cell_aa** new_cells = new cell_aa* [m_max_blocks + cell_block_pool];
+                if(m_cells)
+                {
+                    memcpy(new_cells, m_cells, m_max_blocks * sizeof(cell_aa*));
+                    delete [] m_cells;
+                }
+                m_cells = new_cells;
+                m_max_blocks += cell_block_pool;
+            }
+            m_cells[m_num_blocks++] = new cell_aa [unsigned(cell_block_size)];
+        }
+        m_cur_cell_ptr = m_cells[m_cur_block++];
+    }
+
+
+    //------------------------------------------------------------------------
+    AGG_INLINE void outline_aa::add_cur_cell()
+    {
+        if(m_cur_cell.area | m_cur_cell.cover)
+        {
+            if((m_num_cells & cell_block_mask) == 0)
+            {
+                if(m_num_blocks >= cell_block_limit) return;
+                allocate_block();
+            }
+            *m_cur_cell_ptr++ = m_cur_cell;
+            ++m_num_cells;
+            if(m_cur_cell.x < m_min_x) m_min_x = m_cur_cell.x;
+            if(m_cur_cell.x > m_max_x) m_max_x = m_cur_cell.x;
+        }
+    }
+
+
+
+    //------------------------------------------------------------------------
+    AGG_INLINE void outline_aa::set_cur_cell(int x, int y)
+    {
+        if(m_cur_cell.packed_coord != (y << 16) + x)
+        {
+            add_cur_cell();
+            m_cur_cell.set(x, y, 0, 0);
+        }
+    }
+
+
+
+    //------------------------------------------------------------------------
+    AGG_INLINE void outline_aa::render_hline(int ey, int x1, int y1, int x2, int y2)
+    {
+        int ex1 = x1 >> poly_base_shift;
+        int ex2 = x2 >> poly_base_shift;
+        int fx1 = x1 & poly_base_mask;
+        int fx2 = x2 & poly_base_mask;
+
+        int delta, p, first, dx;
+        int incr, lift, mod, rem;
+
+        //trivial case. Happens often
+        if(y1 == y2)
+        {
+            set_cur_cell(ex2, ey);
+            return;
+        }
+
+        //everything is located in a single cell.  That is easy!
+        if(ex1 == ex2)
+        {
+            delta = y2 - y1;
+            m_cur_cell.add_cover(delta, (fx1 + fx2) * delta);
+            return;
+        }
+
+        //ok, we'll have to render a run of adjacent cells on the same
+        //hline...
+        p     = (poly_base_size - fx1) * (y2 - y1);
+        first = poly_base_size;
+        incr  = 1;
+
+        dx = x2 - x1;
+
+        if(dx < 0)
+        {
+            p     = fx1 * (y2 - y1);
+            first = 0;
+            incr  = -1;
+            dx    = -dx;
+        }
+
+        delta = p / dx;
+        mod   = p % dx;
+
+        if(mod < 0)
+        {
+            delta--;
+            mod += dx;
+        }
+
+        m_cur_cell.add_cover(delta, (fx1 + first) * delta);
+
+        ex1 += incr;
+        set_cur_cell(ex1, ey);
+        y1  += delta;
+
+        if(ex1 != ex2)
+        {
+            p     = poly_base_size * (y2 - y1 + delta);
+            lift  = p / dx;
+            rem   = p % dx;
+
+            if (rem < 0)
+            {
+                lift--;
+                rem += dx;
+            }
+
+            mod -= dx;
+
+            while (ex1 != ex2)
+            {
+                delta = lift;
+                mod  += rem;
+                if(mod >= 0)
+                {
+                    mod -= dx;
+                    delta++;
+                }
+
+                m_cur_cell.add_cover(delta, (poly_base_size) * delta);
+                y1  += delta;
+                ex1 += incr;
+                set_cur_cell(ex1, ey);
+            }
+        }
+        delta = y2 - y1;
+        m_cur_cell.add_cover(delta, (fx2 + poly_base_size - first) * delta);
+    }
+
+
+
+
+
+
+    //------------------------------------------------------------------------
+    void outline_aa::render_line(int x1, int y1, int x2, int y2)
+    {
+        int ey1 = y1 >> poly_base_shift;
+        int ey2 = y2 >> poly_base_shift;
+        int fy1 = y1 & poly_base_mask;
+        int fy2 = y2 & poly_base_mask;
+
+        int dx, dy, x_from, x_to;
+        int p, rem, mod, lift, delta, first, incr;
+
+        dx = x2 - x1;
+        dy = y2 - y1;
+
+        //everything is on a single hline
+        if(ey1 == ey2)
+        {
+            render_hline(ey1, x1, fy1, x2, fy2);
+            return;
+        }
+
+        //Vertical line - we have to calculate start and end cells,
+        //and then - the common values of the area and coverage for
+        //all cells of the line. We know exactly there's only one
+        //cell, so, we don't have to call render_hline().
+        incr  = 1;
+        if(dx == 0)
+        {
+            int ex = x1 >> poly_base_shift;
+            int two_fx = (x1 - (ex << poly_base_shift)) << 1;
+            int area;
+
+            first = poly_base_size;
+            if(dy < 0)
+            {
+                first = 0;
+                incr  = -1;
+            }
+
+            x_from = x1;
+
+            //render_hline(ey1, x_from, fy1, x_from, first);
+            delta = first - fy1;
+            m_cur_cell.add_cover(delta, two_fx * delta);
+
+            ey1 += incr;
+            set_cur_cell(ex, ey1);
+
+            delta = first + first - poly_base_size;
+            area = two_fx * delta;
+            while(ey1 != ey2)
+            {
+                //render_hline(ey1, x_from, poly_base_size - first, x_from, first);
+                m_cur_cell.set_cover(delta, area);
+                ey1 += incr;
+                set_cur_cell(ex, ey1);
+            }
+            //render_hline(ey1, x_from, poly_base_size - first, x_from, fy2);
+            delta = fy2 - poly_base_size + first;
+            m_cur_cell.add_cover(delta, two_fx * delta);
+            return;
+        }
+
+        //ok, we have to render several hlines
+        p     = (poly_base_size - fy1) * dx;
+        first = poly_base_size;
+
+        if(dy < 0)
+        {
+            p     = fy1 * dx;
+            first = 0;
+            incr  = -1;
+            dy    = -dy;
+        }
+
+        delta = p / dy;
+        mod   = p % dy;
+
+        if(mod < 0)
+        {
+            delta--;
+            mod += dy;
+        }
+
+        x_from = x1 + delta;
+        render_hline(ey1, x1, fy1, x_from, first);
+
+        ey1 += incr;
+        set_cur_cell(x_from >> poly_base_shift, ey1);
+
+        if(ey1 != ey2)
+        {
+            p     = poly_base_size * dx;
+            lift  = p / dy;
+            rem   = p % dy;
+
+            if(rem < 0)
+            {
+                lift--;
+                rem += dy;
+            }
+            mod -= dy;
+
+            while(ey1 != ey2)
+            {
+                delta = lift;
+                mod  += rem;
+                if (mod >= 0)
+                {
+                    mod -= dy;
+                    delta++;
+                }
+
+                x_to = x_from + delta;
+                render_hline(ey1, x_from, poly_base_size - first, x_to, first);
+                x_from = x_to;
+
+                ey1 += incr;
+                set_cur_cell(x_from >> poly_base_shift, ey1);
+            }
+        }
+        render_hline(ey1, x_from, poly_base_size - first, x2, fy2);
+    }
+
+
+    //------------------------------------------------------------------------
+    void outline_aa::move_to(int x, int y)
+    {
+        if(m_sorted) reset();
+        set_cur_cell(x >> poly_base_shift, y >> poly_base_shift);
+        m_cur_x = x;
+        m_cur_y = y;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void outline_aa::line_to(int x, int y)
+    {
+        render_line(m_cur_x, m_cur_y, x, y);
+        m_cur_x = x;
+        m_cur_y = y;
+        m_sorted = false;
+    }
+
+
+    //------------------------------------------------------------------------
+    enum
+    {
+        qsort_threshold = 9
+    };
+
+
+    //------------------------------------------------------------------------
+    template <class T> AGG_INLINE void swap_cells(T* a, T* b)
+    {
+        T temp = *a;
+        *a = *b;
+        *b = temp;
+    }
+
+    //------------------------------------------------------------------------
+    template <class T> AGG_INLINE bool less_than(T* a, T* b)
+    {
+        return (*a)->packed_coord < (*b)->packed_coord;
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void outline_aa::qsort_cells(cell_aa** start, unsigned num)
+    {
+        cell_aa**  stack[80];
+        cell_aa*** top;
+        cell_aa**  limit;
+        cell_aa**  base;
+
+        limit = start + num;
+        base  = start;
+        top   = stack;
+
+        for (;;)
+        {
+            int len = int(limit - base);
+
+            cell_aa** i;
+            cell_aa** j;
+            cell_aa** pivot;
+
+            if(len > qsort_threshold)
+            {
+                // we use base + len/2 as the pivot
+                pivot = base + len / 2;
+                swap_cells(base, pivot);
+
+                i = base + 1;
+                j = limit - 1;
+
+                // now ensure that *i <= *base <= *j
+                if(less_than(j, i))
+                {
+                    swap_cells(i, j);
+                }
+
+                if(less_than(base, i))
+                {
+                    swap_cells(base, i);
+                }
+
+                if(less_than(j, base))
+                {
+                    swap_cells(base, j);
+                }
+
+                for(;;)
+                {
+                    do i++; while( less_than(i, base) );
+                    do j--; while( less_than(base, j) );
+
+                    if ( i > j )
+                    {
+                        break;
+                    }
+
+                    swap_cells(i, j);
+                }
+
+                swap_cells(base, j);
+
+                // now, push the largest sub-array
+                if(j - base > limit - i)
+                {
+                    top[0] = base;
+                    top[1] = j;
+                    base   = i;
+                }
+                else
+                {
+                    top[0] = i;
+                    top[1] = limit;
+                    limit  = j;
+                }
+                top += 2;
+            }
+            else
+            {
+                // the sub-array is small, perform insertion sort
+                j = base;
+                i = j + 1;
+
+                for(; i < limit; j = i, i++)
+                {
+                    for(; less_than(j + 1, j); j--)
+                    {
+                        swap_cells(j + 1, j);
+                        if (j == base)
+                        {
+                            break;
+                        }
+                    }
+                }
+                if(top > stack)
+                {
+                    top  -= 2;
+                    base  = top[0];
+                    limit = top[1];
+                }
+                else
+                {
+                    break;
+                }
+            }
+        }
+    }
+
+
+
+
+
+    //------------------------------------------------------------------------
+    void outline_aa::sort_cells()
+    {
+        if(m_num_cells == 0) return;
+        if(m_num_cells > m_sorted_size)
+        {
+            delete [] m_sorted_cells;
+            m_sorted_size = m_num_cells;
+            m_sorted_cells = new cell_aa* [m_num_cells + 1];
+        }
+
+        cell_aa** sorted_ptr = m_sorted_cells;
+        cell_aa** block_ptr = m_cells;
+        cell_aa*  cell_ptr;
+
+        unsigned nb = m_num_cells >> cell_block_shift;
+        unsigned i;
+
+        while(nb--)
+        {
+            cell_ptr = *block_ptr++;
+            i = cell_block_size;
+            while(i--)
+            {
+                *sorted_ptr++ = cell_ptr++;
+            }
+        }
+
+        cell_ptr = *block_ptr++;
+        i = m_num_cells & cell_block_mask;
+        while(i--)
+        {
+            *sorted_ptr++ = cell_ptr++;
+        }
+        m_sorted_cells[m_num_cells] = 0;
+        qsort_cells(m_sorted_cells, m_num_cells);
+        m_min_y = m_sorted_cells[0]->y;
+        m_max_y = m_sorted_cells[m_num_cells - 1]->y;
+    }
+
+
+
+
+    //------------------------------------------------------------------------
+    const cell_aa* const* outline_aa::cells()
+    {
+        //Perform sort only the first time.
+        if(!m_sorted)
+        {
+            add_cur_cell();
+            sort_cells();
+            m_sorted = true;
+        }
+        return m_sorted_cells;
+    }
+
+
+
+
+
+}
+
+
+
+
+
diff --git a/agg/source/agg_rounded_rect.cpp b/agg/source/agg_rounded_rect.cpp
new file mode 100755
index 000000000000..8f6e532e7096
--- /dev/null
+++ b/agg/source/agg_rounded_rect.cpp
@@ -0,0 +1,164 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Rounded rectangle vertex generator
+//
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_rounded_rect.h"
+
+
+namespace agg
+{
+    //------------------------------------------------------------------------
+    rounded_rect::rounded_rect(double x1, double y1, double x2, double y2, double r) :
+        m_x1(x1), m_y1(y1), m_x2(x2), m_y2(y2),
+        m_rx1(r), m_ry1(r), m_rx2(r), m_ry2(r),
+        m_rx3(r), m_ry3(r), m_rx4(r), m_ry4(r)
+    {
+        if(x1 > x2) { m_x1 = x2; m_x2 = x1; }
+        if(y1 > y2) { m_y1 = y2; m_y2 = y1; }
+    }
+
+    //--------------------------------------------------------------------
+    void rounded_rect::rect(double x1, double y1, double x2, double y2)
+    {
+        m_x1 = x1;
+        m_y1 = y1;
+        m_x2 = x2;
+        m_y2 = y2;
+        if(x1 > x2) { m_x1 = x2; m_x2 = x1; }
+        if(y1 > y2) { m_y1 = y2; m_y2 = y1; }
+    }
+
+    //--------------------------------------------------------------------
+    void rounded_rect::radius(double r)
+    {
+        m_rx1 = m_ry1 = m_rx2 = m_ry2 = m_rx3 = m_ry3 = m_rx4 = m_ry4 = r;
+    }
+
+    //--------------------------------------------------------------------
+    void rounded_rect::radius(double rx, double ry)
+    {
+        m_rx1 = m_rx2 = m_rx3 = m_rx4 = rx;
+        m_ry1 = m_ry2 = m_ry3 = m_ry4 = ry;
+    }
+
+    //--------------------------------------------------------------------
+    void rounded_rect::radius(double rx_bottom, double ry_bottom,
+                              double rx_top,    double ry_top)
+    {
+        m_rx1 = m_rx2 = rx_bottom;
+        m_rx3 = m_rx4 = rx_top;
+        m_ry1 = m_ry2 = ry_bottom;
+        m_ry3 = m_ry4 = ry_top;
+    }
+
+    //--------------------------------------------------------------------
+    void rounded_rect::radius(double rx1, double ry1, double rx2, double ry2,
+                              double rx3, double ry3, double rx4, double ry4)
+    {
+        m_rx1 = rx1; m_ry1 = ry1; m_rx2 = rx2; m_ry2 = ry2;
+        m_rx3 = rx3; m_ry3 = ry3; m_rx4 = rx4; m_ry4 = ry4;
+    }
+
+    //--------------------------------------------------------------------
+    void rounded_rect::normalize_radius()
+    {
+        double dx = fabs(m_y2 - m_y1);
+        double dy = fabs(m_x2 - m_x1);
+
+        double k = 1.0;
+        double t;
+        t = dx / (m_rx1 + m_rx2); if(t < k) k = t;
+        t = dx / (m_rx3 + m_rx4); if(t < k) k = t;
+        t = dy / (m_ry1 + m_ry2); if(t < k) k = t;
+        t = dy / (m_ry3 + m_ry4); if(t < k) k = t;
+
+        if(k < 1.0)
+        {
+            m_rx1 *= k; m_ry1 *= k; m_rx2 *= k; m_ry2 *= k;
+            m_rx3 *= k; m_ry3 *= k; m_rx4 *= k; m_ry4 *= k;
+        }
+    }
+
+    //--------------------------------------------------------------------
+    void rounded_rect::rewind(unsigned)
+    {
+        m_status = 0;
+    }
+
+    //--------------------------------------------------------------------
+    unsigned rounded_rect::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_stop;
+        switch(m_status)
+        {
+        case 0:
+            m_arc.init(m_x1 + m_rx1, m_y1 + m_ry1, m_rx1, m_ry1,
+                       pi, pi+pi*0.5);
+            m_arc.rewind(0);
+            m_status++;
+
+        case 1:
+            cmd = m_arc.vertex(x, y);
+            if(is_stop(cmd)) m_status++;
+            else return cmd;
+
+        case 2:
+            m_arc.init(m_x2 - m_rx2, m_y1 + m_ry2, m_rx2, m_ry2,
+                       pi+pi*0.5, 0.0);
+            m_arc.rewind(0);
+            m_status++;
+
+        case 3:
+            cmd = m_arc.vertex(x, y);
+            if(is_stop(cmd)) m_status++;
+            else return path_cmd_line_to;
+
+        case 4:
+            m_arc.init(m_x2 - m_rx3, m_y2 - m_ry3, m_rx3, m_ry3,
+                       0.0, pi*0.5);
+            m_arc.rewind(0);
+            m_status++;
+
+        case 5:
+            cmd = m_arc.vertex(x, y);
+            if(is_stop(cmd)) m_status++;
+            else return path_cmd_line_to;
+
+        case 6:
+            m_arc.init(m_x1 + m_rx4, m_y2 - m_ry4, m_rx4, m_ry4,
+                       pi*0.5, pi);
+            m_arc.rewind(0);
+            m_status++;
+
+        case 7:
+            cmd = m_arc.vertex(x, y);
+            if(is_stop(cmd)) m_status++;
+            else return path_cmd_line_to;
+
+        case 8:
+            cmd = (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw;
+            m_status++;
+            break;
+        }
+        return cmd;
+    }
+
+
+}
+
diff --git a/agg/source/agg_sqrt_tables.cpp b/agg/source/agg_sqrt_tables.cpp
new file mode 100755
index 000000000000..e2f88f5a7fef
--- /dev/null
+++ b/agg/source/agg_sqrt_tables.cpp
@@ -0,0 +1,115 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// static tables for fast integer sqrt
+//
+//----------------------------------------------------------------------------
+
+#include "agg_basics.h"
+
+namespace agg
+{
+    int16u g_sqrt_table[1024] =
+    {
+        0,
+        2048,2896,3547,4096,4579,5017,5418,5793,6144,6476,6792,7094,7384,7663,7932,8192,8444,
+        8689,8927,9159,9385,9606,9822,10033,10240,10443,10642,10837,11029,11217,11403,11585,
+        11765,11942,12116,12288,12457,12625,12790,12953,13114,13273,13430,13585,13738,13890,
+        14040,14189,14336,14482,14626,14768,14910,15050,15188,15326,15462,15597,15731,15864,
+        15995,16126,16255,16384,16512,16638,16764,16888,17012,17135,17257,17378,17498,17618,
+        17736,17854,17971,18087,18203,18318,18432,18545,18658,18770,18882,18992,19102,19212,
+        19321,19429,19537,19644,19750,19856,19961,20066,20170,20274,20377,20480,20582,20684,
+        20785,20886,20986,21085,21185,21283,21382,21480,21577,21674,21771,21867,21962,22058,
+        22153,22247,22341,22435,22528,22621,22713,22806,22897,22989,23080,23170,23261,23351,
+        23440,23530,23619,23707,23796,23884,23971,24059,24146,24232,24319,24405,24491,24576,
+        24661,24746,24831,24915,24999,25083,25166,25249,25332,25415,25497,25580,25661,25743,
+        25824,25905,25986,26067,26147,26227,26307,26387,26466,26545,26624,26703,26781,26859,
+        26937,27015,27092,27170,27247,27324,27400,27477,27553,27629,27705,27780,27856,27931,
+        28006,28081,28155,28230,28304,28378,28452,28525,28599,28672,28745,28818,28891,28963,
+        29035,29108,29180,29251,29323,29394,29466,29537,29608,29678,29749,29819,29890,29960,
+        30030,30099,30169,30238,30308,30377,30446,30515,30583,30652,30720,30788,30856,30924,
+        30992,31059,31127,31194,31261,31328,31395,31462,31529,31595,31661,31727,31794,31859,
+        31925,31991,32056,32122,32187,32252,32317,32382,32446,32511,32575,32640,32704,32768,
+        32832,32896,32959,33023,33086,33150,33213,33276,33339,33402,33465,33527,33590,33652,
+        33714,33776,33839,33900,33962,34024,34086,34147,34208,34270,34331,34392,34453,34514,
+        34574,34635,34695,34756,34816,34876,34936,34996,35056,35116,35176,35235,35295,35354,
+        35413,35472,35531,35590,35649,35708,35767,35825,35884,35942,36001,36059,36117,36175,
+        36233,36291,36348,36406,36464,36521,36578,36636,36693,36750,36807,36864,36921,36978,
+        37034,37091,37147,37204,37260,37316,37372,37429,37485,37540,37596,37652,37708,37763,
+        37819,37874,37929,37985,38040,38095,38150,38205,38260,38315,38369,38424,38478,38533,
+        38587,38642,38696,38750,38804,38858,38912,38966,39020,39073,39127,39181,39234,39287,
+        39341,39394,39447,39500,39553,39606,39659,39712,39765,39818,39870,39923,39975,40028,
+        40080,40132,40185,40237,40289,40341,40393,40445,40497,40548,40600,40652,40703,40755,
+        40806,40857,40909,40960,41011,41062,41113,41164,41215,41266,41317,41368,41418,41469,
+        41519,41570,41620,41671,41721,41771,41821,41871,41922,41972,42021,42071,42121,42171,
+        42221,42270,42320,42369,42419,42468,42518,42567,42616,42665,42714,42763,42813,42861,
+        42910,42959,43008,43057,43105,43154,43203,43251,43300,43348,43396,43445,43493,43541,
+        43589,43637,43685,43733,43781,43829,43877,43925,43972,44020,44068,44115,44163,44210,
+        44258,44305,44352,44400,44447,44494,44541,44588,44635,44682,44729,44776,44823,44869,
+        44916,44963,45009,45056,45103,45149,45195,45242,45288,45334,45381,45427,45473,45519,
+        45565,45611,45657,45703,45749,45795,45840,45886,45932,45977,46023,46069,46114,46160,
+        46205,46250,46296,46341,46386,46431,46477,46522,46567,46612,46657,46702,46746,46791,
+        46836,46881,46926,46970,47015,47059,47104,47149,47193,47237,47282,47326,47370,47415,
+        47459,47503,47547,47591,47635,47679,47723,47767,47811,47855,47899,47942,47986,48030,
+        48074,48117,48161,48204,48248,48291,48335,48378,48421,48465,48508,48551,48594,48637,
+        48680,48723,48766,48809,48852,48895,48938,48981,49024,49067,49109,49152,49195,49237,
+        49280,49322,49365,49407,49450,49492,49535,49577,49619,49661,49704,49746,49788,49830,
+        49872,49914,49956,49998,50040,50082,50124,50166,50207,50249,50291,50332,50374,50416,
+        50457,50499,50540,50582,50623,50665,50706,50747,50789,50830,50871,50912,50954,50995,
+        51036,51077,51118,51159,51200,51241,51282,51323,51364,51404,51445,51486,51527,51567,
+        51608,51649,51689,51730,51770,51811,51851,51892,51932,51972,52013,52053,52093,52134,
+        52174,52214,52254,52294,52334,52374,52414,52454,52494,52534,52574,52614,52654,52694,
+        52734,52773,52813,52853,52892,52932,52972,53011,53051,53090,53130,53169,53209,53248,
+        53287,53327,53366,53405,53445,53484,53523,53562,53601,53640,53679,53719,53758,53797,
+        53836,53874,53913,53952,53991,54030,54069,54108,54146,54185,54224,54262,54301,54340,
+        54378,54417,54455,54494,54532,54571,54609,54647,54686,54724,54762,54801,54839,54877,
+        54915,54954,54992,55030,55068,55106,55144,55182,55220,55258,55296,55334,55372,55410,
+        55447,55485,55523,55561,55599,55636,55674,55712,55749,55787,55824,55862,55900,55937,
+        55975,56012,56049,56087,56124,56162,56199,56236,56273,56311,56348,56385,56422,56459,
+        56497,56534,56571,56608,56645,56682,56719,56756,56793,56830,56867,56903,56940,56977,
+        57014,57051,57087,57124,57161,57198,57234,57271,57307,57344,57381,57417,57454,57490,
+        57527,57563,57599,57636,57672,57709,57745,57781,57817,57854,57890,57926,57962,57999,
+        58035,58071,58107,58143,58179,58215,58251,58287,58323,58359,58395,58431,58467,58503,
+        58538,58574,58610,58646,58682,58717,58753,58789,58824,58860,58896,58931,58967,59002,
+        59038,59073,59109,59144,59180,59215,59251,59286,59321,59357,59392,59427,59463,59498,
+        59533,59568,59603,59639,59674,59709,59744,59779,59814,59849,59884,59919,59954,59989,
+        60024,60059,60094,60129,60164,60199,60233,60268,60303,60338,60373,60407,60442,60477,
+        60511,60546,60581,60615,60650,60684,60719,60753,60788,60822,60857,60891,60926,60960,
+        60995,61029,61063,61098,61132,61166,61201,61235,61269,61303,61338,61372,61406,61440,
+        61474,61508,61542,61576,61610,61644,61678,61712,61746,61780,61814,61848,61882,61916,
+        61950,61984,62018,62051,62085,62119,62153,62186,62220,62254,62287,62321,62355,62388,
+        62422,62456,62489,62523,62556,62590,62623,62657,62690,62724,62757,62790,62824,62857,
+        62891,62924,62957,62991,63024,63057,63090,63124,63157,63190,63223,63256,63289,63323,
+        63356,63389,63422,63455,63488,63521,63554,63587,63620,63653,63686,63719,63752,63785,
+        63817,63850,63883,63916,63949,63982,64014,64047,64080,64113,64145,64178,64211,64243,
+        64276,64309,64341,64374,64406,64439,64471,64504,64536,64569,64601,64634,64666,64699,
+        64731,64763,64796,64828,64861,64893,64925,64957,64990,65022,65054,65086,65119,65151,
+        65183,65215,65247,65279,65312,65344,65376,65408,65440,65472,65504
+    };
+
+
+    int8 g_elder_bit_table[256] =
+    {
+        0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+        5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+        6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+        6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+        7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+        7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+        7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+        7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+    };
+
+}
diff --git a/agg/source/agg_trans_affine.cpp b/agg/source/agg_trans_affine.cpp
new file mode 100755
index 000000000000..f81050d3e42f
--- /dev/null
+++ b/agg/source/agg_trans_affine.cpp
@@ -0,0 +1,195 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Affine transformations
+//
+//----------------------------------------------------------------------------
+#include "agg_trans_affine.h"
+
+
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    const trans_affine& trans_affine::parl_to_parl(const double* src,
+                                                   const double* dst)
+    {
+        m0 = src[2] - src[0];
+        m1 = src[3] - src[1];
+        m2 = src[4] - src[0];
+        m3 = src[5] - src[1];
+        m4 = src[0];
+        m5 = src[1];
+        invert();
+        multiply(trans_affine(dst[2] - dst[0], dst[3] - dst[1],
+                              dst[4] - dst[0], dst[5] - dst[1],
+                              dst[0], dst[1]));
+        return *this;
+    }
+
+    //------------------------------------------------------------------------
+    const trans_affine& trans_affine::rect_to_parl(double x1, double y1,
+                                                   double x2, double y2,
+                                                   const double* parl)
+    {
+        double src[6];
+        src[0] = x1; src[1] = y1;
+        src[2] = x2; src[3] = y1;
+        src[4] = x2; src[5] = y2;
+        parl_to_parl(src, parl);
+        return *this;
+    }
+
+    //------------------------------------------------------------------------
+    const trans_affine& trans_affine::parl_to_rect(const double* parl,
+                                                   double x1, double y1,
+                                                   double x2, double y2)
+    {
+        double dst[6];
+        dst[0] = x1; dst[1] = y1;
+        dst[2] = x2; dst[3] = y1;
+        dst[4] = x2; dst[5] = y2;
+        parl_to_parl(parl, dst);
+        return *this;
+    }
+
+    //------------------------------------------------------------------------
+    const trans_affine& trans_affine::multiply(const trans_affine& m)
+    {
+        double t0 = m0 * m.m0 + m1 * m.m2;
+        double t2 = m2 * m.m0 + m3 * m.m2;
+        double t4 = m4 * m.m0 + m5 * m.m2 + m.m4;
+        m1 = m0 * m.m1 + m1 * m.m3;
+        m3 = m2 * m.m1 + m3 * m.m3;
+        m5 = m4 * m.m1 + m5 * m.m3 + m.m5;
+        m0 = t0;
+        m2 = t2;
+        m4 = t4;
+        return *this;
+    }
+
+
+    //------------------------------------------------------------------------
+    const trans_affine& trans_affine::invert()
+    {
+        double d  = determinant();
+
+        double t0 =  m3 * d;
+               m3 =  m0 * d;
+               m1 = -m1 * d;
+               m2 = -m2 * d;
+
+        double t4 = -m4 * t0 - m5 * m2;
+               m5 = -m4 * m1 - m5 * m3;
+
+        m0 = t0;
+        m4 = t4;
+        return *this;
+    }
+
+
+   //------------------------------------------------------------------------
+    const trans_affine& trans_affine::flip_x()
+    {
+        m0 = -m0;
+        m1 = -m1;
+        m4 = -m4;
+        return *this;
+    }
+
+    //------------------------------------------------------------------------
+    const trans_affine& trans_affine::flip_y()
+    {
+        m2 = -m2;
+        m3 = -m3;
+        m5 = -m5;
+        return *this;
+    }
+
+    //------------------------------------------------------------------------
+    const trans_affine& trans_affine::reset()
+    {
+        m0 = m3 = 1.0;
+        m1 = m2 = m4 = m5 = 0.0;
+        return *this;
+    }
+
+    //------------------------------------------------------------------------
+    inline bool is_equal_eps(double v1, double v2, double epsilon)
+    {
+        return fabs(v1 - v2) < epsilon;
+    }
+
+    //------------------------------------------------------------------------
+    bool trans_affine::is_identity(double epsilon) const
+    {
+        return is_equal_eps(m0, 1.0, epsilon) &&
+               is_equal_eps(m1, 0.0, epsilon) &&
+               is_equal_eps(m2, 0.0, epsilon) &&
+               is_equal_eps(m3, 1.0, epsilon) &&
+               is_equal_eps(m4, 0.0, epsilon) &&
+               is_equal_eps(m5, 0.0, epsilon);
+    }
+
+    //------------------------------------------------------------------------
+    bool trans_affine::is_equal(const trans_affine& m, double epsilon) const
+    {
+        return is_equal_eps(m0, m.m0, epsilon) &&
+               is_equal_eps(m1, m.m1, epsilon) &&
+               is_equal_eps(m2, m.m2, epsilon) &&
+               is_equal_eps(m3, m.m3, epsilon) &&
+               is_equal_eps(m4, m.m4, epsilon) &&
+               is_equal_eps(m5, m.m5, epsilon);
+    }
+
+    //------------------------------------------------------------------------
+    double trans_affine::rotation() const
+    {
+        double x1 = 0.0;
+        double y1 = 0.0;
+        double x2 = 1.0;
+        double y2 = 0.0;
+        transform(&x1, &y1);
+        transform(&x2, &y2);
+        return atan2(y2-y1, x2-x1);
+    }
+
+    //------------------------------------------------------------------------
+    void trans_affine::translation(double* dx, double* dy) const
+    {
+        trans_affine t(*this);
+        t *= trans_affine_rotation(-rotation());
+        t.transform(dx, dy);
+    }
+
+    //------------------------------------------------------------------------
+    void trans_affine::scaling(double* sx, double* sy) const
+    {
+        double x1 = 0.0;
+        double y1 = 0.0;
+        double x2 = 1.0;
+        double y2 = 1.0;
+        trans_affine t(*this);
+        t *= trans_affine_rotation(-rotation());
+        t.transform(&x1, &y1);
+        t.transform(&x2, &y2);
+        *sx = x2 - x1;
+        *sy = y2 - y1;
+    }
+
+
+}
+
diff --git a/agg/source/agg_trans_double_path.cpp b/agg/source/agg_trans_double_path.cpp
new file mode 100755
index 000000000000..5fc83ea50391
--- /dev/null
+++ b/agg/source/agg_trans_double_path.cpp
@@ -0,0 +1,273 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include "agg_math.h"
+#include "agg_trans_double_path.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    trans_double_path::trans_double_path() :
+        m_base_length(0.0),
+        m_base_height(1.0),
+        m_kindex1(0.0),
+        m_kindex2(0.0),
+        m_status1(initial),
+        m_status2(initial),
+        m_preserve_x_scale(true)
+    {
+    }
+
+
+        //------------------------------------------------------------------------
+    void trans_double_path::reset()
+    {
+        m_src_vertices1.remove_all();
+        m_src_vertices2.remove_all();
+        m_kindex1 = 0.0;
+        m_kindex1 = 0.0;
+        m_status1 = initial;
+        m_status2 = initial;
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_double_path::move_to1(double x, double y)
+    {
+        if(m_status1 == initial)
+        {
+            m_src_vertices1.modify_last(vertex_dist(x, y));
+            m_status1 = making_path;
+        }
+        else
+        {
+            line_to1(x, y);
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_double_path::line_to1(double x, double y)
+    {
+        if(m_status1 == making_path)
+        {
+            m_src_vertices1.add(vertex_dist(x, y));
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_double_path::move_to2(double x, double y)
+    {
+        if(m_status2 == initial)
+        {
+            m_src_vertices2.modify_last(vertex_dist(x, y));
+            m_status2 = making_path;
+        }
+        else
+        {
+            line_to2(x, y);
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_double_path::line_to2(double x, double y)
+    {
+        if(m_status2 == making_path)
+        {
+            m_src_vertices2.add(vertex_dist(x, y));
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    double trans_double_path::finalize_path(vertex_storage& vertices)
+    {
+        unsigned i;
+        double dist;
+        double d;
+
+        if(vertices.size() > 2)
+        {
+            if(vertices[vertices.size() - 2].dist * 10.0 <
+               vertices[vertices.size() - 3].dist)
+            {
+                d = vertices[vertices.size() - 3].dist +
+                    vertices[vertices.size() - 2].dist;
+
+                vertices[vertices.size() - 2] =
+                    vertices[vertices.size() - 1];
+
+                vertices.remove_last();
+                vertices[vertices.size() - 2].dist = d;
+            }
+        }
+
+        dist = 0;
+        vertices.close(false);
+        for(i = 0; i < vertices.size(); i++)
+        {
+            vertex_dist& v = vertices[i];
+            d = v.dist;
+            v.dist = dist;
+            dist += d;
+        }
+
+        return (vertices.size() - 1) / dist;
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_double_path::finalize_paths()
+    {
+        if(m_status1 == making_path && m_src_vertices1.size() > 1 &&
+           m_status2 == making_path && m_src_vertices2.size() > 1)
+        {
+            m_kindex1 = finalize_path(m_src_vertices1);
+            m_kindex2 = finalize_path(m_src_vertices2);
+            m_status1 = ready;
+            m_status2 = ready;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    double trans_double_path::total_length1() const
+    {
+        if(m_base_length >= 1e-10) return m_base_length;
+        return (m_status1 == ready) ?
+            m_src_vertices1[m_src_vertices1.size() - 1].dist :
+            0.0;
+    }
+
+
+    //------------------------------------------------------------------------
+    double trans_double_path::total_length2() const
+    {
+        if(m_base_length >= 1e-10) return m_base_length;
+        return (m_status2 == ready) ?
+            m_src_vertices2[m_src_vertices2.size() - 1].dist :
+            0.0;
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_double_path::transform1(const vertex_storage& vertices,
+                                       double kindex, double kx,
+                                       double *x, double* y) const
+    {
+        double x1 = 0.0;
+        double y1 = 0.0;
+        double dx = 1.0;
+        double dy = 1.0;
+        double d  = 0.0;
+        double dd = 1.0;
+        *x *= kx;
+        if(*x < 0.0)
+        {
+            // Extrapolation on the left
+            //--------------------------
+            x1 = vertices[0].x;
+            y1 = vertices[0].y;
+            dx = vertices[1].x - x1;
+            dy = vertices[1].y - y1;
+            dd = vertices[1].dist - vertices[0].dist;
+            d  = *x;
+        }
+        else
+        if(*x > vertices[vertices.size() - 1].dist)
+        {
+            // Extrapolation on the right
+            //--------------------------
+            unsigned i = vertices.size() - 2;
+            unsigned j = vertices.size() - 1;
+            x1 = vertices[j].x;
+            y1 = vertices[j].y;
+            dx = x1 - vertices[i].x;
+            dy = y1 - vertices[i].y;
+            dd = vertices[j].dist - vertices[i].dist;
+            d  = *x - vertices[j].dist;
+        }
+        else
+        {
+            // Interpolation
+            //--------------------------
+            unsigned i = 0;
+            unsigned j = vertices.size() - 1;
+            if(m_preserve_x_scale)
+            {
+                unsigned k;
+                for(i = 0; (j - i) > 1; )
+                {
+                    if(*x < vertices[k = (i + j) >> 1].dist)
+                    {
+                        j = k;
+                    }
+                    else
+                    {
+                        i = k;
+                    }
+                }
+                d  = vertices[i].dist;
+                dd = vertices[j].dist - d;
+                d  = *x - d;
+            }
+            else
+            {
+                i = (unsigned)floor(*x * kindex);
+                j = i + 1;
+                dd = vertices[j].dist - vertices[i].dist;
+                d = ((*x * kindex) - i) * dd;
+            }
+            x1 = vertices[i].x;
+            y1 = vertices[i].y;
+            dx = vertices[j].x - x1;
+            dy = vertices[j].y - y1;
+        }
+        *x = x1 + dx * d / dd;
+        *y = y1 + dy * d / dd;
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_double_path::transform(double *x, double *y) const
+    {
+        if(m_status1 == ready && m_status2 == ready)
+        {
+            if(m_base_length > 1e-10)
+            {
+                *x *= m_src_vertices1[m_src_vertices1.size() - 1].dist /
+                      m_base_length;
+            }
+
+            double x1 = *x;
+            double y1 = *y;
+            double x2 = *x;
+            double y2 = *y;
+            double dd = m_src_vertices2[m_src_vertices2.size() - 1].dist /
+                        m_src_vertices1[m_src_vertices1.size() - 1].dist;
+
+            transform1(m_src_vertices1, m_kindex1, 1.0, &x1, &y1);
+            transform1(m_src_vertices2, m_kindex2, dd,  &x2, &y2);
+
+            *x = x1 + *y * (x2 - x1) / m_base_height;
+            *y = y1 + *y * (y2 - y1) / m_base_height;
+        }
+    }
+
+}
+
diff --git a/agg/source/agg_trans_single_path.cpp b/agg/source/agg_trans_single_path.cpp
new file mode 100755
index 000000000000..cc4fb5356267
--- /dev/null
+++ b/agg/source/agg_trans_single_path.cpp
@@ -0,0 +1,202 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include "agg_math.h"
+#include "agg_vertex_sequence.h"
+#include "agg_trans_single_path.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    trans_single_path::trans_single_path() :
+        m_base_length(0.0),
+        m_kindex(0.0),
+        m_status(initial),
+        m_preserve_x_scale(true)
+    {
+    }
+
+    //------------------------------------------------------------------------
+    void trans_single_path::reset()
+    {
+        m_src_vertices.remove_all();
+        m_kindex = 0.0;
+        m_status = initial;
+    }
+
+    //------------------------------------------------------------------------
+    void trans_single_path::move_to(double x, double y)
+    {
+        if(m_status == initial)
+        {
+            m_src_vertices.modify_last(vertex_dist(x, y));
+            m_status = making_path;
+        }
+        else
+        {
+            line_to(x, y);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    void trans_single_path::line_to(double x, double y)
+    {
+        if(m_status == making_path)
+        {
+            m_src_vertices.add(vertex_dist(x, y));
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_single_path::finalize_path()
+    {
+        if(m_status == making_path && m_src_vertices.size() > 1)
+        {
+            unsigned i;
+            double dist;
+            double d;
+
+            if(m_src_vertices.size() > 2)
+            {
+                if(m_src_vertices[m_src_vertices.size() - 2].dist * 10.0 <
+                   m_src_vertices[m_src_vertices.size() - 3].dist)
+                {
+                    d = m_src_vertices[m_src_vertices.size() - 3].dist +
+                        m_src_vertices[m_src_vertices.size() - 2].dist;
+
+                    m_src_vertices[m_src_vertices.size() - 2] =
+                        m_src_vertices[m_src_vertices.size() - 1];
+
+                    m_src_vertices.remove_last();
+                    m_src_vertices[m_src_vertices.size() - 2].dist = d;
+                }
+            }
+
+            dist = 0.0;
+            m_src_vertices.close(false);
+            for(i = 0; i < m_src_vertices.size(); i++)
+            {
+                vertex_dist& v = m_src_vertices[i];
+                double _d = v.dist;
+                v.dist = dist;
+                dist += _d;
+            }
+            m_kindex = (m_src_vertices.size() - 1) / dist;
+            m_status = ready;
+        }
+    }
+
+
+
+    //------------------------------------------------------------------------
+    double trans_single_path::total_length() const
+    {
+        if(m_base_length >= 1e-10) return m_base_length;
+        return (m_status == ready) ?
+            m_src_vertices[m_src_vertices.size() - 1].dist :
+            0.0;
+    }
+
+
+    //------------------------------------------------------------------------
+    void trans_single_path::transform(double *x, double *y) const
+    {
+        if(m_status == ready)
+        {
+            if(m_base_length > 1e-10)
+            {
+                *x *= m_src_vertices[m_src_vertices.size() - 1].dist /
+                      m_base_length;
+            }
+
+            double x1 = 0.0;
+            double y1 = 0.0;
+            double dx = 1.0;
+            double dy = 1.0;
+            double d  = 0.0;
+            double dd = 1.0;
+            if(*x < 0.0)
+            {
+                // Extrapolation on the left
+                //--------------------------
+                x1 = m_src_vertices[0].x;
+                y1 = m_src_vertices[0].y;
+                dx = m_src_vertices[1].x - x1;
+                dy = m_src_vertices[1].y - y1;
+                dd = m_src_vertices[1].dist - m_src_vertices[0].dist;
+                d  = *x;
+            }
+            else
+            if(*x > m_src_vertices[m_src_vertices.size() - 1].dist)
+            {
+                // Extrapolation on the right
+                //--------------------------
+                unsigned i = m_src_vertices.size() - 2;
+                unsigned j = m_src_vertices.size() - 1;
+                x1 = m_src_vertices[j].x;
+                y1 = m_src_vertices[j].y;
+                dx = x1 - m_src_vertices[i].x;
+                dy = y1 - m_src_vertices[i].y;
+                dd = m_src_vertices[j].dist - m_src_vertices[i].dist;
+                d  = *x - m_src_vertices[j].dist;
+            }
+            else
+            {
+                // Interpolation
+                //--------------------------
+                unsigned i = 0;
+                unsigned j = m_src_vertices.size() - 1;
+                if(m_preserve_x_scale)
+                {
+                    unsigned k;
+                    for(i = 0; (j - i) > 1; )
+                    {
+                        if(*x < m_src_vertices[k = (i + j) >> 1].dist)
+                        {
+                            j = k;
+                        }
+                        else
+                        {
+                            i = k;
+                        }
+                    }
+                    d  = m_src_vertices[i].dist;
+                    dd = m_src_vertices[j].dist - d;
+                    d  = *x - d;
+                }
+                else
+                {
+                    i = (unsigned)floor(*x * m_kindex);
+                    j = i + 1;
+                    dd = m_src_vertices[j].dist - m_src_vertices[i].dist;
+                    d = ((*x * m_kindex) - i) * dd;
+                }
+                x1 = m_src_vertices[i].x;
+                y1 = m_src_vertices[i].y;
+                dx = m_src_vertices[j].x - x1;
+                dy = m_src_vertices[j].y - y1;
+            }
+            double x2 = x1 + dx * d / dd;
+            double y2 = y1 + dy * d / dd;
+            *x = x2 - *y * dy / dd;
+            *y = y2 + *y * dx / dd;
+        }
+    }
+
+
+}
+
diff --git a/agg/source/agg_trans_warp_magnifier.cpp b/agg/source/agg_trans_warp_magnifier.cpp
new file mode 100755
index 000000000000..4f9d28233907
--- /dev/null
+++ b/agg/source/agg_trans_warp_magnifier.cpp
@@ -0,0 +1,50 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_trans_warp_magnifier.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    void trans_warp_magnifier::transform(double* x, double* y) const
+    {
+        double dx = *x - m_xc;
+        double dy = *y - m_yc;
+        double r = sqrt(dx * dx + dy * dy);
+        if(r < m_radius)
+        {
+            *x = m_xc + dx * m_magn;
+            *y = m_yc + dy * m_magn;
+            return;
+        }
+
+        double m = (r + m_radius * (m_magn - 1.0)) / r;
+        *x = m_xc + dx * m;
+        *y = m_yc + dy * m;
+    }
+
+    //------------------------------------------------------------------------
+    void trans_warp_magnifier::inverse_transform(double* x, double* y) const
+    {
+        trans_warp_magnifier t(*this);
+        t.magnification(1.0 / m_magn);
+        t.radius(m_radius * m_magn);
+        t.transform(x, y);
+    }
+
+
+}
diff --git a/agg/source/agg_vcgen_bspline.cpp b/agg/source/agg_vcgen_bspline.cpp
new file mode 100755
index 000000000000..9ca4df9b44f4
--- /dev/null
+++ b/agg/source/agg_vcgen_bspline.cpp
@@ -0,0 +1,194 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include "agg_vcgen_bspline.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    vcgen_bspline::vcgen_bspline() :
+        m_src_vertices(),
+        m_spline_x(),
+        m_spline_y(),
+        m_interpolation_step(1.0/50.0),
+        m_closed(0),
+        m_status(initial),
+        m_src_vertex(0)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_bspline::remove_all()
+    {
+        m_src_vertices.remove_all();
+        m_closed = 0;
+        m_status = initial;
+        m_src_vertex = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_bspline::add_vertex(double x, double y, unsigned cmd)
+    {
+        m_status = initial;
+        if(is_move_to(cmd))
+        {
+            m_src_vertices.modify_last(point_type(x, y));
+        }
+        else
+        {
+            if(is_vertex(cmd))
+            {
+                m_src_vertices.add(point_type(x, y));
+            }
+            else
+            {
+                m_closed = get_close_flag(cmd);
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_bspline::rewind(unsigned)
+    {
+        m_cur_abscissa = 0.0;
+        m_max_abscissa = 0.0;
+        m_src_vertex = 0;
+        if(m_status == initial && m_src_vertices.size() > 2)
+        {
+            if(m_closed)
+            {
+                m_spline_x.init(m_src_vertices.size() + 8);
+                m_spline_y.init(m_src_vertices.size() + 8);
+                m_spline_x.add_point(0.0, m_src_vertices.prev(m_src_vertices.size() - 3).x);
+                m_spline_y.add_point(0.0, m_src_vertices.prev(m_src_vertices.size() - 3).y);
+                m_spline_x.add_point(1.0, m_src_vertices[m_src_vertices.size() - 3].x);
+                m_spline_y.add_point(1.0, m_src_vertices[m_src_vertices.size() - 3].y);
+                m_spline_x.add_point(2.0, m_src_vertices[m_src_vertices.size() - 2].x);
+                m_spline_y.add_point(2.0, m_src_vertices[m_src_vertices.size() - 2].y);
+                m_spline_x.add_point(3.0, m_src_vertices[m_src_vertices.size() - 1].x);
+                m_spline_y.add_point(3.0, m_src_vertices[m_src_vertices.size() - 1].y);
+            }
+            else
+            {
+                m_spline_x.init(m_src_vertices.size());
+                m_spline_y.init(m_src_vertices.size());
+            }
+            unsigned i;
+            for(i = 0; i < m_src_vertices.size(); i++)
+            {
+                double x = m_closed ? i + 4 : i;
+                m_spline_x.add_point(x, m_src_vertices[i].x);
+                m_spline_y.add_point(x, m_src_vertices[i].y);
+            }
+            m_cur_abscissa = 0.0;
+            m_max_abscissa = m_src_vertices.size() - 1;
+            if(m_closed)
+            {
+                m_cur_abscissa = 4.0;
+                m_max_abscissa += 5.0;
+                m_spline_x.add_point(m_src_vertices.size() + 4, m_src_vertices[0].x);
+                m_spline_y.add_point(m_src_vertices.size() + 4, m_src_vertices[0].y);
+                m_spline_x.add_point(m_src_vertices.size() + 5, m_src_vertices[1].x);
+                m_spline_y.add_point(m_src_vertices.size() + 5, m_src_vertices[1].y);
+                m_spline_x.add_point(m_src_vertices.size() + 6, m_src_vertices[2].x);
+                m_spline_y.add_point(m_src_vertices.size() + 6, m_src_vertices[2].y);
+                m_spline_x.add_point(m_src_vertices.size() + 7, m_src_vertices.next(2).x);
+                m_spline_y.add_point(m_src_vertices.size() + 7, m_src_vertices.next(2).y);
+            }
+            m_spline_x.prepare();
+            m_spline_y.prepare();
+            m_status = ready;
+        }
+    }
+
+
+
+
+
+
+    //------------------------------------------------------------------------
+    unsigned vcgen_bspline::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_line_to;
+        while(!is_stop(cmd))
+        {
+            switch(m_status)
+            {
+            case initial:
+                rewind(0);
+
+            case ready:
+                if(m_src_vertices.size() < 2)
+                {
+                    cmd = path_cmd_stop;
+                    break;
+                }
+
+                if(m_src_vertices.size() == 2)
+                {
+                    *x = m_src_vertices[m_src_vertex].x;
+                    *y = m_src_vertices[m_src_vertex].y;
+                    m_src_vertex++;
+                    if(m_src_vertex == 1) return path_cmd_move_to;
+                    if(m_src_vertex == 2) return path_cmd_line_to;
+                    cmd = path_cmd_stop;
+                    break;
+                }
+
+                cmd = path_cmd_move_to;
+                m_status = polygon;
+                m_src_vertex = 0;
+
+            case polygon:
+                if(m_cur_abscissa >= m_max_abscissa)
+                {
+                    if(m_closed)
+                    {
+                        m_status = end_poly;
+                        break;
+                    }
+                    else
+                    {
+                        *x = m_src_vertices[m_src_vertices.size() - 1].x;
+                        *y = m_src_vertices[m_src_vertices.size() - 1].y;
+                        m_status = end_poly;
+                        return path_cmd_line_to;
+                    }
+                }
+
+                *x = m_spline_x.get_stateful(m_cur_abscissa);
+                *y = m_spline_y.get_stateful(m_cur_abscissa);
+                m_src_vertex++;
+                m_cur_abscissa += m_interpolation_step;
+                return (m_src_vertex == 1) ? path_cmd_move_to : path_cmd_line_to;
+
+            case end_poly:
+                m_status = stop;
+                return path_cmd_end_poly | m_closed;
+
+            case stop:
+                return path_cmd_stop;
+            }
+        }
+        return cmd;
+    }
+
+
+}
+
diff --git a/agg/source/agg_vcgen_contour.cpp b/agg/source/agg_vcgen_contour.cpp
new file mode 100755
index 000000000000..979407417e75
--- /dev/null
+++ b/agg/source/agg_vcgen_contour.cpp
@@ -0,0 +1,191 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Contour generator
+//
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_vcgen_contour.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    vcgen_contour::vcgen_contour() :
+        m_src_vertices(),
+        m_out_vertices(),
+        m_width(1.0),
+        m_line_join(bevel_join),
+        m_inner_line_join(miter_join_revert),
+        m_approx_scale(1.0),
+        m_abs_width(1.0),
+        m_signed_width(1.0),
+        m_miter_limit(4.0),
+        m_inner_miter_limit(1.0 + 1.0/64.0),
+        m_status(initial),
+        m_src_vertex(0),
+        m_closed(0),
+        m_orientation(0),
+        m_auto_detect(false)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_contour::remove_all()
+    {
+        m_src_vertices.remove_all();
+        m_closed = 0;
+        m_orientation = 0;
+        m_abs_width = fabs(m_width);
+        m_signed_width = m_width;
+        m_status = initial;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_contour::miter_limit_theta(double t)
+    {
+        m_miter_limit = 1.0 / sin(t * 0.5) ;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_contour::add_vertex(double x, double y, unsigned cmd)
+    {
+        m_status = initial;
+        if(is_move_to(cmd))
+        {
+            m_src_vertices.modify_last(vertex_dist(x, y));
+        }
+        else
+        {
+            if(is_vertex(cmd))
+            {
+                m_src_vertices.add(vertex_dist(x, y));
+            }
+            else
+            {
+                if(is_end_poly(cmd))
+                {
+                    m_closed = get_close_flag(cmd);
+                    if(m_orientation == path_flags_none)
+                    {
+                        m_orientation = get_orientation(cmd);
+                    }
+                }
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_contour::rewind(unsigned)
+    {
+        if(m_status == initial)
+        {
+            m_src_vertices.close(true);
+            m_signed_width = m_width;
+            if(m_auto_detect)
+            {
+                if(!is_oriented(m_orientation))
+                {
+                    m_orientation = (calc_polygon_area(m_src_vertices) > 0.0) ?
+                                    path_flags_ccw :
+                                    path_flags_cw;
+                }
+            }
+            if(is_oriented(m_orientation))
+            {
+                m_signed_width = is_ccw(m_orientation) ? m_width : -m_width;
+            }
+        }
+        m_status = ready;
+        m_src_vertex = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned vcgen_contour::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_line_to;
+        while(!is_stop(cmd))
+        {
+            switch(m_status)
+            {
+            case initial:
+                rewind(0);
+
+            case ready:
+                if(m_src_vertices.size() < 2 + unsigned(m_closed != 0))
+                {
+                    cmd = path_cmd_stop;
+                    break;
+                }
+                m_status = outline;
+                cmd = path_cmd_move_to;
+                m_src_vertex = 0;
+                m_out_vertex = 0;
+
+            case outline:
+                if(m_src_vertex >= m_src_vertices.size())
+                {
+                    m_status = end_poly;
+                    break;
+                }
+                stroke_calc_join(m_out_vertices,
+                                 m_src_vertices.prev(m_src_vertex),
+                                 m_src_vertices.curr(m_src_vertex),
+                                 m_src_vertices.next(m_src_vertex),
+                                 m_src_vertices.prev(m_src_vertex).dist,
+                                 m_src_vertices.curr(m_src_vertex).dist,
+                                 m_signed_width,
+                                 m_line_join,
+                                 m_inner_line_join,
+                                 m_miter_limit,
+                                 m_inner_miter_limit,
+                                 m_approx_scale);
+                ++m_src_vertex;
+                m_status = out_vertices;
+                m_out_vertex = 0;
+
+            case out_vertices:
+                if(m_out_vertex >= m_out_vertices.size())
+                {
+                    m_status = outline;
+                }
+                else
+                {
+                    const point_type& c = m_out_vertices[m_out_vertex++];
+                    *x = c.x;
+                    *y = c.y;
+                    return cmd;
+                }
+                break;
+
+            case end_poly:
+                if(!m_closed) return path_cmd_stop;
+                m_status = stop;
+                return (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw;
+
+            case stop:
+                return path_cmd_stop;
+            }
+        }
+        return cmd;
+    }
+
+}
diff --git a/agg/source/agg_vcgen_dash.cpp b/agg/source/agg_vcgen_dash.cpp
new file mode 100755
index 000000000000..96783abe9952
--- /dev/null
+++ b/agg/source/agg_vcgen_dash.cpp
@@ -0,0 +1,237 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Line dash generator
+//
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_vcgen_dash.h"
+#include "agg_shorten_path.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    vcgen_dash::vcgen_dash() :
+        m_total_dash_len(0.0),
+        m_num_dashes(0),
+        m_dash_start(0.0),
+        m_shorten(0.0),
+        m_curr_dash_start(0.0),
+        m_curr_dash(0),
+        m_src_vertices(),
+        m_closed(0),
+        m_status(initial),
+        m_src_vertex(0)
+    {
+    }
+
+
+
+    //------------------------------------------------------------------------
+    void vcgen_dash::remove_all_dashes()
+    {
+        m_total_dash_len = 0.0;
+        m_num_dashes = 0;
+        m_curr_dash_start = 0.0;
+        m_curr_dash = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_dash::add_dash(double dash_len, double gap_len)
+    {
+        if(m_num_dashes < max_dashes)
+        {
+            m_total_dash_len += dash_len + gap_len;
+            m_dashes[m_num_dashes++] = dash_len;
+            m_dashes[m_num_dashes++] = gap_len;
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_dash::dash_start(double ds)
+    {
+        m_dash_start = ds;
+        calc_dash_start(fabs(ds));
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_dash::calc_dash_start(double ds)
+    {
+        m_curr_dash = 0;
+        m_curr_dash_start = 0.0;
+        while(ds > 0.0)
+        {
+            if(ds > m_dashes[m_curr_dash])
+            {
+                ds -= m_dashes[m_curr_dash];
+                ++m_curr_dash;
+                m_curr_dash_start = 0.0;
+                if(m_curr_dash >= m_num_dashes) m_curr_dash = 0;
+            }
+            else
+            {
+                m_curr_dash_start = ds;
+                ds = 0.0;
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_dash::remove_all()
+    {
+        m_status = initial;
+        m_src_vertices.remove_all();
+        m_closed = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_dash::add_vertex(double x, double y, unsigned cmd)
+    {
+        m_status = initial;
+        if(is_move_to(cmd))
+        {
+            m_src_vertices.modify_last(vertex_dist(x, y));
+        }
+        else
+        {
+            if(is_vertex(cmd))
+            {
+                m_src_vertices.add(vertex_dist(x, y));
+            }
+            else
+            {
+                m_closed = get_close_flag(cmd);
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_dash::rewind(unsigned)
+    {
+        if(m_status == initial)
+        {
+            m_src_vertices.close(m_closed != 0);
+            shorten_path(m_src_vertices, m_shorten, m_closed);
+        }
+        m_status = ready;
+        m_src_vertex = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned vcgen_dash::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_move_to;
+        while(!is_stop(cmd))
+        {
+            switch(m_status)
+            {
+            case initial:
+                rewind(0);
+
+            case ready:
+                if(m_num_dashes < 2 || m_src_vertices.size() < 2)
+                {
+                    cmd = path_cmd_stop;
+                    break;
+                }
+                m_status = polyline;
+                m_src_vertex = 1;
+                m_v1 = &m_src_vertices[0];
+                m_v2 = &m_src_vertices[1];
+                m_curr_rest = m_v1->dist;
+                *x = m_v1->x;
+                *y = m_v1->y;
+                if(m_dash_start >= 0.0) calc_dash_start(m_dash_start);
+                return path_cmd_move_to;
+
+            case polyline:
+                {
+                    double dash_rest = m_dashes[m_curr_dash] - m_curr_dash_start;
+
+                    unsigned _cmd = (m_curr_dash & 1) ?
+                                   path_cmd_move_to :
+                                   path_cmd_line_to;
+
+                    if(m_curr_rest > dash_rest)
+                    {
+                        m_curr_rest -= dash_rest;
+                        ++m_curr_dash;
+                        if(m_curr_dash >= m_num_dashes) m_curr_dash = 0;
+                        m_curr_dash_start = 0.0;
+                        *x = m_v2->x - (m_v2->x - m_v1->x) * m_curr_rest / m_v1->dist;
+                        *y = m_v2->y - (m_v2->y - m_v1->y) * m_curr_rest / m_v1->dist;
+                    }
+                    else
+                    {
+                        m_curr_dash_start += m_curr_rest;
+                        *x = m_v2->x;
+                        *y = m_v2->y;
+                        ++m_src_vertex;
+                        m_v1 = m_v2;
+                        m_curr_rest = m_v1->dist;
+                        if(m_closed)
+                        {
+                            if(m_src_vertex > m_src_vertices.size())
+                            {
+                                m_status = stop;
+                            }
+                            else
+                            {
+                                m_v2 = &m_src_vertices
+                                [
+                                    (m_src_vertex >= m_src_vertices.size()) ? 0 :
+                                    m_src_vertex
+                                ];
+                            }
+                        }
+                        else
+                        {
+                            if(m_src_vertex >= m_src_vertices.size())
+                            {
+                                m_status = stop;
+                            }
+                            else
+                            {
+                                m_v2 = &m_src_vertices[m_src_vertex];
+                            }
+                        }
+                    }
+                    return _cmd;
+                }
+
+                // statement unreachable
+                //break;
+
+            case stop:
+                cmd = path_cmd_stop;
+                break;
+            }
+
+        }
+        return path_cmd_stop;
+    }
+
+
+}
+
diff --git a/agg/source/agg_vcgen_markers_term.cpp b/agg/source/agg_vcgen_markers_term.cpp
new file mode 100755
index 000000000000..0daa40793764
--- /dev/null
+++ b/agg/source/agg_vcgen_markers_term.cpp
@@ -0,0 +1,103 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Terminal markers generator (arrowhead/arrowtail)
+//
+//----------------------------------------------------------------------------
+
+#include "agg_vcgen_markers_term.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    void vcgen_markers_term::remove_all()
+    {
+        m_markers.remove_all();
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_markers_term::add_vertex(double x, double y, unsigned cmd)
+    {
+        if(is_move_to(cmd))
+        {
+            if(m_markers.size() & 1)
+            {
+                // Initial state, the first coordinate was added.
+                // If two of more calls of start_vertex() occures
+                // we just modify the last one.
+                m_markers.modify_last(coord_type(x, y));
+            }
+            else
+            {
+                m_markers.add(coord_type(x, y));
+            }
+        }
+        else
+        {
+            if(is_vertex(cmd))
+            {
+                if(m_markers.size() & 1)
+                {
+                    // Initial state, the first coordinate was added.
+                    // Add three more points, 0,1,1,0
+                    m_markers.add(coord_type(x, y));
+                    m_markers.add(m_markers[m_markers.size() - 1]);
+                    m_markers.add(m_markers[m_markers.size() - 3]);
+                }
+                else
+                {
+                    if(m_markers.size())
+                    {
+                        // Replace two last points: 0,1,1,0 -> 0,1,2,1
+                        m_markers[m_markers.size() - 1] = m_markers[m_markers.size() - 2];
+                        m_markers[m_markers.size() - 2] = coord_type(x, y);
+                    }
+                }
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_markers_term::rewind(unsigned id)
+    {
+        m_curr_id = id * 2;
+        m_curr_idx = m_curr_id;
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned vcgen_markers_term::vertex(double* x, double* y)
+    {
+        if(m_curr_id > 2 || m_curr_idx >= m_markers.size())
+        {
+            return path_cmd_stop;
+        }
+        const coord_type& c = m_markers[m_curr_idx];
+        *x = c.x;
+        *y = c.y;
+        if(m_curr_idx & 1)
+        {
+            m_curr_idx += 3;
+            return path_cmd_line_to;
+        }
+        ++m_curr_idx;
+        return path_cmd_move_to;
+    }
+
+
+}
diff --git a/agg/source/agg_vcgen_smooth_poly1.cpp b/agg/source/agg_vcgen_smooth_poly1.cpp
new file mode 100755
index 000000000000..1df1edb5c72c
--- /dev/null
+++ b/agg/source/agg_vcgen_smooth_poly1.cpp
@@ -0,0 +1,226 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Smooth polygon generator
+//
+//----------------------------------------------------------------------------
+
+#include "agg_vcgen_smooth_poly1.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    vcgen_smooth_poly1::vcgen_smooth_poly1() :
+        m_src_vertices(),
+        m_smooth_value(0.5),
+        m_closed(0),
+        m_status(initial),
+        m_src_vertex(0)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_smooth_poly1::remove_all()
+    {
+        m_src_vertices.remove_all();
+        m_closed = 0;
+        m_status = initial;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_smooth_poly1::add_vertex(double x, double y, unsigned cmd)
+    {
+        m_status = initial;
+        if(is_move_to(cmd))
+        {
+            m_src_vertices.modify_last(vertex_dist(x, y));
+        }
+        else
+        {
+            if(is_vertex(cmd))
+            {
+                m_src_vertices.add(vertex_dist(x, y));
+            }
+            else
+            {
+                m_closed = get_close_flag(cmd);
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_smooth_poly1::rewind(unsigned)
+    {
+        if(m_status == initial)
+        {
+            m_src_vertices.close(m_closed != 0);
+        }
+        m_status = ready;
+        m_src_vertex = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_smooth_poly1::calculate(const vertex_dist& v0,
+                                       const vertex_dist& v1,
+                                       const vertex_dist& v2,
+                                       const vertex_dist& v3)
+    {
+
+        double k1 = v0.dist / (v0.dist + v1.dist);
+        double k2 = v1.dist / (v1.dist + v2.dist);
+
+        double xm1 = v0.x + (v2.x - v0.x) * k1;
+        double ym1 = v0.y + (v2.y - v0.y) * k1;
+        double xm2 = v1.x + (v3.x - v1.x) * k2;
+        double ym2 = v1.y + (v3.y - v1.y) * k2;
+
+        m_ctrl1_x = v1.x + m_smooth_value * (v2.x - xm1);
+        m_ctrl1_y = v1.y + m_smooth_value * (v2.y - ym1);
+        m_ctrl2_x = v2.x + m_smooth_value * (v1.x - xm2);
+        m_ctrl2_y = v2.y + m_smooth_value * (v1.y - ym2);
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned vcgen_smooth_poly1::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_line_to;
+        while(!is_stop(cmd))
+        {
+            switch(m_status)
+            {
+            case initial:
+                rewind(0);
+
+            case ready:
+                if(m_src_vertices.size() <  2)
+                {
+                    cmd = path_cmd_stop;
+                    break;
+                }
+
+                if(m_src_vertices.size() == 2)
+                {
+                    *x = m_src_vertices[m_src_vertex].x;
+                    *y = m_src_vertices[m_src_vertex].y;
+                    m_src_vertex++;
+                    if(m_src_vertex == 1) return path_cmd_move_to;
+                    if(m_src_vertex == 2) return path_cmd_line_to;
+                    cmd = path_cmd_stop;
+                    break;
+                }
+
+                cmd = path_cmd_move_to;
+                m_status = polygon;
+                m_src_vertex = 0;
+
+            case polygon:
+                if(m_closed)
+                {
+                    if(m_src_vertex >= m_src_vertices.size())
+                    {
+                        *x = m_src_vertices[0].x;
+                        *y = m_src_vertices[0].y;
+                        m_status = end_poly;
+                        return path_cmd_curve4;
+                    }
+                }
+                else
+                {
+                    if(m_src_vertex >= m_src_vertices.size() - 1)
+                    {
+                        *x = m_src_vertices[m_src_vertices.size() - 1].x;
+                        *y = m_src_vertices[m_src_vertices.size() - 1].y;
+                        m_status = end_poly;
+                        return path_cmd_curve3;
+                    }
+                }
+
+                calculate(m_src_vertices.prev(m_src_vertex),
+                          m_src_vertices.curr(m_src_vertex),
+                          m_src_vertices.next(m_src_vertex),
+                          m_src_vertices.next(m_src_vertex + 1));
+
+                *x = m_src_vertices[m_src_vertex].x;
+                *y = m_src_vertices[m_src_vertex].y;
+                m_src_vertex++;
+
+                if(m_closed)
+                {
+                    m_status = ctrl1;
+                    return ((m_src_vertex == 1) ?
+                             path_cmd_move_to :
+                             path_cmd_curve4);
+                }
+                else
+                {
+                    if(m_src_vertex == 1)
+                    {
+                        m_status = ctrl_b;
+                        return path_cmd_move_to;
+                    }
+                    if(m_src_vertex >= m_src_vertices.size() - 1)
+                    {
+                        m_status = ctrl_e;
+                        return path_cmd_curve3;
+                    }
+                    m_status = ctrl1;
+                    return path_cmd_curve4;
+                }
+                // statement unreachable
+                //break;
+
+            case ctrl_b:
+                *x = m_ctrl2_x;
+                *y = m_ctrl2_y;
+                m_status = polygon;
+                return path_cmd_curve3;
+
+            case ctrl_e:
+                *x = m_ctrl1_x;
+                *y = m_ctrl1_y;
+                m_status = polygon;
+                return path_cmd_curve3;
+
+            case ctrl1:
+                *x = m_ctrl1_x;
+                *y = m_ctrl1_y;
+                m_status = ctrl2;
+                return path_cmd_curve4;
+
+            case ctrl2:
+                *x = m_ctrl2_x;
+                *y = m_ctrl2_y;
+                m_status = polygon;
+                return path_cmd_curve4;
+
+            case end_poly:
+                m_status = stop;
+                return path_cmd_end_poly | m_closed;
+
+            case stop:
+                return path_cmd_stop;
+            }
+        }
+        return cmd;
+    }
+
+}
+
diff --git a/agg/source/agg_vcgen_stroke.cpp b/agg/source/agg_vcgen_stroke.cpp
new file mode 100755
index 000000000000..a8a4481ec25b
--- /dev/null
+++ b/agg/source/agg_vcgen_stroke.cpp
@@ -0,0 +1,246 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+//
+// Stroke generator
+//
+//----------------------------------------------------------------------------
+#include <math.h>
+#include "agg_vcgen_stroke.h"
+#include "agg_shorten_path.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    vcgen_stroke::vcgen_stroke() :
+        m_src_vertices(),
+        m_out_vertices(),
+        m_width(0.5),
+        m_miter_limit(4.0),
+        m_inner_miter_limit(1.0 + 1.0/64.0),
+        m_approx_scale(1.0),
+        m_shorten(0.0),
+        m_line_cap(butt_cap),
+        m_line_join(miter_join),
+        m_inner_line_join(miter_join_revert),
+        m_closed(0),
+        m_status(initial),
+        m_src_vertex(0),
+        m_out_vertex(0)
+    {
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_stroke::miter_limit_theta(double t)
+    {
+        m_miter_limit = 1.0 / sin(t * 0.5) ;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_stroke::remove_all()
+    {
+        m_src_vertices.remove_all();
+        m_closed = 0;
+        m_status = initial;
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_stroke::add_vertex(double x, double y, unsigned cmd)
+    {
+        m_status = initial;
+        if(is_move_to(cmd))
+        {
+            m_src_vertices.modify_last(vertex_dist(x, y));
+        }
+        else
+        {
+            if(is_vertex(cmd))
+            {
+                m_src_vertices.add(vertex_dist(x, y));
+            }
+            else
+            {
+                m_closed = get_close_flag(cmd);
+            }
+        }
+    }
+
+
+    //------------------------------------------------------------------------
+    void vcgen_stroke::rewind(unsigned)
+    {
+        if(m_status == initial)
+        {
+            m_src_vertices.close(m_closed != 0);
+            shorten_path(m_src_vertices, m_shorten, m_closed);
+            if(m_src_vertices.size() < 3) m_closed = 0;
+        }
+        m_status = ready;
+        m_src_vertex = 0;
+        m_out_vertex = 0;
+    }
+
+
+    //------------------------------------------------------------------------
+    unsigned vcgen_stroke::vertex(double* x, double* y)
+    {
+        unsigned cmd = path_cmd_line_to;
+        while(!is_stop(cmd))
+        {
+            switch(m_status)
+            {
+            case initial:
+                rewind(0);
+
+            case ready:
+                if(m_src_vertices.size() < 2 + unsigned(m_closed != 0))
+                {
+                    cmd = path_cmd_stop;
+                    break;
+                }
+                m_status = m_closed ? outline1 : cap1;
+                cmd = path_cmd_move_to;
+                m_src_vertex = 0;
+                m_out_vertex = 0;
+                break;
+
+            case cap1:
+                stroke_calc_cap(m_out_vertices,
+                                m_src_vertices[0],
+                                m_src_vertices[1],
+                                m_src_vertices[0].dist,
+                                m_line_cap,
+                                m_width,
+                                m_approx_scale);
+                m_src_vertex = 1;
+                m_prev_status = outline1;
+                m_status = out_vertices;
+                m_out_vertex = 0;
+                break;
+
+            case cap2:
+                stroke_calc_cap(m_out_vertices,
+                                m_src_vertices[m_src_vertices.size() - 1],
+                                m_src_vertices[m_src_vertices.size() - 2],
+                                m_src_vertices[m_src_vertices.size() - 2].dist,
+                                m_line_cap,
+                                m_width,
+                                m_approx_scale);
+                m_prev_status = outline2;
+                m_status = out_vertices;
+                m_out_vertex = 0;
+                break;
+
+            case outline1:
+                if(m_closed)
+                {
+                    if(m_src_vertex >= m_src_vertices.size())
+                    {
+                        m_prev_status = close_first;
+                        m_status = end_poly1;
+                        break;
+                    }
+                }
+                else
+                {
+                    if(m_src_vertex >= m_src_vertices.size() - 1)
+                    {
+                        m_status = cap2;
+                        break;
+                    }
+                }
+                stroke_calc_join(m_out_vertices,
+                                 m_src_vertices.prev(m_src_vertex),
+                                 m_src_vertices.curr(m_src_vertex),
+                                 m_src_vertices.next(m_src_vertex),
+                                 m_src_vertices.prev(m_src_vertex).dist,
+                                 m_src_vertices.curr(m_src_vertex).dist,
+                                 m_width,
+                                 m_line_join,
+                                 m_inner_line_join,
+                                 m_miter_limit,
+                                 m_inner_miter_limit,
+                                 m_approx_scale);
+                ++m_src_vertex;
+                m_prev_status = m_status;
+                m_status = out_vertices;
+                m_out_vertex = 0;
+                break;
+
+            case close_first:
+                m_status = outline2;
+                cmd = path_cmd_move_to;
+
+            case outline2:
+                if(m_src_vertex <= unsigned(m_closed == 0))
+                {
+                    m_status = end_poly2;
+                    m_prev_status = stop;
+                    break;
+                }
+
+                --m_src_vertex;
+                stroke_calc_join(m_out_vertices,
+                                 m_src_vertices.next(m_src_vertex),
+                                 m_src_vertices.curr(m_src_vertex),
+                                 m_src_vertices.prev(m_src_vertex),
+                                 m_src_vertices.curr(m_src_vertex).dist,
+                                 m_src_vertices.prev(m_src_vertex).dist,
+                                 m_width,
+                                 m_line_join,
+                                 m_inner_line_join,
+                                 m_miter_limit,
+                                 m_inner_miter_limit,
+                                 m_approx_scale);
+
+                m_prev_status = m_status;
+                m_status = out_vertices;
+                m_out_vertex = 0;
+                break;
+
+            case out_vertices:
+                if(m_out_vertex >= m_out_vertices.size())
+                {
+                    m_status = m_prev_status;
+                }
+                else
+                {
+                    const point_type& c = m_out_vertices[m_out_vertex++];
+                    *x = c.x;
+                    *y = c.y;
+                    return cmd;
+                }
+                break;
+
+            case end_poly1:
+                m_status = m_prev_status;
+                return (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_ccw;
+
+            case end_poly2:
+                m_status = m_prev_status;
+                return (unsigned)path_cmd_end_poly | (unsigned)path_flags_close | (unsigned)path_flags_cw;
+
+            case stop:
+                cmd = path_cmd_stop;
+                break;
+            }
+        }
+        return cmd;
+    }
+
+}
diff --git a/agg/source/agg_vpgen_clip_polygon.cpp b/agg/source/agg_vpgen_clip_polygon.cpp
new file mode 100755
index 000000000000..e3a0b71d821b
--- /dev/null
+++ b/agg/source/agg_vpgen_clip_polygon.cpp
@@ -0,0 +1,133 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include "agg_vpgen_clip_polygon.h"
+#include "agg_clip_liang_barsky.h"
+
+namespace agg
+{
+
+    //------------------------------------------------------------------------
+    // Determine the clipping code of the vertex according to the
+    // Cyrus-Beck line clipping algorithm
+    //
+    //        |        |
+    //  0110  |  0010  | 0011
+    //        |        |
+    // -------+--------+-------- clip_box.y2
+    //        |        |
+    //  0100  |  0000  | 0001
+    //        |        |
+    // -------+--------+-------- clip_box.y1
+    //        |        |
+    //  1100  |  1000  | 1001
+    //        |        |
+    //  clip_box.x1  clip_box.x2
+    //
+    //
+    unsigned vpgen_clip_polygon::clipping_flags(double x, double y)
+    {
+        if(x < m_clip_box.x1)
+        {
+            if(y > m_clip_box.y2) return 6;
+            if(y < m_clip_box.y1) return 12;
+            return 4;
+        }
+
+        if(x > m_clip_box.x2)
+        {
+            if(y > m_clip_box.y2) return 3;
+            if(y < m_clip_box.y1) return 9;
+            return 1;
+        }
+
+        if(y > m_clip_box.y2) return 2;
+        if(y < m_clip_box.y1) return 8;
+
+        return 0;
+    }
+
+    //----------------------------------------------------------------------------
+    void vpgen_clip_polygon::reset()
+    {
+        m_vertex = 0;
+        m_num_vertices = 0;
+    }
+
+    //----------------------------------------------------------------------------
+    void vpgen_clip_polygon::move_to(double x, double y)
+    {
+        m_vertex = 0;
+        m_num_vertices = 0;
+        m_clip_flags = clipping_flags(x, y);
+        if(m_clip_flags == 0)
+        {
+            m_x[0] = x;
+            m_y[0] = y;
+            m_num_vertices = 1;
+        }
+        m_x1  = x;
+        m_y1  = y;
+        m_cmd = path_cmd_move_to;
+    }
+
+
+    //----------------------------------------------------------------------------
+    void vpgen_clip_polygon::line_to(double x, double y)
+    {
+        m_vertex = 0;
+        m_num_vertices = 0;
+        unsigned flags = clipping_flags(x, y);
+
+        if(m_clip_flags == flags)
+        {
+            if(flags == 0)
+            {
+                m_x[0] = x;
+                m_y[0] = y;
+                m_num_vertices = 1;
+            }
+        }
+        else
+        {
+            m_num_vertices = clip_liang_barsky(m_x1, m_y1,
+                                               x, y,
+                                               m_clip_box,
+                                               m_x, m_y);
+        }
+
+        m_clip_flags = flags;
+        m_x1 = x;
+        m_y1 = y;
+    }
+
+
+    //----------------------------------------------------------------------------
+    unsigned vpgen_clip_polygon::vertex(double* x, double* y)
+    {
+        if(m_vertex < m_num_vertices)
+        {
+            *x = m_x[m_vertex];
+            *y = m_y[m_vertex];
+            ++m_vertex;
+            unsigned cmd = m_cmd;
+            m_cmd = path_cmd_line_to;
+            return cmd;
+        }
+        return path_cmd_stop;
+    }
+
+
+}
diff --git a/agg/source/agg_vpgen_clip_polyline.cpp b/agg/source/agg_vpgen_clip_polyline.cpp
new file mode 100755
index 000000000000..b3b60c96a70d
--- /dev/null
+++ b/agg/source/agg_vpgen_clip_polyline.cpp
@@ -0,0 +1,142 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_vpgen_clip_polyline.h"
+
+namespace agg
+{
+    static double clip_epsilon = 1e-10;
+
+
+    //----------------------------------------------------------------------------
+    void vpgen_clip_polyline::reset()
+    {
+        m_vertex = 0;
+        m_num_vertices = 0;
+    }
+
+    //----------------------------------------------------------------------------
+    void vpgen_clip_polyline::move_to(double x, double y)
+    {
+        m_vertex = 0;
+        m_num_vertices = 0;
+        m_f1 = clipping_flags(x, y);
+        if(m_f1 == 0)
+        {
+            m_x[0] = x;
+            m_y[0] = y;
+            m_cmd[0] = path_cmd_move_to;
+            m_num_vertices = 1;
+        }
+        m_x1 = x;
+        m_y1 = y;
+    }
+
+
+    //----------------------------------------------------------------------------
+    bool vpgen_clip_polyline::move_point(double& x, double& y, unsigned& flags)
+    {
+       double bound;
+
+       if(flags & (clip_x1 | clip_x2))
+       {
+           bound = (flags & clip_x1) ? m_clip_box.x1 : m_clip_box.x2;
+           y = (bound - m_x1) * (m_y2 - m_y1) / (m_x2 - m_x1) + m_y1;
+           x = bound;
+           flags = clipping_flags_y(y);
+       }
+       if(fabs(m_y2 - m_y1) < clip_epsilon && fabs(m_x2 - m_x1) < clip_epsilon)
+       {
+           return false;
+       }
+       if(flags & (clip_y1 | clip_y2))
+       {
+           bound = (flags & clip_y1) ? m_clip_box.y1 : m_clip_box.y2;
+           x = (bound - m_y1) * (m_x2 - m_x1) / (m_y2 - m_y1) + m_x1;
+           y = bound;
+       }
+       flags = 0;
+       return true;
+    }
+
+    //----------------------------------------------------------------------------
+    void vpgen_clip_polyline::clip_line_segment()
+    {
+        if((m_f1 & m_f2) == 0)
+        {
+            if(m_f1)
+            {
+                if(!move_point(m_x1, m_y1, m_f1)) return;
+                if(m_f1) return;
+                m_x[0] = m_x1;
+                m_y[0] = m_y1;
+                m_cmd[0] = path_cmd_move_to;
+                m_num_vertices = 1;
+            }
+            if(m_f2)
+            {                    // Move Point 2
+                if(!move_point(m_x2, m_y2, m_f2)) return;
+            }
+            m_x[m_num_vertices] = m_x2;
+            m_y[m_num_vertices] = m_y2;
+            m_cmd[m_num_vertices++] = path_cmd_line_to;
+        }
+    }
+
+
+
+    //----------------------------------------------------------------------------
+    void vpgen_clip_polyline::line_to(double x, double y)
+    {
+        m_vertex = 0;
+        m_num_vertices = 0;
+        unsigned f = m_f2 = clipping_flags(m_x2 = x, m_y2 = y);
+
+        if(m_f2 == m_f1)
+        {
+            if(m_f2 == 0)
+            {
+                m_x[0] = x;
+                m_y[0] = y;
+                m_cmd[0] = path_cmd_line_to;
+                m_num_vertices = 1;
+            }
+        }
+        else
+        {
+            clip_line_segment();
+        }
+
+        m_f1 = f;
+        m_x1 = x;
+        m_y1 = y;
+    }
+
+
+    //----------------------------------------------------------------------------
+    unsigned vpgen_clip_polyline::vertex(double* x, double* y)
+    {
+        if(m_vertex < m_num_vertices)
+        {
+            *x = m_x[m_vertex];
+            *y = m_y[m_vertex];
+            return m_cmd[m_vertex++];
+        }
+        return path_cmd_stop;
+    }
+
+
+}
diff --git a/agg/source/agg_vpgen_segmentator.cpp b/agg/source/agg_vpgen_segmentator.cpp
new file mode 100755
index 000000000000..97e76707c1cb
--- /dev/null
+++ b/agg/source/agg_vpgen_segmentator.cpp
@@ -0,0 +1,67 @@
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.3
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem@antigrain.com
+//          mcseemagg@yahoo.com
+//          http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#include <math.h>
+#include "agg_vpgen_segmentator.h"
+
+namespace agg
+{
+
+    void vpgen_segmentator::move_to(double x, double y)
+    {
+        m_x1 = x;
+        m_y1 = y;
+        m_dx = 0.0;
+        m_dy = 0.0;
+        m_dl = 2.0;
+        m_ddl = 2.0;
+        m_cmd = path_cmd_move_to;
+    }
+
+    void vpgen_segmentator::line_to(double x, double y)
+    {
+        m_x1 += m_dx;
+        m_y1 += m_dy;
+        m_dx  = x - m_x1;
+        m_dy  = y - m_y1;
+        double len = sqrt(m_dx * m_dx + m_dy * m_dy) * m_approximation_scale;
+        if(len < 1e-30) len = 1e-30;
+        m_ddl = 1.0 / len;
+        m_dl  = (m_cmd == path_cmd_move_to) ? 0.0 : m_ddl;
+        if(m_cmd == path_cmd_stop) m_cmd = path_cmd_line_to;
+    }
+
+    unsigned vpgen_segmentator::vertex(double* x, double* y)
+    {
+        if(m_cmd == path_cmd_stop) return path_cmd_stop;
+
+        unsigned cmd = m_cmd;
+        m_cmd = path_cmd_line_to;
+        if(m_dl >= 1.0 - m_ddl)
+        {
+            m_dl = 1.0;
+            m_cmd = path_cmd_stop;
+            *x = m_x1 + m_dx;
+            *y = m_y1 + m_dy;
+            return cmd;
+        }
+        *x = m_x1 + m_dx * m_dl;
+        *y = m_y1 + m_dy * m_dl;
+        m_dl += m_ddl;
+        return cmd;
+    }
+
+}
+
diff --git a/agg/source/makefile.mk b/agg/source/makefile.mk
new file mode 100755
index 000000000000..e29f2c3b8891
--- /dev/null
+++ b/agg/source/makefile.mk
@@ -0,0 +1,91 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+PRJNAME=agg
+TARGET=agg
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+.IF "$(L10N_framework)"==""
+# don't link default libraries from sal
+UWINAPILIB=
+LIBSALCPPRT=
+# --- Files -------------------------------------
+
+SLOFILES= \
+        $(SLO)$/agg_arc.obj						\
+        $(SLO)$/agg_arrowhead.obj				\
+        $(SLO)$/agg_bezier_arc.obj				\
+        $(SLO)$/agg_bspline.obj					\
+        $(SLO)$/agg_curves.obj					\
+        $(SLO)$/agg_embedded_raster_fonts.obj	\
+        $(SLO)$/agg_gsv_text.obj				\
+        $(SLO)$/agg_image_filters.obj			\
+        $(SLO)$/agg_line_aa_basics.obj			\
+        $(SLO)$/agg_line_profile_aa.obj			\
+        $(SLO)$/agg_path_storage.obj			\
+        $(SLO)$/agg_rasterizer_scanline_aa.obj	\
+        $(SLO)$/agg_rounded_rect.obj			\
+        $(SLO)$/agg_sqrt_tables.obj				\
+        $(SLO)$/agg_trans_affine.obj			\
+        $(SLO)$/agg_trans_double_path.obj		\
+        $(SLO)$/agg_trans_single_path.obj		\
+        $(SLO)$/agg_trans_warp_magnifier.obj	\
+        $(SLO)$/agg_vcgen_bspline.obj			\
+        $(SLO)$/agg_vcgen_contour.obj			\
+        $(SLO)$/agg_vcgen_dash.obj				\
+        $(SLO)$/agg_vcgen_markers_term.obj		\
+        $(SLO)$/agg_vcgen_smooth_poly1.obj		\
+        $(SLO)$/agg_vcgen_stroke.obj			\
+        $(SLO)$/agg_vpgen_clip_polygon.obj		\
+        $(SLO)$/agg_vpgen_clip_polyline.obj		\
+        $(SLO)$/agg_vpgen_segmentator.obj
+
+SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
+SHL1IMPLIB = i$(TARGET)
+SHL1LIBS = $(SLB)$/$(TARGET).lib
+SHL1DEF = $(MISC)$/$(SHL1TARGET).def
+DEF1NAME = $(SHL1TARGET)
+
+DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt \
+        $(LIB1TARGET)
+
+DEF1DES		=agg
+DEFLIB1NAME	=$(TARGET)
+
+# --- Targets ----------------------------------
+
+.ENDIF # L10N_framework
+.INCLUDE : target.mk
+.IF "$(L10N_framework)"==""
+$(MISC)$/$(SHL1TARGET).flt : makefile.mk $(TARGET).flt
+    @$(TYPE) $(TARGET).flt > $@
+
+.ENDIF # L10N_framework
diff --git a/animations/inc/animations/animationnodehelper.hxx b/animations/inc/animations/animationnodehelper.hxx
new file mode 100644
index 000000000000..8857c52942ce
--- /dev/null
+++ b/animations/inc/animations/animationnodehelper.hxx
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_ANIMATIONS_ANIMATIONNODEHELPER_HXX
+#define INCLUDED_ANIMATIONS_ANIMATIONNODEHELPER_HXX
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XEnumeration.hpp>
+
+#include <vector>
+
+/* Declaration and definition of AnimationNode helper */
+
+namespace anim
+{
+    // TODO(Q1): this could possibly be implemented with a somewhat
+    // more lightweight template, by having the actual worker receive
+    // only a function pointer, and a thin templated wrapper around
+    // that which converts member functions into that.
+
+    /** Apply given functor to every animation node child.
+
+        @param xNode
+        Parent node
+
+        @param rFunctor
+        Functor to apply. The functor must have an appropriate
+        operator()( const ::com::sun::star::uno::Reference<
+        ::com::sun::star::animations::XAnimationNode >& ) member.
+
+        @return true, if the functor was successfully applied to
+        all children, false otherwise.
+    */
+    template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >&    xNode,
+                                                          Functor&                                                                                  rFunctor )
+    {
+        try
+        {
+            // get an XEnumerationAccess to the children
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+                  xEnumerationAccess( xNode,
+                                      ::com::sun::star::uno::UNO_QUERY_THROW );
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+                  xEnumeration( xEnumerationAccess->createEnumeration(),
+                                ::com::sun::star::uno::UNO_QUERY_THROW );
+
+            while( xEnumeration->hasMoreElements() )
+            {
+                ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+                      xChildNode( xEnumeration->nextElement(),
+                                  ::com::sun::star::uno::UNO_QUERY_THROW );
+
+                rFunctor( xChildNode );
+            }
+
+            return true;
+        }
+        catch( ::com::sun::star::uno::Exception& )
+        {
+            return false;
+        }
+    }
+
+
+    /** pushes the given node to the given vector and recursivly calls itself for each child node.
+    */
+    inline void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
+                                std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector )
+    {
+        rVector.push_back( xNode );
+
+        try
+        {
+            // get an XEnumerationAccess to the children
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+                  xEnumerationAccess( xNode,
+                                      ::com::sun::star::uno::UNO_QUERY );
+
+            if( xEnumerationAccess.is() )
+            {
+                ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+                      xEnumeration( xEnumerationAccess->createEnumeration(),
+                                    ::com::sun::star::uno::UNO_QUERY );
+
+                if( xEnumeration.is() )
+                {
+                    while( xEnumeration->hasMoreElements() )
+                    {
+                        ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+                            xChildNode( xEnumeration->nextElement(),
+                                        ::com::sun::star::uno::UNO_QUERY_THROW );
+
+                        create_deep_vector( xChildNode, rVector );
+                    }
+                }
+            }
+        }
+        catch( ::com::sun::star::uno::Exception& )
+        {
+        }
+    }
+}
+
+#endif /* INCLUDED_ANIMATIONS_ANIMATIONNODEHELPER_HXX */
diff --git a/animations/prj/build.lst b/animations/prj/build.lst
new file mode 100644
index 000000000000..00a1eb69c743
--- /dev/null
+++ b/animations/prj/build.lst
@@ -0,0 +1,3 @@
+animations	animations	:	cppuhelper comphelper offuh NULL
+animations	animations						usr1	-	all	animations_mkout NULL
+animations	animations\source\animcore		nmake	-	all	animations_animcore NULL
diff --git a/animations/prj/d.lst b/animations/prj/d.lst
new file mode 100644
index 000000000000..bdab238656c3
--- /dev/null
+++ b/animations/prj/d.lst
@@ -0,0 +1,9 @@
+..\%__SRC%\bin\animcore.dll %_DEST%\bin%_EXT%\animcore.dll
+..\%__SRC%\lib\libanimcore.so %_DEST%\lib%_EXT%\libanimcore.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
+..\source\animcore\animcore.xml %_DEST%\xml%_EXT%\animcore.xml
+
+..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
+
+mkdir: %_DEST%\inc%_EXT%\animations
+..\inc\animations\animationnodehelper.hxx %_DEST%\inc%_EXT%\animations\animationnodehelper.hxx
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
new file mode 100644
index 000000000000..7b18a83e2fe4
--- /dev/null
+++ b/animations/source/animcore/animcore.cxx
@@ -0,0 +1,2089 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/animations/XAnimateColor.hpp>
+#include <com/sun/star/animations/XAnimateSet.hpp>
+#include <com/sun/star/animations/XAnimateMotion.hpp>
+#include <com/sun/star/animations/XAnimateTransform.hpp>
+#include <com/sun/star/animations/XTransitionFilter.hpp>
+#include <com/sun/star/animations/XTimeContainer.hpp>
+#include <com/sun/star/animations/XIterateContainer.hpp>
+#include <com/sun/star/animations/XAudio.hpp>
+#include <com/sun/star/animations/XCommand.hpp>
+#include <com/sun/star/animations/AnimationNodeType.hpp>
+#include <com/sun/star/animations/AnimationCalcMode.hpp>
+#include <com/sun/star/animations/AnimationFill.hpp>
+#include <com/sun/star/animations/AnimationRestart.hpp>
+#include <com/sun/star/animations/AnimationColorSpace.hpp>
+#include <com/sun/star/animations/AnimationAdditiveMode.hpp>
+#include <com/sun/star/animations/AnimationTransformType.hpp>
+#include <com/sun/star/animations/TransitionType.hpp>
+#include <com/sun/star/animations/TransitionSubType.hpp>
+#include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/util/XChangesNotifier.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <cppuhelper/interfacecontainer.hxx>
+
+#include <cppuhelper/implbase1.hxx>
+#include <rtl/uuid.h>
+
+#include <osl/mutex.hxx>
+#include <list>
+#include <algorithm>
+
+using ::osl::Mutex;
+using ::osl::Guard;
+using ::rtl::OUString;
+using ::cppu::OInterfaceContainerHelper;
+using ::cppu::OInterfaceIteratorHelper;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::XComponentContext;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::XWeak;
+using ::com::sun::star::uno::Type;
+using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::lang::NoSupportException;
+using ::com::sun::star::lang::IllegalArgumentException;
+using ::com::sun::star::lang::WrappedTargetException;
+using ::com::sun::star::lang::NoSupportException;
+using ::com::sun::star::lang::XServiceInfo;
+using ::com::sun::star::lang::XTypeProvider;
+using ::com::sun::star::container::NoSuchElementException;
+using ::com::sun::star::container::ElementExistException;
+using ::com::sun::star::container::XEnumeration;
+using ::com::sun::star::container::XEnumerationAccess;
+using ::com::sun::star::beans::NamedValue;
+using ::com::sun::star::util::XCloneable;
+using ::com::sun::star::lang::XUnoTunnel;
+using ::com::sun::star::util::XChangesNotifier;
+using ::com::sun::star::util::XChangesListener;
+using ::com::sun::star::util::ElementChange;
+using ::com::sun::star::util::ChangesEvent;
+
+using ::cppu::OWeakObject;
+
+using namespace ::com::sun::star::animations;
+using namespace ::com::sun::star::animations::AnimationNodeType;
+
+namespace animcore
+{
+
+// ====================================================================
+
+typedef ::std::list< Reference< XAnimationNode > > ChildList_t;
+
+// ====================================================================
+
+class AnimationNodeBase :   public XAnimateMotion,
+                            public XAnimateColor,
+                            public XTransitionFilter,
+                            public XAnimateSet,
+                            public XAnimateTransform,
+                            public XIterateContainer,
+                            public XEnumerationAccess,
+                            public XServiceInfo,
+                            public XTypeProvider,
+                            public XAudio,
+                            public XCommand,
+                            public XCloneable,
+                            public XChangesNotifier,
+                            public XUnoTunnel,
+                            public OWeakObject
+{
+public:
+    // our first, last and only protection from mutli-threads!
+    Mutex maMutex;
+};
+
+class AnimationNode : public AnimationNodeBase
+{
+public:
+    AnimationNode( sal_Int16 nNodeType );
+    AnimationNode( const AnimationNode& rNode );
+    virtual ~AnimationNode();
+
+    // XInterface
+    virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException);
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // XTypeProvider
+    virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException);
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException);
+
+    // XServiceInfo
+    OUString SAL_CALL getImplementationName() throw();
+    Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw();
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw();
+
+    // XChild
+    virtual Reference< XInterface > SAL_CALL getParent() throw (RuntimeException);
+    virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException);
+
+    // XCloneable
+    virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException);
+
+    // XAnimationNode
+    virtual sal_Int16 SAL_CALL getType() throw (RuntimeException);
+    virtual Any SAL_CALL getBegin() throw (RuntimeException);
+    virtual void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException);
+    virtual Any SAL_CALL getDuration() throw (RuntimeException);
+    virtual void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException);
+    virtual Any SAL_CALL getEnd() throw (RuntimeException);
+    virtual void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException);
+    virtual Any SAL_CALL getEndSync() throw (RuntimeException);
+    virtual void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException);
+    virtual Any SAL_CALL getRepeatCount() throw (RuntimeException);
+    virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException);
+    virtual Any SAL_CALL getRepeatDuration() throw (RuntimeException);
+    virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getFill() throw (RuntimeException);
+    virtual void SAL_CALL setFill( sal_Int16 _fill ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException);
+    virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getRestart() throw (RuntimeException);
+    virtual void SAL_CALL setRestart( sal_Int16 _restart ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException);
+    virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException);
+    virtual double SAL_CALL getAcceleration() throw (RuntimeException);
+    virtual void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException);
+    virtual double SAL_CALL getDecelerate() throw (RuntimeException);
+    virtual void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException);
+    virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException);
+    virtual Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException);
+    virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException);
+
+    // XAnimate
+    virtual Any SAL_CALL getTarget() throw (RuntimeException);
+    virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getSubItem() throw (RuntimeException);
+    virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) throw (RuntimeException);
+    virtual OUString SAL_CALL getAttributeName() throw (RuntimeException);
+    virtual void SAL_CALL setAttributeName( const OUString& _attribute ) throw (RuntimeException);
+    virtual Sequence< Any > SAL_CALL getValues() throw (RuntimeException);
+    virtual void SAL_CALL setValues( const Sequence< Any >& _values ) throw (RuntimeException);
+    virtual Sequence< double > SAL_CALL getKeyTimes() throw (RuntimeException);
+    virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getValueType() throw (RuntimeException);
+    virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getCalcMode() throw (RuntimeException);
+    virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getAccumulate() throw (RuntimeException);
+    virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getAdditive() throw (RuntimeException);
+    virtual void SAL_CALL setAdditive( sal_Int16 _additive ) throw (RuntimeException);
+    virtual Any SAL_CALL getFrom() throw (RuntimeException);
+    virtual void SAL_CALL setFrom( const Any& _from ) throw (RuntimeException);
+    virtual Any SAL_CALL getTo() throw (RuntimeException);
+    virtual void SAL_CALL setTo( const Any& _to ) throw (RuntimeException);
+    virtual Any SAL_CALL getBy() throw (RuntimeException);
+    virtual void SAL_CALL setBy( const Any& _by ) throw (RuntimeException);
+    virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() throw (RuntimeException);
+    virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) throw (RuntimeException);
+    virtual OUString SAL_CALL getFormula() throw (RuntimeException);
+    virtual void SAL_CALL setFormula( const OUString& _formula ) throw (RuntimeException);
+
+    // XAnimateColor
+    virtual sal_Int16 SAL_CALL getColorInterpolation() throw (RuntimeException);
+    virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException);
+    virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException);
+
+    // XAnimateMotion
+    virtual Any SAL_CALL getPath() throw (RuntimeException);
+    virtual void SAL_CALL setPath( const Any& _path ) throw (RuntimeException);
+    virtual Any SAL_CALL getOrigin() throw (RuntimeException);
+    virtual void SAL_CALL setOrigin( const Any& _origin ) throw (RuntimeException);
+
+    // XAnimateTransform
+    virtual sal_Int16 SAL_CALL getTransformType() throw (RuntimeException);
+    virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) throw (RuntimeException);
+
+    // XTransitionFilter
+    virtual sal_Int16 SAL_CALL getTransition() throw (RuntimeException);
+    virtual void SAL_CALL setTransition( sal_Int16 _transition ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getSubtype() throw (RuntimeException);
+    virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getMode() throw (RuntimeException);
+    virtual void SAL_CALL setMode( sal_Bool _mode ) throw (RuntimeException);
+//    virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException);
+//    virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException);
+    virtual sal_Int32 SAL_CALL getFadeColor() throw (RuntimeException);
+    virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException);
+
+    // XAudio
+    virtual Any SAL_CALL getSource() throw (RuntimeException);
+    virtual void SAL_CALL setSource( const Any& _source ) throw (RuntimeException);
+    virtual double SAL_CALL getVolume() throw (RuntimeException);
+    virtual void SAL_CALL setVolume( double _volume ) throw (RuntimeException);
+
+
+    // XCommand
+//    virtual Any SAL_CALL getTarget() throw (RuntimeException);
+//    virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getCommand() throw (RuntimeException);
+    virtual void SAL_CALL setCommand( sal_Int16 _command ) throw (RuntimeException);
+    virtual Any SAL_CALL getParameter() throw (RuntimeException);
+    virtual void SAL_CALL setParameter( const Any& _parameter ) throw (RuntimeException);
+
+    // XElementAccess
+    virtual Type SAL_CALL getElementType() throw (RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException);
+
+    // XEnumerationAccess
+    virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException);
+
+    // XTimeContainer
+    virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException);
+
+    // XIterateContainer
+    virtual sal_Int16 SAL_CALL getIterateType() throw (RuntimeException);
+    virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException);
+    virtual double SAL_CALL getIterateInterval() throw (RuntimeException);
+    virtual void SAL_CALL setIterateInterval( double _iterateinterval ) throw (RuntimeException);
+
+    // XChangesNotifier
+    virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException);
+    virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException);
+
+    // XUnoTunnel
+    virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) throw (RuntimeException);
+
+    static const Sequence< sal_Int8 > & getUnoTunnelId();
+    void fireChangeListener();
+
+private:
+    OInterfaceContainerHelper   maChangeListener;
+
+    static void initTypeProvider( sal_Int16 nNodeType ) throw();
+
+    const sal_Int16 mnNodeType;
+
+    // for XTypeProvider
+    static Sequence< Type >* mpTypes[12];
+    static Sequence< sal_Int8 >* mpId[12];
+
+    // attributes for the XAnimationNode interface implementation
+    Any maBegin, maDuration, maEnd, maEndSync, maRepeatCount, maRepeatDuration;
+    sal_Int16 mnFill, mnFillDefault, mnRestart, mnRestartDefault;
+    double mfAcceleration, mfDecelerate;
+    sal_Bool mbAutoReverse;
+    Sequence< NamedValue > maUserData;
+
+    // parent interface for XChild interface implementation
+    Reference<XInterface>   mxParent;
+    AnimationNode*          mpParent;
+
+    // attributes for XAnimate
+    Any maTarget;
+    OUString maAttributeName, maFormula;
+    Sequence< Any > maValues;
+    Sequence< double > maKeyTimes;
+    sal_Int16 mnValueType, mnSubItem;
+    sal_Int16 mnCalcMode, mnAdditive;
+    sal_Bool mbAccumulate;
+    Any maFrom, maTo, maBy;
+    Sequence< TimeFilterPair > maTimeFilter;
+
+    // attributes for XAnimateColor
+    sal_Int16 mnColorSpace;
+    sal_Bool mbDirection;
+
+    // atributes for XAnimateMotion
+    Any maPath, maOrigin;
+
+    // attributes for XAnimateTransform
+    sal_Int16 mnTransformType;
+
+    // attributes for XTransitionFilter
+    sal_Int16 mnTransition;
+    sal_Int16 mnSubtype;
+    sal_Bool mbMode;
+    sal_Int32 mnFadeColor;
+
+    // XAudio
+    double mfVolume;
+
+    // XCommand
+    sal_Int16 mnCommand;
+    Any maParameter;
+
+    // XIterateContainer
+    sal_Int16 mnIterateType;
+    double  mfIterateInterval;
+
+    /** sorted list of child nodes for XTimeContainer*/
+    ChildList_t             maChilds;
+};
+
+// ====================================================================
+
+class TimeContainerEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
+{
+public:
+    TimeContainerEnumeration( const ChildList_t &rChilds );
+    virtual ~TimeContainerEnumeration();
+
+    // Methods
+    virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException);
+    virtual Any SAL_CALL nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException);
+
+private:
+    /** sorted list of child nodes */
+    ChildList_t             maChilds;
+
+    /** current iteration position */
+    ChildList_t::iterator   maIter;
+
+    /** our first, last and only protection from mutli-threads! */
+    Mutex                   maMutex;
+};
+
+TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChilds )
+: maChilds( rChilds )
+{
+    maIter = maChilds.begin();
+}
+
+TimeContainerEnumeration::~TimeContainerEnumeration()
+{
+}
+
+// Methods
+sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    return maIter != maChilds.end();
+}
+
+Any SAL_CALL TimeContainerEnumeration::nextElement()
+    throw (NoSuchElementException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( maIter == maChilds.end() )
+        throw NoSuchElementException();
+
+    return makeAny( (*maIter++) );
+}
+
+// ====================================================================
+
+Sequence< Type >* AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+Sequence< sal_Int8 >* AnimationNode::mpId[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+
+AnimationNode::AnimationNode( sal_Int16 nNodeType )
+:   maChangeListener(maMutex),
+    mnNodeType( nNodeType ),
+    mnFill( AnimationFill::DEFAULT ),
+    mnFillDefault( AnimationFill::INHERIT ),
+    mnRestart( AnimationRestart:: DEFAULT ),
+    mnRestartDefault( AnimationRestart:: INHERIT ),
+    mfAcceleration( 0.0 ),
+    mfDecelerate( 0.0 ),
+    mbAutoReverse( sal_False ),
+    mpParent(0),
+    mnValueType( 0 ),
+    mnSubItem( 0 ),
+    mnCalcMode( (nNodeType == AnimationNodeType::ANIMATEMOTION) ? AnimationCalcMode::PACED : AnimationCalcMode::LINEAR),
+    mnAdditive(AnimationAdditiveMode::REPLACE),
+    mbAccumulate(sal_False),
+    mnColorSpace( AnimationColorSpace::RGB ),
+    mbDirection( sal_True ),
+    mnTransformType( AnimationTransformType::TRANSLATE ),
+    mnTransition(TransitionType::BARWIPE),
+    mnSubtype(TransitionSubType::DEFAULT),
+    mbMode(true),
+    mnFadeColor(0),
+    mfVolume(1.0),
+    mnCommand(0),
+    mnIterateType( ::com::sun::star::presentation::ShapeAnimationSubType::AS_WHOLE ),
+    mfIterateInterval(0.0)
+{
+    OSL_ENSURE((sal_uInt32)nNodeType < sizeof(mpTypes)/sizeof(Sequence<Type>*), "NodeType out of range");
+}
+
+AnimationNode::AnimationNode( const AnimationNode& rNode )
+:   AnimationNodeBase(),
+    maChangeListener(maMutex),
+    mnNodeType( rNode.mnNodeType ),
+
+    // attributes for the XAnimationNode interface implementation
+    maBegin( rNode.maBegin ),
+    maDuration( rNode.maDuration ),
+    maEnd( rNode.maEnd ),
+    maEndSync( rNode.maEndSync ),
+    maRepeatCount( rNode.maRepeatCount ),
+    maRepeatDuration( rNode.maRepeatDuration ),
+    mnFill( rNode.mnFill ),
+    mnFillDefault( rNode.mnFillDefault ),
+    mnRestart( rNode.mnRestart ),
+    mnRestartDefault( rNode.mnRestartDefault ),
+    mfAcceleration( rNode.mfAcceleration ),
+    mfDecelerate( rNode.mfDecelerate ),
+    mbAutoReverse( rNode.mbAutoReverse ),
+    maUserData( rNode.maUserData ),
+    mpParent(0),
+
+    // attributes for XAnimate
+    maTarget( rNode.maTarget ),
+    maAttributeName( rNode.maAttributeName ),
+    maFormula( rNode.maFormula ),
+    maValues( rNode.maValues ),
+    maKeyTimes( rNode.maKeyTimes ),
+    mnValueType( rNode.mnValueType ),
+    mnSubItem( rNode.mnSubItem ),
+    mnCalcMode( rNode.mnCalcMode ),
+    mnAdditive( rNode.mnAdditive ),
+    mbAccumulate( rNode.mbAccumulate ),
+    maFrom( rNode.maFrom ),
+    maTo( rNode.maTo ),
+    maBy( rNode.maBy ),
+    maTimeFilter( rNode.maTimeFilter ),
+
+    // attributes for XAnimateColor
+    mnColorSpace( rNode.mnColorSpace ),
+    mbDirection( rNode.mbDirection ),
+
+    // atributes for XAnimateMotion
+    maPath( rNode.maPath ),
+    maOrigin( rNode.maOrigin ),
+
+    // attributes for XAnimateTransform
+    mnTransformType( rNode.mnTransformType ),
+
+    // attributes for XTransitionFilter
+    mnTransition( rNode.mnTransition ),
+    mnSubtype( rNode.mnSubtype ),
+    mbMode( rNode.mbMode ),
+    mnFadeColor( rNode.mnFadeColor ),
+
+    // XAudio
+    mfVolume( rNode.mfVolume ),
+
+    // XCommand
+    mnCommand( rNode.mnCommand ),
+    maParameter( rNode.maParameter ),
+
+    // XIterateContainer
+    mnIterateType( rNode.mnIterateType ),
+    mfIterateInterval( rNode.mfIterateInterval )
+{
+}
+
+AnimationNode::~AnimationNode()
+{
+}
+
+// --------------------------------------------------------------------
+
+#define IMPL_NODE_FACTORY(N,IN,SN)\
+Reference< XInterface > SAL_CALL createInstance_##N( const Reference< XComponentContext > &  ) throw (Exception)\
+{\
+    return Reference < XInterface > ( SAL_STATIC_CAST( ::cppu::OWeakObject * , new AnimationNode( N ) ) );\
+}\
+OUString getImplementationName_##N()\
+{\
+    return OUString( RTL_CONSTASCII_USTRINGPARAM ( IN ) );\
+}\
+Sequence<OUString> getSupportedServiceNames_##N(void)\
+{\
+    Sequence<OUString> aRet(1);\
+    aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SN ));\
+    return aRet;\
+}
+
+IMPL_NODE_FACTORY( PAR, "animcore::ParallelTimeContainer", "com.sun.star.animations.ParallelTimeContainer" )
+IMPL_NODE_FACTORY( SEQ, "animcore::SequenceTimeContainer", "com.sun.star.animations.SequenceTimeContainer" )
+IMPL_NODE_FACTORY( ITERATE, "animcore::IterateContainer", "com.sun.star.animations.IterateContainer" )
+IMPL_NODE_FACTORY( ANIMATE, "animcore::Animate", "com.sun.star.animations.Animate" )
+IMPL_NODE_FACTORY( SET, "animcore::AnimateSet", "com.sun.star.animations.AnimateSet" )
+IMPL_NODE_FACTORY( ANIMATECOLOR, "animcore::AnimateColor", "com.sun.star.animations.AnimateColor" )
+IMPL_NODE_FACTORY( ANIMATEMOTION, "animcore::AnimateMotion", "com.sun.star.animations.AnimateMotion" )
+IMPL_NODE_FACTORY( ANIMATETRANSFORM, "animcore::AnimateTransform", "com.sun.star.animations.AnimateTransform" )
+IMPL_NODE_FACTORY( TRANSITIONFILTER, "animcore::TransitionFilter", "com.sun.star.animations.TransitionFilter" )
+IMPL_NODE_FACTORY( AUDIO, "animcore::Audio", "com.sun.star.animations.Audio" );
+IMPL_NODE_FACTORY( COMMAND, "animcore::Command", "com.sun.star.animations.Command" );
+
+// --------------------------------------------------------------------
+
+// XInterface
+Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeException)
+{
+    Any aRet( ::cppu::queryInterface(
+        aType,
+        static_cast< XServiceInfo * >( this ),
+        static_cast< XTypeProvider * >( this ),
+        static_cast< XChild * >( static_cast< XTimeContainer * >(this) ),
+        static_cast< XCloneable* >( this ),
+        static_cast< XAnimationNode* >( static_cast< XTimeContainer * >(this) ),
+        static_cast< XInterface* >(static_cast< OWeakObject * >(this)),
+        static_cast< XWeak* >(static_cast< OWeakObject * >(this)),
+        static_cast< XChangesNotifier* >( this ),
+        static_cast< XUnoTunnel* >( this ) ) );
+
+    if(!aRet.hasValue())
+    {
+        switch( mnNodeType )
+        {
+        case AnimationNodeType::PAR:
+        case AnimationNodeType::SEQ:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XTimeContainer * >( this ),
+                static_cast< XEnumerationAccess * >( this ),
+                static_cast< XElementAccess * >( this ) );
+            break;
+        case AnimationNodeType::ITERATE:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XTimeContainer * >( this ),
+                static_cast< XIterateContainer * >( this ),
+                static_cast< XEnumerationAccess * >( this ),
+                static_cast< XElementAccess * >( this ) );
+            break;
+        case AnimationNodeType::ANIMATE:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateMotion * >(this) ) );
+            break;
+        case AnimationNodeType::ANIMATEMOTION:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateMotion * >(this) ),
+                static_cast< XAnimateMotion * >( this ) );
+            break;
+        case AnimationNodeType::ANIMATECOLOR:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateColor * >(this) ),
+                static_cast< XAnimateColor * >( this ) );
+            break;
+        case AnimationNodeType::SET:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateSet * >(this) ),
+                static_cast< XAnimateSet * >( this ) );
+            break;
+        case AnimationNodeType::ANIMATETRANSFORM:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateTransform * >(this) ),
+                static_cast< XAnimateTransform * >( this ) );
+            break;
+        case AnimationNodeType::AUDIO:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAudio * >( static_cast< XAudio * >(this) ) );
+            break;
+        case AnimationNodeType::COMMAND:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XCommand * >( static_cast< XCommand * >(this) ) );
+            break;
+        case AnimationNodeType::TRANSITIONFILTER:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XTransitionFilter * >(this) ),
+                static_cast< XTransitionFilter * >( this ) );
+            break;
+        }
+    }
+
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( aType );
+}
+
+// --------------------------------------------------------------------
+
+void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw()
+{
+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+
+    if(! mpTypes[nNodeType] )
+    {
+        // create id
+        mpId[nNodeType] = new Sequence< sal_Int8 >( 16 );
+        rtl_createUuid( (sal_uInt8 *)mpId[nNodeType]->getArray(), 0, sal_True );
+
+        static sal_Int32 type_numbers[] =
+        {
+            7, // CUSTOM
+            9, // PAR
+            9, // SEQ
+            9, // ITERATE
+            8, // ANIMATE
+            8, // SET
+            8, // ANIMATEMOTION
+            8, // ANIMATECOLOR
+            8, // ANIMATETRANSFORM
+            8, // TRANSITIONFILTER
+            8, // AUDIO
+            8, // COMMAND
+        };
+
+        // collect types
+        Sequence< Type > * types = new Sequence< Type >( type_numbers[nNodeType] );
+        Type * pTypeAr = types->getArray();
+        sal_Int32 nPos = 0;
+
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XWeak > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XChild > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XCloneable > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XTypeProvider > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XServiceInfo > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XUnoTunnel > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XChangesNotifier> *)0 );
+
+        switch( nNodeType )
+        {
+        case AnimationNodeType::PAR:
+        case AnimationNodeType::SEQ:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XTimeContainer > *)0 );
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XEnumerationAccess > *)0 );
+            break;
+        case AnimationNodeType::ITERATE:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XIterateContainer > *)0 );
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XEnumerationAccess > *)0 );
+            break;
+        case AnimationNodeType::ANIMATE:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimate > *)0 );
+            break;
+        case AnimationNodeType::ANIMATEMOTION:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateMotion > *)0 );
+            break;
+        case AnimationNodeType::ANIMATECOLOR:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateColor > *)0 );
+            break;
+        case AnimationNodeType::ANIMATETRANSFORM:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateTransform > *)0 );
+            break;
+        case AnimationNodeType::SET:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateSet > *)0 );
+            break;
+        case AnimationNodeType::TRANSITIONFILTER:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XTransitionFilter > *)0 );
+            break;
+        case AnimationNodeType::AUDIO:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAudio > *)0 );
+            break;
+        case AnimationNodeType::COMMAND:
+            pTypeAr[nPos++] = ::getCppuType( ( const Reference< XCommand > *)0 );
+            break;
+        }
+        mpTypes[nNodeType] = types;
+    }
+}
+
+// --------------------------------------------------------------------
+
+Sequence< Type > AnimationNode::getTypes() throw (RuntimeException)
+{
+    if (! mpTypes[mnNodeType])
+        initTypeProvider(mnNodeType);
+    return *mpTypes[mnNodeType];
+}
+// --------------------------------------------------------------------
+
+Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeException)
+{
+    if (! mpId[mnNodeType])
+        initTypeProvider(mnNodeType);
+    return *mpId[mnNodeType];
+}
+
+// --------------------------------------------------------------------
+
+// XInterface
+void SAL_CALL AnimationNode::acquire(  ) throw ()
+{
+    OWeakObject::acquire();
+}
+
+// --------------------------------------------------------------------
+
+// XInterface
+void SAL_CALL AnimationNode::release(  ) throw ()
+{
+    OWeakObject::acquire();
+}
+
+// --------------------------------------------------------------------
+
+// XServiceInfo
+OUString AnimationNode::getImplementationName() throw()
+{
+    switch( mnNodeType )
+    {
+    case AnimationNodeType::PAR:
+        return getImplementationName_PAR();
+    case AnimationNodeType::SEQ:
+        return getImplementationName_SEQ();
+    case AnimationNodeType::ITERATE:
+        return getImplementationName_ITERATE();
+    case AnimationNodeType::SET:
+        return getImplementationName_SET();
+    case AnimationNodeType::ANIMATECOLOR:
+        return getImplementationName_ANIMATECOLOR();
+    case AnimationNodeType::ANIMATEMOTION:
+        return getImplementationName_ANIMATEMOTION();
+    case AnimationNodeType::TRANSITIONFILTER:
+        return getImplementationName_TRANSITIONFILTER();
+    case AnimationNodeType::ANIMATETRANSFORM:
+        return getImplementationName_ANIMATETRANSFORM();
+    case AnimationNodeType::AUDIO:
+        return getImplementationName_AUDIO();
+    case AnimationNodeType::COMMAND:
+        return getImplementationName_COMMAND();
+    case AnimationNodeType::ANIMATE:
+    default:
+        return getImplementationName_ANIMATE();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XServiceInfo
+sal_Bool AnimationNode::supportsService(const OUString& ServiceName) throw()
+{
+    Sequence< OUString > aSNL( getSupportedServiceNames() );
+    const OUString * pArray = aSNL.getConstArray();
+
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
+        if( pArray[i] == ServiceName )
+            return sal_True;
+
+    return sal_False;
+}
+
+// --------------------------------------------------------------------
+
+// XServiceInfo
+Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw()
+{
+    switch( mnNodeType )
+    {
+    case AnimationNodeType::PAR:
+        return getSupportedServiceNames_PAR();
+    case AnimationNodeType::SEQ:
+        return getSupportedServiceNames_SEQ();
+    case AnimationNodeType::ITERATE:
+        return getSupportedServiceNames_ITERATE();
+    case AnimationNodeType::SET:
+        return getSupportedServiceNames_SET();
+    case AnimationNodeType::ANIMATECOLOR:
+        return getSupportedServiceNames_ANIMATECOLOR();
+    case AnimationNodeType::ANIMATEMOTION:
+        return getSupportedServiceNames_ANIMATEMOTION();
+    case AnimationNodeType::TRANSITIONFILTER:
+        return getSupportedServiceNames_TRANSITIONFILTER();
+    case AnimationNodeType::AUDIO:
+        return getSupportedServiceNames_AUDIO();
+    case AnimationNodeType::COMMAND:
+        return getSupportedServiceNames_COMMAND();
+    case AnimationNodeType::ANIMATE:
+    default:
+        return getSupportedServiceNames_ANIMATE();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnNodeType;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maBegin;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _begin != maBegin )
+    {
+        maBegin = _begin;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maDuration;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _duration != maDuration )
+    {
+        maDuration = _duration;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maEnd;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _end != maEnd )
+    {
+        maEnd = _end;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maEndSync;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _endsync != maEndSync )
+    {
+        maEndSync = _endsync;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maRepeatCount;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _repeatcount != maRepeatCount )
+    {
+        maRepeatCount = _repeatcount;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maRepeatDuration;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _repeatduration != maRepeatDuration )
+    {
+        maRepeatDuration = _repeatduration;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnFill;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _fill != mnFill )
+    {
+        mnFill = _fill;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnFillDefault;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _filldefault != mnFillDefault )
+    {
+        mnFillDefault = _filldefault;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnRestart;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _restart != mnRestart )
+    {
+        mnRestart = _restart;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnRestartDefault;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _restartdefault != mnRestartDefault )
+    {
+        mnRestartDefault = _restartdefault;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfAcceleration;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _acceleration != mfAcceleration )
+    {
+        mfAcceleration = _acceleration;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfDecelerate;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _decelerate != mfDecelerate )
+    {
+        mfDecelerate = _decelerate;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbAutoReverse;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _autoreverse != mbAutoReverse )
+    {
+        mbAutoReverse = _autoreverse;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maUserData;
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maUserData = _userdata;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XChild
+Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mxParent;
+}
+
+// --------------------------------------------------------------------
+
+// XChild
+void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( Parent != mxParent )
+    {
+        mxParent = Parent;
+
+        mpParent = 0;
+        Reference< XUnoTunnel > xTunnel( mxParent, UNO_QUERY );
+        if( xTunnel.is() )
+            mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() )));
+
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XCloneable
+Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    Reference< XCloneable > xNewNode;
+    try
+    {
+        xNewNode = new AnimationNode( *this );
+
+        if( maChilds.size() )
+        {
+            Reference< XTimeContainer > xContainer( xNewNode, UNO_QUERY );
+            if( xContainer.is() )
+            {
+                ChildList_t::iterator aIter( maChilds.begin() );
+                ChildList_t::iterator aEnd( maChilds.end() );
+                while( aIter != aEnd )
+                {
+                    Reference< XCloneable > xCloneable((*aIter++), UNO_QUERY );
+                    if( xCloneable.is() ) try
+                    {
+                        Reference< XAnimationNode > xNewChildNode( xCloneable->createClone(), UNO_QUERY );
+                        if( xNewChildNode.is() )
+                            xContainer->appendChild( xNewChildNode );
+                    }
+                    catch( Exception& e )
+                    {
+                        (void)e;
+                        OSL_TRACE( "animations::AnimationNode::createClone(), exception caught!" );
+                    }
+                }
+            }
+        }
+    }
+    catch( Exception& e )
+    {
+        (void)e;
+        OSL_TRACE( "animations::AnimationNode::createClone(), exception caught!" );
+    }
+
+    return xNewNode;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getTarget()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTarget;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setTarget( const Any& _target )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _target != maTarget )
+    {
+        maTarget= _target;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maAttributeName;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _attribute != maAttributeName )
+    {
+        maAttributeName = _attribute;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Sequence< Any > SAL_CALL AnimationNode::getValues()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maValues;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maValues = _values;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnSubItem;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _subitem != mnSubItem )
+    {
+        mnSubItem = _subitem;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maKeyTimes;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maKeyTimes = _keytimes;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnValueType;
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _valuetype != mnValueType )
+    {
+        mnValueType = _valuetype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getCalcMode()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnCalcMode;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _calcmode != mnCalcMode )
+    {
+        mnCalcMode = _calcmode;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Bool SAL_CALL AnimationNode::getAccumulate()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbAccumulate;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _accumulate != mbAccumulate )
+    {
+        mbAccumulate = _accumulate;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getAdditive()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnAdditive;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _additive != mnAdditive )
+    {
+        mnAdditive = _additive;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getFrom()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maFrom;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setFrom( const Any& _from )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _from != maFrom )
+    {
+        maFrom = _from;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getTo()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTo;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setTo( const Any& _to )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _to != maTo )
+    {
+        maTo = _to;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getBy()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maBy;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setBy( const Any& _by )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _by != maBy )
+    {
+        maBy = _by;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTimeFilter;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maTimeFilter = _timefilter;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maFormula;
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _formula != maFormula )
+    {
+        maFormula = _formula;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnColorSpace;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _colorspace != mnColorSpace )
+    {
+        mnColorSpace = _colorspace;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbDirection;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _direction != mbDirection )
+    {
+        mbDirection = _direction;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+Any SAL_CALL AnimationNode::getPath() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maPath;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maPath = _path;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maOrigin;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maOrigin = _origin;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateTransform
+sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnTransformType;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateTransform
+void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _transformtype != mnTransformType )
+    {
+        mnTransformType = _transformtype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnTransition;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _transition != mnTransition )
+    {
+        mnTransition = _transition;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnSubtype;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _subtype != mnSubtype )
+    {
+        mnSubtype = _subtype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbMode;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _mode != mbMode )
+    {
+        mbMode = _mode;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnFadeColor;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _fadecolor != mnFadeColor )
+    {
+        mnFadeColor = _fadecolor;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+Any SAL_CALL AnimationNode::getSource() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTarget;
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maTarget = _source;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+double SAL_CALL AnimationNode::getVolume() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfVolume;
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _volume != mfVolume )
+    {
+        mfVolume = _volume;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnCommand;
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _command != mnCommand )
+    {
+        mnCommand = _command;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maParameter;
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maParameter = _parameter;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XElementAccess
+Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException)
+{
+    return ::getCppuType((const Reference< XAnimationNode >*)0);
+}
+
+// --------------------------------------------------------------------
+
+// XElementAccess
+sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return !maChilds.empty();
+}
+
+// --------------------------------------------------------------------
+
+// XEnumerationAccess
+Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    return new TimeContainerEnumeration( maChilds);
+}
+
+// --------------------------------------------------------------------
+
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
+    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() || !refChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
+    if( before == maChilds.end() )
+        throw NoSuchElementException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    maChilds.insert( before, newChild );
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
+    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() || !refChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
+    if( before == maChilds.end() )
+        throw NoSuchElementException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    before++;
+    if( before != maChilds.end() )
+        maChilds.insert( before, newChild );
+    else
+        maChilds.push_back( newChild );
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild )
+    throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() || !oldChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator replace = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
+    if( replace == maChilds.end() )
+        throw NoSuchElementException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    Reference< XInterface > xNull( 0 );
+    oldChild->setParent( xNull );
+
+    (*replace) = newChild;
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild )
+    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !oldChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator old = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
+    if( old == maChilds.end() )
+        throw NoSuchElementException();
+
+    Reference< XInterface > xNull( 0 );
+    oldChild->setParent( xNull );
+
+    maChilds.erase( old );
+
+    return oldChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild )
+    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() )
+        throw IllegalArgumentException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    Reference< XInterface > xChild( newChild );
+
+    if( xThis == xChild )
+        throw IllegalArgumentException();
+
+    maChilds.push_back( newChild );
+
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnIterateType;
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _iteratetype != mnIterateType )
+    {
+        mnIterateType = _iteratetype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfIterateInterval;
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _iterateinterval != mfIterateInterval )
+    {
+        mfIterateInterval = _iterateinterval;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XChangesNotifier
+void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException)
+{
+    maChangeListener.addInterface( aListener );
+}
+
+// --------------------------------------------------------------------
+
+// XChangesNotifier
+void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException)
+{
+    maChangeListener.removeInterface(aListener);
+}
+
+// --------------------------------------------------------------------
+
+// XUnoTunnel
+::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException)
+{
+    if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
+    {
+        return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this));
+
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+// --------------------------------------------------------------------
+
+const ::com::sun::star::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId()
+{
+    static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = 0;
+    if( !pSeq )
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
+        if( !pSeq )
+        {
+            static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
+            rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+            pSeq = &aSeq;
+        }
+    }
+    return *pSeq;
+}
+
+// --------------------------------------------------------------------
+
+void AnimationNode::fireChangeListener()
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    OInterfaceIteratorHelper aIterator( maChangeListener );
+    if( aIterator.hasMoreElements() )
+    {
+        Reference< XInterface > xSource( static_cast<OWeakObject*>(this), UNO_QUERY );
+        Sequence< ElementChange > aChanges;
+        const ChangesEvent aEvent( xSource, makeAny( mxParent ), aChanges );
+        while( aIterator.hasMoreElements() )
+        {
+            Reference< XChangesListener > xListener( aIterator.next(), UNO_QUERY );
+            if( xListener.is() )
+                xListener->changesOccurred( aEvent );
+        }
+    }
+
+    if( mpParent )
+        mpParent->fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+} // namespace animcore
diff --git a/animations/source/animcore/animcore.xml b/animations/source/animcore/animcore.xml
new file mode 100644
index 000000000000..9ccca0f02081
--- /dev/null
+++ b/animations/source/animcore/animcore.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name> animations </module-name>
+
+    <component-description>
+        <author> Christian Lippka </author>
+        <name> todo </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language>  c++ </language>
+        <status value="draft"/>
+        <supported-service> </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type> ... </type>
+    </component-description>
+
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  vos         </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+
+    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> vos2MSC     </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>
+
diff --git a/animations/source/animcore/factreg.cxx b/animations/source/animcore/factreg.cxx
new file mode 100644
index 000000000000..3cfc350d405d
--- /dev/null
+++ b/animations/source/animcore/factreg.cxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <osl/diagnose.h>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
+
+#include <com/sun/star/registry/XRegistryKey.hpp>
+
+using namespace ::rtl;
+using namespace ::cppu;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::registry;
+
+#include "factreg.hxx"
+
+namespace animcore
+{
+    rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
+}
+
+using namespace animcore;
+
+#define IMPLEMENTATION_ENTRY(N)\
+{\
+    createInstance_##N, getImplementationName_##N ,\
+    getSupportedServiceNames_##N, createSingleComponentFactory ,\
+    &g_moduleCount.modCnt , 0\
+}\
+
+static struct ImplementationEntry g_entries[] =
+{
+    IMPLEMENTATION_ENTRY( PAR ),
+    IMPLEMENTATION_ENTRY( SEQ ),
+    IMPLEMENTATION_ENTRY( ITERATE ),
+    IMPLEMENTATION_ENTRY( ANIMATE ),
+    IMPLEMENTATION_ENTRY( SET ),
+    IMPLEMENTATION_ENTRY( ANIMATECOLOR ),
+    IMPLEMENTATION_ENTRY( ANIMATEMOTION ),
+    IMPLEMENTATION_ENTRY( ANIMATETRANSFORM ),
+    IMPLEMENTATION_ENTRY( TRANSITIONFILTER ),
+    IMPLEMENTATION_ENTRY( AUDIO ),
+    IMPLEMENTATION_ENTRY( COMMAND ),
+    IMPLEMENTATION_ENTRY( TargetPropertiesCreator ),
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+extern "C"
+{
+
+sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+{
+    return g_moduleCount.canUnload( &g_moduleCount , pTime );
+}
+
+//==================================================================================================
+void SAL_CALL component_getImplementationEnvironment(
+    const sal_Char ** ppEnvTypeName, uno_Environment ** )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+//==================================================================================================
+sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey )
+{
+    return component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries );
+}
+//==================================================================================================
+void * SAL_CALL component_getFactory(
+    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+{
+    return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
+}
+
+}
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx
new file mode 100644
index 000000000000..b76fc1067e0c
--- /dev/null
+++ b/animations/source/animcore/factreg.hxx
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include <rtl/unload.h>
+
+namespace animcore {
+
+extern rtl_StandardModuleCount g_moduleCount;
+
+#define DECL_NODE_FACTORY(N)\
+extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance_##N( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rSMgr ) throw (::com::sun::star::uno::Exception);\
+extern ::rtl::OUString getImplementationName_##N();\
+extern ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_##N(void)
+
+DECL_NODE_FACTORY( PAR );
+DECL_NODE_FACTORY( SEQ );
+DECL_NODE_FACTORY( ITERATE );
+DECL_NODE_FACTORY( ANIMATE );
+DECL_NODE_FACTORY( SET );
+DECL_NODE_FACTORY( ANIMATECOLOR );
+DECL_NODE_FACTORY( ANIMATEMOTION );
+DECL_NODE_FACTORY( ANIMATETRANSFORM );
+DECL_NODE_FACTORY( TRANSITIONFILTER );
+DECL_NODE_FACTORY( AUDIO );
+DECL_NODE_FACTORY( COMMAND );
+DECL_NODE_FACTORY( TargetPropertiesCreator );
+
+}
diff --git a/animations/source/animcore/makefile.mk b/animations/source/animcore/makefile.mk
new file mode 100644
index 000000000000..b78460ada157
--- /dev/null
+++ b/animations/source/animcore/makefile.mk
@@ -0,0 +1,70 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+
+PRJNAME=animations
+TARGET=animcore
+ENABLE_EXCEPTIONS=TRUE
+NO_BSYMBOLIC=TRUE
+#COMP1TYPELIST=$(TARGET)
+#COMPRDB=$(SOLARBINDIR)$/offapi.rdb
+
+# --- Settings -----------------------------------------------------
+.INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
+# --- Files --------------------------------------------------------
+#UNOUCRDEP=$(SOLARBINDIR)$/offapi.rdb
+#UNOUCRRDB=$(SOLARBINDIR)$/offapi.rdb
+#UNOUCROUT=$(OUT)$/inc$/animations
+#INCPRE+= $(UNOUCROUT)
+
+
+SLOFILES = 	$(SLO)$/animcore.obj\
+            $(SLO)$/factreg.obj\
+            $(SLO)$/targetpropertiescreator.obj
+
+SHL1TARGET= $(TARGET)
+SHL1VERSIONMAP=$(SOLARENV)/src/unloadablecomponent.map
+
+SHL1STDLIBS= \
+        $(SALLIB) 	 \
+        $(CPPULIB)	 \
+        $(CPPUHELPERLIB) 
+
+
+SHL1DEPN=
+SHL1IMPLIB=		i$(TARGET)
+SHL1LIBS=		$(SLB)$/$(TARGET).lib
+SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=		$(SHL1TARGET)
+
+.ENDIF # L10N_framework
+
+# --- Targets ------------------------------------------------------
+.INCLUDE :	target.mk
+
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
new file mode 100644
index 000000000000..0bba7b55d918
--- /dev/null
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -0,0 +1,504 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/animations/XTargetPropertiesCreator.hpp>
+#include <com/sun/star/animations/XIterateContainer.hpp>
+#include <com/sun/star/animations/TargetProperties.hpp>
+#include <com/sun/star/presentation/ParagraphTarget.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/animations/AnimationNodeType.hpp>
+#include <com/sun/star/animations/XAnimate.hpp>
+#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
+#include <comphelper/optionalvalue.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/sequence.hxx>
+
+#include <animations/animationnodehelper.hxx>
+
+#include <vector>
+#include <hash_map>
+
+
+using namespace ::com::sun::star;
+
+#define IMPLEMENTATION_NAME "animcore::TargetPropertiesCreator"
+#define SERVICE_NAME "com.sun.star.animations.TargetPropertiesCreator"
+
+namespace animcore
+{
+    typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::animations::XTargetPropertiesCreator,
+                                              lang::XServiceInfo,
+                                              lang::XServiceName >  TargetPropertiesCreator_Base;
+
+    class TargetPropertiesCreator : public ::comphelper::OBaseMutex,
+                                    public TargetPropertiesCreator_Base
+    {
+    public:
+        static uno::Reference< uno::XInterface > SAL_CALL createInstance( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::Exception )
+        {
+            return uno::Reference< uno::XInterface >( static_cast<cppu::OWeakObject*>(new TargetPropertiesCreator( xContext )) );
+        }
+
+        /// Dispose all internal references
+        virtual void SAL_CALL disposing();
+
+        // XTargetPropertiesCreator
+        virtual uno::Sequence< animations::TargetProperties > SAL_CALL createInitialTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode ) throw (uno::RuntimeException);
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException );
+        virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( uno::RuntimeException );
+
+        // XServiceName
+        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (uno::RuntimeException);
+
+    protected:
+        ~TargetPropertiesCreator(); // we're a ref-counted UNO class. _We_ destroy ourselves.
+
+    private:
+        // default: disabled copy/assignment
+        TargetPropertiesCreator(const TargetPropertiesCreator&);
+        TargetPropertiesCreator& operator=( const TargetPropertiesCreator& );
+
+        TargetPropertiesCreator( const uno::Reference< uno::XComponentContext >& rxContext );
+    };
+
+    // --------------------------------------------------------------------
+
+    uno::Reference< uno::XInterface > SAL_CALL createInstance_TargetPropertiesCreator( const uno::Reference< uno::XComponentContext > & rSMgr ) throw (uno::Exception)
+    {
+        return TargetPropertiesCreator::createInstance( rSMgr );
+    }
+
+    ::rtl::OUString getImplementationName_TargetPropertiesCreator()
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    }
+
+    uno::Sequence< ::rtl::OUString > getSupportedServiceNames_TargetPropertiesCreator(void)
+    {
+        uno::Sequence< ::rtl::OUString > aRet(1);
+        aRet.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+        return aRet;
+    }
+
+    // --------------------------------------------------------------------
+
+    namespace
+    {
+        // Vector containing all properties for a given shape
+        typedef ::std::vector< beans::NamedValue > VectorOfNamedValues;
+
+        /** The hash map key
+
+            This key contains both XShape reference and a paragraph
+            index, as we somehow have to handle shape and paragraph
+            targets with the same data structure.
+         */
+        struct ShapeHashKey
+        {
+            /// Shape target
+            uno::Reference< drawing::XShape >   mxRef;
+
+            /** Paragraph index.
+
+                If this is a pure shape target, mnParagraphIndex is
+                set to -1.
+             */
+            sal_Int16                           mnParagraphIndex;
+
+            /// Comparison needed for hash_map
+            bool operator==( const ShapeHashKey& rRHS ) const
+            {
+                return mxRef == rRHS.mxRef && mnParagraphIndex == rRHS.mnParagraphIndex;
+            }
+        };
+
+        // A hash map which maps a XShape to the corresponding vector of initial properties
+        typedef ::std::hash_map< ShapeHashKey,
+                                 VectorOfNamedValues,
+                                 ::std::size_t (*)(const ShapeHashKey&) > XShapeHash;
+
+        ::std::size_t refhasher( const ShapeHashKey& rKey )
+        {
+            // TODO(P2): Maybe a better hash function would be to
+            // spread mnParagraphIndex to 32 bit: a0b0c0d0e0... Hakmem
+            // should have a formula.
+            //
+            // Yes it has:
+            // x = (x & 0x0000FF00) << 8) | (x >> 8) & 0x0000FF00 | x & 0xFF0000FF;
+            // x = (x & 0x00F000F0) << 4) | (x >> 4) & 0x00F000F0 | x & 0xF00FF00F;
+            // x = (x & 0x0C0C0C0C) << 2) | (x >> 2) & 0x0C0C0C0C | x & 0xC3C3C3C3;
+            // x = (x & 0x22222222) << 1) | (x >> 1) & 0x22222222 | x & 0x99999999;
+            //
+            // Costs about 17 cycles on a RISC machine with infinite
+            // instruction level parallelism (~42 basic
+            // instructions). Thus I truly doubt this pays off...
+            return reinterpret_cast< ::std::size_t >(rKey.mxRef.get()) ^ (rKey.mnParagraphIndex << 16L);
+        }
+
+
+        class NodeFunctor
+        {
+        public:
+            explicit NodeFunctor( XShapeHash& rShapeHash ) :
+                mrShapeHash( rShapeHash ),
+                mxTargetShape(),
+                mnParagraphIndex( -1 )
+            {
+            }
+
+            NodeFunctor( XShapeHash&                                rShapeHash,
+                         const uno::Reference< drawing::XShape >&   rTargetShape,
+                         sal_Int16                                  nParagraphIndex ) :
+                mrShapeHash( rShapeHash ),
+                mxTargetShape( rTargetShape ),
+                mnParagraphIndex( nParagraphIndex )
+            {
+            }
+
+            void operator()( const uno::Reference< animations::XAnimationNode >& xNode ) const
+            {
+                if( !xNode.is() )
+                {
+                    OSL_ENSURE( false,
+                                "AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
+                    return;
+                }
+
+                uno::Reference< drawing::XShape > xTargetShape( mxTargetShape );
+                sal_Int16                         nParagraphIndex( mnParagraphIndex );
+
+                switch( xNode->getType() )
+                {
+                    case animations::AnimationNodeType::ITERATE:
+                    {
+                        // extract target shape from iterate node
+                        // (will override the target for all children)
+                        // --------------------------------------------------
+
+                        uno::Reference< animations::XIterateContainer > xIterNode( xNode,
+                                                                                   uno::UNO_QUERY );
+
+                        // TODO(E1): I'm not too sure what to expect here...
+                        if( !xIterNode->getTarget().hasValue() )
+                        {
+                            OSL_ENSURE( false,
+                                        "animcore: NodeFunctor::operator(): no target on ITERATE node" );
+                            return;
+                        }
+
+                        xTargetShape.set( xIterNode->getTarget(),
+                                          uno::UNO_QUERY );
+
+                        if( !xTargetShape.is() )
+                        {
+                            ::com::sun::star::presentation::ParagraphTarget aTarget;
+
+                            // no shape provided. Maybe a ParagraphTarget?
+                            if( !(xIterNode->getTarget() >>= aTarget) )
+                            {
+                                OSL_ENSURE( false,
+                                            "animcore: NodeFunctor::operator(): could not extract any "
+                                            "target information" );
+                                return;
+                            }
+
+                            xTargetShape = aTarget.Shape;
+                            nParagraphIndex = aTarget.Paragraph;
+
+                            if( !xTargetShape.is() )
+                            {
+                                OSL_ENSURE( false,
+                                            "animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
+                                return;
+                            }
+                        }
+                    }
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::PAR:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::SEQ:
+                    {
+                        NodeFunctor aFunctor( mrShapeHash,
+                                              xTargetShape,
+                                              nParagraphIndex );
+                        if( !::anim::for_each_childNode( xNode,
+                                                         aFunctor ) )
+                        {
+                            OSL_ENSURE( false,
+                                        "AnimCore: NodeFunctor::operator(): child node iteration failed, "
+                                        "or extraneous container nodes encountered" );
+                        }
+                    }
+                    break;
+
+                    case animations::AnimationNodeType::CUSTOM:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATE:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATEMOTION:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATECOLOR:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATETRANSFORM:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::TRANSITIONFILTER:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::AUDIO:
+                        // FALLTHROUGH intended
+                    default:
+                        // ignore this node, no valuable content for now.
+                        break;
+
+                    case animations::AnimationNodeType::SET:
+                    {
+                        // evaluate set node content
+                        uno::Reference< animations::XAnimate > xAnimateNode( xNode,
+                                                                             uno::UNO_QUERY );
+
+                        if( !xAnimateNode.is() )
+                            break; // invalid node
+
+                        // determine target shape (if any)
+                        ShapeHashKey aTarget;
+                        if( xTargetShape.is() )
+                        {
+                            // override target shape with parent-supplied
+                            aTarget.mxRef = xTargetShape;
+                            aTarget.mnParagraphIndex = nParagraphIndex;
+                        }
+                        else
+                        {
+                            // no parent-supplied target, retrieve
+                            // node target
+                            if( (xAnimateNode->getTarget() >>= aTarget.mxRef) )
+                            {
+                                // pure shape target - set paragraph
+                                // index to magic
+                                aTarget.mnParagraphIndex = -1;
+                            }
+                            else
+                            {
+                                // not a pure shape target - maybe a
+                                // ParagraphTarget?
+                                presentation::ParagraphTarget aUnoTarget;
+
+                                if( !(xAnimateNode->getTarget() >>= aUnoTarget) )
+                                {
+                                    OSL_ENSURE( false,
+                                                "AnimCore: NodeFunctor::operator(): unknown target type encountered" );
+                                    break;
+                                }
+
+                                aTarget.mxRef = aUnoTarget.Shape;
+                                aTarget.mnParagraphIndex = aUnoTarget.Paragraph;
+                            }
+                        }
+
+                        if( !aTarget.mxRef.is() )
+                        {
+                            OSL_ENSURE( false,
+                                        "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
+                            break; // invalid target XShape
+                        }
+
+                        // check whether we already have an entry for
+                        // this target (we only take the first set
+                        // effect for every shape)
+                        XShapeHash::const_iterator aIter;
+                        if( (aIter=mrShapeHash.find( aTarget )) != mrShapeHash.end() )
+                            break; // already an entry in existence for given XShape
+
+                        // if this is an appear effect, hide shape
+                        // initially. This is currently the only place
+                        // where a shape effect influences shape
+                        // attributes outside it's effective duration.
+                        if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCaseAscii("visibility") )
+                        {
+                            sal_Bool bVisible( sal_False );
+
+                            uno::Any aAny( xAnimateNode->getTo() );
+
+                            // try to extract bool value
+                            if( !(aAny >>= bVisible) )
+                            {
+                                // try to extract string
+                                ::rtl::OUString aString;
+                                if( (aAny >>= aString) )
+                                {
+                                    // we also take the strings "true" and "false",
+                                    // as well as "on" and "off" here
+                                    if( aString.equalsIgnoreAsciiCaseAscii("true") ||
+                                        aString.equalsIgnoreAsciiCaseAscii("on") )
+                                    {
+                                        bVisible = sal_True;
+                                    }
+                                    if( aString.equalsIgnoreAsciiCaseAscii("false") ||
+                                        aString.equalsIgnoreAsciiCaseAscii("off") )
+                                    {
+                                        bVisible = sal_False;
+                                    }
+                                }
+                            }
+
+                            if( bVisible )
+                            {
+                                // target is set to 'visible' at the
+                                // first relevant effect. Thus, target
+                                // must be initially _hidden_, for the
+                                // effect to have visible impact.
+                                mrShapeHash.insert(
+                                    XShapeHash::value_type(
+                                        aTarget,
+                                        VectorOfNamedValues(
+                                            1,
+                                            beans::NamedValue(
+                                                xAnimateNode->getAttributeName(),
+                                                uno::makeAny( sal_False ) ) ) ) );
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+
+        private:
+            XShapeHash&                         mrShapeHash;
+            uno::Reference< drawing::XShape >   mxTargetShape;
+            sal_Int16                           mnParagraphIndex;
+        };
+    }
+
+    // --------------------------------------------------------------------
+
+    TargetPropertiesCreator::TargetPropertiesCreator( const uno::Reference< uno::XComponentContext >&  ) :
+        TargetPropertiesCreator_Base( m_aMutex )
+    {
+    }
+
+    TargetPropertiesCreator::~TargetPropertiesCreator()
+    {
+    }
+
+    void SAL_CALL TargetPropertiesCreator::disposing()
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+    }
+
+    // XTargetPropertiesCreator
+    uno::Sequence< animations::TargetProperties > SAL_CALL TargetPropertiesCreator::createInitialTargetProperties
+        (
+            const uno::Reference< animations::XAnimationNode >& xRootNode
+        ) throw (uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        // scan all nodes for visibility changes, and record first
+        // 'visibility=true' for each shape
+        XShapeHash aShapeHash( 101,
+                               &refhasher );
+
+        NodeFunctor aFunctor( aShapeHash );
+
+        // TODO(F1): Maybe limit functor application to main sequence
+        // alone (CL said something that shape visibility is only
+        // affected by effects in the main sequence for PPT).
+        //
+        // OTOH, client code can pass us only the main sequence (which
+        // it actually does right now, for the slideshow implementation).
+        aFunctor( xRootNode );
+
+
+        // output to result sequence
+        // ----------------------------------------------------------------------
+
+        uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size() );
+
+        ::std::size_t                       nCurrIndex(0);
+        XShapeHash::const_iterator          aCurr( aShapeHash.begin() );
+        const XShapeHash::const_iterator    aEnd ( aShapeHash.end()   );
+        while( aCurr != aEnd )
+        {
+            animations::TargetProperties& rCurrProps( aRes[ nCurrIndex++ ] );
+
+            if( aCurr->first.mnParagraphIndex == -1 )
+            {
+                rCurrProps.Target = uno::makeAny( aCurr->first.mxRef );
+            }
+            else
+            {
+                rCurrProps.Target = uno::makeAny(
+                    presentation::ParagraphTarget(
+                        aCurr->first.mxRef,
+                        aCurr->first.mnParagraphIndex ) );
+            }
+
+            rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
+
+            ++aCurr;
+        }
+
+        return aRes;
+    }
+
+    // XServiceInfo
+    ::rtl::OUString SAL_CALL TargetPropertiesCreator::getImplementationName() throw( uno::RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+    }
+
+    sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+    {
+        return ServiceName.equalsIgnoreAsciiCaseAscii( SERVICE_NAME );
+    }
+
+    uno::Sequence< ::rtl::OUString > SAL_CALL TargetPropertiesCreator::getSupportedServiceNames()  throw( uno::RuntimeException )
+    {
+        uno::Sequence< ::rtl::OUString > aRet(1);
+        aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+
+        return aRet;
+    }
+
+    // XServiceName
+    ::rtl::OUString SAL_CALL TargetPropertiesCreator::getServiceName(  ) throw (uno::RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    }
+
+} // namespace animcore
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
new file mode 100644
index 000000000000..6976731477de
--- /dev/null
+++ b/apache-commons/java/codec/makefile.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-codec
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-codec-1.3-src
+TARFILE_MD5=af3c3acf618de6108d65fcdc92b492e1
+
+TARFILE_ROOTDIR=commons-codec-1.3
+
+PATCH_FILES=$(PRJ)$/patches$/codec.patch
+
+#CONVERTFILES=build.xml
+                
+OUT2CLASS=dist$/commons-codec-1.3.jar
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
new file mode 100644
index 000000000000..6e05150c7c20
--- /dev/null
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -0,0 +1,79 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-httpclient
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+TAR!:=$(GNUTAR)
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-httpclient-3.1-src
+TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776f39b
+
+TARFILE_ROOTDIR=commons-httpclient-3.1
+
+#PATCH_FILES=$(PRJ)$/patches$/httpclient.patch
+
+#CONVERTFILES=build.xml
+                
+OUT2CLASS=dist$/commons-httpclient.jar
+
+COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
+COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk
new file mode 100644
index 000000000000..0bf15d0020ce
--- /dev/null
+++ b/apache-commons/java/lang/makefile.mk
@@ -0,0 +1,76 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-lang
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+TAR!:=$(GNUTAR)
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-lang-2.3-src
+TARFILE_MD5=2ae988b339daec234019a7066f96733e
+
+TARFILE_ROOTDIR=commons-lang-2.3-src
+
+#PATCH_FILES=$(PRJ)$/patches$/logging.patch
+
+#CONVERTFILES=build.xml
+                
+OUT2CLASS=dist$/commons-lang-2.3.jar
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk
new file mode 100644
index 000000000000..5df8c34dde3a
--- /dev/null
+++ b/apache-commons/java/logging/makefile.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-logging
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-logging-1.1.1-src
+TARFILE_MD5=3c219630e4302863a9a83d0efde889db
+
+TARFILE_ROOTDIR=commons-logging-1.1.1-src
+
+PATCH_FILES=$(PRJ)$/patches$/logging.patch
+
+CONVERTFILES=build.xml
+                
+OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
+
+.IF "$(SYSTEM_TOMCAT)" != "YES"
+SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
+.ENDIF
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) -Dservletapi.jar=$(SERVLETAPI_JAR) compile build-jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
new file mode 100644
index 000000000000..dea25ad263d2
--- /dev/null
+++ b/apache-commons/patches/codec.patch
@@ -0,0 +1,17 @@
+--- misc/build/commons-codec-1.3/build.xml-old	2008-01-31 15:28:58.000000000 +0100
++++ misc/build/commons-codec-1.3/build.xml	2008-01-31 15:29:21.000000000 +0100
+@@ -90,14 +90,12 @@
+     </target>

+     <target name="dist" depends="compile,javadoc" description="Create binary distribution">

+         <mkdir dir="${dist.home}"/>

+-        <copy file="../LICENSE" todir="${dist.home}"/>

+         <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>

+         <antcall target="jar"/>

+     </target>

+     <target name="jar" depends="compile" description="Create jar">

+         <mkdir dir="${dist.home}"/>

+         <mkdir dir="${build.home}/classes/META-INF"/>

+-        <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>

+         <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>

+     </target>

+     <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}">

diff --git a/apache-commons/patches/logging.patch b/apache-commons/patches/logging.patch
new file mode 100644
index 000000000000..63b93dcbd6f2
--- /dev/null
+++ b/apache-commons/patches/logging.patch
@@ -0,0 +1,15 @@
+--- misc/commons-logging-1.1.1-src/build.xml	2007-11-22 00:27:52.000000000 +0100
++++ misc/build/commons-logging-1.1.1-src/build.xml	2008-06-24 14:23:56.316301736 +0200
+@@ -127,10 +127,10 @@
+ <!-- ========== Compiler Defaults ========================================= -->
+ 
+   <!-- Version of java class files to generate. -->
+-  <property name="target.version" value="1.1"/>
++  <property name="target.version" value="1.3"/>
+ 
+   <!-- Version of java source to accept -->
+-  <property name="source.version" value="1.2"/>
++  <property name="source.version" value="1.3"/>
+ 
+   <!-- Should Java compilations set the 'debug' compiler option? -->
+   <property name="compile.debug"           value="true"/>
diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst
new file mode 100644
index 000000000000..c509ce0336dd
--- /dev/null
+++ b/apache-commons/prj/build.lst
@@ -0,0 +1,6 @@
+ac      apache-commons  :       solenv TOMCAT:tomcat NULL
+ac	apache-commons								usr1	-	all	ac_mkout 							NULL
+ac	apache-commons\java\codec					nmake	-	all	ac_codec								NULL
+ac	apache-commons\java\lang					nmake	-	all	ac_lang									NULL
+ac	apache-commons\java\logging					nmake	-	all	ac_logging								NULL
+ac	apache-commons\java\httpclient					nmake	-	all	ac_httpclient ac_logging ac_codec					NULL
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
new file mode 100644
index 000000000000..21f6e01700ea
--- /dev/null
+++ b/apache-commons/prj/d.lst
@@ -0,0 +1,5 @@
+..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-logging-1.1.1.jar
+..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin%_EXT%\commons-codec-1.3.jar
+..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin%_EXT%\commons-httpclient-3.1.jar
+..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin%_EXT%\commons-lang-2.3.jar
+
diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
new file mode 100644
index 000000000000..a65cc6440b41
--- /dev/null
+++ b/apple_remote/AppleRemote.m
@@ -0,0 +1,125 @@
+/*****************************************************************************
+ * RemoteControlWrapper.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "AppleRemote.h"
+
+#import <mach/mach.h>
+#import <mach/mach_error.h>
+#import <IOKit/IOKitLib.h>
+#import <IOKit/IOCFPlugIn.h>
+#import <IOKit/hid/IOHIDKeys.h>
+
+const char* AppleRemoteDeviceName = "AppleIRController";
+
+// the WWDC 07 Leopard Build is missing the constant
+#ifndef NSAppKitVersionNumber10_4
+	#define NSAppKitVersionNumber10_4 824
+#endif
+#ifndef NSAppKitVersionNumber10_5
+	#define NSAppKitVersionNumber10_5 949
+#endif
+
+@implementation AppleRemote
+
++ (const char*) remoteControlDeviceName {
+	return AppleRemoteDeviceName;
+}
+
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
+    
+    // TODO : avoid such magics 
+	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.4 cookies" );
+	    #endif
+		// 10.4.x Tiger
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"14_12_11_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"14_13_11_6_"];		
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"14_7_6_14_7_6_"];			
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"14_8_6_14_8_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"14_9_6_14_9_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"14_10_6_14_10_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"18_14_6_18_14_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
+	} else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.5 cookies" );
+	    #endif
+		// 10.5.x Leopard
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"31_30_28_19_18_"];	
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"31_20_19_18_31_20_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"31_21_19_18_31_21_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"31_22_19_18_31_22_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"31_23_19_18_31_23_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"31_19_18_4_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"31_19_18_3_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"31_19_18_31_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"35_31_19_18_35_31_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
+	}
+	else
+	{
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.6 cookies" );
+	    #endif
+	    // 10.6.x Snow Leopard
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"33_32_30_21_20_2_"];	
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"33_22_21_20_2_33_22_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"33_23_21_20_2_33_23_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"33_24_21_20_2_33_24_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"33_25_21_20_2_33_25_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"33_21_20_14_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"33_21_20_13_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"33_21_20_2_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"37_33_21_20_2_37_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];
+	}
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
+	if (pressedDown == NO && event == kRemoteButtonMenu_Hold) {
+		// There is no seperate event for pressed down on menu hold. We are simulating that event here
+		[super sendRemoteButtonEvent:event pressedDown:YES];
+	}	
+	
+	[super sendRemoteButtonEvent:event pressedDown:pressedDown];
+	
+	if (pressedDown && (event == kRemoteButtonRight || event == kRemoteButtonLeft || event == kRemoteButtonPlay || event == kRemoteButtonMenu || event == kRemoteButtonPlay_Hold)) {
+		// There is no seperate event when the button is being released. We are simulating that event here
+		[super sendRemoteButtonEvent:event pressedDown:NO];
+	}
+}
+
+@end
diff --git a/apple_remote/GlobalKeyboardDevice.m b/apple_remote/GlobalKeyboardDevice.m
new file mode 100644
index 000000000000..14bf558a0511
--- /dev/null
+++ b/apple_remote/GlobalKeyboardDevice.m
@@ -0,0 +1,249 @@
+/*****************************************************************************
+ * GlobalKeyboardDevice.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+
+#import "GlobalKeyboardDevice.h"
+
+#define F1 122
+#define F2 120
+#define F3 99
+#define F4 118
+#define F5 96
+#define F6 97
+#define F7 98
+
+/*
+ the following default keys are read and shall be used to change the keyboard mapping
+ 
+ mac.remotecontrols.GlobalKeyboardDevice.plus_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.plus_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.minus_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.minus_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.play_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.play_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.left_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.left_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.right_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.right_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.menu_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.menu_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.playhold_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.playhold_keycode
+ */
+
+static OSStatus hotKeyEventHandler(EventHandlerCallRef, EventRef, void*);
+
+@implementation GlobalKeyboardDevice
+
+- (id) initWithDelegate: (id) _remoteControlDelegate {	
+	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
+		hotKeyRemoteEventMapping = [[NSMutableDictionary alloc] init];
+		
+		unsigned int modifiers = cmdKey + shiftKey /*+ optionKey*/ + controlKey;
+				
+		[self mapRemoteButton:kRemoteButtonPlus			defaultKeycode:F1 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonMinus		defaultKeycode:F2 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonPlay			defaultKeycode:F3 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonLeft			defaultKeycode:F4 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonRight		defaultKeycode:F5 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonMenu			defaultKeycode:F6 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonPlay_Hold	defaultKeycode:F7 defaultModifiers:modifiers];		
+	}
+	return self;
+}
+
+- (void) dealloc {
+	[hotKeyRemoteEventMapping release];
+	[super dealloc];
+}
+
+- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers {
+	NSString* defaultsKey = NULL;	
+	
+	switch(remoteButtonIdentifier) {
+		case kRemoteButtonPlus:
+			defaultsKey = @"plus";
+			break;
+		case kRemoteButtonMinus:
+			defaultsKey = @"minus";
+			break;			
+		case kRemoteButtonMenu:
+			defaultsKey = @"menu";
+			break;			
+		case kRemoteButtonPlay:
+			defaultsKey = @"play";
+			break;
+		case kRemoteButtonRight:
+			defaultsKey = @"right";
+			break;			
+		case kRemoteButtonLeft:			
+			defaultsKey = @"left";
+			break;
+		case kRemoteButtonPlay_Hold:
+			defaultsKey = @"playhold";
+			break;			
+		default: 
+#ifdef DEBUG
+			NSLog(@"Unknown global keyboard defaults key for remote button identifier %d", remoteButtonIdentifier);
+#endif
+            break;
+	}
+	
+	NSNumber* modifiersCfg = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_modifiers", defaultsKey]];
+	NSNumber* keycodeCfg   = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_keycode", defaultsKey]];
+	
+	unsigned int modifiers = defaultModifiers;
+	if (modifiersCfg) modifiers = [modifiersCfg unsignedIntValue];
+	
+	unsigned int keycode = defaultKeycode;
+	if (keycodeCfg) keycode = [keycodeCfg unsignedIntValue];
+				  
+    [self registerHotKeyCode: keycode  modifiers: modifiers remoteEventIdentifier: remoteButtonIdentifier];
+}	
+
+- (void) setListeningToRemote: (BOOL) value {
+	if (value == [self isListeningToRemote]) return;
+	if (value) {
+		[self startListening: self];
+	} else {
+		[self stopListening: self];
+	}
+}
+- (BOOL) isListeningToRemote {	
+	return (eventHandlerRef!=NULL);
+}
+
+- (void) startListening: (id) sender {
+	
+	if (eventHandlerRef) return;
+		
+	EventTypeSpec eventSpec[2] = {
+		{ kEventClassKeyboard, kEventHotKeyPressed },
+		{ kEventClassKeyboard, kEventHotKeyReleased }
+	};    
+	
+	InstallEventHandler( GetEventDispatcherTarget(),
+						 (EventHandlerProcPtr)hotKeyEventHandler, 
+						 2, eventSpec, self, &eventHandlerRef);	
+}
+- (void) stopListening: (id) sender {
+	RemoveEventHandler(eventHandlerRef);
+	eventHandlerRef = NULL;
+}
+
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
+	NSEnumerator* values = [hotKeyRemoteEventMapping objectEnumerator];
+	NSNumber* remoteIdentifier;
+	while( (remoteIdentifier = [values nextObject]) ) {
+		if ([remoteIdentifier unsignedIntValue] == identifier) return YES;
+	}
+	return NO;
+}
+
++ (const char*) remoteControlDeviceName {
+	return "Keyboard";
+}
+
+- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier {	
+	OSStatus err;
+	EventHotKeyID hotKeyID;
+	EventHotKeyRef carbonHotKey;
+
+	hotKeyID.signature = 'PTHk';
+	hotKeyID.id = (long)keycode;
+	
+	err = RegisterEventHotKey(keycode, modifiers, hotKeyID, GetEventDispatcherTarget(), 0, &carbonHotKey );
+	
+	if( err )
+		return NO;
+	
+	[hotKeyRemoteEventMapping setObject: [NSNumber numberWithInt:identifier] forKey: [NSNumber numberWithUnsignedInt: hotKeyID.id]];
+	
+	return YES;
+}
+/*
+- (void)unregisterHotKey: (PTHotKey*)hotKey
+{
+	OSStatus err;
+	EventHotKeyRef carbonHotKey;
+	NSValue* key;
+	
+	if( [[self allHotKeys] containsObject: hotKey] == NO )
+		return;
+	
+	carbonHotKey = [self _carbonHotKeyForHotKey: hotKey];
+	NSAssert( carbonHotKey != nil, @"" );
+	
+	err = UnregisterEventHotKey( carbonHotKey );
+	//Watch as we ignore 'err':
+	
+	key = [NSValue valueWithPointer: carbonHotKey];
+	[mHotKeys removeObjectForKey: key];
+	
+	[self _updateEventHandler];
+	
+	//See that? Completely ignored
+}
+*/
+
+- (RemoteControlEventIdentifier) remoteControlEventIdentifierForID: (unsigned int) id {
+	NSNumber* remoteEventIdentifier = [hotKeyRemoteEventMapping objectForKey:[NSNumber numberWithUnsignedInt: id]];
+	return [remoteEventIdentifier unsignedIntValue];
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
+	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
+}
+
+static RemoteControlEventIdentifier lastEvent;
+
+
+static OSStatus hotKeyEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEvent, void* userData )
+{
+	GlobalKeyboardDevice* keyboardDevice = (GlobalKeyboardDevice*) userData;
+	EventHotKeyID hkCom;
+	GetEventParameter(inEvent,kEventParamDirectObject,typeEventHotKeyID,NULL,sizeof(hkCom),NULL,&hkCom);
+
+	RemoteControlEventIdentifier identifier = [keyboardDevice remoteControlEventIdentifierForID:hkCom.id];
+	if (identifier == 0) return noErr;
+	
+	BOOL pressedDown = YES;
+	if (identifier != lastEvent) {
+		lastEvent = identifier;
+	} else {
+		lastEvent = 0;
+	    pressedDown = NO;
+	}
+	[keyboardDevice sendRemoteButtonEvent: identifier pressedDown: pressedDown];
+	
+	return noErr;
+}
+
+@end
diff --git a/apple_remote/HIDRemoteControlDevice.m b/apple_remote/HIDRemoteControlDevice.m
new file mode 100644
index 000000000000..94215900717b
--- /dev/null
+++ b/apple_remote/HIDRemoteControlDevice.m
@@ -0,0 +1,518 @@
+/*****************************************************************************
+ * HIDRemoteControlDevice.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "HIDRemoteControlDevice.h"
+
+#import <mach/mach.h>
+#import <mach/mach_error.h>
+#import <IOKit/IOKitLib.h>
+#import <IOKit/IOCFPlugIn.h>
+#import <IOKit/hid/IOHIDKeys.h>
+#import <Carbon/Carbon.h>
+
+@interface HIDRemoteControlDevice (PrivateMethods) 
+- (NSDictionary*) cookieToButtonMapping; // Creates the dictionary using the magics, depending on the remote
+- (IOHIDQueueInterface**) queue;
+- (IOHIDDeviceInterface**) hidDeviceInterface;
+- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues; 
+- (void) removeNotifcationObserver;
+- (void) remoteControlAvailable:(NSNotification *)notification;
+
+@end
+
+@interface HIDRemoteControlDevice (IOKitMethods) 
++ (io_object_t) findRemoteDevice;
+- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice;
+- (BOOL) initializeCookies;
+- (BOOL) openDevice;
+@end
+
+@implementation HIDRemoteControlDevice
+
++ (const char*) remoteControlDeviceName {
+	return "";
+}
+
++ (BOOL) isRemoteAvailable {	
+	io_object_t hidDevice = [self findRemoteDevice];
+	if (hidDevice != 0) {
+		IOObjectRelease(hidDevice);
+		return YES;
+	} else {
+		return NO;		
+	}
+}
+
+- (id) initWithDelegate: (id) _remoteControlDelegate {	
+	if ([[self class] isRemoteAvailable] == NO) return nil;
+	
+	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
+		openInExclusiveMode = YES;
+		queue = NULL;
+		hidDeviceInterface = NULL;
+		cookieToButtonMapping = [[NSMutableDictionary alloc] init];
+		
+		[self setCookieMappingInDictionary: cookieToButtonMapping];
+
+		NSEnumerator* enumerator = [cookieToButtonMapping objectEnumerator];
+		NSNumber* identifier;
+		supportedButtonEvents = 0;
+		while( (identifier = [enumerator nextObject]) ) {
+			supportedButtonEvents |= [identifier intValue];
+		}
+		
+		fixSecureEventInputBug = [[NSUserDefaults standardUserDefaults] boolForKey: @"remoteControlWrapperFixSecureEventInputBug"];
+	}
+	
+	return self;
+}
+
+- (void) dealloc {
+	[self removeNotifcationObserver];
+	[self stopListening:self];
+	[cookieToButtonMapping release];
+	[super dealloc];
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
+	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
+}
+
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping {
+}
+- (int) remoteIdSwitchCookie {
+	return 0;
+}
+
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
+	return (supportedButtonEvents & identifier) == identifier;
+}
+	
+- (BOOL) isListeningToRemote {
+	return (hidDeviceInterface != NULL && allCookies != NULL && queue != NULL);	
+}
+
+- (void) setListeningToRemote: (BOOL) value {
+	if (value == NO) {
+		[self stopListening:self];
+	} else {
+		[self startListening:self];
+	}
+}
+
+- (BOOL) isOpenInExclusiveMode {
+	return openInExclusiveMode;
+}
+- (void) setOpenInExclusiveMode: (BOOL) value {
+	openInExclusiveMode = value;
+}
+
+- (BOOL) processesBacklog {
+	return processesBacklog;
+}
+- (void) setProcessesBacklog: (BOOL) value {
+	processesBacklog = value;
+}
+
+- (void) startListening: (id) sender {	
+	if ([self isListeningToRemote]) return;
+	
+	// 4th July 2007
+	// 
+	// A security update in february of 2007 introduced an odd behavior.
+	// Whenever SecureEventInput is activated or deactivated the exclusive access
+	// to the remote control device is lost. This leads to very strange behavior where
+	// a press on the Menu button activates FrontRow while your app still gets the event.
+	// A great number of people have complained about this.	
+	// 
+	// Enabling the SecureEventInput and keeping it enabled does the trick.
+	//
+	// I'm pretty sure this is a kind of bug at Apple and I'm in contact with the responsible
+	// Apple Engineer. This solution is not a perfect one - I know. 	
+	// One of the side effects is that applications that listen for special global keyboard shortcuts (like Quicksilver)
+	// may get into problems as they no longer get the events.
+	// As there is no official Apple Remote API from Apple I also failed to open a technical incident on this.
+	// 
+	// Note that there is a corresponding DisableSecureEventInput in the stopListening method below.
+	// 
+	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) EnableSecureEventInput();	
+	
+	[self removeNotifcationObserver];
+	
+	io_object_t hidDevice = [[self class] findRemoteDevice];
+	if (hidDevice == 0) return;
+	
+	if ([self createInterfaceForDevice:hidDevice] == NULL) {
+		goto error;
+	}
+	
+	if ([self initializeCookies]==NO) {
+		goto error;
+	}
+
+	if ([self openDevice]==NO) {
+		goto error;
+	}
+	// be KVO friendly
+	[self willChangeValueForKey:@"listeningToRemote"];
+	[self didChangeValueForKey:@"listeningToRemote"];
+	goto cleanup;
+	
+error:
+	[self stopListening:self];
+	DisableSecureEventInput();
+	
+cleanup:	
+	IOObjectRelease(hidDevice);	
+}
+
+- (void) stopListening: (id) sender {
+	if ([self isListeningToRemote]==NO) return;
+	
+	BOOL sendNotification = NO;
+	
+	if (eventSource != NULL) {
+		CFRunLoopRemoveSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
+		CFRelease(eventSource);
+		eventSource = NULL;
+	}
+	if (queue != NULL) {
+		(*queue)->stop(queue);		
+		
+		//dispose of queue
+		(*queue)->dispose(queue);		
+		
+		//release the queue we allocated
+		(*queue)->Release(queue);	
+		
+		queue = NULL;
+		
+		sendNotification = YES;
+	}
+	
+	if (allCookies != nil) {
+		[allCookies autorelease];
+		allCookies = nil;
+	}
+	
+	if (hidDeviceInterface != NULL) {
+		//close the device
+		(*hidDeviceInterface)->close(hidDeviceInterface);
+		
+		//release the interface	
+		(*hidDeviceInterface)->Release(hidDeviceInterface);
+		
+		hidDeviceInterface = NULL;
+	}
+	
+	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) DisableSecureEventInput();
+	
+	if ([self isOpenInExclusiveMode] && sendNotification) {
+		[[self class] sendFinishedNotifcationForAppIdentifier: nil];		
+	}
+	// be KVO friendly
+	[self willChangeValueForKey:@"listeningToRemote"];
+	[self didChangeValueForKey:@"listeningToRemote"];	
+}
+
+@end
+
+@implementation HIDRemoteControlDevice (PrivateMethods) 
+
+- (IOHIDQueueInterface**) queue {
+	return queue;
+}
+
+- (IOHIDDeviceInterface**) hidDeviceInterface {
+	return hidDeviceInterface;
+}
+
+
+- (NSDictionary*) cookieToButtonMapping {
+	return cookieToButtonMapping;
+}
+
+- (NSString*) validCookieSubstring: (NSString*) cookieString {
+	if (cookieString == nil || [cookieString length] == 0) return nil;
+	NSEnumerator* keyEnum = [[self cookieToButtonMapping] keyEnumerator];
+	NSString* key;
+	while( (key = [keyEnum nextObject]) ) {
+		NSRange range = [cookieString rangeOfString:key];
+		if (range.location == 0) return key; 
+	}
+	return nil;
+}
+
+- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues {
+	/*
+	if (previousRemainingCookieString) {
+		cookieString = [previousRemainingCookieString stringByAppendingString: cookieString];
+		NSLog(@"New cookie string is %@", cookieString);
+		[previousRemainingCookieString release], previousRemainingCookieString=nil;							
+	}*/
+	if (cookieString == nil || [cookieString length] == 0) return;
+		
+	NSNumber* buttonId = [[self cookieToButtonMapping] objectForKey: cookieString];
+	if (buttonId != nil) {
+		[self sendRemoteButtonEvent: [buttonId intValue] pressedDown: (sumOfValues>0)];
+	} else {
+		// let's see if a number of events are stored in the cookie string. this does
+		// happen when the main thread is too busy to handle all incoming events in time.
+		NSString* subCookieString;
+		NSString* lastSubCookieString=nil;
+		while( (subCookieString = [self validCookieSubstring: cookieString]) ) {
+			cookieString = [cookieString substringFromIndex: [subCookieString length]];
+			lastSubCookieString = subCookieString;
+			if (processesBacklog) [self handleEventWithCookieString: subCookieString sumOfValues:sumOfValues];
+		}
+		if (processesBacklog == NO && lastSubCookieString != nil) {
+			// process the last event of the backlog and assume that the button is not pressed down any longer.
+			// The events in the backlog do not seem to be in order and therefore (in rare cases) the last event might be 
+			// a button pressed down event while in reality the user has released it. 
+			// NSLog(@"processing last event of backlog");
+			[self handleEventWithCookieString: lastSubCookieString sumOfValues:0];
+		}
+		if ([cookieString length] > 0) {
+			NSLog(@"Unknown button for cookiestring %@", cookieString);
+		}		
+	}
+}
+
+- (void) removeNotifcationObserver {
+	[[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
+}
+
+- (void) remoteControlAvailable:(NSNotification *)notification {
+	[self removeNotifcationObserver];
+	[self startListening: self];
+}
+
+@end
+
+/*	Callback method for the device queue
+Will be called for any event of any type (cookie) to which we subscribe
+*/
+static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon, void* sender) {	
+	if (target < 0) {
+		NSLog(@"QueueCallbackFunction called with invalid target!");
+		return;
+	}
+	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+	
+	HIDRemoteControlDevice* remote = (HIDRemoteControlDevice*)target;	
+	IOHIDEventStruct event;	
+	AbsoluteTime 	 zeroTime = {0,0};
+	NSMutableString* cookieString = [NSMutableString string];
+	SInt32			 sumOfValues = 0;
+	while (result == kIOReturnSuccess)
+	{
+		result = (*[remote queue])->getNextEvent([remote queue], &event, zeroTime, 0);		
+		if ( result != kIOReturnSuccess )
+			continue;
+	
+		//printf("%d %d %d\n", event.elementCookie, event.value, event.longValue);		
+		
+		if (((int)event.elementCookie)!=5) {
+			sumOfValues+=event.value;
+			[cookieString appendString:[NSString stringWithFormat:@"%d_", event.elementCookie]];
+		}
+	}
+	[remote handleEventWithCookieString: cookieString sumOfValues: sumOfValues];
+	
+	[pool release];
+}
+
+@implementation HIDRemoteControlDevice (IOKitMethods)
+
+- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice {
+	io_name_t				className;
+	IOCFPlugInInterface**   plugInInterface = NULL;
+	HRESULT					plugInResult = S_OK;
+	SInt32					score = 0;
+	IOReturn				ioReturnValue = kIOReturnSuccess;
+	
+	hidDeviceInterface = NULL;
+	
+	ioReturnValue = IOObjectGetClass(hidDevice, className);
+	
+	if (ioReturnValue != kIOReturnSuccess) {
+		NSLog(@"Error: Failed to get class name.");
+		return NULL;
+	}
+	
+	ioReturnValue = IOCreatePlugInInterfaceForService(hidDevice,
+													  kIOHIDDeviceUserClientTypeID,
+													  kIOCFPlugInInterfaceID,
+													  &plugInInterface,
+													  &score);
+	if (ioReturnValue == kIOReturnSuccess)
+	{
+		//Call a method of the intermediate plug-in to create the device interface
+		plugInResult = (*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) &hidDeviceInterface);
+		
+		if (plugInResult != S_OK) {
+			NSLog(@"Error: Couldn't create HID class device interface");
+		}
+		// Release
+		if (plugInInterface) (*plugInInterface)->Release(plugInInterface);
+	}
+	return hidDeviceInterface;
+}
+
+- (BOOL) initializeCookies {
+	IOHIDDeviceInterface122** handle = (IOHIDDeviceInterface122**)hidDeviceInterface;
+	IOHIDElementCookie		cookie;
+	long					usage;
+	long					usagePage;
+	id						object;
+	NSArray*				elements = nil;
+	NSDictionary*			element;
+	IOReturn success;
+	
+	if (!handle || !(*handle)) return NO;
+	
+	// Copy all elements, since we're grabbing most of the elements
+	// for this device anyway, and thus, it's faster to iterate them
+	// ourselves. When grabbing only one or two elements, a matching
+	// dictionary should be passed in here instead of NULL.
+	success = (*handle)->copyMatchingElements(handle, NULL, (CFArrayRef*)&elements);
+	
+	if (success == kIOReturnSuccess) {
+		
+		[elements autorelease];		
+		/*
+		cookies = calloc(NUMBER_OF_APPLE_REMOTE_ACTIONS, sizeof(IOHIDElementCookie)); 
+		memset(cookies, 0, sizeof(IOHIDElementCookie) * NUMBER_OF_APPLE_REMOTE_ACTIONS);
+		*/
+		allCookies = [[NSMutableArray alloc] init];
+		
+		NSEnumerator *elementsEnumerator = [elements objectEnumerator];
+		
+		while ( (element = [elementsEnumerator nextObject]) ) {						
+			//Get cookie
+			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementCookieKey) ];
+			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;
+			if (object == 0 || CFGetTypeID(object) != CFNumberGetTypeID()) continue;
+			cookie = (IOHIDElementCookie) [object longValue];
+			
+			//Get usage
+			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsageKey) ];
+			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
+			usage = [object longValue];
+			
+			//Get usage page
+			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsagePageKey) ];
+			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
+			usagePage = [object longValue];
+
+			[allCookies addObject: [NSNumber numberWithInt:(int)cookie]];
+		}
+	} else {
+		return NO;
+	}
+	
+	return YES;
+}
+
+- (BOOL) openDevice {
+	HRESULT  result;
+	
+	IOHIDOptionsType openMode = kIOHIDOptionsTypeNone;
+	if ([self isOpenInExclusiveMode]) openMode = kIOHIDOptionsTypeSeizeDevice;	
+	IOReturn ioReturnValue = (*hidDeviceInterface)->open(hidDeviceInterface, openMode);	
+	
+	if (ioReturnValue == KERN_SUCCESS) {		
+		queue = (*hidDeviceInterface)->allocQueue(hidDeviceInterface);
+		if (queue) {
+			result = (*queue)->create(queue, 0, 12);	//depth: maximum number of elements in queue before oldest elements in queue begin to be lost.
+
+			IOHIDElementCookie cookie;
+			NSEnumerator *allCookiesEnumerator = [allCookies objectEnumerator];
+			
+			while ( (cookie = (IOHIDElementCookie)[[allCookiesEnumerator nextObject] intValue]) ) {
+				(*queue)->addElement(queue, cookie, 0);
+			}
+									  
+			// add callback for async events			
+			ioReturnValue = (*queue)->createAsyncEventSource(queue, &eventSource);			
+			if (ioReturnValue == KERN_SUCCESS) {
+				ioReturnValue = (*queue)->setEventCallout(queue,QueueCallbackFunction, self, NULL);
+				if (ioReturnValue == KERN_SUCCESS) {
+					CFRunLoopAddSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
+					
+					//start data delivery to queue
+					(*queue)->start(queue);	
+					return YES;
+				} else {
+					NSLog(@"Error when setting event callback");
+				}
+			} else {
+				NSLog(@"Error when creating async event source");
+			}
+		} else {
+			NSLog(@"Error when opening device");
+		}
+	} else if (ioReturnValue == kIOReturnExclusiveAccess) {
+		// the device is used exclusive by another application
+		
+		// 1. we register for the FINISHED_USING_REMOTE_CONTROL_NOTIFICATION notification
+		[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(remoteControlAvailable:) name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
+		
+		// 2. send a distributed notification that we wanted to use the remote control				
+		[[self class] sendRequestForRemoteControlNotification];
+	}
+	return NO;				
+}
+
++ (io_object_t) findRemoteDevice {
+	CFMutableDictionaryRef hidMatchDictionary = NULL;
+	IOReturn ioReturnValue = kIOReturnSuccess;	
+	io_iterator_t hidObjectIterator = 0;
+	io_object_t	hidDevice = 0;
+	
+	// Set up a matching dictionary to search the I/O Registry by class
+	// name for all HID class devices
+	hidMatchDictionary = IOServiceMatching([self remoteControlDeviceName]);
+	
+	// Now search I/O Registry for matching devices.
+	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
+	
+	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
+		hidDevice = IOIteratorNext(hidObjectIterator);
+	}
+	
+	// release the iterator
+	IOObjectRelease(hidObjectIterator);
+	
+	return hidDevice;
+}
+
+@end
+
diff --git a/apple_remote/KeyspanFrontRowControl.m b/apple_remote/KeyspanFrontRowControl.m
new file mode 100644
index 000000000000..dd86475b12b1
--- /dev/null
+++ b/apple_remote/KeyspanFrontRowControl.m
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * KeyspanFrontRowControl.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+ 
+#import "KeyspanFrontRowControl.h"
+#import <mach/mach.h>
+#import <mach/mach_error.h>
+#import <IOKit/IOKitLib.h>
+#import <IOKit/IOCFPlugIn.h>
+#import <IOKit/hid/IOHIDKeys.h>
+
+@implementation KeyspanFrontRowControl
+
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		 forKey:@"11_18_99_10_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		 forKey:@"11_18_98_10_"];		
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		 forKey:@"11_18_58_10_"];		
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		 forKey:@"11_18_61_10_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		 forKey:@"11_18_96_10_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		 forKey:@"11_18_97_10_"];
+	/* hold events are not being send by this device
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Sleep]	forKey:@"18_14_6_18_14_6_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
+	*/
+}
+
++ (io_object_t) findRemoteDevice {
+	CFMutableDictionaryRef hidMatchDictionary = NULL;
+	IOReturn ioReturnValue = kIOReturnSuccess;	
+	io_iterator_t hidObjectIterator = 0;
+	io_object_t	hidDevice = 0;
+	SInt32                  idVendor = 1741;
+	SInt32                  idProduct = 0x420;	
+	
+	// Set up a matching dictionary to search the I/O Registry by class
+	// name for all HID class devices
+	hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
+	
+	CFNumberRef numberRefVendor = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idVendor);
+    if ( numberRefVendor )
+    {
+        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDVendorIDKey), numberRefVendor);
+        CFRelease(numberRefVendor);
+	}
+
+    CFNumberRef numberRefProduct = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idProduct);
+    if ( numberRefProduct )
+    {
+        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDProductIDKey), numberRefProduct);
+        CFRelease(numberRefProduct);	
+	}
+
+	// Now search I/O Registry for matching devices.
+	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
+	
+	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
+		hidDevice = IOIteratorNext(hidObjectIterator);
+	}
+	
+	// release the iterator
+    if ( hidObjectIterator )
+        IOObjectRelease(hidObjectIterator);
+
+	return hidDevice;
+	
+}
+
+@end
diff --git a/apple_remote/MultiClickRemoteBehavior.m b/apple_remote/MultiClickRemoteBehavior.m
new file mode 100644
index 000000000000..03b24978d93b
--- /dev/null
+++ b/apple_remote/MultiClickRemoteBehavior.m
@@ -0,0 +1,213 @@
+/*****************************************************************************
+ * MultiClickRemoteBehavior.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "MultiClickRemoteBehavior.h"
+
+const NSTimeInterval DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE = 0.35;
+const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4;
+
+@implementation MultiClickRemoteBehavior
+
+- (id) init {
+	if ( (self = [super init]) ) {
+		maxClickTimeDifference = DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE;
+	}
+	return self;
+}
+
+// Delegates are not retained!
+// http://developer.apple.com/documentation/Cocoa/Conceptual/CocoaFundamentals/CommunicatingWithObjects/chapter_6_section_4.html
+// Delegating objects do not (and should not) retain their delegates. 
+// However, clients of delegating objects (applications, usually) are responsible for ensuring that their delegates are around
+// to receive delegation messages. To do this, they may have to retain the delegate.
+- (void) setDelegate: (id) _delegate {
+	if ( _delegate && ( [_delegate respondsToSelector:@selector(remoteButton:pressedDown:clickCount:)] == NO )) return; // return what ?
+	
+	delegate = _delegate;
+}
+- (id) delegate {
+	return delegate;
+}
+
+- (BOOL) simulateHoldEvent {
+	return simulateHoldEvents;
+}
+- (void) setSimulateHoldEvent: (BOOL) value {
+	simulateHoldEvents = value;
+}
+
+- (BOOL) simulatesHoldForButtonIdentifier: (RemoteControlEventIdentifier) identifier remoteControl: (RemoteControl*) remoteControl {
+	// we do that check only for the normal button identifiers as we would check for hold support for hold events instead
+	if (identifier > (1 << EVENT_TO_HOLD_EVENT_OFFSET)) return NO; 
+	
+	return [self simulateHoldEvent] && [remoteControl sendsEventForButtonIdentifier: (identifier << EVENT_TO_HOLD_EVENT_OFFSET)]==NO;
+}
+
+- (BOOL) clickCountingEnabled {
+	return clickCountEnabledButtons != 0;
+}
+- (void) setClickCountingEnabled: (BOOL) value {
+	if (value) {
+		[self setClickCountEnabledButtons: kRemoteButtonPlus | kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight | kRemoteButtonMenu];
+	} else {
+		[self setClickCountEnabledButtons: 0];
+	}
+}
+
+- (unsigned int) clickCountEnabledButtons {
+	return clickCountEnabledButtons;
+}
+- (void) setClickCountEnabledButtons: (unsigned int)value {
+	clickCountEnabledButtons = value;
+}
+
+- (NSTimeInterval) maximumClickCountTimeDifference {
+	return maxClickTimeDifference;
+}
+- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff {
+	maxClickTimeDifference = timeDiff;
+}
+
+- (void) sendSimulatedHoldEvent: (id) time {
+	BOOL startSimulateHold = NO;
+	RemoteControlEventIdentifier event = lastHoldEvent;
+	@synchronized(self) {
+		startSimulateHold = (lastHoldEvent>0 && lastHoldEventTime == [time doubleValue]);
+	}
+	if (startSimulateHold) {
+		lastEventSimulatedHold = YES;
+		event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
+		[delegate remoteButton:event pressedDown: YES clickCount: 1];
+	}
+}
+
+- (void) executeClickCountEvent: (NSArray*) values {
+	RemoteControlEventIdentifier event = [[values objectAtIndex: 0] unsignedIntValue]; 
+	NSTimeInterval eventTimePoint = [[values objectAtIndex: 1] doubleValue];
+	
+	BOOL finishedClicking = NO;
+	int finalClickCount = eventClickCount;	
+	
+	@synchronized(self) {
+		finishedClicking = (event != lastClickCountEvent || eventTimePoint == lastClickCountEventTime);
+		if (finishedClicking) {
+			eventClickCount = 0;		
+			lastClickCountEvent = 0;
+			lastClickCountEventTime = 0;
+		}
+	}
+	
+	if (finishedClicking) {	
+		[delegate remoteButton:event pressedDown: YES clickCount:finalClickCount];		
+		// trigger a button release event, too
+		[NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow:0.1]];
+		[delegate remoteButton:event pressedDown: NO clickCount:finalClickCount];
+	}
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl {	
+	if (!delegate)  return;
+	
+	BOOL clickCountingForEvent = ([self clickCountEnabledButtons] & event) == event;
+
+	if ([self simulatesHoldForButtonIdentifier: event remoteControl: remoteControl] && lastClickCountEvent==0) {
+		if (pressedDown) {
+			// wait to see if it is a hold
+			lastHoldEvent = event;
+			lastHoldEventTime = [NSDate timeIntervalSinceReferenceDate];
+			[self performSelector:@selector(sendSimulatedHoldEvent:) 
+					   withObject:[NSNumber numberWithDouble:lastHoldEventTime]
+					   afterDelay:HOLD_RECOGNITION_TIME_INTERVAL];
+			return;
+		} else {
+			if (lastEventSimulatedHold) {
+				// it was a hold
+				// send an event for "hold release"
+				event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
+				lastHoldEvent = 0;
+				lastEventSimulatedHold = NO;
+
+				[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
+				return;
+			} else {
+				RemoteControlEventIdentifier previousEvent = lastHoldEvent;
+				@synchronized(self) {
+					lastHoldEvent = 0;
+				}						
+				
+				// in case click counting is enabled we have to setup the state for that, too
+				if (clickCountingForEvent) {
+					lastClickCountEvent = previousEvent;
+					lastClickCountEventTime = lastHoldEventTime;
+					NSNumber* eventNumber;
+					NSNumber* timeNumber;		
+					eventClickCount = 1;
+					timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
+					eventNumber= [NSNumber numberWithUnsignedInt:previousEvent];
+					NSTimeInterval diffTime = maxClickTimeDifference-([NSDate timeIntervalSinceReferenceDate]-lastHoldEventTime);
+					[self performSelector: @selector(executeClickCountEvent:) 
+							   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
+							   afterDelay: diffTime];							
+					// we do not return here because we are still in the press-release event
+					// that will be consumed below
+				} else {
+					// trigger the pressed down event that we consumed first
+					[delegate remoteButton:event pressedDown: YES clickCount:1];							
+				}
+			}										
+		}
+	}
+	
+	if (clickCountingForEvent) {
+		if (pressedDown == NO) return;
+
+		NSNumber* eventNumber;
+		NSNumber* timeNumber;
+		@synchronized(self) {
+			lastClickCountEventTime = [NSDate timeIntervalSinceReferenceDate];
+			if (lastClickCountEvent == event) {
+				eventClickCount = eventClickCount + 1;
+			} else {
+				eventClickCount = 1;
+			}
+			lastClickCountEvent = event;
+			timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
+			eventNumber= [NSNumber numberWithUnsignedInt:event];
+		}
+		[self performSelector: @selector(executeClickCountEvent:) 
+				   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
+				   afterDelay: maxClickTimeDifference];
+	} else {
+		[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
+	}		
+
+}
+
+@end
diff --git a/apple_remote/RemoteControl.m b/apple_remote/RemoteControl.m
new file mode 100644
index 000000000000..d0812d384b3e
--- /dev/null
+++ b/apple_remote/RemoteControl.m
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * RemoteControl.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+ 
+#import "RemoteControl.h"
+
+// notifaction names that are being used to signal that an application wants to 
+// have access to the remote control device or if the application has finished
+// using the remote control device
+NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION     = @"mac.remotecontrols.RequestForRemoteControl";
+NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION = @"mac.remotecontrols.FinishedUsingRemoteControl";
+
+// keys used in user objects for distributed notifications
+NSString* kRemoteControlDeviceName = @"RemoteControlDeviceName";
+NSString* kApplicationIdentifier   = @"CFBundleIdentifier";
+// bundle identifier of the application that should get access to the remote control
+// this key is being used in the FINISHED notification only
+NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
+
+
+@implementation RemoteControl
+
+// returns nil if the remote control device is not available
+- (id) initWithDelegate: (id) _remoteControlDelegate {	
+	if ( (self = [super init]) ) {
+		delegate = [_remoteControlDelegate retain];
+#ifdef DEBUG
+        NSLog(@"RemoteControl initWithDelegate ok");
+#endif
+    }
+	return self;
+}
+
+- (void) dealloc {
+	[delegate release];
+	[super dealloc];
+}
+
+- (void) setListeningToRemote: (BOOL) value {
+#ifdef DEBUG
+        NSLog(@"setListeningToRemote ok");
+#endif
+}
+- (BOOL) isListeningToRemote {
+	return NO;
+}
+
+- (void) startListening: (id) sender {
+#ifdef DEBUG
+            NSLog(@"startListening ok");
+#endif
+}
+- (void) stopListening: (id) sender {
+#ifdef DEBUG
+            NSLog(@"stopListening ok");
+#endif
+}
+
+- (BOOL) isOpenInExclusiveMode {
+	return YES;
+}
+- (void) setOpenInExclusiveMode: (BOOL) value {
+}
+
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
+#ifdef DEBUG
+   NSLog(@"sending event for button identifier \n");
+#endif
+	return YES;
+}
+
++ (void) sendDistributedNotification: (NSString*) notificationName targetBundleIdentifier: (NSString*) targetIdentifier
+{
+    if ( (self = [super init]) ) {
+    NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithCString:[self remoteControlDeviceName] encoding:NSASCIIStringEncoding],
+                            kRemoteControlDeviceName /* key = RemoteControlDeviceName  -> OK */,
+                            [[NSBundle mainBundle] bundleIdentifier] /* value = org.openoffice.script -> OK */,
+                            kApplicationIdentifier/* key = CFBundleIdentifier -> OK */,
+                            targetIdentifier /*value = AppleIRController -> OK */,
+                            kTargetApplicationIdentifier /*targetBundleIdentifier -> does not appear, since the peer is nil*/,
+                            nil];
+#ifdef DEBUG
+    // Debug purpose: returns all the existing dictionary keys. 
+    NSString *s;
+    NSEnumerator *e = [userInfo keyEnumerator];
+    while ( (s = [e nextObject]) ) {
+        NSLog(@"key = %@ ",s);
+    }
+    NSEnumerator *f = [userInfo objectEnumerator ];
+    while ( (s = [f nextObject]) ) {
+        NSLog(@"value = %@ ",s);
+    }
+    NSLog(@"sendDistributedNotification ...");
+#endif
+
+	[[NSDistributedNotificationCenter defaultCenter] postNotificationName:notificationName
+																   object:nil
+																 userInfo:userInfo
+													   deliverImmediately:YES];	
+    }
+}
+
++ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
+    [self sendDistributedNotification:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION targetBundleIdentifier:identifier];
+#ifdef DEBUG
+    NSLog(@"sendFinishedNotifcationForAppIdentifier ...");
+#endif
+}
++ (void) sendRequestForRemoteControlNotification {
+    [self sendDistributedNotification:REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION targetBundleIdentifier:nil];
+#ifdef DEBUG
+    NSLog(@"sendRequestForRemoteControlNotification ...");
+#endif
+}
+
++ (const char*) remoteControlDeviceName {
+	return NULL;
+}
+
+@end
diff --git a/apple_remote/RemoteControlContainer.m b/apple_remote/RemoteControlContainer.m
new file mode 100644
index 000000000000..40a222f2d829
--- /dev/null
+++ b/apple_remote/RemoteControlContainer.m
@@ -0,0 +1,140 @@
+/*****************************************************************************
+ * RemoteControlContainer.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "RemoteControlContainer.h"
+
+@implementation RemoteControlContainer
+
+- (id) initWithDelegate: (id) _remoteControlDelegate {
+	if ( (self = [super initWithDelegate:_remoteControlDelegate]) ) {
+		remoteControls = [[NSMutableArray alloc] init];
+#ifdef DEBUG
+        NSLog(@"RemoteControlContainer initWithDelegate ok");
+	}
+    else {
+        NSLog(@"RemoteControlContainer initWithDelegate failed");
+#endif
+    }
+
+	return self;
+}
+
+- (void) dealloc {
+	[self stopListening: self];
+	[remoteControls release];
+	[super dealloc];
+}
+
+- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz {
+    BOOL toReturn = NO;
+    RemoteControl* remoteControl = [[clazz alloc] initWithDelegate: delegate];
+    if (remoteControl) {
+        [remoteControls addObject: remoteControl];
+        [remoteControl addObserver: self forKeyPath:@"listeningToRemote" options:NSKeyValueObservingOptionNew context:nil];
+        toReturn = YES;		
+    }
+#ifdef DEBUG
+    else {
+        NSLog(@"RemoteControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
+        toReturn = NO;	
+    }
+#endif
+    return toReturn;
+}
+
+- (unsigned int) count {
+	return [remoteControls count];
+}
+
+- (void) reset {
+	[self willChangeValueForKey:@"listeningToRemote"];
+	[self didChangeValueForKey:@"listeningToRemote"];
+#ifdef DEBUG
+	// debug purpose
+    NSLog(@"reset... (after listening to remote)");
+#endif
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+	[self reset];
+}
+
+- (void) setListeningToRemote: (BOOL) value {
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] setListeningToRemote: value];
+	}
+	if (value && value != [self isListeningToRemote]) [self performSelector:@selector(reset) withObject:nil afterDelay:0.01];
+}
+- (BOOL) isListeningToRemote {
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		if ([[remoteControls objectAtIndex: i] isListeningToRemote]) {
+			return YES;
+		}
+	}
+	return NO;
+}
+
+- (void) startListening: (id) sender {
+#ifdef DEBUG
+	NSLog(@"startListening to events... ");
+#endif
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] startListening: sender];
+	}	
+}
+- (void) stopListening: (id) sender {
+#ifdef DEBUG
+	NSLog(@"stopListening to events... ");
+#endif
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] stopListening: sender];
+	}	
+}
+
+- (BOOL) isOpenInExclusiveMode {
+	BOOL mode = YES;
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		mode = mode && ([[remoteControls objectAtIndex: i] isOpenInExclusiveMode]);
+	}
+	return mode;	
+}
+- (void) setOpenInExclusiveMode: (BOOL) value {
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] setOpenInExclusiveMode:value];
+	}	
+}
+
+@end
diff --git a/apple_remote/RemoteMainController.m b/apple_remote/RemoteMainController.m
new file mode 100644
index 000000000000..5b3b893adafc
--- /dev/null
+++ b/apple_remote/RemoteMainController.m
@@ -0,0 +1,177 @@
+/*****************************************************************************
+ * RemoteMainController.m
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "RemoteMainController.h"
+#import "AppleRemote.h"
+#import "KeyspanFrontRowControl.h"
+#import "GlobalKeyboardDevice.h"
+#import "RemoteControlContainer.h"
+#import "MultiClickRemoteBehavior.h"
+
+// -------------------------------------------------------------------------------------------
+// Sample Code 3: Multi Click Behavior and Hold Event Simulation
+// -------------------------------------------------------------------------------------------
+
+@implementation MainController
+
+- (id) init {
+    self = [super init];  // because we redefined our own init instead of use the fu..nny awakeFromNib 
+    if (self != nil) {
+
+        // 1. instantiate the desired behavior for the remote control device
+        remoteControlBehavior = [[MultiClickRemoteBehavior alloc] init];	
+
+        // 2. configure the behavior
+        [remoteControlBehavior setDelegate: self];
+		
+        // 3. a Remote Control Container manages a number of devices and conforms to the RemoteControl interface
+        //    Therefore you can enable or disable all the devices of the container with a single "startListening:" call.
+        RemoteControlContainer* container = [[RemoteControlContainer alloc] initWithDelegate: remoteControlBehavior];
+
+        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] != 0 ) {
+#ifdef DEBUG
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] successfull");
+        }
+        else {
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] failed");
+#endif
+        }
+
+        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] != 0 ) {
+#ifdef DEBUG
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] successfull");
+        }
+        else {
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] failed");
+#endif
+        }
+
+        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] != 0 ) {
+#ifdef DEBUG
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] successfull");
+        }
+        else {
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] failed");
+#endif
+        }	
+        // to give the binding mechanism a chance to see the change of the attribute
+        [self setValue: container forKey: @"remoteControl"];	
+#ifdef DEBUG
+            NSLog(@"MainController init done");
+#endif
+    }
+    else 
+        NSLog(@"MainController init failed");
+    return self;
+}
+
+- (void) postTheEvent: (short int)buttonIdentifier modifierFlags:(int)modifierFlags
+{
+    [NSApp postEvent: 
+    [NSEvent    otherEventWithType:NSApplicationDefined
+                location:NSZeroPoint
+                modifierFlags:modifierFlags
+                timestamp: 0
+                windowNumber:[[NSApp keyWindow] windowNumber]
+                context:nil
+                subtype:AppleRemoteControlEvent
+                data1: buttonIdentifier 
+                data2: 0]
+    atStart: NO];
+}
+
+
+- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int)clickCount
+{
+    NSString* pressed = @"";
+#ifdef DEBUG
+    NSString* buttonName = nil;
+#endif
+    if (pressedDown)
+    {
+        pressed = @"(pressed)";
+
+#ifdef DEBUG
+        switch(buttonIdentifier) 
+        {
+            case kRemoteButtonPlus:         buttonName = @"Volume up";              break;  // MEDIA_COMMAND_VOLUME_UP  ( see vcl/inc/vcl/cmdevt.hxx )
+            case kRemoteButtonMinus:        buttonName = @"Volume down";            break;  // MEDIA_COMMAND_VOLUME_DOWN
+            case kRemoteButtonMenu:         buttonName = @"Menu";                   break;  // MEDIA_COMMAND_MENU
+            case kRemoteButtonPlay:         buttonName = @"Play";                   break;  // MEDIA_COMMAND_PLAY
+            case kRemoteButtonRight:        buttonName = @"Next slide";             break;  // MEDIA_COMMAND_NEXTTRACK
+            case kRemoteButtonLeft:         buttonName = @"Left";                   break;  // MEDIA_COMMAND_PREVIOUSTRACK
+            case kRemoteButtonRight_Hold:   buttonName = @"Last slide";             break;  // MEDIA_COMMAND_NEXTTRACK_HOLD
+            case kRemoteButtonLeft_Hold:    buttonName = @"First slide";            break;  // MEDIA_COMMAND_PREVIOUSTRACK_HOLD
+            case kRemoteButtonPlus_Hold:    buttonName = @"Volume up holding";      break;
+            case kRemoteButtonMinus_Hold:   buttonName = @"Volume down holding";    break;
+            case kRemoteButtonPlay_Hold:    buttonName = @"Play (sleep mode)";      break;  // MEDIA_COMMAND_PLAY_HOLD
+            case kRemoteButtonMenu_Hold:    buttonName = @"Menu (long)";            break;  // MEDIA_COMMAND_MENU_HOLD
+            case kRemoteControl_Switched:   buttonName = @"Remote Control Switched";break;
+
+            default:    NSLog(@"Unmapped event for button %d", buttonIdentifier);   break;
+        }
+#endif
+        [ self postTheEvent:buttonIdentifier modifierFlags: 0 ];
+    }
+    else // not pressed
+    {
+        pressed = @"(released)";
+    }
+
+#ifdef DEBUG
+	//NSLog(@"Button %@ pressed %@", buttonName, pressed);
+	NSString* clickCountString = @"";
+	if (clickCount > 1) clickCountString = [NSString stringWithFormat: @"%d clicks", clickCount];
+	NSString* feedbackString = [NSString stringWithFormat:@"(Value:%4d) %@  %@ %@",buttonIdentifier, buttonName, pressed, clickCountString];
+
+	// print out events
+	NSLog(@"%@", feedbackString);
+
+    if (pressedDown == NO) printf("\n");
+	// simulate slow processing of events
+	// [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.5]];
+#endif
+}
+
+- (void) dealloc {
+    [remoteControl autorelease];
+	[remoteControlBehavior autorelease];
+	[super dealloc];
+}
+
+// for bindings access
+- (RemoteControl*) remoteControl {
+	return remoteControl;
+}
+
+- (MultiClickRemoteBehavior*) remoteBehavior {
+	return remoteControlBehavior;
+}
+
+@end
\ No newline at end of file
diff --git a/apple_remote/inc/AppleRemote.h b/apple_remote/inc/AppleRemote.h
new file mode 100644
index 000000000000..aeb32f9f3892
--- /dev/null
+++ b/apple_remote/inc/AppleRemote.h
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * RemoteControlWrapper.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import "HIDRemoteControlDevice.h"
+
+/*  Interacts with the Apple Remote Control HID device
+    The class is not thread safe
+*/
+@interface AppleRemote : HIDRemoteControlDevice {
+}
+
+@end
diff --git a/apple_remote/inc/GlobalKeyboardDevice.h b/apple_remote/inc/GlobalKeyboardDevice.h
new file mode 100644
index 000000000000..8e2aede3f34c
--- /dev/null
+++ b/apple_remote/inc/GlobalKeyboardDevice.h
@@ -0,0 +1,54 @@
+/*****************************************************************************
+ * GlobalKeyboardDevice.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import <Carbon/Carbon.h>
+
+#import "RemoteControl.h"
+
+
+/*
+ This class registers for a number of global keyboard shortcuts to simulate a remote control
+ */
+
+@interface GlobalKeyboardDevice : RemoteControl {
+
+    NSMutableDictionary* hotKeyRemoteEventMapping;
+    EventHandlerRef eventHandlerRef;
+
+}
+
+- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers;
+
+- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier;
+
+
+
+@end
diff --git a/apple_remote/inc/HIDRemoteControlDevice.h b/apple_remote/inc/HIDRemoteControlDevice.h
new file mode 100644
index 000000000000..622441fce83c
--- /dev/null
+++ b/apple_remote/inc/HIDRemoteControlDevice.h
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * HIDRemoteControlDevice.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import <IOKit/hid/IOHIDLib.h>
+
+#import "RemoteControl.h"
+
+/*
+    Base class for HID based remote control devices
+ */
+@interface HIDRemoteControlDevice : RemoteControl {
+    IOHIDDeviceInterface** hidDeviceInterface; // see IOKit/hid/IOHIDLib.h
+    IOHIDQueueInterface**  queue;  // IOKit/hid/IOHIDLib.h
+    NSMutableArray*        allCookies;
+    NSMutableDictionary*   cookieToButtonMapping;
+    CFRunLoopSourceRef     eventSource;
+
+    BOOL fixSecureEventInputBug;
+    BOOL openInExclusiveMode;
+    BOOL processesBacklog;
+
+    int supportedButtonEvents;
+}
+
+// When your application needs to much time on the main thread when processing an event other events
+// may already be received which are put on a backlog. As soon as your main thread
+// has some spare time this backlog is processed and may flood your delegate with calls.
+// Backlog processing is turned off by default.
+- (BOOL) processesBacklog;
+- (void) setProcessesBacklog: (BOOL) value;
+
+// methods that should be overwritten by subclasses
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping;
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown;
+
++ (BOOL) isRemoteAvailable;
+
+@end
diff --git a/apple_remote/inc/KeyspanFrontRowControl.h b/apple_remote/inc/KeyspanFrontRowControl.h
new file mode 100644
index 000000000000..a67ce4a96111
--- /dev/null
+++ b/apple_remote/inc/KeyspanFrontRowControl.h
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * KeyspanFrontRowControl.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+
+#import <Cocoa/Cocoa.h>
+#import "HIDRemoteControlDevice.h"
+
+/*  Interacts with the Keyspan FrontRow Remote Control HID device
+    The class is not thread safe
+*/
+@interface KeyspanFrontRowControl : HIDRemoteControlDevice {
+
+}
+
+@end
diff --git a/apple_remote/inc/MultiClickRemoteBehavior.h b/apple_remote/inc/MultiClickRemoteBehavior.h
new file mode 100644
index 000000000000..9cffa35fae2f
--- /dev/null
+++ b/apple_remote/inc/MultiClickRemoteBehavior.h
@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * MultiClickRemoteBehavior.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+
+#import <Cocoa/Cocoa.h>
+#import "RemoteControl.h"
+
+/**
+    A behavior that adds multiclick and hold events on top of a device.
+    Events are generated and send to a delegate
+ */
+@interface MultiClickRemoteBehavior : NSObject {
+    id delegate;
+
+    // state for simulating plus/minus hold
+    BOOL simulateHoldEvents;
+    BOOL lastEventSimulatedHold;
+    RemoteControlEventIdentifier lastHoldEvent;
+    NSTimeInterval lastHoldEventTime;
+
+    // state for multi click
+    unsigned int clickCountEnabledButtons;
+    NSTimeInterval maxClickTimeDifference;
+    NSTimeInterval lastClickCountEventTime;
+    RemoteControlEventIdentifier lastClickCountEvent;
+    unsigned int eventClickCount;
+}
+
+- (id) init;
+
+// Delegates are not retained
+- (void) setDelegate: (id) delegate;
+- (id) delegate;
+
+// Simulating hold events does deactivate sending of individual requests for pressed down/released.
+// Instead special hold events are being triggered when the user is pressing and holding a button for a small period.
+// Simulation is activated only for those buttons and remote control that do not have a seperate event already
+- (BOOL) simulateHoldEvent;
+- (void) setSimulateHoldEvent: (BOOL) value;
+
+// click counting makes it possible to recognize if the user has pressed a button repeatedly
+// click counting does delay each event as it has to wait if there is another event (second click)
+// therefore there is a slight time difference (maximumClickCountTimeDifference) between a single click
+// of the user and the call of your delegate method
+// click counting can be enabled individually for specific buttons. Use the property clickCountEnableButtons to
+// set the buttons for which click counting shall be enabled
+- (BOOL) clickCountingEnabled;
+- (void) setClickCountingEnabled: (BOOL) value;
+
+- (unsigned int) clickCountEnabledButtons;
+- (void) setClickCountEnabledButtons: (unsigned int)value;
+
+// the maximum time difference till which clicks are recognized as multi clicks
+- (NSTimeInterval) maximumClickCountTimeDifference;
+- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff;
+
+@end
+
+/*
+ * Method definitions for the delegate of the MultiClickRemoteBehavior class
+ */
+@interface NSObject(MultiClickRemoteBehaviorDelegate)
+
+- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int) count;
+
+@end
diff --git a/apple_remote/inc/RemoteControl.h b/apple_remote/inc/RemoteControl.h
new file mode 100644
index 000000000000..cbf8fd856235
--- /dev/null
+++ b/apple_remote/inc/RemoteControl.h
@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * RemoteControl.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+// notifaction names that are being used to signal that an application wants to
+// have access to the remote control device or if the application has finished
+// using the remote control device
+extern NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION;
+extern NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION;
+
+// keys used in user objects for distributed notifications
+extern NSString* kRemoteControlDeviceName;
+extern NSString* kApplicationIdentifier;
+extern NSString* kTargetApplicationIdentifier;
+
+// we have a 6 bit offset to make a hold event out of a normal event
+#define EVENT_TO_HOLD_EVENT_OFFSET 6
+
+@class RemoteControl;
+
+typedef enum _RemoteControlEventIdentifier {
+    // normal events
+    kRemoteButtonPlus               =1<<1,
+    kRemoteButtonMinus              =1<<2,
+    kRemoteButtonMenu               =1<<3,
+    kRemoteButtonPlay               =1<<4,
+    kRemoteButtonRight              =1<<5,
+    kRemoteButtonLeft               =1<<6,
+
+    // hold events
+    kRemoteButtonPlus_Hold          =1<<7,
+    kRemoteButtonMinus_Hold         =1<<8,
+    kRemoteButtonMenu_Hold          =1<<9,
+    kRemoteButtonPlay_Hold          =1<<10,
+    kRemoteButtonRight_Hold         =1<<11,
+    kRemoteButtonLeft_Hold          =1<<12,
+
+    // special events (not supported by all devices)
+    kRemoteControl_Switched         =1<<13,
+} RemoteControlEventIdentifier;
+
+@interface NSObject(RemoteControlDelegate)
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl;
+
+@end
+
+/*
+    Base Interface for Remote Control devices
+*/
+@interface RemoteControl : NSObject {
+    id delegate;
+}
+
+// returns nil if the remote control device is not available
+- (id) initWithDelegate: (id) remoteControlDelegate;
+
+- (void) setListeningToRemote: (BOOL) value;
+- (BOOL) isListeningToRemote;
+
+- (BOOL) isOpenInExclusiveMode;
+- (void) setOpenInExclusiveMode: (BOOL) value;
+
+- (void) startListening: (id) sender;
+- (void) stopListening: (id) sender;
+
+// is this remote control sending the given event?
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier;
+
+// sending of notifications between applications
++ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier;
++ (void) sendRequestForRemoteControlNotification;
+
+// name of the device
++ (const char*) remoteControlDeviceName;
+
+@end
diff --git a/apple_remote/inc/RemoteControlContainer.h b/apple_remote/inc/RemoteControlContainer.h
new file mode 100644
index 000000000000..f6cd40ba1178
--- /dev/null
+++ b/apple_remote/inc/RemoteControlContainer.h
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * RemoteControlContainer.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import "RemoteControl.h"
+
+@interface RemoteControlContainer : RemoteControl {
+    NSMutableArray* remoteControls;
+}
+
+- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz;
+- (unsigned int) count;
+
+@end
diff --git a/apple_remote/inc/RemoteMainController.h b/apple_remote/inc/RemoteMainController.h
new file mode 100644
index 000000000000..7143f1f1eda9
--- /dev/null
+++ b/apple_remote/inc/RemoteMainController.h
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * RemoteMainController.h
+ *
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+#define AppleRemoteControlEvent 15
+
+@class RemoteControl;
+@class MultiClickRemoteBehavior;
+
+//static void sendTheEvent( unichar, int );
+
+@interface MainController : NSObject {
+@public // else remoteControl is not reachable from GetSalData()->mpMainController
+    RemoteControl* remoteControl;
+@private
+    MultiClickRemoteBehavior* remoteControlBehavior;
+}
+- (RemoteControl*) remoteControl;
+- (MultiClickRemoteBehavior*) remoteBehavior;
+
+@end
diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk
new file mode 100644
index 000000000000..d261d5192708
--- /dev/null
+++ b/apple_remote/makefile.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=external
+TARGET=AppleRemote
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(GUIBASE)"!="aqua"
+
+dummy:
+    @echo "Nothing to build for GUIBASE $(GUIBASE)"
+
+.ELSE		# "$(GUIBASE)"!="aqua"
+
+SHL1STDLIBS+= \
+    -framework Cocoa -framework Carbon -framework IOKit
+
+LIB1FILES+= \
+        $(SLB)$/AppleRemote.lib
+
+SLOFILES=	\
+        $(SLO)$/KeyspanFrontRowControl.obj 	\
+        $(SLO)$/AppleRemote.obj 		\
+        $(SLO)$/RemoteControl.obj		\
+        $(SLO)$/RemoteControlContainer.obj	\
+        $(SLO)$/GlobalKeyboardDevice.obj	\
+        $(SLO)$/HIDRemoteControlDevice.obj	\
+        $(SLO)$/MultiClickRemoteBehavior.obj	\
+        $(SLO)$/RemoteMainController.obj
+
+SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+SHL1OBJS= $(SLOFILES)
+
+OUT2INC = \
+        $(BUILDDIR)$/KeyspaFrontRowControl.h	\
+        $(BUILDDIR)$/AppleRemote.h		\
+        $(BUILDDIR)$/RemoteControl.h		\
+        $(BUILDDIR)$/RemoteControlContainer.h	\
+        $(BUILDDIR)$/GlobalKeyboardDevice.h	\
+        $(BUILDDIR)$/HIDRemoteControlDevice.h	\
+        $(BUILDDIR)$/MultiClickRemoteBehavior.h	\
+        $(BUILDDIR)$/RemoteMainController.h
+
+
+.ENDIF		# "$(GUIBASE)"!="aqua"
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/apple_remote/prj/build.lst b/apple_remote/prj/build.lst
new file mode 100644
index 000000000000..ff4ee577408a
--- /dev/null
+++ b/apple_remote/prj/build.lst
@@ -0,0 +1,2 @@
+apr	apple_remote :	solenv	soltools NULL
+apr	apple_remote	nmake	-	u	apr_aprem	NULL
diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst
new file mode 100644
index 000000000000..ef6dd4613f43
--- /dev/null
+++ b/apple_remote/prj/d.lst
@@ -0,0 +1,5 @@
+mkdir: %_DEST%\inc%_EXT%\apple_remote
+..\inc\*.h %_DEST%\inc%_EXT%\apple_remote\*
+
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+
diff --git a/autodoc/inc/ary/actions.hxx b/autodoc/inc/ary/actions.hxx
new file mode 100644
index 000000000000..8468c1a820ec
--- /dev/null
+++ b/autodoc/inc/ary/actions.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_ACTIONS_HXX
+#define ARY_ACTIONS_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+    class RepositoryCenter;
+
+
+/*
+enum E_Action
+{
+    action_Parse,
+    action_SecondaryProductions,
+    action_Save,
+    action_Load,
+    action_ReadyForRead
+};
+*/
+
+
+/** @resp
+    Performs such commands on the repository, which refer to
+    large parts of it.
+
+    @collab ::ary::Repository
+            and its components and derivates.
+    @descr
+    This class works in kind of double dispatch way:
+
+    // Client code:
+    Command_Xy  aMyCommand;
+    ary::Repository::The_().PerformCommand( aMyCommand );
+
+    // Repository_Implementation::PerformCommand() code:
+    aMyCommand.Run(*this);
+
+    // Command_Xy::Run(Repository_Implementation & rRepository) code:
+    rRepository.Run_Command_Xy(*this);
+*/
+class Command
+{
+  public:
+    virtual             ~Command() {}
+
+    void                Run(
+                            n22::RepositoryCenter &
+                                                io_rReposy );
+  private:
+    virtual void        do_Run(
+                            n22::RepositoryCenter &
+                                                io_rReposy ) = 0;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+Command::Run(n22::RepositoryCenter & io_rReposy)
+    { do_Run(io_rReposy); }
+
+
+} // namespace ary
+
+
+#endif
+
+
+
diff --git a/autodoc/inc/ary/ary.hxx b/autodoc/inc/ary/ary.hxx
new file mode 100644
index 000000000000..9b1afeebba3f
--- /dev/null
+++ b/autodoc/inc/ary/ary.hxx
@@ -0,0 +1,90 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_ARY_HXX
+#define ARY_ARY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+namespace ary
+{
+namespace idl
+{
+    class Gate;
+}
+
+namespace cpp
+{
+    class Gate;
+}
+}
+
+
+
+namespace ary
+{
+
+/** Starting point for all work with the
+    Autodoc Sourcecode Repository.
+
+    Create and destroy the repository and
+    give access to the "Gates" for different tasks.
+
+    @collab ::ary::cpp::Gate
+    @collab ::ary::idl::Gate
+*/
+
+class Repository
+{
+  public:
+    //  LIFECYCLE
+    virtual             ~Repository() {}
+    static DYN Repository &
+                        Create_();
+    // INQUIRY
+    virtual const String &
+                        Title() const = 0;
+    virtual const ::ary::cpp::Gate &
+                        Gate_Cpp() const = 0;
+    virtual const ::ary::idl::Gate &
+                        Gate_Idl() const = 0;
+    // ACCESS
+    virtual ::ary::cpp::Gate &
+                        Gate_Cpp() = 0;
+    virtual ::ary::idl::Gate &
+                        Gate_Idl() = 0;
+    virtual void        Set_Title(
+                            const String &      i_sName ) = 0;
+};
+
+
+
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/ary_disp.hxx b/autodoc/inc/ary/ary_disp.hxx
new file mode 100644
index 000000000000..5e8194d6d049
--- /dev/null
+++ b/autodoc/inc/ary/ary_disp.hxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_ARY_DISP_HXX
+#define ARY_ARY_DISP_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/types.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+
+class Display : public csv::ProcessorIfc
+{
+  public:
+    virtual             ~Display() {}
+
+    // OPERATIONS
+    void                StartSlot();
+    void                FinishSlot();
+
+    /** This method depends on the result of Get_ReFinder().
+        If Get_ReFinder() != 0, then DisplayGate::Find_Re() is called
+        and if valid, cpp::CppEntity::Accept( *this ) is called.
+        If Get_ReFinder() == 0, simply do_DisplaySlot_Rid() is called
+        with just the id as parameter.
+    */
+    void                DisplaySlot_Rid(
+                            ary::Rid            i_nId );
+//    void                DisplaySlot_Lid(
+//                          ary::Lid            i_nId );
+    /** This method depends on the result of Get_ReFinder().
+        If Get_ReFinder() != 0, then DisplayGate::Find_Re() is called
+        and if valid, cpp::CppEntity::Accept( *this ) is called.
+        If Get_ReFinder() == 0, simply do_DisplaySlot_LocalCe() is called
+        with just the id as parameter.
+    */
+    void                DisplaySlot_LocalCe(
+                            ary::cpp::Ce_id     i_nId,
+                            const String  &     i_sName );
+    // INQUIRY
+    const cpp::Gate *   Get_ReFinder() const;
+
+  private:
+    virtual void        do_StartSlot();
+    virtual void        do_FinishSlot();
+
+
+    virtual void        do_DisplaySlot_Rid(
+                            ary::Rid            i_nId );
+    virtual void        do_DisplaySlot_LocalCe(
+                            ary::cpp::Ce_id     i_nId,
+                            const String  &     i_sName );
+    virtual const cpp::Gate *
+                        inq_Get_ReFinder() const = 0;
+};
+
+
+// IMPLEMENTATION
+
+
+inline void
+Display::StartSlot()
+    { do_StartSlot(); }
+inline void
+Display::FinishSlot()
+    { do_FinishSlot(); }
+inline const cpp::Gate *
+Display::Get_ReFinder() const
+    { return inq_Get_ReFinder(); }
+
+
+
+
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/arygroup.hxx b/autodoc/inc/ary/arygroup.hxx
new file mode 100644
index 000000000000..68de399f99c5
--- /dev/null
+++ b/autodoc/inc/ary/arygroup.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_ARYGROUP_HXX
+#define ARY_ARYGROUP_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/types.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+    class CppEntity;
+}
+
+class Slot;
+
+namespace group
+{
+    typedef std::vector< SlotAccessId > SlotList;
+}
+}
+
+
+
+
+namespace ary
+{
+
+
+
+class AryGroup
+{
+  public:
+    // LIFECYCLE
+    virtual             ~AryGroup() {}
+
+    // INQUIRY
+    Gid                 Id_Group() const;
+    const cpp::CppEntity &
+                        RE_Group() const;
+    const group::SlotList &
+                        Slots() const;
+    DYN Slot *          Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+
+
+  private:
+    virtual Gid         inq_Id_Group() const = 0;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const = 0;
+    virtual const group::SlotList &
+                        inq_Slots() const = 0;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const = 0;
+};
+
+
+
+// IMPLEMENTATION
+inline Gid
+AryGroup::Id_Group() const
+    { return inq_Id_Group(); }
+inline const cpp::CppEntity &
+AryGroup::RE_Group() const
+    { return inq_RE_Group(); }
+inline const group::SlotList &
+AryGroup::Slots() const
+    { return inq_Slots(); }
+inline DYN Slot *
+AryGroup::Create_Slot( SlotAccessId i_nSlot ) const
+    { return inq_Create_Slot(i_nSlot); }
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/ceslot.hxx b/autodoc/inc/ary/ceslot.hxx
new file mode 100644
index 000000000000..f113d26d7372
--- /dev/null
+++ b/autodoc/inc/ary/ceslot.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CESLOT_HXX
+#define ARY_CESLOT_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+
+class Display;
+
+/** Unterscheidungen von Slots
+
+    Slots:
+    -   ReadWrite or ReadOnly
+    -   ContentType
+        -   Groups
+        -   MemberLink              'EnumValue from Enum' or 'Class from Namespace'
+        -   MemberData              'Parameter from Operation'
+        -   SimpleLink
+        -   CommentedLink           'Baseclass from Class'
+        -   DefaultCommentedLink    'Class from GlobaIndex'
+*/
+
+class Slot
+{
+  public:
+    virtual             ~Slot() {}
+
+    virtual void        StoreAt(
+                            Display     &       o_rDestination ) const;
+    virtual uintt       Size() const = 0;
+
+  private:
+    virtual void        StoreEntries(
+                            Display     &       o_rDestination ) const = 0;
+};
+
+class Slot_AutoPtr
+{
+  public:
+                        Slot_AutoPtr(
+                            Slot *              i_pSlot = 0 )
+                                                :   pSlot(i_pSlot) {}
+                        ~Slot_AutoPtr()         { if (pSlot != 0) delete pSlot; }
+
+    Slot_AutoPtr &      operator=(
+                            Slot *              i_pSlot )
+                                                { if (pSlot != 0) delete pSlot;
+                                                  pSlot = i_pSlot;
+                                                  return *this; }
+                        operator bool() const   { return pSlot != 0; }
+
+    const Slot &        operator*()             { csv_assert(pSlot != 0);
+                                                  return *pSlot; }
+    const Slot *        operator->()            { csv_assert(pSlot != 0);
+                                                  return pSlot; }
+
+  private:
+    // Forbidden functions
+                        Slot_AutoPtr(const Slot_AutoPtr &);
+    Slot_AutoPtr &      operator=(const Slot_AutoPtr &);
+
+    // DATA
+    Slot *              pSlot;
+};
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cessentl.hxx b/autodoc/inc/ary/cessentl.hxx
new file mode 100644
index 000000000000..bd724b9c8fe6
--- /dev/null
+++ b/autodoc/inc/ary/cessentl.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CESSENTL_HXX
+#define ARY_CESSENTL_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+class CeEssentials
+{   // Non inline functions are implemented in ceworker.cxx .
+  public:
+    // LIFECYCLE
+                        CeEssentials();
+                        CeEssentials(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            loc::Le_id          i_nLocation );
+                        ~CeEssentials();
+    // INQUIRY
+    const String  &     LocalName() const;
+    Ce_id               Owner() const;
+    loc::Le_id          Location() const;
+
+    // ACCESS
+  private:
+    String              sLocalName;
+    Ce_id               nOwner;
+    loc::Le_id          nLocation;
+};
+
+
+
+// IMPLEMENTATION
+inline const String     &
+CeEssentials::LocalName() const
+    { return sLocalName; }
+inline Ce_id
+CeEssentials::Owner() const
+    { return nOwner; }
+inline loc::Le_id
+CeEssentials::Location() const
+    { return nLocation; }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_builtintype.hxx b/autodoc/inc/ary/cpp/c_builtintype.hxx
new file mode 100644
index 000000000000..1bb6bec86b9c
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_builtintype.hxx
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_BUILTINTYPE_HXX
+#define ARY_CPP_C_BUILTINTYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_type.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Represents types like void, int, double.
+*/
+class BuiltInType : public Type
+{
+  public:
+    enum E_ClassId { class_id = 1200 };
+
+                        BuiltInType(
+                            const String  &     i_sName,
+                            E_TypeSpecialisation
+                                                i_Specialisation );
+
+    String              SpecializedName() const;
+
+    static String       SpecializedName_(
+                            const char *        i_sName,
+                            E_TypeSpecialisation
+                                                i_eTypeSpecialisation );
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual bool        inq_IsConst() const;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const Gate &        i_rGate ) const;
+    // DATA
+    String              sName;
+    E_TypeSpecialisation
+                        eSpecialisation;
+};
+
+
+
+inline String
+BuiltInType::SpecializedName() const
+{
+    return SpecializedName_(sName, eSpecialisation);
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_ce.hxx b/autodoc/inc/ary/cpp/c_ce.hxx
new file mode 100644
index 000000000000..5bec606630fa
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_ce.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_CE_HXX
+#define ARY_CPP_C_CE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_cppentity.hxx>
+    // COMPONENTS
+#include <ary/doc/d_docu.hxx>
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+
+typedef loc::Le_id  Lid;
+
+
+
+/** Represents a C++ code entity.
+*/
+class CodeEntity : public ary::cpp::CppEntity
+{
+  public:
+    typedef Ce_Traits       traits_t;
+
+    // LIFECYCLE
+    virtual             ~CodeEntity() {}
+
+    // INQUIRY
+    Ce_id               CeId() const            { return Ce_id(Id()); }
+    const String  &     LocalName() const;
+    Cid                 Owner() const;
+    Lid                 Location() const;
+    bool                IsVisible() const;
+
+    // ACCESS
+    void                Set_InVisible()         { bIsVisible = false; }
+
+  protected:
+                        CodeEntity() : bIsVisible(true) {}
+
+  private:
+    // Locals
+    virtual const String  &
+                        inq_LocalName() const = 0;
+    virtual Cid         inq_Owner() const = 0;
+    virtual Lid         inq_Location() const = 0;
+
+    // DATA
+    mutable bool        bIsVisible;
+};
+
+
+// IMPLEMENTATION
+inline const String  &
+CodeEntity::LocalName() const
+    { return inq_LocalName(); }
+inline Cid
+CodeEntity::Owner() const
+    { return inq_Owner(); }
+inline Lid
+CodeEntity::Location() const
+    { return inq_Location(); }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_class.hxx b/autodoc/inc/ary/cpp/c_class.hxx
new file mode 100644
index 000000000000..60a81e81be3c
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_class.hxx
@@ -0,0 +1,245 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_CLASS_HXX
+#define ARY_CPP_C_CLASS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/arygroup.hxx>
+    // OTHER
+#include <ary/symtreenode.hxx>
+#include <ary/cessentl.hxx>
+#include <ary/sequentialids.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Enum;
+    class Typedef;
+    class Function;
+    class Variable;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ class.
+*/
+class Class : public CodeEntity,
+              public AryGroup
+{
+  public:
+    enum E_ClassId { class_id = 1001 };
+
+    enum E_Slots
+    {
+        SLOT_Bases = 1,
+        SLOT_NestedClasses,
+        SLOT_Enums,
+        SLOT_Typedefs,
+        SLOT_Operations,
+        SLOT_StaticOperations,
+        SLOT_Data,
+        SLOT_StaticData,
+        SLOT_FriendClasses,
+        SLOT_FriendOperations
+    };
+
+    typedef ::ary::symtree::Node<CeNode_Traits>    node_t;
+
+
+    // LIFECYCLE
+                        Class(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            loc::Le_id          i_nFile,
+                            E_ClassKey          i_eClassKey );
+                        ~Class();
+
+    // OPERATIONS
+    void                Add_BaseClass(
+                            const S_Classes_Base &
+                                                i_rBaseClass );
+    void                Add_TemplateParameterType(
+                            const String  &     i_sLocalName,
+                            Type_id             i_nIdAsType );
+    void                Add_KnownDerivative(
+                            Ce_id               i_nId )
+                                                { aKnownDerivatives.Add(i_nId); }
+
+    void                Add_LocalClass(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalEnum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalTypedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalOperation(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalStaticOperation(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalData(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalStaticData(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+
+    void                UpdateVirtuality(
+                            E_Virtuality        i_eVirtuality )
+                                                { if ( int(i_eVirtuality) > int(eVirtuality) )
+                                                     eVirtuality = i_eVirtuality; }
+    const List_TplParam &
+                        TemplateParameters() const
+                                                { return aTemplateParameterTypes; }
+    const List_Bases &  BaseClasses() const     { return aBaseClasses; }
+    const SequentialIds<Ce_id> &
+                        KnownDerivatives() const
+                                                { return aKnownDerivatives; }
+
+    // INQUIRY
+    E_ClassKey          ClassKey() const;
+    E_Protection        Protection() const;
+    E_Virtuality        Virtuality() const      { return eVirtuality; }
+
+    Ce_id               Search_Child(
+                            const String &      i_key ) const;
+    Rid                 Search_LocalClass(
+                            const String  &     i_sName ) const;
+    const node_t &      AsNode() const;
+
+    // ACCESS
+    node_t &            AsNode();
+
+  private:
+    NON_COPYABLE(Class);
+
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual loc::Le_id  inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // Interface ary::AryGroup
+    virtual Gid         inq_Id_Group() const;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const;
+    virtual const group::SlotList &
+                        inq_Slots() const;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+    // Local
+     typedef List_LocalCe::const_iterator        CIterator_Locals;
+     typedef List_LocalCe::iterator              Iterator_Locals;
+    typedef SequentialIds<Ce_id>                IdSequence;
+
+    CIterator_Locals    PosOfName(
+                            const List_LocalCe& i_rList,
+                            const String  &     i_sName ) const;
+    // DATA
+    CeEssentials        aEssentials;
+    node_t              aAssignedNode;
+
+    List_Bases          aBaseClasses;
+    List_TplParam       aTemplateParameterTypes;
+
+    List_LocalCe        aClasses;
+    List_LocalCe        aEnums;
+    List_LocalCe        aTypedefs;
+    List_LocalCe        aOperations;
+    List_LocalCe        aStaticOperations;
+    List_LocalCe        aData;
+    List_LocalCe        aStaticData;
+
+    IdSequence          aFriendClasses;
+    IdSequence          aFriendOperations;
+    IdSequence          aKnownDerivatives;
+
+    E_ClassKey          eClassKey;
+    E_Protection        eProtection;
+    E_Virtuality        eVirtuality;
+};
+
+
+
+
+// IMPLEMENTATION
+inline E_ClassKey
+Class::ClassKey() const
+{
+    return eClassKey;
+}
+
+inline E_Protection
+Class::Protection() const
+{
+    return eProtection;
+}
+
+inline const Class::node_t &
+Class::AsNode() const
+{
+    return aAssignedNode;
+}
+
+inline Class::node_t &
+Class::AsNode()
+{
+    return aAssignedNode;
+}
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_cppentity.hxx b/autodoc/inc/ary/cpp/c_cppentity.hxx
new file mode 100644
index 000000000000..e487f77102c7
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_cppentity.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_CPPENTITY_HXX
+#define ARY_CPP_C_CPPENTITY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/entity.hxx>
+    // OTHER
+#include <ary/doc/d_docu.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ code entity as parsed by Autodoc.
+*/
+class CppEntity : public Entity
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CppEntity() {}
+
+    // OPERATIONS
+
+    // INQUIRY
+    const ary::doc::Documentation &
+                        Docu() const;
+    // ACCESS
+    void                Set_Docu(
+                            DYN ary::doc::Node &
+                                                pass_docudata );
+  private:
+    // DATA
+    ary::doc::Documentation
+                        aDocu;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const doc::Documentation &
+CppEntity::Docu() const
+{
+    return aDocu;
+}
+
+inline void
+CppEntity::Set_Docu(ary::doc::Node & pass_docudata)
+{
+    aDocu.Set_Data(pass_docudata);
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_de.hxx b/autodoc/inc/ary/cpp/c_de.hxx
new file mode 100644
index 000000000000..46c565b07c15
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_de.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_DE_HXX
+#define ARY_CPP_C_DE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_cppentity.hxx>
+    // OTHER
+#include <ary/loc/loc_types4loc.hxx>
+#include <ary/cpp/c_traits.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Describes a C/C++ #define statement. May be a define or a macro, for which
+    two cases the two different constructors are to be used.
+
+    This class is used by cpp::PreProcessor.
+*/
+class DefineEntity : public ary::cpp::CppEntity
+{
+  public:
+    typedef Def_Traits       traits_t;
+
+    virtual             ~DefineEntity() {}
+
+    // INQUIRY
+    De_id               DefId() const           { return De_id(Id()); }
+    const String  &     LocalName() const;
+    loc::Le_id          Location() const;
+    const StringVector &
+                        DefinitionText() const;
+    // ACCESS
+  protected:
+                        DefineEntity(
+                            const String  &     i_name,
+                            loc::Le_id          i_declaringFile );
+  private:
+    // Locals
+    virtual const StringVector &
+                        inq_DefinitionText() const = 0;
+
+    // DATA
+    String              sName;
+    loc::Le_id          nLocation;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String  &
+DefineEntity::LocalName() const
+    { return sName; }
+
+inline loc::Le_id
+DefineEntity::Location() const
+    { return nLocation; }
+
+inline const StringVector &
+DefineEntity::DefinitionText() const
+    { return inq_DefinitionText(); }
+
+
+
+
+
+}   // end namespace cpp
+}   // end namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_define.hxx b/autodoc/inc/ary/cpp/c_define.hxx
new file mode 100644
index 000000000000..2ad480090c81
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_define.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_DEFINE_HXX
+#define ARY_CPP_C_DEFINE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_de.hxx>
+    // OTHER
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C/C++ #define ("#define DEF") statement, but no macro.
+
+    @see Macro
+*/
+class Define : public DefineEntity
+{
+  public:
+    enum E_ClassId { class_id = 1601 };
+
+                        Define(      /// Used for: #define DEFINE xyz
+                            const String  &     i_name,
+                            const StringVector &
+                                                i_definition,
+                            loc::Le_id          i_declaringFile );
+    virtual             ~Define();
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface DefineEntity:
+    virtual const StringVector &
+                        inq_DefinitionText() const;
+    // DATA
+    StringVector        aDefinition;
+};
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_enum.hxx b/autodoc/inc/ary/cpp/c_enum.hxx
new file mode 100644
index 000000000000..19e04f61a7f8
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_enum.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_ENUM_HXX
+#define ARY_CPP_C_ENUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/arygroup.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/sequentialids.hxx>
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ enum declaration.
+*/
+class Enum : public CodeEntity,
+             public AryGroup
+{
+  public:
+    enum E_ClassId { class_id = 1002 };
+
+    enum E_Slots
+    {
+        SLOT_Values = 1
+    };
+
+    // LIFECYCLE
+                        Enum(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            Lid                 i_nFile );
+                        ~Enum();
+
+    // OPERATIONS
+    void                Add_Value(
+                            Ce_id               i_nId );
+
+    // INQUIRY
+    E_Protection        Protection() const      { return eProtection; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // Interface ary::AryGroup
+    virtual Gid         inq_Id_Group() const;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const;
+    virtual const group::SlotList &
+                        inq_Slots() const;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+
+    // DATA
+       CeEssentials     aEssentials;
+    SequentialIds<Ce_id>
+                        aValues;
+    E_Protection        eProtection;
+};
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_enuval.hxx b/autodoc/inc/ary/cpp/c_enuval.hxx
new file mode 100644
index 000000000000..f2710689a497
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_enuval.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_ENUVAL_HXX
+#define ARY_CPP_C_ENUVAL_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** A C++ enum value declaration and definition.
+*/
+class EnumValue : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 1006 };
+
+    // LIFECYCLE
+                        EnumValue(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            String              i_sInitialisation );
+                        ~EnumValue();
+    // INQUIRY
+    const String  &     Initialisation() const;
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // DATA
+    CeEssentials        aEssentials;
+    String              sInitialisation;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String  &
+EnumValue::Initialisation() const
+    { return sInitialisation; }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_funct.hxx b/autodoc/inc/ary/cpp/c_funct.hxx
new file mode 100644
index 000000000000..94c4a06cad2b
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_funct.hxx
@@ -0,0 +1,149 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_FUNCT_HXX
+#define ARY_CPP_C_FUNCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+#include <ary/cpp/c_osigna.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** A C++ function declaration.
+*/
+class Function : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 1004 };
+
+                        Function(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            loc::Le_id          i_nFile,
+                            Type_id             i_nReturnType,
+                            const std::vector<S_Parameter> &
+                                                i_parameters,
+                            E_ConVol            i_conVol,
+                            E_Virtuality        i_eVirtuality,
+                            FunctionFlags       i_aFlags,
+                            bool                i_bThrowExists,
+                            const std::vector<Type_id> &
+                                                i_rExceptions );
+                        ~Function();
+
+
+    // OPERATIONS
+    void                Add_TemplateParameterType(
+                            const String  &     i_sLocalName,
+                            Type_id             i_nIdAsType );
+
+    // INQUIRY
+    const OperationSignature &
+                        Signature() const;
+    Type_id             ReturnType() const;
+    E_Protection        Protection() const      { return eProtection; }
+    E_Virtuality        Virtuality() const      { return eVirtuality; }
+    const FunctionFlags &
+                        Flags() const           { return aFlags; }
+    const StringVector &
+                        ParamInfos() const      { return aParameterInfos; }
+    const std::vector<Type_id> *
+                        Exceptions() const      { return pExceptions.Ptr(); }
+
+    const List_TplParam &
+                        TemplateParameters() const
+                                                { return aTemplateParameterTypes; }
+    bool                IsIdentical(
+                            const Function &    i_f ) const;
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // Local Types
+    typedef StringVector                ParameterInfoList;
+    typedef std::vector<Type_id>        ExceptionTypeList;
+
+    // DATA
+    CeEssentials        aEssentials;
+    List_TplParam       aTemplateParameterTypes;
+    OperationSignature  aSignature;
+    Type_id             nReturnType;
+    E_Protection        eProtection;
+    E_Virtuality        eVirtuality;
+    FunctionFlags       aFlags;
+    ParameterInfoList   aParameterInfos;
+    Dyn<ExceptionTypeList>
+                        pExceptions;            //  if (NOT pExceptions) there is no throw,
+                                                //    else, there is one, but the list still may be empty.
+};
+
+
+
+
+// IMPLEMENTATION
+inline const OperationSignature &
+Function::Signature() const
+    { return aSignature; }
+inline Type_id
+Function::ReturnType() const
+    { return nReturnType; }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_gate.hxx b/autodoc/inc/ary/cpp/c_gate.hxx
new file mode 100644
index 000000000000..ea9d09078397
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_gate.hxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_GATE_HXX
+#define ARY_CPP_C_GATE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace autodoc
+{
+    class Options;
+}
+namespace ary
+{
+    class Entity;
+
+namespace cpp
+{
+    class CodeEntity;
+    class CppEntity;
+    class CePilot;
+    class DefPilot;
+    class TypePilot;
+}
+namespace loc
+{
+    class LocationPilot;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Acess to all stored objcts in the repository, which are
+    relevant to C++.
+*/
+class Gate
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Gate() {}
+
+
+    // OPERATIONS
+    virtual void        Calculate_AllSecondaryInformation() = 0;
+//                            const ::autodoc::Options &
+//                                                i_options ) = 0;
+
+    // INQUIRY
+    virtual const String &
+                        RepositoryTitle() const = 0;
+    virtual const CodeEntity *
+                        Search_RelatedCe(
+                            Type_id             i_type ) const = 0;
+    virtual const ::ary::cpp::CppEntity *
+                        Search_Entity(
+                            GlobalId            i_id ) const = 0;
+    virtual uintt       Get_AlphabeticalList(
+                            List_GlobalIds &    o_result,
+                            const char *        i_begin,
+                            const char *        i_end ) const = 0;
+    virtual const CePilot &
+                        Ces() const = 0;
+    virtual const DefPilot &
+                        Defs() const = 0;
+    virtual const TypePilot &
+                        Types() const = 0;
+    virtual const loc::LocationPilot &
+                        Locations() const = 0;
+
+    // ACCESS
+    virtual CePilot &   Ces() = 0;
+    virtual DefPilot &  Defs() = 0;
+    virtual TypePilot & Types() = 0;
+    virtual loc::LocationPilot &
+                        Locations() = 0;
+};
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_macro.hxx b/autodoc/inc/ary/cpp/c_macro.hxx
new file mode 100644
index 000000000000..35fe6c17c623
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_macro.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_MACRO_HXX
+#define ARY_CPP_C_MACRO_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_de.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C/C++ macro ("#define ABC(a,b)") statement, but no simple define.
+
+    @see Define
+*/
+class Macro : public DefineEntity
+{
+  public:
+    enum E_ClassId { class_id = 1602 };
+
+                        Macro();
+                        Macro(      /// Used for: #define DEFINE xyz
+                            const String  &     i_name,
+                            const StringVector &
+                                                i_params,
+                            const StringVector &
+                                                i_definition,
+                            loc::Le_id          i_declaringFile );
+                        ~Macro();
+    const StringVector &  Params() const          { return aParams; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface DefineEntity:
+    virtual const StringVector &
+                        inq_DefinitionText() const;
+    // DATA
+    StringVector          aParams;
+    StringVector          aDefinition;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_namesp.hxx b/autodoc/inc/ary/cpp/c_namesp.hxx
new file mode 100644
index 000000000000..2cb0f6878169
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_namesp.hxx
@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_NAMESP_HXX
+#define ARY_CPP_C_NAMESP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/arygroup.hxx>
+    // OTHER
+#include <ary/symtreenode.hxx>
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+    class OperationSignature;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** A C++ namespace.
+*/
+class Namespace : public CodeEntity,
+                  public AryGroup
+{
+  public:
+    enum E_ClassId { class_id = 1000 };
+
+    enum E_Slots
+    {
+        SLOT_SubNamespaces = 1,
+        SLOT_Classes,
+        SLOT_Enums,
+        SLOT_Typedefs,
+        SLOT_Operations,
+        SLOT_Variables,
+        SLOT_Constants
+    };
+
+    typedef ::ary::symtree::Node<CeNode_Traits>    node_t;
+
+                        Namespace();
+                        Namespace(
+                            const String  &     i_sName,
+                            Namespace &         i_rParent );
+                        ~Namespace();
+    // OPERATIONS
+    void                Add_LocalNamespace(
+                            Namespace &         io_rLocalNamespace );
+    void                Add_LocalClass(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalEnum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalTypedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalOperation(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalVariable(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalConstant(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+
+    // INQUIRY
+    virtual uintt       Depth() const;
+    Namespace *         Parent() const;
+
+    Ce_id               Search_Child(
+                            const String &      i_key ) const;
+    Namespace *         Search_LocalNamespace(
+                            const String  &     i_sLocalName ) const;
+    uintt               Get_SubNamespaces(
+                            std::vector< const Namespace* > &
+                                                o_rResultList ) const;
+    Ce_id               Search_LocalClass(
+                            const String &      i_sName ) const;
+    void                Search_LocalOperations(
+                            std::vector<Ce_id> &
+                                                o_result,
+                            const String &      i_sName ) const;
+    const node_t &      AsNode() const;
+
+    // ACCESS
+    node_t &            AsNode();
+
+  private:
+    NON_COPYABLE(Namespace);
+
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+        // Interface AryGroup
+    virtual Gid         inq_Id_Group() const;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const;
+    virtual const ary::group::SlotList &
+                        inq_Slots() const;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+    // Local
+    typedef std::multimap<String, Ce_id>  Map_Operations;
+
+    // DATA
+    CeEssentials        aEssentials;
+    node_t              aAssignedNode;
+
+    Map_NamespacePtr    aLocalNamespaces;
+    Map_LocalCe         aLocalClasses;
+    Map_LocalCe         aLocalEnums;
+    Map_LocalCe         aLocalTypedefs;
+    Map_Operations      aLocalOperations;
+    Map_LocalCe         aLocalVariables;
+    Map_LocalCe         aLocalConstants;
+
+    Namespace *         pParent;
+    uintt               nDepth;
+};
+
+
+
+// IMPLEMENTATION
+inline const Namespace::node_t &
+Namespace::AsNode() const
+{
+    return aAssignedNode;
+}
+
+inline Namespace::node_t &
+Namespace::AsNode()
+{
+    return aAssignedNode;
+}
+
+
+
+
+}   // namespace cpp
+}   // ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_osigna.hxx b/autodoc/inc/ary/cpp/c_osigna.hxx
new file mode 100644
index 000000000000..60596e327191
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_osigna.hxx
@@ -0,0 +1,122 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_OSIGNA_HXX
+#define ARY_CPP_C_OSIGNA_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** The signature of a C++ function. That is: parameter types and
+    const/volatile modifiers.
+*/
+class OperationSignature
+{
+  public:
+    typedef std::vector<Type_id>    ParameterTypeList;
+
+                        OperationSignature(
+                            ParameterTypeList   i_parameterTypes,  // Non const, because it will be swapped with aParameterTypes.
+                            E_ConVol            i_conVol );
+
+    bool                operator==(
+                            const OperationSignature &
+                                                i_rSig ) const;
+    bool                operator<(
+                            const OperationSignature &
+                                                i_rSig ) const;
+
+    // INQUIRY
+    const ParameterTypeList &
+                        Parameters() const;
+    E_ConVol            ConVol() const;
+
+    /** Compares the signatures by length an then by ids of
+        parameter types. So the result is not always human
+        reconstructable.
+        @return like in strcmp().
+    */
+    int                 Compare(
+                            const OperationSignature &
+                                                i_rSig ) const;
+  private:
+    // DATA
+    ParameterTypeList   aParameterTypes;
+    E_ConVol            eConVol;
+};
+
+
+
+
+// IMPLEMENTATION
+inline bool
+OperationSignature::operator==( const OperationSignature & i_rSign ) const
+{
+    return Compare(i_rSign) == 0;
+}
+
+inline bool
+OperationSignature::operator<( const OperationSignature & i_rSign ) const
+{
+    return Compare(i_rSign) < 0;
+}
+
+inline const OperationSignature::ParameterTypeList &
+OperationSignature::Parameters() const
+{
+    return aParameterTypes;
+}
+
+inline E_ConVol
+OperationSignature::ConVol() const
+{
+    return eConVol;
+}
+
+
+
+} // namespace cpp
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_slntry.hxx b/autodoc/inc/ary/cpp/c_slntry.hxx
new file mode 100644
index 000000000000..0c6ef0d9c74a
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_slntry.hxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_SLNTRY_HXX
+#define ARY_CPP_C_SLNTRY_HXX
+//  KORR_DEPRECATED_3.0
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/namesort.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Namespace;
+
+
+
+typedef Namespace * NamespacePtr;
+struct Less_NamespacePtr
+{
+    bool                operator()(             /// @return true if (i_p1->Name() < i_p2->Name()) .
+                            const NamespacePtr& i_p1,
+                            const NamespacePtr& i_p2 );
+};
+
+
+
+
+struct S_Classes_Base
+{
+    Type_id             nId;
+    E_Protection        eProtection;
+    E_Virtuality        eVirtuality;
+    String              sComment;
+
+                        S_Classes_Base()
+                            :   nId(0),
+                                eProtection(PROTECT_global),
+                                eVirtuality(VIRTUAL_none)
+                                // sComment
+                                { }
+};
+
+struct S_TplParam
+{
+    String              sName;
+    Type_id             nId;
+
+                        S_TplParam(
+                            String              i_sName,
+                            Type_id             i_nId )
+                            :   sName(i_sName), nId(i_nId) {}
+    const String  &     Name() const            { return sName; }
+};
+
+
+struct S_LocalCe
+{
+    String              sLocalName;
+    Ce_id               nId;
+
+                        S_LocalCe()             : nId(0) {}
+                        S_LocalCe(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId )
+                                                : sLocalName(i_sLocalName), nId(i_nId) {}
+    bool                operator<(
+                            const S_LocalCe &   i_rCe ) const
+                                                { return LesserName()(sLocalName,i_rCe.sLocalName); }
+};
+
+typedef std::vector< S_LocalCe >        List_LocalCe;
+
+
+typedef std::map<String, NamespacePtr>          Map_NamespacePtr;
+typedef std::vector< S_Classes_Base >           List_Bases;
+typedef std::vector< S_TplParam >               List_TplParam;
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_traits.hxx b/autodoc/inc/ary/cpp/c_traits.hxx
new file mode 100644
index 000000000000..70db38ce0400
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_traits.hxx
@@ -0,0 +1,216 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_TRAITS_HXX
+#define ARY_CPP_C_TRAITS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace symtree
+{
+    template <class X> class Node;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Basic traits for derived ones of ->CodeEntity.
+*/
+struct Ce_Traits
+{
+    typedef CodeEntity          entity_base_type;
+    typedef Ce_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of SYMBOL_TRAITS for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct CeNode_Traits : public Ce_Traits
+{
+    static const symtree::Node<CeNode_Traits> *
+                        NodeOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static symtree::Node<CeNode_Traits> *
+                        NodeOf_(
+                            entity_base_type &  i_entity );
+    static entity_base_type *
+                        ParentOf_(
+                            const entity_base_type &
+                                                i_entity );
+    template <class KEY>
+    static id_type      Search_(
+                            const entity_base_type &
+                                                i_entity,
+                            const KEY &         i_localKey );
+};
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Ce_Compare : public Ce_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Ce_GlobalCompare : public Ce_Traits
+{
+    typedef  entity_base_type   key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity )
+                            { return i_entity; }
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+/** Basic traits for derivd ones of ->DefineEntity.
+*/
+struct Def_Traits
+{
+    typedef DefineEntity        entity_base_type;
+    typedef De_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Def_Compare : public Def_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+/** Basic traits for derivd ones of ->Type.
+*/
+struct Type_Traits
+{
+    typedef Type                entity_base_type;
+    typedef Type_id             id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct UsedType_Compare : public Type_Traits
+{
+    typedef  UsedType           key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+
+
+
+
+// IMPLEMENTATION
+
+/// Implementation helper for ->CeNode_Traits::Search_ .
+Ce_id                   CeNode_Search(
+                            const CodeEntity &  i_entity,
+                            const String &      i_localKey );
+
+
+template <class KEY>
+Ce_Traits::id_type
+CeNode_Traits::Search_( const entity_base_type & i_entity,
+                        const KEY &              i_localKey )
+{
+    return CeNode_Search(i_entity, i_localKey);
+}
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_tydef.hxx b/autodoc/inc/ary/cpp/c_tydef.hxx
new file mode 100644
index 000000000000..398b140215d2
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_tydef.hxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_TYDEF_HXX
+#define ARY_CPP_C_TYDEF_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ typedef declaration.
+*/
+class Typedef : public CodeEntity
+{
+  public:
+    // LIFECYCLE
+    enum E_ClassId { class_id = 1003 };
+
+                        Typedef(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            Lid                 i_nFile,
+                            Type_id             i_nDescribingType );
+                        ~Typedef();
+    // INQUIRY
+    Type_id             DescribingType() const;
+    E_Protection        Protection() const      { return eProtection; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // DATA
+    CeEssentials        aEssentials;
+    Type_id             nDescribingType;
+    E_Protection        eProtection;
+};
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Typedef::DescribingType() const
+{
+    return nDescribingType;
+}
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_type.hxx b/autodoc/inc/ary/cpp/c_type.hxx
new file mode 100644
index 000000000000..b404c890ec54
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_type.hxx
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_TYPE_HXX
+#define ARY_CPP_C_TYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/entity.hxx>
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_traits.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Base of all C++ types
+*/
+class Type : public ::ary::Entity
+{
+  public:
+    typedef Type_Traits       traits_t;
+
+    virtual             ~Type() {}
+
+    Type_id             TypeId() const          { return Type_id(Id()); }
+    Ce_id               RelatedCe() const;
+    bool                IsConst() const;
+    void                Get_Text(
+                            StreamStr &         o_rOut,
+                            const Gate &        i_rGate ) const;
+
+    /** It is guaranteed, that the output is correct, also,
+        if all three output-streams are the same instance.
+    */
+    void                Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const Gate &        i_rGate ) const;
+
+  private:
+    virtual Rid         inq_RelatedCe() const;  // Defaulted to 0. Implemented in c_builtintype.cxx.
+    virtual bool        inq_IsConst() const = 0;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const Gate &        i_rGate ) const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Ce_id
+Type::RelatedCe() const
+{
+    return Ce_id(inq_RelatedCe());
+}
+
+inline bool
+Type::IsConst() const
+{
+    return inq_IsConst();
+}
+
+inline void
+Type::Get_Text( StreamStr &         o_rOut,
+                const Gate &        i_rGate ) const
+{
+    inq_Get_Text( o_rOut, o_rOut, o_rOut, i_rGate );
+}
+
+inline void
+Type::Get_Text( StreamStr &         o_rPreName,
+                StreamStr &         o_rName,
+                StreamStr &         o_rPostName,
+                const Gate &        i_rGate ) const
+{
+    inq_Get_Text( o_rPreName,o_rName,o_rPostName, i_rGate );
+}
+
+
+
+
+
+}   // namespace  cpp
+}   // namespace  ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_types4cpp.hxx b/autodoc/inc/ary/cpp/c_types4cpp.hxx
new file mode 100644
index 000000000000..230578054051
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_types4cpp.hxx
@@ -0,0 +1,134 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_TYPES4CPP_HXX
+#define ARY_CPP_C_TYPES4CPP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <cosv/tpl/range.hxx>
+#include <ary/types.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+class Namespace;
+class CodeEntity;
+class Type;
+class DefineEntity;
+class Gate;
+class CePilot;
+class TypePilot;
+class SecondariesPilot;
+class Ce_Storage;
+class Def_Storage;
+class Type_Storage;
+class UsedType;
+
+
+typedef TypedId< ::ary::cpp::CodeEntity >       Ce_id;
+typedef TypedId< ::ary::cpp::Type >             Type_id;
+typedef TypedId< ::ary::cpp::DefineEntity >     De_id;
+
+
+typedef std::vector<Ce_id>                      CesList;
+typedef std::vector<De_id>                      DefsList;
+typedef std::vector<Type_id>                    TypesList;
+
+typedef std::vector<Ce_id>::const_iterator      CesConstIterator;
+typedef std::vector<De_id>::const_iterator      DefsConstIterator;
+typedef std::vector<Type_id>::const_iterator    TypesConstIterator;
+
+typedef csv::range< CesConstIterator >          CesResultList;
+typedef csv::range< DefsConstIterator >         DefsResultList;
+typedef csv::range< TypesConstIterator >        TypesResultList;
+
+
+typedef std::map<String, Ce_id>                 Map_LocalCe;
+
+
+
+enum E_Protection
+{
+    PROTECT_global = 0,
+    PROTECT_local,          /// within Functions
+    PROTECT_public,
+    PROTECT_protected,
+    PROTECT_private
+};
+
+/** The sequence of E_Virtuality's values must not be changed,
+    because they are used in int-comparisons.
+*/
+enum E_Virtuality
+{
+    VIRTUAL_none = 0,
+    VIRTUAL_virtual,
+    VIRTUAL_abstract
+};
+
+enum E_ClassKey
+{
+    CK_class,
+    CK_struct,
+    CK_union
+};
+
+enum E_TypeSpecialisation
+{
+    TYSP_none = 0,
+    TYSP_unsigned,
+    TYSP_signed
+};
+
+enum E_ConVol
+{
+    CONVOL_none = 0,
+    CONVOL_const = 0x0001,
+    CONVOL_volatile = 0x0002,
+    CONVOL_both = 0x0003
+};
+
+
+
+// Backwards compatibility:
+typedef Ce_id                           Cid;
+typedef Type_id                         Tid;
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_vari.hxx b/autodoc/inc/ary/cpp/c_vari.hxx
new file mode 100644
index 000000000000..42f3e76a5e83
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_vari.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_VARI_HXX
+#define ARY_CPP_C_VARI_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ variable or constant declaration.
+*/
+class Variable : public CodeEntity
+{
+  public:
+    // LIFECYCLE
+    enum E_ClassId { class_id = 1005 };
+
+                        Variable(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            loc::Le_id          i_nFile,
+                            Type_id             i_nType,
+                            VariableFlags       i_aFlags,
+                            const String  &     i_sArraySize,
+                            const String  &     i_sInitValue );
+                        ~Variable();
+
+
+    // INQUIRY
+    Type_id             Type() const;
+    const String  &     ArraySize() const;
+    const String  &     Initialisation() const;
+    E_Protection        Protection() const      { return eProtection; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // DATA
+    CeEssentials        aEssentials;
+    Type_id             nType;
+    E_Protection        eProtection;
+    VariableFlags       aFlags;
+    String              sArraySize;
+    String              sInitialisation;
+};
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Variable::Type() const
+    { return nType; }
+inline const String  &
+Variable::ArraySize() const
+    { return sArraySize; }
+inline const String  &
+Variable::Initialisation() const
+    { return sInitialisation; }
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/c_vfflag.hxx b/autodoc/inc/ary/cpp/c_vfflag.hxx
new file mode 100644
index 000000000000..f9e3532e0f2b
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_vfflag.hxx
@@ -0,0 +1,151 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_VFFLAG_HXX
+#define ARY_CPP_C_VFFLAG_HXX
+
+// USED SERVICES
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Properties of C++ variables.
+*/
+struct VariableFlags
+{
+  public:
+    enum E_Flags
+    {
+        f_static_local      = 0x0001,
+        f_static_member     = 0x0002,
+        f_extern            = 0x0004,
+        f_mutable           = 0x0008
+    };
+
+                        VariableFlags(
+                            UINT16              i_nFlags = 0 )
+                                                :   nFlags(i_nFlags) {}
+
+    void                Reset()                 { nFlags = 0; }
+
+    void                SetStaticLocal()        { nFlags |= f_static_local; }
+    void                SetStaticMember()       { nFlags |= f_static_member; }
+    void                SetExtern()             { nFlags |= f_extern; }
+    void                SetMutable()            { nFlags |= f_mutable; }
+
+    bool                IsStaticLocal() const   { return (nFlags & f_static_local) != 0; }
+    bool                IsStaticMember() const  { return (nFlags & f_static_member) != 0; }
+    bool                IsExtern() const        { return (nFlags & f_extern) != 0; }
+    bool                IsMutable() const       { return (nFlags & f_mutable) != 0; }
+
+  private:
+    UINT16              nFlags;
+};
+
+
+/** Properties of C++ functions.
+*/
+struct FunctionFlags
+{
+  public:
+    enum E_Flags
+    {
+        f_static_local      = 0x0001,
+        f_static_member     = 0x0002,
+        f_extern            = 0x0004,
+        f_externC           = 0x0008,
+        f_mutable           = 0x0010,
+        f_inline            = 0x0100,
+        f_register          = 0x0200,
+        f_explicit          = 0x0400
+    };
+
+                        FunctionFlags(
+                            UINT16              i_nFlags = 0 )
+                                                :   nFlags(i_nFlags) {}
+
+    bool                operator==(
+                            const FunctionFlags &
+                                                i_ff ) const
+                                                { return nFlags == i_ff.nFlags; }
+    bool                operator!=(
+                            const FunctionFlags &
+                                                i_ff ) const
+                                                { return NOT operator==(i_ff); }
+
+    void                Reset()                 { nFlags = 0; }
+
+    void                SetStaticLocal()        { nFlags |= f_static_local; }
+    void                SetStaticMember()       { nFlags |= f_static_member; }
+    void                SetExtern()             { nFlags |= f_extern; }
+    void                SetExternC()            { nFlags |= f_externC; }
+    void                SetMutable()            { nFlags |= f_mutable; }
+    void                SetInline()             { nFlags |= f_inline; }
+    void                SetRegister()           { nFlags |= f_register; }
+    void                SetExplicit()           { nFlags |= f_explicit; }
+
+    bool                IsStaticLocal() const   { return (nFlags & f_static_local) != 0; }
+    bool                IsStaticMember() const  { return (nFlags & f_static_member) != 0; }
+    bool                IsExtern() const        { return (nFlags & f_extern) != 0; }
+    bool                IsExternC() const       { return (nFlags & f_externC) != 0; }
+    bool                IsMutable() const       { return (nFlags & f_mutable) != 0; }
+    bool                IsInline() const        { return (nFlags & f_inline) != 0; }
+    bool                IsRegister() const      { return (nFlags & f_register) != 0; }
+    bool                IsExplicit() const      { return (nFlags & f_explicit) != 0; }
+
+  private:
+    UINT16              nFlags;
+};
+
+
+/** A C++ function parameter.
+*/
+struct S_Parameter
+{
+    String              sName;
+    String              sSizeExpression;
+    String              sInitExpression;
+    Type_id             nType;
+
+                        S_Parameter()           : nType(0) {}
+                        ~S_Parameter()          {}
+    void                Empty()                 { nType = Type_id(0);
+                                                  sName.clear();
+                                                  sSizeExpression.clear();
+                                                  sInitExpression.clear(); }
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/cp_ce.hxx b/autodoc/inc/ary/cpp/cp_ce.hxx
new file mode 100644
index 000000000000..93b56536dbbb
--- /dev/null
+++ b/autodoc/inc/ary/cpp/cp_ce.hxx
@@ -0,0 +1,173 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CP_CE_HXX
+#define ARY_CPP_CP_CE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+    class QualifiedName;
+
+namespace cpp
+{
+    class Class;
+    class CodeEntity;
+    class Enum;
+    class EnumValue;
+    class Function;
+    class InputContext;
+    class Namespace;
+    class OperationSignature;
+    class Typedef;
+    class Variable;
+
+    struct FunctionFlags;
+    struct S_Parameter;
+    struct VariableFlags;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Acess to all declared C++ code entites (types, variables, operations)
+    in the repository.
+*/
+class CePilot
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CePilot() {}
+
+    // OPERATIONS
+    virtual Namespace &
+                        CheckIn_Namespace(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName ) = 0;
+    virtual Class &     Store_Class(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            E_ClassKey          i_classKey ) = 0;
+    virtual Enum &      Store_Enum(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName ) = 0;
+    virtual Typedef &   Store_Typedef(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_referredType ) = 0;
+
+    /// @return 0, if the function is duplicate.
+    virtual Function *  Store_Operation(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_returnType,
+                            const std::vector<S_Parameter> &
+                                                i_parameters,
+                            E_Virtuality        i_virtuality,
+                            E_ConVol            i_conVol,
+                            FunctionFlags       i_flags,
+                            bool                i_throwExists,
+                            const std::vector<Tid> &
+                                                i_exceptions ) = 0;
+    virtual Variable &  Store_Variable(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_type,
+                            VariableFlags       i_flags,
+                            const String  &     i_arraySize,
+                            const String  &     i_initValue ) = 0;
+    virtual EnumValue & Store_EnumValue(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            const String  &     i_initValue ) = 0;
+    // INQUIRY
+    virtual const Namespace &
+                        GlobalNamespace() const = 0;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_id ) const = 0;
+    virtual const CodeEntity *
+                        Search_Ce(
+                            Ce_id               i_id ) const = 0;
+
+    /// It's assumed that i_rSearchedName is an absolute name.
+    virtual const CodeEntity *
+                        Search_CeAbsolute(
+                            const CodeEntity &  i_curScope,
+                            const QualifiedName &
+                                                i_absoluteName ) const = 0;
+    virtual const CodeEntity *
+                        Search_CeLocal(
+                            const String  &     i_relativeName,
+                            bool                i_isFunction,
+                            const Namespace &   i_curNamespace,
+                            const Class *       i_curClass ) const = 0;
+    virtual void        Get_QualifiedName(
+                            StreamStr &         o_result,
+                            const String  &     i_localName,
+                            Ce_id               i_owner,
+                            const char *        i_delimiter = "::" ) const = 0;
+    virtual void        Get_SignatureText(
+                            StreamStr &         o_rOut,
+                            const OperationSignature &
+                                                i_signature,
+                            const StringVector *
+                                                i_sParameterNames = 0 ) const = 0;
+    virtual CesResultList
+                        Search_TypeName(
+                            const String  &     i_sName ) const = 0;
+    // ACCESS
+       virtual Namespace & GlobalNamespace() = 0;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/cp_def.hxx b/autodoc/inc/ary/cpp/cp_def.hxx
new file mode 100644
index 000000000000..5f58634b4716
--- /dev/null
+++ b/autodoc/inc/ary/cpp/cp_def.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CP_DEF_HXX
+#define ARY_CPP_CP_DEF_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Define;
+    class InputContext;
+    class Macro;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Acess to C++ defines and macros in the repository.
+*/
+class DefPilot
+{
+  public:
+    typedef DefsList::const_iterator                DefsIterator;
+
+
+
+    // LIFECYCLE
+    virtual             ~DefPilot() {}
+
+
+    // OPERATIONS
+    virtual Define &    Store_Define(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rDefinition ) = 0;
+    virtual Macro &     Store_Macro(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rParams,
+                            const StringVector &
+                                                i_rDefinition ) = 0;
+    // INQUIRY
+    virtual const DefineEntity &
+                        Find_Def(
+                            De_id               i_id ) const = 0;
+    virtual DefsResultList
+                        AllDefines() const = 0;
+    virtual DefsResultList
+                        AllMacros() const = 0;
+};
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/cp_type.hxx b/autodoc/inc/ary/cpp/cp_type.hxx
new file mode 100644
index 000000000000..c8ebd6450f59
--- /dev/null
+++ b/autodoc/inc/ary/cpp/cp_type.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CP_TYPE_HXX
+#define ARY_CPP_CP_TYPE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class InputContext;
+    class Type;
+    class UsedType;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+/** Acess to all found C++ types (as they are used in declarations)
+    in the repository.
+*/
+class TypePilot
+{
+  public:
+
+    // LIFECYCLE
+    virtual             ~TypePilot() {}
+
+
+    // OPERATIONS
+    virtual const Type &
+                        CheckIn_UsedType(
+                            const InputContext &
+                                                i_context,
+                            DYN UsedType &      pass_type ) = 0;
+    // INQUIRY
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_type ) const = 0;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_result,
+                            Type_id             i_type ) const = 0;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_preName,              ///  ::ary::cpp::
+                            StreamStr &         o_name,                 ///  MyClass
+                            StreamStr &         o_postName,             ///  <TplArgument> * const &
+                            Type_id             i_type ) const = 0;
+    virtual Type_id     Tid_Ellipse() const = 0;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/inpcontx.hxx b/autodoc/inc/ary/cpp/inpcontx.hxx
new file mode 100644
index 000000000000..69d0d3f41337
--- /dev/null
+++ b/autodoc/inc/ary/cpp/inpcontx.hxx
@@ -0,0 +1,216 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_INPCONTX_HXX
+#define ARY_CPP_INPCONTX_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+namespace cpp
+{
+    class Gate;
+    class Namespace;
+    class Class;
+    class Enum;
+
+    class OperationSignature;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** The context of a CodeEntity, which is going to be stored in the
+    repository. The information is used mainly by ->ary::cpp::CeAdmin.
+*/
+class InputContext
+{
+  public:
+    class Owner
+    {
+      public:
+        // LIFECYCLE
+        virtual             ~Owner() {}
+
+        // OPERATIONS
+        /// Adds Class data to current inner scope (Namespace or Class).
+        void                Add_Class(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId );
+        /// Adds Enum data to current inner scope (Namespace or Class).
+        void                Add_Enum(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId );
+        /// Adds Typedef data to current inner scope (Namespace or Class).
+        void                Add_Typedef(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId );
+        /// Adds Operation data to current inner scope (Namespace or Class).
+        void                Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsStaticMember );    /// True only for static class members.
+        /// Adds Variable data to current inner scope (Namespace or Class).
+        void                Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStaticMember );    /// True only for static class members.
+        // INQUIRY
+        Ce_id               CeId() const;
+
+        /** @attention Must only be used by ary::cpp::GatePilot!
+            Will work nowhere else!
+        */
+        virtual bool        HasClass(
+                                const String  &     i_sLocalName ) = 0;
+      private:
+        virtual void        do_Add_Class(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId ) = 0;
+        virtual void        do_Add_Enum(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId ) = 0;
+        virtual void        do_Add_Typedef(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId ) = 0;
+        virtual void        do_Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsStatic ) = 0;
+        virtual void        do_Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStatic ) = 0;
+        virtual Ce_id       inq_CeId() const = 0;
+    };
+
+    // LIFECYCLE
+    virtual             ~InputContext() {}
+
+    // OPERATIONS
+
+    // INQUIRY
+    loc::File &         CurFile() const;
+
+    Namespace &         CurNamespace() const;
+    Class *             CurClass() const;
+    Enum *              CurEnum() const;
+
+    Owner &             CurOwner() const;
+    E_Protection        CurProtection() const;
+
+  private:
+    virtual loc::File & inq_CurFile() const = 0;
+
+    virtual Namespace & inq_CurNamespace() const = 0;
+    virtual Class *     inq_CurClass() const = 0;
+    virtual Enum *      inq_CurEnum() const = 0;
+
+    virtual Owner &     inq_CurOwner() const = 0;
+    virtual E_Protection
+                        inq_CurProtection() const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline loc::File &
+InputContext::CurFile() const
+    { return inq_CurFile(); }
+
+inline Namespace &
+InputContext::CurNamespace() const
+    { return inq_CurNamespace(); }
+inline Class *
+InputContext::CurClass() const
+    { return inq_CurClass(); }
+inline Enum *
+InputContext::CurEnum() const
+    { return inq_CurEnum(); }
+inline InputContext::Owner &
+InputContext::CurOwner() const
+    { return inq_CurOwner(); }
+inline E_Protection
+InputContext::CurProtection() const
+    { return inq_CurProtection(); }
+
+
+inline void
+InputContext::Owner::Add_Class( const String  &     i_sLocalName,
+                                Cid                 i_nId )
+    { do_Add_Class(i_sLocalName, i_nId); }
+inline void
+InputContext::Owner::Add_Enum( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+    { do_Add_Enum(i_sLocalName, i_nId); }
+inline void
+InputContext::Owner::Add_Typedef( const String  &     i_sLocalName,
+                                  Cid                 i_nId )
+    { do_Add_Typedef(i_sLocalName, i_nId); }
+inline void
+InputContext::Owner::Add_Operation( const String  &             i_sLocalName,
+                                    Cid                         i_nId,
+                                    bool                        i_bIsStatic )
+    { do_Add_Operation( i_sLocalName, i_nId, i_bIsStatic ); }
+inline void
+InputContext::Owner::Add_Variable( const String  &     i_sLocalName,
+                                   Cid                 i_nId,
+                                   bool                i_bIsConst,
+                                   bool                i_bIsStatic )
+    { do_Add_Variable( i_sLocalName, i_nId, i_bIsConst, i_bIsStatic ); }
+inline Ce_id
+InputContext::Owner::CeId() const
+    { return inq_CeId(); }
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/namechain.hxx b/autodoc/inc/ary/cpp/namechain.hxx
new file mode 100644
index 000000000000..094abd755981
--- /dev/null
+++ b/autodoc/inc/ary/cpp/namechain.hxx
@@ -0,0 +1,140 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_NAMECHAI_HXX
+#define ARY_CPP_NAMECHAI_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+
+namespace ut
+{
+    class List_TplParameter;
+
+class NameSegment
+{
+  public:
+                        NameSegment(
+                            const char *        i_sName );
+    /** @precond MPT pTemplate.
+        This cannot be used, except of inserting a new element
+        in the segment list of ary::cpp::ut::NameChain. In that
+        case, the template parameter list doe snot yet exist.
+    */
+                        NameSegment(
+                            const NameSegment & i_rSeg );
+                        ~NameSegment();
+
+    // OPERATIONS
+    List_TplParameter & AddTemplate();
+
+    // INQUIRY
+    const String  &     Name() const;
+
+        /// @return as strcmp().
+    intt                Compare(
+                            const NameSegment & i_rOther ) const;
+    void                Get_Text_AsScope(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+    void                Get_Text_AsMainType(
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+
+    NameSegment& operator=(const NameSegment&);
+  private:
+    String              sName;
+    Dyn<List_TplParameter>
+                        pTemplate;
+};
+
+class NameChain
+{
+  public:
+    typedef std::vector<NameSegment>::const_iterator
+            const_iterator;
+
+                        NameChain();
+                        ~NameChain();
+
+    // OPERATIONS
+    void                Add_Segment(
+                            const char *        i_sSeg );
+    /** @precond  aSegments.size() > 0.
+        Which means: Add_Segment() has to be called at least once before.
+    */
+    List_TplParameter & Templatize_LastSegment();
+
+    // INQUIRY
+    const_iterator      begin() const          { return aSegments.begin(); }
+    const_iterator      end() const            { return aSegments.end(); }
+
+    /// @return like strcmp.
+    intt                Compare(
+                            const NameChain &   i_rChain ) const;
+    /// @ATTENTION Return value is volatile. Not reentrance enabled.
+    const String  &     LastSegment() const;
+
+    void                Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+  private:
+    std::vector< NameSegment >
+                        aSegments;
+};
+
+
+
+// IMPLEMENTATION
+inline const String  &
+NameSegment::Name() const
+    { return sName; }
+
+
+
+
+
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/cpp/usedtype.hxx b/autodoc/inc/ary/cpp/usedtype.hxx
new file mode 100644
index 000000000000..594be2a948a4
--- /dev/null
+++ b/autodoc/inc/ary/cpp/usedtype.hxx
@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_USEDTYPE_HXX
+#define ARY_CPP_USEDTYPE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_type.hxx>
+    // OTHER
+#include <ary/cpp/namechain.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class CePilot;
+
+namespace ut
+{
+    class List_TplParameter;
+}
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** This class represents a type in textual form, like it is parsed out of
+    source code as a variable type or function return type.
+*/
+class UsedType : public Type
+{
+  public:
+    enum E_ClassId { class_id = 1203 };
+
+    explicit            UsedType(
+                            Ce_id               i_scope );
+                        ~UsedType();
+    // OPERATORS
+    bool                operator<(
+                            const UsedType &    i_rType ) const;
+    // OPERATIONS
+
+        // Operations to build up the used type from parsing:
+    void                Set_Absolute();         /// "::" is in front.
+    void                Add_NameSegment(
+                            const char *        i_sSeg );
+    ut::List_TplParameter &
+                        Enter_Template();
+    void                Set_Unsigned();
+    void                Set_Signed();
+    void                Set_BuiltIn(
+                            const char *        i_sType );
+    void                Set_Const();            /// Sets CV to the type or the present pointer level, whatever is highest.
+    void                Set_Volatile();         /// Sets CV to the type or the present pointer level, whatever is highest.
+    void                Add_PtrLevel();         /// For an '*'.
+    void                Set_Reference();        /// For an '&'.
+
+        // Operations to find the relating CodeEntity:
+    /** This needs to be called only one time. After that
+        RelatedCe() will return the value.
+
+        When connectiing all parsed types, there are three steps:
+            1. Find related types in the same scope and namespaces above.
+            2. Then all classes can be connected to their base classes.
+            3. Lastly types can be connected to Ces only known via their base
+               classes. This is not possible at step 1.
+
+        @see Connect2CeOnlyKnownViaBaseClass()
+    */
+    void                Connect2Ce(
+                            const CePilot &     i_ces );
+
+    /** @see Connect2Ce()
+    */
+    void                Connect2CeOnlyKnownViaBaseClass(
+                            const Gate &        i_gate );
+
+    // INQUIRY
+    /** @return True, if type consists of one built-in typename and
+                nothing else.
+    */
+    bool                IsBuiltInType() const;
+    /** @return the full local name, including template instantiation, but without
+        '*','&' or modifiers.
+    */
+    const String  &     LocalName() const;
+    E_TypeSpecialisation
+                        TypeSpecialisation() const;
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface ary::cpp::Type:
+    virtual Rid         inq_RelatedCe() const;
+    virtual bool        inq_IsConst() const;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+    // Local
+    typedef std::vector< ary::cpp::E_ConVol >   PtrLevelVector;
+
+    uintt               PtrLevel() const        { return uintt(aPtrLevels.size()); }
+    Ce_id               RecursiveSearchCe_InBaseClassesOf(
+                            const CodeEntity &  i_mayBeClass,
+                            const StringVector &
+                                                i_myQualification,
+                            const String &      i_myName,
+                            const Gate &        i_gate ) const;
+    void                Get_NameParts(
+                            StringVector &      o_qualification,
+                            String &            o_name );
+
+    // Forbidden functions
+                        UsedType(
+                            const UsedType &    i_rType );
+    bool                operator=(
+                            const UsedType &    i_rType );
+
+    // DATA
+    ut::NameChain       aPath;
+    PtrLevelVector      aPtrLevels;
+    ary::cpp::E_ConVol  eConVol_Type;
+    bool                bIsReference;
+    bool                bIsAbsolute;
+    bool                bRefers2BuiltInType;
+    E_TypeSpecialisation
+                        eTypeSpecialisation;
+    Ce_id               nRelatedCe;
+
+    /// Namespace or class scope where the type occurred.
+    Ce_id               nScope;
+};
+
+
+namespace ut
+{
+    class TemplateParameter;
+
+class List_TplParameter
+{
+  public:
+    typedef std::vector< DYN TemplateParameter * >::const_iterator  const_iterator;
+
+                        List_TplParameter();
+                        ~List_TplParameter();
+
+    void                AddParam_Type(
+                            Type_id             i_nType );
+    /// puts "< " TemplateArgumentList " >" to o_rOut.
+    void                Get_Text(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+    /// @return as strcmp().
+    intt                Compare(
+                            const List_TplParameter &
+                                                i_rOther ) const;
+
+  private:
+    typedef std::vector< DYN TemplateParameter * >  Vector_TplArgument;
+
+    Vector_TplArgument  aTplParameters;
+};
+
+}   // namespace ut
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/d_boolean.hxx b/autodoc/inc/ary/doc/d_boolean.hxx
new file mode 100644
index 000000000000..58dd45008919
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_boolean.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DOC_D_BOOLEAN_HXX
+#define ARY_DOC_D_BOOLEAN_HXX
+
+// BASE CLASSES
+#include <ary/doc/d_node.hxx>
+
+// USED SERVICES
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Repesents a boolean documentation item like "optional" or "not optional".
+*/
+class Boolean : public Node
+{
+  public:
+    // LIFECYCLE
+    explicit            Boolean(
+                            nodetype::id        i_type );
+    virtual             ~Boolean();
+
+    // OPERATIONS
+    void                Set(
+                            bool                i_b );
+    // INQUIRY
+    bool                IsTrue() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    bool                b;
+};
+
+
+
+
+// IMPLEMENTATION
+inline
+Boolean::Boolean(nodetype::id i_type)
+    :   Node(i_type),
+        b(false)
+{
+}
+
+inline bool
+Boolean::IsTrue() const
+{
+    return b;
+}
+
+inline void
+Boolean::Set( bool i_b )
+{
+    b = i_b;
+}
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/d_docu.hxx b/autodoc/inc/ary/doc/d_docu.hxx
new file mode 100644
index 000000000000..ad9c895a2a6e
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_docu.hxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DOC_D_DOCU_HXX
+#define ARY_DOC_D_DOCU_HXX
+
+// BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+
+// USED SERVICES
+#include <ary/doc/d_node.hxx>
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Represents a documentation which is assigned to an Autodoc
+    repository entity.
+*/
+class Documentation : public csv::ConstProcessorClient
+{
+  public:
+                        Documentation();
+                        ~Documentation();
+    // OPERATIONS
+    void                Clear();
+
+    // INQUIRY
+    const Node *        Data() const;
+
+    // ACCESS
+    Node *              Data();
+    void                Set_Data(
+                            ary::doc::Node &    i_data );
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    Dyn<Node>           pData;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Documentation::Clear()
+{
+    pData = 0;
+}
+
+inline const Node *
+Documentation::Data() const
+{
+    return pData.Ptr();
+}
+
+inline Node *
+Documentation::Data()
+{
+    return pData.Ptr();
+}
+
+inline void
+Documentation::Set_Data(ary::doc::Node & i_data)
+{
+    pData = &i_data;
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/d_node.hxx b/autodoc/inc/ary/doc/d_node.hxx
new file mode 100644
index 000000000000..e5b29d7b5a7f
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_node.hxx
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DOC_D_NODE_HXX
+#define ARY_DOC_D_NODE_HXX
+
+// BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <cosv/tpl/vvector.hxx>
+#include <ary/doc/d_types4doc.hxx>
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** The abstract base class for any type of documentation content.
+
+    A ->Documentation has as content a hierarchy of Nodes, each can be a
+    different kind of content, like descriptions of single items or structs
+    or lists of Nodes.
+*/
+class Node : public csv::ConstProcessorClient
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Node();
+
+    // OPERATIONS
+    void                Add_toChain(
+                            DYN Node &          pass_nextNode );
+    // INQUIRY
+    nodetype::id        Type() const;
+    const Node *        Next() const;
+    bool                IsSingle() const;
+    uintt               ListSize() const;
+
+  protected:
+    explicit            Node(
+                            nodetype::id        i_type);
+  private:
+    // Forbid copies:
+    Node(const Node&);
+    Node & operator=(const Node&);
+
+    // DATA
+    nodetype::id        nType;
+    Dyn<Node>           pNext;      /// Next ->Node in same list.
+};
+
+typedef csv::VirtualVector<Node>    NodeList;
+
+
+
+
+// IMPLEMENTATION
+inline nodetype::id
+Node::Type() const
+{
+    return nType;
+}
+
+inline const Node *
+Node::Next() const
+{
+    return pNext.Ptr();
+}
+
+inline bool
+Node::IsSingle() const
+{
+    return pNext.operator bool();
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/d_oldcppdocu.hxx b/autodoc/inc/ary/doc/d_oldcppdocu.hxx
new file mode 100644
index 000000000000..79bc4ab33aaf
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_oldcppdocu.hxx
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DOC_D_OLDCPPDOCU_HXX
+#define ARY_DOC_D_OLDCPPDOCU_HXX
+//  KORR_DEPRECATED_3.0
+
+// BASE CLASSES
+#include <ary/doc/d_node.hxx>
+// USED SERVICES
+#include <ary/info/inftypes.hxx>
+#include <ary/ary_disp.hxx>
+
+namespace ary
+{
+namespace info
+{
+    class AtTag;
+    class DocuStore;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+    using ::ary::info::AtTag;
+    using ::ary::info::E_AtTagId;
+
+
+/** Wrapper class for old C++ documentation format.
+
+    To be replaced by using the standard format.
+*/
+class OldCppDocu : public Node
+{
+  public:
+    typedef std::vector< DYN AtTag * >  TagList;
+
+    // LIFECYCLE
+                        OldCppDocu();
+    virtual             ~OldCppDocu();
+
+    void                Store2(
+                            info::DocuStore &   o_rDocuStore );
+
+    virtual AtTag *     Create_StdTag(
+                            E_AtTagId           i_eId );
+    virtual AtTag *     CheckIn_BaseTag();
+    virtual AtTag *     CheckIn_ExceptionTag();
+    virtual AtTag *     Create_ImplementsTag();
+    virtual AtTag *     Create_KeywordTag();
+    virtual AtTag *     CheckIn_ParameterTag();
+    virtual AtTag *     CheckIn_SeeTag();
+    virtual AtTag *     CheckIn_TemplateTag();
+    virtual AtTag *     Create_LabelTag();
+    virtual AtTag *     Create_DefaultTag();
+    virtual AtTag *     Create_SinceTag();          /// @return always the first one created.
+
+    virtual void        Replace_AtShort_By_AtDescr();
+
+    virtual void        Set_Obsolete();
+    virtual void        Set_Internal();
+    virtual void        Set_Interface()         { bIsInterface = true; }
+
+  // INQUIRY
+    const TagList &     Tags() const            { return aTags; }
+    const AtTag &       Short() const;
+    bool                IsObsolete() const      { return bIsObsolete; }
+    virtual bool        IsInternal() const;
+    virtual bool        IsInterface() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    unsigned char       nTags[ary::info::C_eAtTag_NrOfClasses];
+
+    /** Creates a new AtTag at the end of aTags.
+        The index of this new AtTag is inserted in nTags at position
+        i_nIndex.
+    */
+    AtTag * &           NewTag(
+                            UINT8               i_nIndex );
+    /** Returns the Tag with the position nTags[i_nIndex]
+        in aTags.
+    */
+    AtTag &             GetTag(
+                            UINT8               i_nIndex );
+
+    TagList             aTags;
+    bool                bIsObsolete;
+    bool                bIsInternal;
+    bool                bIsInterface;
+};
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/d_oldidldocu.hxx b/autodoc/inc/ary/doc/d_oldidldocu.hxx
new file mode 100644
index 000000000000..6c4d2bdc2cc7
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_oldidldocu.hxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DOC_D_OLDIDLDOCU_HXX
+#define ARY_DOC_D_OLDIDLDOCU_HXX
+
+// BASE CLASSES
+#include <ary/doc/d_node.hxx>
+// USED SERVICES
+#include <ary_i/ci_text2.hxx>
+
+
+
+
+namespace ary
+{
+namespace inf
+{
+    class AtTag2;
+    class DocuToken;
+    class DocuTex2;
+}
+namespace doc
+{
+    using ::ary::inf::AtTag2;
+    using ::ary::inf::DocuToken;
+    using ::ary::inf::DocuTex2;
+
+
+
+/** Wrapper for the old idl documentation format.
+*/
+class OldIdlDocu : public Node
+{
+  public:
+                        OldIdlDocu();
+                        ~OldIdlDocu();
+
+    void                AddToken2Short(
+                            DYN DocuToken &     let_drToken )
+                                                { aShort.AddToken(let_drToken); }
+    void                AddToken2Description(
+                            DYN DocuToken &     let_drToken )
+                                                { aDescription.AddToken(let_drToken); }
+    void                AddToken2DeprecatedText(
+                            DYN DocuToken &     let_drToken );
+    void                AddAtTag(
+                            DYN AtTag2 &        let_drAtTag )
+                                                { aTags.push_back(&let_drAtTag); }
+    void                SetPublished()          { bIsPublished = true; }
+    void                SetDeprecated()         { bIsDeprecated = true; }
+    void                SetOptional()           { bIsOptional = true; }
+    void                SetExternShort(
+                            const DocuTex2 &    i_pExternShort )
+                                                { pExternShort = &i_pExternShort; }
+
+    const DocuTex2 &    Short() const           { return pExternShort != 0 ? *pExternShort : aShort; }
+    const DocuTex2 &    Description() const     { return aDescription; }
+    const DocuTex2 &    DeprecatedText() const  { return aDeprecatedText; }
+    const std::vector< AtTag2* > &
+                        Tags() const            { return aTags; }
+    bool                IsPublished() const     { return bIsPublished; }
+    bool                IsDeprecated() const    { return bIsDeprecated; }
+    bool                IsOptional() const      { return bIsOptional; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    DocuTex2            aShort;
+    DocuTex2            aDescription;
+    DocuTex2            aDeprecatedText;
+    std::vector< AtTag2* >
+                        aTags;
+    const DocuTex2 *    pExternShort;
+    bool                bIsPublished;
+    bool                bIsDeprecated;
+    bool                bIsOptional;
+};
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/d_parametrized.hxx b/autodoc/inc/ary/doc/d_parametrized.hxx
new file mode 100644
index 000000000000..21f699e180d9
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_parametrized.hxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DOC_D_PARAMETER_HXX
+#define ARY_DOC_D_PARAMETER_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/doc/d_node.hxx>
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Documentation unit with Parameter.
+*/
+template <class T>
+class Parametrized : public Node
+{
+  public:
+    // LIFECYCLE
+    explicit            Parametrized(
+                            nodetype::id        i_id,
+                            T                   i_Parameter );
+    virtual             ~Parametrized();
+
+    // INQUIRY
+    const HyperText &   Doc() const;
+    const T &           Parameter() const;
+
+    // ACESS
+    HyperText &         Doc();
+    void                Set_Parameter(
+                            const T &           i_param );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    HyperText           aDoc;
+    T                   aParameter;
+};
+
+
+
+
+// IMPLEMENTATION
+template <class T>
+Parametrized<T>::Parametrized( nodetype::id     i_id,
+                               T                i_Parameter )
+    :   Node(i_id),
+        aDoc(),
+        aParameter(i_Parameter)
+{
+}
+
+template <class T>
+Parametrized<T>::~Parametrized()
+{
+}
+
+template <class T>
+const HyperText &
+Parametrized<T>::Doc() const
+{
+    return aDoc;
+}
+
+template <class T>
+const T &
+Parametrized<T>::Parameter() const
+{
+    return aParameter;
+}
+
+template <class T>
+HyperText &
+Parametrized<T>::Doc()
+{
+    return aDoc;
+}
+
+template <class T>
+inline void
+Parametrized<T>::Set_Parameter(const T & i_param)
+{
+    aParameter = i_param;
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/d_types4doc.hxx b/autodoc/inc/ary/doc/d_types4doc.hxx
new file mode 100644
index 000000000000..754a1b414a1d
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_types4doc.hxx
@@ -0,0 +1,70 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DOC_D_TYPES4DOC_HXX
+#define ARY_DOC_D_TYPES4DOC_HXX
+
+// USED SERVICES
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Type of a documentation: multiple lines or single line.
+*/
+enum E_BlockType
+{
+    dbt_none = 0,
+    dbt_multiline,
+    dbt_singleline
+};
+
+/** Type of documentation text: with html or without.
+*/
+enum E_TextType
+{
+    dtt_none = 0,
+    dtt_plain,
+    dtt_html
+};
+
+namespace nodetype
+{
+
+typedef int id;
+
+}   //  namespace nodetype
+
+
+
+}   //  namespace doc
+}   //  namespace ary
+#endif
diff --git a/autodoc/inc/ary/doc/ht/dht_interpreter.hxx b/autodoc/inc/ary/doc/ht/dht_interpreter.hxx
new file mode 100644
index 000000000000..3659654c03d4
--- /dev/null
+++ b/autodoc/inc/ary/doc/ht/dht_interpreter.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DHT_INTERPRETER_HXX
+#define ARY_DHT_INTERPRETER_HXX
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+namespace ht
+{
+    class Processor;
+
+
+/** Interface for all interpreters of a ->Component.
+*/
+class Interpreter
+{
+  public:
+    virtual             ~Interpreter() {}
+
+    void                Accept(
+                            Processor &         io_processor,
+                            const String &      i_data ) const;
+  private:
+    virtual void        do_Accept(
+                            Processor &         io_processor,
+                            const String &      i_data ) const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Interpreter::Accept( Processor &     io_processor,
+                     const String &  i_data ) const
+{
+    do_Accept(io_processor, i_data);
+}
+
+
+
+
+}   // namespace ht
+}   // namespace doc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/entity.hxx b/autodoc/inc/ary/entity.hxx
new file mode 100644
index 000000000000..2b51fb37cb1d
--- /dev/null
+++ b/autodoc/inc/ary/entity.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_ENTITY_HXX
+#define ARY_ENTITY_HXX
+
+// BASE CLASSES
+#include <ary/object.hxx>
+
+
+
+
+namespace ary
+{
+
+
+/** Interface for every class, whose objects are searchable within the
+    Autodoc Repository by an id.
+
+    @todo
+    Possibly make ->Set_Id() less public accessible.
+*/
+class Entity : public Object
+{
+  public:
+    virtual             ~Entity() {}
+
+    Rid                 Id() const;
+
+    /// @attention Must be used only by ->ary::stg::Storage<>
+    void                Set_Id(
+                            Rid                 i_nId );
+  protected:
+                        Entity()      : nId(0) {}
+  private:
+    // DATA
+    Rid                 nId;
+};
+
+
+inline Rid
+Entity::Id() const
+{
+    return nId;
+}
+
+inline void
+Entity::Set_Id(Rid i_nId)
+{
+    nId = i_nId;
+}
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/getncast.hxx b/autodoc/inc/ary/getncast.hxx
new file mode 100644
index 000000000000..01b286fe1a0a
--- /dev/null
+++ b/autodoc/inc/ary/getncast.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_GETNCAST_HXX
+#define ARY_GETNCAST_HXX
+
+
+// USED SERVICES
+#include <ary/object.hxx>
+
+
+
+
+namespace ary
+{
+
+
+template <class DEST>
+inline bool
+is_type(const ary::Object & i_obj)
+{
+    return i_obj.AryClass() == DEST::class_id;
+}
+
+
+template <class DEST>
+inline const DEST &
+ary_cast( const Object & ce)
+{
+    csv_assert( is_type<DEST>(ce) );
+    return static_cast< const DEST& >(ce);
+}
+
+template <class DEST>
+inline DEST &
+ary_cast( Object & ce)
+{
+    csv_assert( is_type<DEST>(ce) );
+    return static_cast< DEST& >(ce);
+}
+
+template <class DEST>
+inline const DEST *
+ary_cast( const Object * ce)
+{
+    if ( ce ? is_type<DEST>(*ce) : false )
+        return static_cast< const DEST* >(ce);
+    return 0;
+}
+
+template <class DEST>
+inline DEST *
+ary_cast( Object * ce)
+{
+    if ( ce ? is_type<DEST>(*ce) : false )
+        return static_cast< DEST* >(ce);
+    return 0;
+}
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_attribute.hxx b/autodoc/inc/ary/idl/i_attribute.hxx
new file mode 100644
index 000000000000..1a14f5c6f716
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_attribute.hxx
@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_ATTRIBUTE_HXX
+#define ARY_IDL_I_ATTRIBUTE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_attribute
+{
+    struct attr;
+}
+
+
+
+
+/** @resp
+    Represents an IDL property.
+*/
+class Attribute : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2014 };
+
+    // LIFECYCLE
+                        Attribute(
+                            const String &      i_sName,
+                            Ce_id               i_nInterface,
+                            Ce_id               i_nModule,
+                            Type_id             i_nType,
+                            bool                i_bReadonly,
+                            bool                i_bBound );
+                        ~Attribute();
+    // OPERATIONS
+    void                Add_GetException(
+                            Type_id             i_nException );
+    void                Add_SetException(
+                            Type_id             i_nException );
+
+    // INQUIRY
+    Type_id             Type() const;
+    bool                IsReadonly() const;
+    bool                IsBound() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    typedef std::vector< Type_id >      ExceptionList;
+    friend struct ifc_attribute::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nType;
+    ExceptionList       aGetExceptions;
+    ExceptionList       aSetExceptions;
+    bool                bReadonly;
+    bool                bBound;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Attribute::Add_GetException( Type_id i_nException )
+    { aGetExceptions.push_back(i_nException); }
+
+inline void
+Attribute::Add_SetException( Type_id i_nException )
+    { aSetExceptions.push_back(i_nException); }
+
+inline Type_id
+Attribute::Type() const
+    { return nType; }
+
+inline bool
+Attribute::IsReadonly() const
+    { return bReadonly; }
+
+inline bool
+Attribute::IsBound() const
+    { return bBound; }
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_ce.hxx b/autodoc/inc/ary/idl/i_ce.hxx
new file mode 100644
index 000000000000..1c2414a22023
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_ce.hxx
@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_CE_HXX
+#define ARY_IDL_I_CE_HXX
+
+// BASE CLASSES
+#include <ary/entity.hxx>
+// USED SERVICES
+#include <ary/doc/d_docu.hxx>
+#include <ary/idl/i_ce2s.hxx>
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** @resp Base class for all IDL code entities.
+
+    A @->CodeEntity is a namespace, type, data or function, which occures in
+    the parsed UNO IDL code and is described and/or commented within the
+    Autodoc repository.
+
+    This is a storage base class, where more special classes are
+    derived from.
+*/
+class CodeEntity : public ary::Entity
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CodeEntity();
+
+    // OPERATION
+
+    // INQUIRY
+    Ce_id               CeId() const            { return Ce_id(Id()); }
+    const String &      LocalName() const;
+    Ce_id               NameRoom() const;
+    Ce_id               Owner() const;
+    E_SightLevel        SightLevel() const;
+
+    const ary::doc::Documentation &
+                        Docu() const;
+    const Ce_2s &       Secondaries() const;
+
+    static const CodeEntity &
+                        Null_();
+    // ACCESS
+    void                Set_Docu(
+                            DYN ary::doc::Node &
+                                                pass_data );
+    Ce_2s &             Secondaries();
+
+  protected:
+                        CodeEntity();
+  private:
+    // Locals
+    virtual const String &  inq_LocalName() const = 0;
+    virtual Ce_id           inq_NameRoom() const = 0;
+    virtual Ce_id           inq_Owner() const = 0;
+    virtual E_SightLevel    inq_SightLevel() const = 0;
+
+    // DATA
+    ary::doc::Documentation
+                        aDocu;
+    Dyn<Ce_2s>          p2s;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String &
+CodeEntity::LocalName() const
+    { return inq_LocalName(); }
+
+inline Ce_id
+CodeEntity::NameRoom() const
+    { return inq_NameRoom(); }
+
+inline Ce_id
+CodeEntity::Owner() const
+    { return inq_Owner(); }
+
+inline E_SightLevel
+CodeEntity::SightLevel() const
+    { return inq_SightLevel(); }
+
+inline const ary::doc::Documentation &
+CodeEntity::Docu() const
+    { return aDocu; }
+
+inline void
+CodeEntity::Set_Docu(DYN ary::doc::Node & pass_data)
+{
+    aDocu.Set_Data(pass_data);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_ce2s.hxx b/autodoc/inc/ary/idl/i_ce2s.hxx
new file mode 100644
index 000000000000..f3b3140f48c3
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_ce2s.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_CE2S_HXX
+#define ARY_IDL_I_CE2S_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+
+
+namespace ary
+{
+
+namespace idl
+{
+
+
+
+/** Abstract base for all secondary productions of code entities
+*/
+class Ce_2s
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Ce_2s();
+
+    static DYN Ce_2s *  Create_(
+                            ClassId             i_nCeClass );
+    // OPERATIONS
+    void                Add_Link2DescriptionInManual(
+                            const String &      i_link,
+                            const String &      i_linkUI )
+                                                { aDescriptionsInManual.push_back(i_link); aDescriptionsInManual.push_back(i_linkUI); }
+    void                Add_Link2RefInManual(
+                            const String &      i_link,
+                            const String &      i_linkUI )
+                                                { aRefsInManual.push_back(i_link); aRefsInManual.push_back(i_linkUI); }
+    std::vector<Ce_id> &
+                        Access_List(
+                            int                 i_indexOfList );
+    // INQUIRY
+    const StringVector &
+                        Links2DescriptionInManual() const
+                                                { return aDescriptionsInManual; }
+    const StringVector &
+                        Links2RefsInManual() const
+                                                { return aRefsInManual; }
+    int                 CountXrefLists() const  { return aXrefLists.size(); }
+    const std::vector<Ce_id> &
+                        List(
+                            int                 i_indexOfList ) const;
+  private:
+    typedef DYN std::vector<Ce_id> * ListPtr;
+
+    // DATA
+    StringVector        aDescriptionsInManual;
+    StringVector        aRefsInManual;
+    std::vector<ListPtr>
+                        aXrefLists;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_comrela.hxx b/autodoc/inc/ary/idl/i_comrela.hxx
new file mode 100644
index 000000000000..1e3a040291eb
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_comrela.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_COMRELA_HXX
+#define ARY_IDL_I_COMRELA_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+
+namespace ary
+{
+namespace doc
+{
+    class OldIdlDocu;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Contains data for an IDL code entity related to another one like a base of
+    an interface or of a service or the supported interface of a service.
+*/
+class CommentedRelation
+{
+  public:
+    // LIFECYCLE
+
+                        CommentedRelation(
+                            Type_id             i_nType,
+                            doc::OldIdlDocu *   i_pInfo )
+                                                :   nType(i_nType),
+                                                    pInfo(i_pInfo)
+                                                {}
+    // INQUIRY
+    Type_id             Type() const            { return nType; }
+    doc::OldIdlDocu *   Info() const            { return pInfo; }
+
+  private:
+    // DATA
+    Type_id             nType;
+    doc::OldIdlDocu *   pInfo;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_constant.hxx b/autodoc/inc/ary/idl/i_constant.hxx
new file mode 100644
index 000000000000..f822e780f4d2
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_constant.hxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_CONSTANT_HXX
+#define ARY_IDL_I_CONSTANT_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_constant
+{
+    struct attr;
+}
+
+
+/** Represents an IDL constant.
+*/
+class Constant : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2012 };
+
+    // LIFECYCLE
+                        Constant(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            Type_id             i_nType,
+                            const String &      i_sInitValue );
+                        ~Constant();
+    // INQUIRY
+    Type_id             Type() const;
+    const String &      Value() const;
+
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_constant::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nNameRoom;
+    Ce_id               nOwner;
+
+    Type_id             nType;
+    String              sInitValue;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Constant::Type() const
+{
+    return nType;
+}
+
+inline const String &
+Constant::Value() const
+{
+    return sInitValue;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_constgroup.hxx b/autodoc/inc/ary/idl/i_constgroup.hxx
new file mode 100644
index 000000000000..961daf6678ab
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_constgroup.hxx
@@ -0,0 +1,101 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_CONSTGROUP_HXX
+#define ARY_IDL_I_CONSTGROUP_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_constgroup
+{
+    struct attr;
+}
+
+
+/** Represents an IDL constants group.
+*/
+class ConstantsGroup : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2011 };
+
+    // LIFECYCLE
+                        ConstantsGroup(
+                            const String &      i_sName,
+                            Ce_id               i_nModule );
+                        ~ConstantsGroup();
+    // ACCESS
+    void                Add_Constant(
+                            Ce_id               i_nConstant );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>    ConstantList;
+    friend struct ifc_constgroup::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nModule;
+
+    ConstantList        aConstants;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+ConstantsGroup::Add_Constant( Ce_id i_nConstant )
+{
+    aConstants.push_back(i_nConstant);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_enum.hxx b/autodoc/inc/ary/idl/i_enum.hxx
new file mode 100644
index 000000000000..36e1244460dd
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_enum.hxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_ENUM_HXX
+#define ARY_IDL_I_ENUM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_enum
+{
+    struct attr;
+}
+
+
+/** Represents an IDL enum.
+*/
+class Enum : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2005 };
+    // LIFECYCLE
+                        Enum(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Enum();
+    // ACCESS
+    void                Add_Value(
+                            Ce_id               i_nValue );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>   ValueList;
+    friend struct ifc_enum::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    ValueList           aValues;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Enum::Add_Value( Ce_id i_nValue )
+{
+    aValues.push_back(i_nValue);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_enumvalue.hxx b/autodoc/inc/ary/idl/i_enumvalue.hxx
new file mode 100644
index 000000000000..ea3d1df74c5d
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_enumvalue.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_ENUMVALUE_HXX
+#define ARY_IDL_I_ENUMVALUE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_enumvalue
+{
+    struct attr;
+}
+
+
+/** @resp
+    Represents an IDL enum value.
+*/
+class EnumValue : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2006 };
+
+    // LIFECYCLE
+                        EnumValue(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            const String &      i_sInitValue );
+                        ~EnumValue();
+    // INQUIRY
+    const String &      Value() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_enumvalue::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    String              sValue;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String &
+EnumValue::Value() const
+{
+    return sValue;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_exception.hxx b/autodoc/inc/ary/idl/i_exception.hxx
new file mode 100644
index 000000000000..bed245e884c7
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_exception.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_EXCEPTION_HXX
+#define ARY_IDL_I_EXCEPTION_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_exception
+{
+    struct attr;
+}
+
+
+/** Represents an IDL exception.
+*/
+class Exception : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2010 };
+
+    // LIFECYCLE
+                        Exception(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBase );
+                        ~Exception();
+    // INQUIRY
+    Type_id             Base() const            { return nBase; }
+
+    // ACCESS
+    void                Add_Member(
+                            Ce_id               i_nMember );
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>     ElementList;
+    friend struct ifc_exception::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nBase;
+    ElementList         aElements;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Exception::Add_Member( Ce_id i_nMember )
+{
+    aElements.push_back(i_nMember);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_function.hxx b/autodoc/inc/ary/idl/i_function.hxx
new file mode 100644
index 000000000000..45cac1ffc55a
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_function.hxx
@@ -0,0 +1,160 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_FUNCTION_HXX
+#define ARY_IDL_I_FUNCTION_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/idl/i_param.hxx>
+#include <ary/idl/ik_function.hxx>
+#include <ary/stdconstiter.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Represents an IDL function.
+
+    Special case constructor:
+    Constructors have return type "0".
+*/
+class Function : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2002 };
+
+    typedef std::vector< Parameter >    ParamList;
+    typedef std::vector< Type_id >      ExceptionList;
+
+    // LIFECYCLE
+    /// Normal function
+                        Function(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            Type_id             i_nReturnType,
+                            bool                i_bOneWay );
+    /// Constructor
+                        Function(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom );
+                        ~Function();
+
+    // OPERATIONS
+    void                Add_Parameter(
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            E_ParameterDirection
+                                                i_eDirection );
+    /// The function's parameter list ends with the ellipse "..." .
+    void                Set_Ellipse();
+    void                Add_Exception(
+                            Type_id             i_nException );
+
+    // INQUIRY
+    Type_id             ReturnType() const;
+    const ParamList &   Parameters() const      { return aParameters; }
+    const ExceptionList &
+                        Exceptions() const      { return aExceptions; }
+    bool                IsOneway() const;
+    bool                HasEllipse() const      { return bEllipse; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    friend struct ifc_function::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nReturnType;
+    ParamList           aParameters;
+    ExceptionList       aExceptions;
+    bool                bOneWay;
+    bool                bEllipse;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Function::Add_Parameter( const String &         i_sName,
+                         Type_id                i_nType,
+                         E_ParameterDirection   i_eDirection )
+{
+    aParameters.push_back( Parameter(i_sName,i_nType,i_eDirection) );
+}
+
+inline void
+Function::Set_Ellipse()
+{
+    bEllipse = true;
+}
+
+inline void
+Function::Add_Exception( Type_id i_nException )
+{
+    aExceptions.push_back(i_nException);
+}
+
+inline Type_id
+Function::ReturnType() const
+    { return nReturnType; }
+
+inline bool
+Function::IsOneway() const
+    { return bOneWay; }
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_gate.hxx b/autodoc/inc/ary/idl/i_gate.hxx
new file mode 100644
index 000000000000..923ee68998a3
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_gate.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_GATE_HXX
+#define ARY_IDL_I_GATE_HXX
+
+// USED SERVICES
+
+namespace autodoc
+{
+    class Options;
+}
+namespace ary
+{
+namespace idl
+{
+    class CePilot;
+    class TypePilot;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Main entry to access the IDL parts of the repository.
+*/
+class Gate
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Gate() {}
+
+    // OPERATIONS
+    virtual void        Calculate_AllSecondaryInformation(
+                            const String &      i_devman_reffilepath ) = 0;
+//                            const ::autodoc::Options &
+//                                                i_options ) = 0;
+    // INQUIRY
+    virtual const CePilot &
+                        Ces() const = 0;
+    virtual const TypePilot &
+                        Types() const = 0;
+    // ACCESS
+    virtual CePilot &   Ces() = 0;
+    virtual TypePilot & Types() = 0;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_interface.hxx b/autodoc/inc/ary/idl/i_interface.hxx
new file mode 100644
index 000000000000..4c68d1703b1b
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_interface.hxx
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_INTERFACE_HXX
+#define ARY_IDL_I_INTERFACE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/idl/i_comrela.hxx>
+#include <ary/stdconstiter.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_interface
+{
+    struct attr;
+}
+    class Interface_2s;
+
+
+/** Represents an IDL interface.
+*/
+class Interface : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2001 };
+
+    // LIFECYCLE
+                        Interface(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Interface();
+    // INQUIRY
+    bool                HasBase() const;
+
+    // ACCESS
+    void                Add_Function(
+                            Ce_id               i_nId );
+    void                Add_Attribute(
+                            Ce_id               i_nId );
+    void                Add_Base(
+                            Type_id             i_nInterface,
+                            DYN doc::OldIdlDocu *
+                                                pass_dpDocu );
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity:
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    typedef std::vector< CommentedRelation >    RelationList;
+    typedef std::vector<Ce_id>                  MemberList;
+    friend struct ifc_interface::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    RelationList        aBases;
+    MemberList          aFunctions;
+    MemberList          aAttributes;
+    Dyn<Interface_2s>   p2s;
+};
+
+
+
+
+// IMPLEMENTATION
+inline bool
+Interface::HasBase() const
+    { return aBases.size() > 0; }
+inline void
+Interface::Add_Function( Ce_id i_nId )
+    { aFunctions.push_back(i_nId); }
+inline void
+Interface::Add_Attribute( Ce_id i_nId )
+    { aAttributes.push_back(i_nId); }
+inline void
+Interface::Add_Base( Type_id                i_nInterface,
+                     DYN doc::OldIdlDocu *  pass_dpDocu )
+    { aBases.push_back( CommentedRelation(i_nInterface, pass_dpDocu) ); }
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_module.hxx b/autodoc/inc/ary/idl/i_module.hxx
new file mode 100644
index 000000000000..feaa520faa3a
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_module.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_MODULE_HXX
+#define ARY_IDL_I_MODULE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/stdconstiter.hxx>
+
+
+
+
+namespace ary
+{
+    template <class> class NameTreeNode;
+
+namespace idl
+{
+namespace ifc_module
+{
+    struct attr;
+}
+    class Gate;
+
+
+/** Represents an IDL module.
+
+    "Name" in methods means all code entities which belong into
+    this namespace (not in a subnamespace of this one), but not
+    to the subnamespaces.
+
+    "SubNamespace" in method names refers to all direct subnamespaces.
+*/
+class Module : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2000 };
+
+        // LIFECYCLE
+                        Module();
+                        Module(
+                            const String &      i_sName,
+                            const Module &      i_rParent );
+                        ~Module();
+    // OPERATIONS
+    void                Add_Name(
+                            const String &      i_sName,
+                            Ce_id               i_nId );
+    // INQUIRY
+    Ce_id               Search_Name(
+                            const String &      i_sName ) const;
+    void                Get_Names(
+                            Dyn_StdConstIterator<Ce_id> &
+                                                o_rResult ) const;
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_module::attr;
+
+    // DATA
+    Dyn< NameTreeNode<Ce_id> >
+                            pImpl;
+};
+
+
+inline bool
+is_Module( const CodeEntity & i_rCe )
+{
+    return i_rCe.AryClass() == Module::class_id;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_namelookup.hxx b/autodoc/inc/ary/idl/i_namelookup.hxx
new file mode 100644
index 000000000000..917c36f8e9d6
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_namelookup.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_NAMELOOKUP_HXX
+#define ARY_IDL_I_NAMELOOKUP_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_types4idl.hxx>
+
+// USED SERVICES
+#include <ary/stdconstiter.hxx>
+#include <ary/itrange.hxx>
+#include <vector>
+#include <map>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** This class finds all occurrences in the current language of a
+    name in the repository.
+*/
+class NameLookup
+{
+  public:
+    struct NameProperties
+    {
+                            NameProperties()
+                                :   nId(0),
+                                    nClass(0),
+                                    nOwner(0) {}
+                            NameProperties(
+                                Ce_id               i_id,
+                                ClassId             i_class,
+                                Ce_id               i_owner )
+                                :   nId(i_id),
+                                    nClass(i_class),
+                                    nOwner(i_owner) {}
+        Ce_id               nId;
+        ClassId             nClass;
+        Ce_id               nOwner;
+    };
+
+    /// Map from Name to NameProperties.
+    typedef std::multimap<String, NameProperties>   Map_Names;
+
+    // LIFECYCLE
+                        NameLookup();
+                        ~NameLookup();
+    // OPERATIONS
+    void                Add_Name(
+                            const String &      i_name,
+                            Ce_id               i_id,
+                            ClassId             i_class,
+                            Ce_id               i_owner );
+  private:
+    // DATA
+    Map_Names           aNames;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_param.hxx b/autodoc/inc/ary/idl/i_param.hxx
new file mode 100644
index 000000000000..726a1403f29a
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_param.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_PARAM_HXX
+#define ARY_IDL_I_PARAM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Represents a parameter in an IDL function.
+*/
+class Parameter
+{
+  public:
+    // LIFECYCLE
+                        Parameter(
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            E_ParameterDirection
+                                                i_eDirection );
+                        ~Parameter();
+
+    // INQUIRY
+    const String &      Name() const            { return sName; }
+    Type_id             Type() const            { return nType; }
+    E_ParameterDirection
+                        Direction() const       { return eDirection; }
+
+  private:
+    // DATA
+    String              sName;
+    Type_id             nType;
+    E_ParameterDirection
+                        eDirection;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_property.hxx b/autodoc/inc/ary/idl/i_property.hxx
new file mode 100644
index 000000000000..b0a5739dd6ab
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_property.hxx
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_PROPERTY_HXX
+#define ARY_IDL_I_PROPERTY_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_property
+{
+    struct attr;
+}
+
+
+/** Represents an IDL property.
+*/
+class Property : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2004 };
+
+    class Stereotypes
+    {
+      public:
+        enum E_Flags
+        {
+            readonly = 1,
+            bound = 2,
+            constrained = 4,
+            maybeambiguous = 8,
+            maybedefault = 16,
+            maybevoid = 32,
+            removable = 64,
+            transient = 128,
+            s_MAX
+        };
+                            Stereotypes()       : nFlags(0) {}
+
+        bool                HasAny() const      { return nFlags != 0; }
+        bool                IsReadOnly() const  { return (nFlags & UINT32(readonly)) != 0; }
+        bool                IsBound() const     { return (nFlags & UINT32(bound)) != 0; }
+        bool                IsConstrained() const
+                                                { return (nFlags & UINT32(constrained)) != 0; }
+        bool                IsMayBeAmbiguous() const
+                                                { return (nFlags & UINT32(maybeambiguous)) != 0; }
+        bool                IsMayBeDefault() const
+                                                { return (nFlags & UINT32(maybedefault)) != 0; }
+        bool                IsMayBeVoid() const { return (nFlags & UINT32(maybevoid)) != 0; }
+        bool                IsRemovable() const { return (nFlags & UINT32(removable)) != 0; }
+        bool                IsTransient() const { return (nFlags & UINT32(transient)) != 0; }
+
+        void                Set_Flag(
+                                E_Flags         i_flag )
+                                                { nFlags |= UINT32(i_flag); }
+      private:
+        // DATA
+        UINT32              nFlags;
+    };
+
+
+    // LIFECYCLE
+                        Property(
+                            const String &      i_sName,
+                            Ce_id               i_nService,
+                            Ce_id               i_nModule,
+                            Type_id             i_nType,
+                            Stereotypes         i_stereotypes );
+                        ~Property();
+    // INQUIRY
+    Type_id             Type() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_property::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nType;
+    Stereotypes         aStereotypes;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Property::Type() const
+{
+    return nType;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_service.hxx b/autodoc/inc/ary/idl/i_service.hxx
new file mode 100644
index 000000000000..a1cdb400dcda
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_service.hxx
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_SERVICE_HXX
+#define ARY_IDL_I_SERVICE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/idl/i_comrela.hxx>
+#include <ary/stdconstiter.hxx>
+#include <ary/idl/ik_service.hxx>
+
+
+
+
+namespace ary
+{
+namespace info
+{
+    class CodeInformation;
+}
+namespace idl
+{
+namespace ifc_service
+{
+    struct attr;
+}
+
+
+/** Represents an IDL service.
+*/
+class Service : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2003 };     // See reposy.cxx
+
+    // LIFECYCLE
+                        Service(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Service();
+
+    // INQUIRY
+    void                Get_SupportedInterfaces(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_rResult ) const;
+    void                Get_IncludedServices(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_rResult ) const;
+
+    // ACCESS
+    void                Add_Property(
+                            Ce_id               i_nProperty );
+    void                AddRef_IncludedService(
+                            Type_id             i_nService,
+                            DYN doc::OldIdlDocu *
+                                                pass_dpDocu );
+    void                AddRef_SupportedInterface(
+                            Type_id             i_nInterface,
+                            DYN doc::OldIdlDocu *
+                                                pass_dpDocu );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector< CommentedRelation >    RelationList;
+    typedef std::vector<Ce_id>                  PropertyList;
+    friend struct ifc_service::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    RelationList        aIncludedServices;
+    RelationList        aSupportedInterfaces;
+    PropertyList        aProperties;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Service::Add_Property( Ce_id i_nProperty )
+    { aProperties.push_back(i_nProperty); }
+
+inline void
+Service::AddRef_IncludedService( Type_id                    i_nService,
+                                 DYN doc::OldIdlDocu  *     pass_dpDocu )
+    { aIncludedServices.push_back( CommentedRelation(i_nService, pass_dpDocu) ); }
+
+inline void
+Service::AddRef_SupportedInterface( Type_id                 i_nInterface,
+                                    DYN doc::OldIdlDocu *   pass_dpDocu )
+    { aSupportedInterfaces.push_back( CommentedRelation(i_nInterface, pass_dpDocu) ); }
+
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_singleton.hxx b/autodoc/inc/ary/idl/i_singleton.hxx
new file mode 100644
index 000000000000..dbfca6d93087
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_singleton.hxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_SINGLETON_HXX
+#define ARY_IDL_I_SINGLETON_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_singleton
+{
+    struct attr;
+}
+
+
+/** Represents an IDL singleton.
+*/
+class Singleton : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2013 };
+
+    // LIFECYCLE
+                        Singleton(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Singleton();
+    // INQUIRY
+    Type_id             AssociatedService() const
+                                                { return nService; }
+
+    // ACCESS
+    void                Set_Service(
+                            Type_id             i_nService );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    friend struct ifc_singleton::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nService;
+};
+
+
+
+
+
+// IMPLEMENTATION
+inline void
+Singleton::Set_Service( Type_id i_nService )
+{
+    nService = i_nService;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_siservice.hxx b/autodoc/inc/ary/idl/i_siservice.hxx
new file mode 100644
index 000000000000..c38e90610a74
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_siservice.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_SISERVICE_HXX
+#define ARY_IDL_I_SISERVICE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_sglifcservice
+{
+    struct attr;
+}
+
+
+/** Represents an IDL single interface service.
+*/
+class SglIfcService : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2015 };     // See reposy.cxx
+
+    // LIFECYCLE
+                        SglIfcService(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBaseInterface );
+                        ~SglIfcService();
+    // ACCESS
+    void                Add_Constructor(
+                            Ce_id               i_nId );
+
+    // INFO
+    Type_id             BaseInterface() const   { return nBaseInterface; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity:
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    typedef std::vector<Ce_id>          CtorList;
+    friend struct ifc_sglifcservice::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Type_id             nBaseInterface;
+
+    CtorList            aConstructors;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+SglIfcService::Add_Constructor( Ce_id i_nId )
+{
+    aConstructors.push_back(i_nId);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_sisingleton.hxx b/autodoc/inc/ary/idl/i_sisingleton.hxx
new file mode 100644
index 000000000000..6dd288c048d3
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_sisingleton.hxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_SISINGLETON_HXX
+#define ARY_IDL_I_SISINGLETON_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_sglifcsingleton
+{
+    struct attr;
+}
+
+
+/** Represents an IDL interface.
+*/
+class SglIfcSingleton : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2016 };     // See reposy.cxx
+
+    // LIFECYCLE
+                        SglIfcSingleton(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBaseInterface );
+                        ~SglIfcSingleton();
+    // INQUIRY
+    Type_id             BaseInterface() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity:
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    friend struct ifc_sglifcsingleton::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Type_id             nBaseInterface;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+SglIfcSingleton::BaseInterface() const
+{
+    return nBaseInterface;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_struct.hxx b/autodoc/inc/ary/idl/i_struct.hxx
new file mode 100644
index 000000000000..c73eb1517f7b
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_struct.hxx
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_STRUCT_HXX
+#define ARY_IDL_I_STRUCT_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_struct
+{
+    struct attr;
+}
+
+
+/** Represents an IDL struct.
+*/
+class Struct : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2008 };
+
+    // LIFECYCLE
+                        Struct(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParameter,
+                            Type_id             i_nTemplateParameterType );
+                        ~Struct();
+    // INQUIRY
+    Type_id             Base() const;
+    String              TemplateParameter() const;
+    Type_id             TemplateParameterType() const;
+
+    // ACCESS
+    void                Add_Member(
+                            Ce_id               i_nMember );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>     ElementList;
+    friend struct ifc_struct::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nBase;
+    String              sTemplateParameter;
+    Type_id             nTemplateParameterType;
+    ElementList         aElements;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Struct::Base() const
+{
+    return nBase;
+}
+
+inline String
+Struct::TemplateParameter() const
+{
+    return sTemplateParameter;
+}
+
+inline Type_id
+Struct::TemplateParameterType() const
+{
+    return nTemplateParameterType;
+}
+
+inline void
+Struct::Add_Member( Ce_id i_nMember )
+{
+    aElements.push_back(i_nMember);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_structelem.hxx b/autodoc/inc/ary/idl/i_structelem.hxx
new file mode 100644
index 000000000000..f7544f027f2d
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_structelem.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_STRUCTELEM_HXX
+#define ARY_IDL_I_STRUCTELEM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_structelement
+{
+    struct attr;
+}
+
+
+/** Represents an IDL struct element.
+*/
+class StructElement : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2009 };
+
+    // LIFECYCLE
+                        StructElement(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            Type_id             i_nType );
+                        ~StructElement();
+
+    // INQUIRY
+    Type_id             Type() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_structelement::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nType;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+StructElement::Type() const
+{
+    return nType;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_traits.hxx b/autodoc/inc/ary/idl/i_traits.hxx
new file mode 100644
index 000000000000..c34704537794
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_traits.hxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_TRAITS_HXX
+#define ARY_IDL_I_TRAITS_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Basic traits for derivd ones of ->CodeEntity.
+*/
+struct Ce_Traits
+{
+    typedef CodeEntity          entity_base_type;
+    typedef Ce_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Ce_Compare : public Ce_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_type.hxx b/autodoc/inc/ary/idl/i_type.hxx
new file mode 100644
index 000000000000..75f9737f1468
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_type.hxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_TYPE_HXX
+#define ARY_IDL_I_TYPE_HXX
+
+// USED SERVICES
+#include <ary/entity.hxx>
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+    class Gate;
+
+
+/** Abstract base for all secondary productions of types
+*/
+class Type_2s
+{
+  public:
+    virtual             ~Type_2s() {}
+
+    static DYN Type_2s *
+                        Create_(
+                            ClassId             i_nCeId );
+};
+
+
+/** Base of all IDL types.
+
+    Type represents the occurence of a type as base,
+    parameter, return type or element type in UNO IDL code.
+    Some of them relate to a ->CodeEntity, but
+    the ->Type "MyInterface" is something different than
+    the ->CodeEntity "MyInterface".
+
+    This is a storage base class, where more special
+    classes are derived from.
+*/
+class Type : public ary::Entity
+{
+  public:
+    typedef Type_2s secondary_productions;
+
+    // LIFECYCLE
+    virtual             ~Type() {}
+
+    // INQUIRY
+    Type_id             TypeId() const          { return Type_id(Id()); }
+
+    /** Does NOT clear the output-parameters.
+
+        @attention
+        If this is a sequence, the text of the first non-sequence, enclosed type
+        is returned.
+    */
+    void                Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const;
+    const std::vector<Type_id> *
+                        TemplateParameters() const;
+    const Type &        FirstEnclosedNonSequenceType(   /// @return *this, if this is not a ->Sequence.
+                            const Gate &        i_rGate ) const;
+
+  private:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const = 0;
+    virtual const std::vector<Type_id> *
+                        inq_TemplateParameters() const;
+    virtual const Type &
+                        inq_FirstEnclosedNonSequenceType(
+                            const Gate &        i_rGate ) const;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Type::Get_Text( StringVector &      o_module,
+                String &            o_name,
+                Ce_id &             o_nRelatedCe,
+                int &               o_nSequenceCount,
+                const Gate &        i_rGate ) const
+{
+    inq_Get_Text(o_module,o_name,o_nRelatedCe,o_nSequenceCount,i_rGate);
+}
+
+inline const std::vector<Type_id> *
+Type::TemplateParameters() const
+{
+    return inq_TemplateParameters();
+}
+
+inline const Type &
+Type::FirstEnclosedNonSequenceType(const Gate & i_rGate) const
+{
+    return inq_FirstEnclosedNonSequenceType(i_rGate);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_typedef.hxx b/autodoc/inc/ary/idl/i_typedef.hxx
new file mode 100644
index 000000000000..9d315c2f12d9
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_typedef.hxx
@@ -0,0 +1,90 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_TYPEDEF_HXX
+#define ARY_IDL_I_TYPEDEF_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_typedef
+{
+    struct attr;
+}
+
+
+/** Represents an IDL typedef.
+*/
+class Typedef : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2007 };
+
+    // LIFECYCLE
+                        Typedef(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nDefiningType );
+                        ~Typedef();
+
+    Type_id             DefiningType() const    { return nDefiningType; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_typedef::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nDefiningType;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/i_types4idl.hxx b/autodoc/inc/ary/idl/i_types4idl.hxx
new file mode 100644
index 000000000000..046b47f4bb0c
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_types4idl.hxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_TYPES4IDL_HXX
+#define ARY_IDL_I_TYPES4IDL_HXX
+
+// USED SERVICES
+#include <ary/types.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+    class CodeEntity;
+    class Type;
+    class Gate;
+    class CePilot;
+    class TypePilot;
+
+
+typedef TypedId<CodeEntity>         Ce_id;
+typedef TypedId<Type>               Type_id;
+
+
+/** This is used when an ->ary::idl::ExplicitType
+    represents a templated struct and is sorted into the
+    dictionary of an ->ary::idl::XNameRoom.
+    Then local type name and template type id are concatenated
+    to one string with this char as delimiter.
+*/
+const char C_cTemplateDelimiter = '<';
+
+typedef std::vector<Ce_id>          Ce_idList;
+
+
+enum E_ParameterDirection
+{
+    param_in,
+    param_out,
+    param_inout
+};
+
+
+enum E_SightLevel
+{
+    sl_Module,          // not file bound entities, like modules
+    sl_File,            // entities on top level within one file, like interface or enum
+    sl_Member           // member entities, like enumvalue or function
+};
+
+inline Ce_id
+Ce_id_Null()
+{
+    return Ce_id(0);
+}
+
+inline void
+NullPush_IdList(Ce_idList * o_pList)
+{
+    if (o_pList)
+        o_pList->push_back( Ce_id_Null() );
+}
+
+inline void
+NullPush_IdList_2(Ce_idList * o_pList)
+{
+    if (o_pList)
+    {
+        o_pList->push_back( Ce_id_Null() );
+        o_pList->push_back( Ce_id_Null() );
+    }
+}
+
+namespace alphabetical_index
+{
+    enum E_Letter
+    {
+        a = int('a'),
+        b,
+        c,
+        d,
+        e,
+        f,
+        g,
+        h,
+        i,
+        j,
+        k,
+        l,
+        m,
+        n,
+        o,
+        p,
+        q,
+        r,
+        s,
+        t,
+        u,
+        v,
+        w,
+        x,
+        y,
+        z,
+        non_alpha = int('_'),
+        MAX
+    };
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/ik_attribute.hxx b/autodoc/inc/ary/idl/ik_attribute.hxx
new file mode 100644
index 000000000000..6e8822111d1e
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_attribute.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_ATTRIBUTE_HXX
+#define ARY_IDL_IK_ATTRIBUTE_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_attribute
+{
+
+using ifc_ce::DocText;
+using ::ary::idl::ifc_ce::Dyn_TypeIterator;
+
+
+struct attr: public ifc_ce::attr
+{
+    static bool         HasAnyStereotype(
+                            const CodeEntity &  i_ce );
+    static bool         IsReadOnly(
+                            const CodeEntity &  i_ce );
+    static bool         IsBound(
+                            const CodeEntity &  i_ce );
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+    static void         Get_GetExceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_SetExceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_attribute
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_ce.hxx b/autodoc/inc/ary/idl/ik_ce.hxx
new file mode 100644
index 000000000000..ffa9363a6543
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_ce.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_CE_HXX
+#define ARY_IDL_IK_CE_HXX
+//  KORR_DEPRECATED_3.0
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/stdconstiter.hxx>
+
+namespace ary
+{
+namespace info
+{
+     class Text;
+}
+namespace idl
+{
+
+
+namespace ifc_ce
+{
+
+
+typedef ::ary::Dyn_StdConstIterator<Ce_id>      Dyn_CeIterator;
+typedef ::ary::Dyn_StdConstIterator<Type_id>    Dyn_TypeIterator;
+typedef ::ary::info::Text                       DocText;
+
+
+
+struct attr
+{
+    static Ce_id        CeId(
+                            const CodeEntity &  i_ce );
+    static const String &
+                        LocalName(
+                            const CodeEntity &  i_ce );
+    static Ce_id        NameRoom(
+                            const CodeEntity &  i_ce );
+    static Rid          Owner(
+                            const CodeEntity &  i_ce );
+    static E_SightLevel SightLevel(
+                            const CodeEntity &  i_ce );
+    static bool         Search_Member(
+                            const CodeEntity &  ,
+                            const String &      )
+                            { return true; }    // KORR_FUTURE
+};
+
+struct xref
+{
+};
+
+struct doc
+{
+    static const DocText &
+                        ShortInfo(          /// @return a short description of the CodeEntity
+                            const CodeEntity &  i_ce );
+
+    static const DocText &
+                        TagAuthor(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagExample(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagDescr(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagGuarantees(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagKey(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagMissing(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagSee(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagShort(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagVersion(
+                            const CodeEntity &  i_ce );
+
+    void                Get_UnkownTags(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+
+    bool                IsDeprecated(
+                            const CodeEntity &  i_ce );
+    bool                IsIncomplete(
+                            const CodeEntity &  i_ce );
+    bool                IsInternal(
+                            const CodeEntity &  i_ce );
+    bool                IsNodoc(
+                            const CodeEntity &  i_ce );
+    bool                IsOptional(
+                            const CodeEntity &  i_ce );
+    bool                IsSuspicious(
+                            const CodeEntity &  i_ce );
+
+};
+
+
+}   // namespace ifc_ce
+
+
+}   // namspace idl
+}   // namspace ary
+
+#endif
+
+
diff --git a/autodoc/inc/ary/idl/ik_constant.hxx b/autodoc/inc/ary/idl/ik_constant.hxx
new file mode 100644
index 000000000000..61b7fb7c87e0
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_constant.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_CONSTANT_HXX
+#define ARY_IDL_IK_CONSTANT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_constant
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+    static const String &
+                        Value(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_constant
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary/idl/ik_constgroup.hxx b/autodoc/inc/ary/idl/ik_constgroup.hxx
new file mode 100644
index 000000000000..df55fda2ce03
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_constgroup.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_CONSTGROUP_HXX
+#define ARY_IDL_IK_CONSTGROUP_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_constgroup
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_Constants(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_constgroup
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary/idl/ik_enum.hxx b/autodoc/inc/ary/idl/ik_enum.hxx
new file mode 100644
index 000000000000..229d945b06f9
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_enum.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_ENUM_HXX
+#define ARY_IDL_IK_ENUM_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_enum
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_Values(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_SynonymTypedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_enum
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary/idl/ik_enumvalue.hxx b/autodoc/inc/ary/idl/ik_enumvalue.hxx
new file mode 100644
index 000000000000..4071199a9f12
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_enumvalue.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_ENUMVALUE_HXX
+#define ARY_IDL_IK_ENUMVALUE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_enumvalue
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static const String &
+                        Value(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_enumvalue
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_exception.hxx b/autodoc/inc/ary/idl/ik_exception.hxx
new file mode 100644
index 000000000000..6bd9eaa58109
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_exception.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_EXCEPTION_HXX
+#define ARY_IDL_IK_EXCEPTION_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_exception
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Base(
+                            const CodeEntity &  i_ce );
+    static void         Get_Elements(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_Derivations(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_RaisingFunctions(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_exception
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary/idl/ik_function.hxx b/autodoc/inc/ary/idl/ik_function.hxx
new file mode 100644
index 000000000000..b52264440405
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_function.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_SERVICE_HXX
+#define ARY_IDL_IK_SERVICE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/i_param.hxx>
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+namespace ifc_function
+{
+
+using ::ary::idl::ifc_ce::Dyn_CeIterator;
+using ::ary::idl::ifc_ce::Dyn_TypeIterator;
+using ::ary::idl::ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      ReturnType(
+                            const CodeEntity &  i_ce );
+    static bool         IsOneway(
+                            const CodeEntity &  i_ce );
+    static bool         HasEllipse(
+                            const CodeEntity &  i_ce );
+    static void         Get_Parameters(
+                            Dyn_StdConstIterator<ary::idl::Parameter> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Exceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+//  aStateMachine.AddToken( "@param",   nTok_at_param,       A_nAtTagDefStatus, finAtTag );
+//  aStateMachine.AddToken( "@throws",  nTok_at_throws,      A_nAtTagDefStatus, finAtTag );
+//  aStateMachine.AddToken( "@exception",
+//  aStateMachine.AddToken( "@return",  nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+//  aStateMachine.AddToken( "@returns", nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+};
+
+
+}   // namespace ifc_function
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary/idl/ik_interface.hxx b/autodoc/inc/ary/idl/ik_interface.hxx
new file mode 100644
index 000000000000..c6fb059fea48
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_interface.hxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_INTERFACE_HXX
+#define ARY_IDL_IK_INTERFACE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+class CommentedRelation;
+
+namespace ifc_interface
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_Bases(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Functions(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Attributes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_Derivations(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_SynonymTypedefs(     /// like: typedef i_ce.LocalName() newName;
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ExportingServices(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ExportingSingletons(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+
+#if 0
+    static void         Get_UsingTypedefs(      /// like: typedef sequence<i_ce.LocalName()> newNameSeq;
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsIndirectReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsIndirectParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+#endif // 0
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_interface
+
+}   // namespace idl
+}   // namespace ary
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_module.hxx b/autodoc/inc/ary/idl/ik_module.hxx
new file mode 100644
index 000000000000..e4b5e5b0a6b1
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_module.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_MODULE_HXX
+#define ARY_IDL_IK_MODULE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+class CePilot;
+
+namespace ifc_module
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr : public ifc_ce::attr
+{
+    // KORR_FUTURE
+    //   This has to be changed that way, that the differencing takes place
+    //   within hfi_module.cxx and not here.
+    //   So the class CePilot is not needed here, etc.
+    //   Too much scope pollution.
+    static void         Get_AllChildrenSeparated(
+                            std::vector< const CodeEntity* > & o_nestedModules,
+                            std::vector< const CodeEntity* > & o_services,
+                            std::vector< const CodeEntity* > & o_interfaces,
+                            std::vector< const CodeEntity* > & o_structs,
+                            std::vector< const CodeEntity* > & o_exceptions,
+                            std::vector< const CodeEntity* > & o_enums,
+                            std::vector< const CodeEntity* > & o_typedefs,
+                            std::vector< const CodeEntity* > & o_constantGroups,
+                            std::vector< const CodeEntity* > & o_singletons,
+                            const CePilot &     i_pilot,
+                            const CodeEntity &  i_ce );
+
+    static void         Get_SubModules(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Services(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Interfaces(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Structs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Exceptions(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Enums(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Typedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ConstantsGroups(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_module
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_property.hxx b/autodoc/inc/ary/idl/ik_property.hxx
new file mode 100644
index 000000000000..874eb91edce4
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_property.hxx
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_PROPERTY_HXX
+#define ARY_IDL_IK_PROPERTY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_property
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static bool         HasAnyStereotype(
+                            const CodeEntity &  i_ce );
+    static bool         IsReadOnly(
+                            const CodeEntity &  i_ce );
+    static bool         IsBound(
+                            const CodeEntity &  i_ce );
+    static bool         IsConstrained(
+                            const CodeEntity &  i_ce );
+    static bool         IsMayBeAmbiguous(
+                            const CodeEntity &  i_ce );
+    static bool         IsMayBeDefault(
+                            const CodeEntity &  i_ce );
+    static bool         IsMayBeVoid(
+                            const CodeEntity &  i_ce );
+    static bool         IsRemovable(
+                            const CodeEntity &  i_ce );
+    static bool         IsTransient(
+                            const CodeEntity &  i_ce );
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_property
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_service.hxx b/autodoc/inc/ary/idl/ik_service.hxx
new file mode 100644
index 000000000000..6a7561375a4a
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_service.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_SERVICE_HXX
+#define ARY_IDL_IK_SERVICE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_service
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_IncludedServices(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ExportedInterfaces(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Properties(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_IncludingServices(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_InstantiatingSingletons(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_service
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_singleton.hxx b/autodoc/inc/ary/idl/ik_singleton.hxx
new file mode 100644
index 000000000000..e4af7af5b810
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_singleton.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_SINGLETON_HXX
+#define ARY_IDL_IK_SINGLETON_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_singleton
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      AssociatedService(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_singleton
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_siservice.hxx b/autodoc/inc/ary/idl/ik_siservice.hxx
new file mode 100644
index 000000000000..8a42f899b6a3
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_siservice.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_SISERVICE_HXX
+#define ARY_IDL_IK_SISERVICE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_sglifcservice
+{
+
+using ifc_ce::Dyn_CeIterator;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      BaseInterface(
+                            const CodeEntity &  i_ce );
+    static void         Get_Constructors(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_sglifcservice
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_sisingleton.hxx b/autodoc/inc/ary/idl/ik_sisingleton.hxx
new file mode 100644
index 000000000000..13ba8b810251
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_sisingleton.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_SISINGLETON_HXX
+#define ARY_IDL_IK_SISINGLETON_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_sglifcsingleton
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      BaseInterface(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_sglifcsingleton
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_struct.hxx b/autodoc/inc/ary/idl/ik_struct.hxx
new file mode 100644
index 000000000000..b5908d3a1e0c
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_struct.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_STRUCT_HXX
+#define ARY_IDL_IK_STRUCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_struct
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Base(
+                            const CodeEntity &  i_ce );
+    static void         Get_Elements(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_Derivations(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_SynonymTypedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_struct
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary/idl/ik_structelem.hxx b/autodoc/inc/ary/idl/ik_structelem.hxx
new file mode 100644
index 000000000000..2b8f95587463
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_structelem.hxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_STRUCTELEM_HXX
+#define ARY_IDL_IK_STRUCTELEM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_structelement
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_structelement
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ik_typedef.hxx b/autodoc/inc/ary/idl/ik_typedef.hxx
new file mode 100644
index 000000000000..1d4a88d5d287
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_typedef.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IK_TYPEDEF_HXX
+#define ARY_IDL_IK_TYPEDEF_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_typedef
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      DefiningType(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_SynonymTypedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_typedef
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/inc/ary/idl/ip_ce.hxx b/autodoc/inc/ary/idl/ip_ce.hxx
new file mode 100644
index 000000000000..d2b7773d62df
--- /dev/null
+++ b/autodoc/inc/ary/idl/ip_ce.hxx
@@ -0,0 +1,210 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IP_CE_HXX
+#define ARY_IDL_IP_CE_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/idl/i_property.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+
+    class ConstantsGroup;
+    class Enum;
+    class Exception;
+    class Interface;
+    class Service;
+    class SglIfcService;
+    class Singleton;
+    class SglIfcSingleton;
+    class Struct;
+    class Typedef;
+
+    class Attribute;
+    class Constant;
+    class EnumValue;
+    class Function;
+    class Property;
+    class StructElement;
+    class Variable;
+
+    class NameLookup;
+
+
+/** Provides the access logic for all code entities.
+*/
+class CePilot
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CePilot() {}
+
+    // OPERATIONS
+    virtual Module &    CheckIn_Module(
+                            Ce_id               i_nParentId,
+                            const String &      i_sName ) = 0;
+    virtual Service &   Store_Service(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual SglIfcService &
+                        Store_SglIfcService(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface ) = 0;
+    virtual Interface & Store_Interface(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase ) = 0;
+    virtual Struct &    Store_Struct(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParam = String::Null_() ) = 0;
+    virtual Exception & Store_Exception(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase ) = 0;
+    virtual Enum &      Store_Enum(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual Typedef &   Store_Typedef(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nDefiningType ) = 0;
+    virtual ConstantsGroup &
+                        Store_ConstantsGroup(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual Singleton & Store_Singleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual SglIfcSingleton &
+                        Store_SglIfcSingleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface ) = 0;
+
+    virtual Constant &  Store_Constant(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            const String &      i_sValue ) = 0;
+    virtual Property &  Store_Property(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            Property::Stereotypes
+                                                i_stereotypes ) = 0;
+    virtual Function &  Store_Function(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nReturnType,
+                            bool                i_bOneWay ) = 0;
+    virtual Function &  Store_ServiceConstructor(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual StructElement &
+                        Store_StructMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType ) = 0;
+    virtual StructElement &
+                        Store_ExceptionMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType ) = 0;
+    virtual EnumValue & Store_EnumValue(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            const String &      i_sValue ) = 0;
+    virtual Attribute & Store_Attribute(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            bool                i_bReadOnly,
+                            bool                i_bBound ) = 0;
+    // INQUIRY
+    virtual const Module &
+                        GlobalNamespace() const = 0;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId ) const = 0;
+
+    virtual const Module &
+                        Find_Module(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Module *
+                        Search_Module(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Function &
+                        Find_Function(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Property &
+                        Find_Property(
+                            Ce_id               i_nId ) const = 0;
+    virtual const EnumValue &
+                        Find_EnumValue(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Constant &
+                        Find_Constant(
+                            Ce_id               i_nId ) const = 0;
+    virtual const StructElement &
+                        Find_StructElement(
+                            Ce_id               i_nId ) const = 0;
+    virtual void        Get_Text(
+                            StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const CodeEntity &  i_ce ) const = 0;
+    virtual const NameLookup &
+                        NameDictionary() const = 0;
+    virtual void        Get_AlphabeticalIndex(
+                            std::vector<Ce_id> &
+                                                o_rResult,
+                            alphabetical_index::E_Letter
+                                                i_cLetter) const = 0;
+    // ACCESS
+    virtual Module &    GlobalNamespace() = 0;
+    virtual CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId ) = 0;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/idl/ip_type.hxx b/autodoc/inc/ary/idl/ip_type.hxx
new file mode 100644
index 000000000000..7936bab40bff
--- /dev/null
+++ b/autodoc/inc/ary/idl/ip_type.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IP_TYPE_HXX
+#define ARY_IDL_IP_TYPE_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+    class QualifiedName;
+
+namespace idl
+{
+    class Type;
+    class ExplicitNameRoom;
+
+
+/** Access point to all {->Type}s in IDL.
+*/
+class TypePilot
+{
+  public:
+    // LIFECYCLE
+    virtual             ~TypePilot() {}
+
+    // OPERATIONS
+    virtual const Type &
+                        CheckIn_Type(
+                            QualifiedName &     i_rFullName,
+                            uintt               i_nSequenceCount,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters ) = 0;
+    // INQUIRY
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_nType ) const = 0;
+    virtual String      Search_LocalNameOf(
+                            Type_id             i_nType ) const = 0;
+    virtual Ce_id       Search_CeRelatedTo(
+                            Type_id             i_nType ) const = 0;
+    virtual const ExplicitNameRoom &
+                        Find_XNameRoom(
+                            Type_id             i_nType ) const = 0;
+    virtual bool        IsBuiltInOrRelated(
+                            const Type &        i_rType ) const = 0;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/info/all_dts.hxx b/autodoc/inc/ary/info/all_dts.hxx
new file mode 100644
index 000000000000..58aee2a5e50d
--- /dev/null
+++ b/autodoc/inc/ary/info/all_dts.hxx
@@ -0,0 +1,160 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_INFO_ALL_DTS_HXX
+#define ARY_INFO_ALL_DTS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+
+class DocuDisplay;
+
+class DocuToken
+{
+  public:
+    virtual             ~DocuToken() {}
+
+    void                StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    bool                IsWhite() const;
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const = 0;
+    virtual bool        inq_IsWhite() const = 0;
+};
+
+class DT_Text : public DocuToken
+{
+  public:
+                        DT_Text(
+                            const char *        i_sText )
+                                                :   sText( i_sText ) {}
+
+    const String  &     Text() const            { return sText; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    String              sText;
+};
+
+class DT_MaybeLink : public DocuToken
+{
+  public:
+                        DT_MaybeLink(
+                            const char *        i_sText,
+                            bool                i_bIsGlobal,
+                            bool                i_bIsFunction  )
+                                                :   sText( i_sText ),
+                                                    bIsGlobal(i_bIsGlobal),
+                                                    bIsFunction(i_bIsFunction) { }
+
+    const String  &     Text() const            { return sText; }
+    bool                IsAbsolute() const      { return bIsGlobal; }
+    bool                IsFunction() const      { return bIsFunction; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    String              sText;
+    bool                bIsGlobal;
+    bool                bIsFunction;
+};
+
+class DT_Whitespace : public DocuToken
+{
+  public:
+                        DT_Whitespace(
+                            UINT8               i_nLength )
+                                                :   nLength( i_nLength ) {}
+    UINT8               Length() const          { return nLength; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    UINT8               nLength;
+};
+
+
+class DT_Eol : public DocuToken
+{
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+};
+
+class DT_Xml : public DocuToken
+{
+  public:
+                        DT_Xml(
+                            const char *        i_sText )
+                                                :   sText( i_sText ) {}
+
+    const String  &     Text() const            { return sText; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    String              sText;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+DocuToken::StoreAt( DocuDisplay & o_rDisplay ) const
+    { do_StoreAt(o_rDisplay); }
+inline bool
+DocuToken::IsWhite() const
+    { return inq_IsWhite(); }
+
+
+
+}
+}
+
+#endif
+
diff --git a/autodoc/inc/ary/info/all_tags.hxx b/autodoc/inc/ary/info/all_tags.hxx
new file mode 100644
index 000000000000..bd2de713f22c
--- /dev/null
+++ b/autodoc/inc/ary/info/all_tags.hxx
@@ -0,0 +1,289 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_INFO_ALL_TAGS_HXX
+#define ARY_INFO_ALL_TAGS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/info/ci_attag.hxx>
+    // COMPONENTS
+#include <ary/info/inftypes.hxx>
+#include <ary/info/ci_text.hxx>
+#include <ary/qualiname.hxx>
+    // PARAMETERS
+
+
+
+namespace ary
+{
+namespace info
+{
+
+
+class StdTag : public AtTag
+{
+  public:
+                        StdTag(
+                            E_AtTagId       i_eId );
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    void                ChangeId2(
+                            E_AtTagId           i_eId )
+                                                { eId = i_eId; }
+
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+    E_AtTagId           Std_Id() const          { return eId; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    E_AtTagId           eId;
+    DocuText            aText;
+    StdTag *            pNext;
+};
+
+class BaseTag : public AtTag
+{
+  public:
+                        BaseTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    QualifiedName       sBase;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class ExceptionTag : public AtTag
+{
+  public:
+                        ExceptionTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    QualifiedName       sException;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class ImplementsTag : public AtTag
+{
+  public:
+                        ImplementsTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    QualifiedName   sName;
+    AtTag *         pNext;
+};
+
+class KeywordTag : public AtTag
+{
+  public:
+                        KeywordTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    StringVector        sKeys;
+};
+
+class ParameterTag : public AtTag
+{
+  public:
+                        ParameterTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+
+    const String  &     ParamName() const       { return sName; }
+    const DocuText &    CText() const           { return aText; }
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual const ParameterTag *
+                        GetNext() const         { return dynamic_cast< ParameterTag* >(pNext); }
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    String              sName;
+    String              sValidRange;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class SeeTag : public AtTag
+{
+  public:
+                        SeeTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+    const std::vector< QualifiedName > &
+                        References() const      { return sReferences; }
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    std::vector< QualifiedName >
+                        sReferences;
+};
+
+class TemplateTag : public AtTag
+{
+  public:
+                        TemplateTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    const DocuText &    CText() const           { return aText; }
+    virtual const char *
+                        Title() const;
+    const String  &     TplParamName() const    { return sName; }
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual const TemplateTag *
+                        GetNext() const         { return dynamic_cast< TemplateTag* >(pNext); }
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    String              sName;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class LabelTag : public AtTag
+{
+  public:
+                        LabelTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    String              sLabel;
+};
+
+class SinceTag : public AtTag
+{
+  public:
+                        SinceTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+    const String &      Version() const         { return sVersion; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    // Data
+    String              sVersion;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}
+}
+
+#endif
+
diff --git a/autodoc/inc/ary/info/ci_attag.hxx b/autodoc/inc/ary/info/ci_attag.hxx
new file mode 100644
index 000000000000..da487a86f7fb
--- /dev/null
+++ b/autodoc/inc/ary/info/ci_attag.hxx
@@ -0,0 +1,101 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_INFO_CI_ATTAG_HXX
+#define ARY_INFO_CI_ATTAG_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace ary
+{
+namespace info
+{
+
+class DocuText;
+class DocuDisplay;
+
+class AtTag
+{
+  public:
+    virtual             ~AtTag() {}
+
+    void                Set_HtmlUseInDocuText(
+                            bool                i_bUseIt );
+    virtual bool        Add_SpecialMeaningToken(    /// @return false, if token was not sp�ecial.
+                            const char *        i_sText,
+                            intt                i_nNr ) = 0;
+    virtual void        Add_Token(
+                            const char *        i_sText );
+    virtual void        Add_PotentialLink(
+                            const char *        i_sText,
+                            bool                i_bIsGlobal,
+                            bool                i_bIsFunction );
+    virtual void        Add_Whitespace(
+                            UINT8               i_nLength );
+    virtual void        Add_Eol();
+
+    virtual UINT8       NrOfSpecialMeaningTokens() const = 0;
+    virtual AtTag *     GetFollower() = 0;
+
+    void                StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    const DocuText &    CText() const;
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;   // later becoming abstract
+
+    virtual DocuText *  Text() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+AtTag::StoreAt( DocuDisplay & o_rDisplay ) const
+    { do_StoreAt(o_rDisplay); }
+inline const DocuText &
+AtTag::CText() const
+    { DocuText * ret = const_cast< AtTag* >(this)->Text();
+      csv_assert( ret != 0 );
+      return *ret;
+    }
+
+
+}
+}
+
+#endif
+
diff --git a/autodoc/inc/ary/info/ci_text.hxx b/autodoc/inc/ary/info/ci_text.hxx
new file mode 100644
index 000000000000..c2dce2bfd11a
--- /dev/null
+++ b/autodoc/inc/ary/info/ci_text.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_INFO_CI_TEXT_HXX
+#define ARY_INFO_CI_TEXT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+
+class DocuToken;
+class DocuDisplay;
+
+
+class DocuText
+{
+  public:
+    typedef std::vector< DocuToken * >  TokenList;
+
+                        DocuText();
+                        ~DocuText();
+
+    void                Set_HtmlUse(
+                            bool                i_bUseIt )
+                                                { bUsesHtml = i_bUseIt; }
+    void                Add_Token(
+                            DYN DocuToken &     let_drToken )
+                                                { aTokens.push_back(&let_drToken); }
+    const TokenList &   Tokens() const          { return aTokens; }
+    void                StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    bool                IsNoHtml() const        { return NOT bUsesHtml; }
+    bool                IsEmpty() const         { return aTokens.size() == 0; }
+
+  private:
+    TokenList           aTokens;
+    bool                bUsesHtml;
+};
+
+
+
+
+
+
+// IMPLEMENTATION
+
+
+}
+}
+
+#endif
+
diff --git a/autodoc/inc/ary/info/docstore.hxx b/autodoc/inc/ary/info/docstore.hxx
new file mode 100644
index 000000000000..421904ab94fd
--- /dev/null
+++ b/autodoc/inc/ary/info/docstore.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_INFO_DOCSTORE_HXX
+#define ARY_INFO_DOCSTORE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/info/inftypes.hxx>
+
+namespace ary
+{
+namespace doc
+{
+    class Node;
+}
+
+
+
+namespace info
+{
+
+class DocuStore
+{
+  public:
+    virtual             ~DocuStore() {}
+
+    void                Store2CurFile(
+                            DYN doc::Node     & let_drDocu );
+    void                Store2CurNamespace(
+                            DYN doc::Node     & let_drDocu );
+
+    void                Store2ConnectedDeclaration(
+                            DYN doc::Node     & let_drDocu );
+
+    void                Store2Glossary(
+                            DYN doc::Node     & let_drDocu,
+                            const String  &     i_sExplainedTerm );
+    void                Store2GlobalTexts(
+                            DYN doc::Node     & let_drDocu,
+                            ary::info::GlobalTextId
+                                                i_nId );
+  private:
+    virtual void        do_Store2CurFile(
+                            DYN doc::Node     & let_drDocu ) = 0;
+    virtual void        do_Store2CurNamespace(
+                            DYN doc::Node     & let_drDocu ) = 0;
+
+    virtual void        do_Store2ConnectedDeclaration(
+                            DYN doc::Node     & let_drDocu ) = 0;
+
+    virtual void        do_Store2Glossary(
+                            DYN doc::Node     & let_drDocu,
+                            const String  &     i_sExplainedTerm ) = 0;
+    virtual void        do_Store2GlobalTexts(
+                            DYN doc::Node     & let_drDocu,
+                            ary::info::GlobalTextId
+                                                i_nId ) = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+DocuStore::Store2CurFile( DYN doc::Node     & let_drDocu )
+    { do_Store2CurFile(let_drDocu);  }
+inline void
+DocuStore::Store2CurNamespace( DYN doc::Node     & let_drDocu )
+    { do_Store2CurNamespace(let_drDocu);  }
+inline void
+DocuStore::Store2ConnectedDeclaration( DYN doc::Node     & let_drDocu )
+    { do_Store2ConnectedDeclaration(let_drDocu);  }
+inline void
+DocuStore::Store2Glossary( DYN doc::Node     &  let_drDocu,
+                           const String  &      i_sExplainedTerm )
+    { do_Store2Glossary(let_drDocu, i_sExplainedTerm);  }
+inline void
+DocuStore::Store2GlobalTexts( DYN doc::Node     &       let_drDocu,
+                              ary::info::GlobalTextId   i_nId )
+    { do_Store2GlobalTexts(let_drDocu, i_nId);  }
+
+
+
+
+}   // namespace info
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/info/infodisp.hxx b/autodoc/inc/ary/info/infodisp.hxx
new file mode 100644
index 000000000000..f486a2292f8d
--- /dev/null
+++ b/autodoc/inc/ary/info/infodisp.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_INFO_INFODISP_HXX
+#define ARY_INFO_INFODISP_HXX
+//  KORR_DEPRECATED_3.0
+
+// BASE CLASSES
+// USED SERVICES
+
+
+
+
+namespace ary
+{
+namespace info
+{
+    class StdTag;
+    class BaseTag;
+    class ExceptionTag;
+    class ImplementsTag;
+    class KeywordTag;
+    class ParameterTag;
+    class SeeTag;
+    class TemplateTag;
+    class LabelTag;
+    class SinceTag;
+    class DT_Text;
+    class DT_MaybeLink;
+    class DT_Whitespace;
+    class DT_Eol;
+    class DT_Xml;
+
+
+
+/** Displaying an ary::doc::OldCppDocu.
+
+    @descr
+    This class is an interface, but the functions are defaulted,
+    to do nothing. so a derived class needn't implement all of them.
+*/
+class DocuDisplay
+{
+  public:
+    virtual             ~DocuDisplay() {}
+
+    virtual void        Display_StdTag(
+                            const StdTag &      i_rData ) = 0;
+    virtual void        Display_BaseTag(
+                            const BaseTag &     i_rData ) = 0;
+    virtual void        Display_ExceptionTag(
+                            const ExceptionTag &
+                                                i_rData ) = 0;
+    virtual void        Display_ImplementsTag(
+                            const ImplementsTag &
+                                                i_rData ) = 0;
+    virtual void        Display_KeywordTag(
+                            const KeywordTag &  i_rData ) = 0;
+    virtual void        Display_ParameterTag(
+                            const ParameterTag &
+                                                i_rData ) = 0;
+    virtual void        Display_SeeTag(
+                            const SeeTag &      i_rData ) = 0;
+    virtual void        Display_TemplateTag(
+                            const TemplateTag & i_rData ) = 0;
+    virtual void        Display_LabelTag(
+                            const LabelTag &    i_rData ) = 0;
+    virtual void        Display_SinceTag(
+                            const ary::info::SinceTag &
+                                                i_rData ) = 0;
+    virtual void        Display_DT_Text(
+                            const DT_Text &     i_rData ) = 0;
+    virtual void        Display_DT_MaybeLink(
+                            const DT_MaybeLink& i_rData ) = 0;
+    virtual void        Display_DT_Whitespace(
+                            const DT_Whitespace &
+                                                i_rData ) = 0;
+    virtual void        Display_DT_Eol(
+                            const DT_Eol &      i_rData ) = 0;
+    virtual void        Display_DT_Xml(
+                            const ary::info::DT_Xml &
+                                                i_rData ) = 0;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/autodoc/inc/ary/info/inftypes.hxx b/autodoc/inc/ary/info/inftypes.hxx
new file mode 100644
index 000000000000..0bf330670063
--- /dev/null
+++ b/autodoc/inc/ary/info/inftypes.hxx
@@ -0,0 +1,122 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_INFO_INFTYPES_HXX
+#define ARY_INFO_INFTYPES_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+
+
+
+
+typedef uintt GlobalTextId;
+
+
+
+/** Because this enum is used as index list for displayed
+    tag headlines, the items must neither be moved nor deleted.
+    Only adding to the end is allowed. atid_MAX always has to exist
+    and to be the last used value.
+    Also assigning numbers to the values is forbidden.
+*/
+enum E_AtTagId
+{
+    atid_ATT = 0,
+    atid_author,
+    atid_change,
+    atid_collab,
+    atid_contact,
+
+    atid_copyright,
+    atid_deprecated,
+    atid_descr,
+    atid_docdate,
+    atid_derive,
+
+    atid_dyn,
+    atid_instance,
+    atid_interface,
+    atid_invariant,
+    atid_life,
+
+    atid_multi,
+    atid_onerror,
+    atid_persist,
+    atid_postcond,
+    atid_precond,
+
+    atid_resp,
+    atid_return,
+    atid_short,
+    atid_todo,
+    atid_version,
+
+    atid_MAX
+};
+
+/** Because this enum is used as index list for displayed
+    tag headlines, the items must neither be moved nor deleted.
+    Only adding to the end is allowed. C_eAtTag_NrOfClasses always has to exist
+    and to be the last used value.
+    Also assigning other numbers to the values, than in this
+    existing scheme, is forbidden.
+*/
+enum E_AtTagClass
+{
+    atc_std = 0,
+
+    atc_base = atid_MAX,
+    atc_exception = atid_MAX + 1,
+    atc_implements = atid_MAX + 2,
+    atc_keyword = atid_MAX + 3,
+    atc_parameter = atid_MAX + 4,
+
+    atc_see = atid_MAX + 5,
+    atc_template = atid_MAX + 6,
+    atc_label = atid_MAX + 7,
+    atc_since = atid_MAX + 8,
+    C_eAtTag_NrOfClasses
+};
+
+
+
+}   // namespace info
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary/itrange.hxx b/autodoc/inc/ary/itrange.hxx
new file mode 100644
index 000000000000..2c8b625b0c16
--- /dev/null
+++ b/autodoc/inc/ary/itrange.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_ITRANGE_HXX
+#define ARY_ITRANGE_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <utility>
+
+
+
+
+namespace ary
+{
+
+template <typename ITER>
+class IteratorRange
+{
+  public:
+                        IteratorRange(
+                            ITER                i_begin,
+                            ITER                i_end )
+                                                :   itCurrent(i_begin),
+                                                    itEnd(i_end)
+                                                {}
+                        IteratorRange(
+                            std::pair<ITER,ITER>
+                                                i_range )
+                                                :   itCurrent(i_range.first),
+                                                    itEnd(i_range.second)
+                                                {}
+
+                        operator bool() const   { return itCurrent != itEnd; }
+    IteratorRange &     operator++()            { ++itCurrent; return *this; }
+
+    ITER                cur() const             { return itCurrent; }
+    ITER                end() const             { return itEnd; }
+
+
+  private:
+    // DATA
+    ITER                itCurrent;
+    ITER                itEnd;
+};
+
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/loc_dir.hxx b/autodoc/inc/ary/loc/loc_dir.hxx
new file mode 100644
index 000000000000..4d63d526b6df
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_dir.hxx
@@ -0,0 +1,145 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_DIR_HXX
+#define ARY_LOC_DIR_HXX
+
+// BASE CLASSES
+#include <ary/loc/loc_le.hxx>
+
+// USED SERVICES
+#include <ary/loc/loc_traits.hxx>
+#include <ary/symtreenode.hxx>
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Represents a directory for source code files.
+*/
+class Directory : public LocationEntity
+{
+  public:
+    enum E_ClassId { class_id = 7030 };
+
+    typedef ::ary::symtree::Node<LeNode_Traits>    node_t;
+
+    /// Used for root directories.
+    explicit            Directory(
+                            Le_id               i_assignedRoot );
+
+    /// Used for subdirectories which have a parent directory.
+                        Directory(
+                            const String  &     i_localName,
+                            Le_id               i_parentDirectory );
+    virtual             ~Directory();
+
+    void                Add_Dir(
+                            const Directory  &  i_dir );
+    void                Add_File(
+                            const File &        i_file );
+
+    Le_id               Parent() const;
+    Le_id               AssignedRoot() const;
+
+    Le_id               Search_Dir(
+                            const String &      i_name ) const;
+    Le_id               Search_File(
+                            const String &      i_name ) const;
+
+    const node_t &      AsNode() const;
+    node_t &            AsNode();
+
+  private:
+    struct Container;
+
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface LocationEntity:
+    virtual const String &
+                        inq_LocalName() const;
+    virtual Le_id       inq_ParentDirectory() const;
+
+    // DATA
+    String              sLocalName;
+    Le_id               nParentDirectory;
+    Le_id               nAssignedRoot;
+    node_t              aAssignedNode;
+    Dyn<Container>      pChildren;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Le_id
+Directory::Parent() const
+{
+    return nParentDirectory;
+}
+
+inline Le_id
+Directory::AssignedRoot() const
+{
+    return nAssignedRoot;
+}
+
+inline const Directory::node_t &
+Directory::AsNode() const
+{
+    return aAssignedNode;
+}
+
+inline Directory::node_t &
+Directory::AsNode()
+{
+    return aAssignedNode;
+}
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/loc_file.hxx b/autodoc/inc/ary/loc/loc_file.hxx
new file mode 100644
index 000000000000..63586ad4977d
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_file.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_FILE_HXX
+#define ARY_LOC_FILE_HXX
+
+// BASE CLASSES
+#include <ary/loc/loc_filebase.hxx>
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Represents an unspecified source code file.
+*/
+class File : public FileBase
+{
+  public:
+    enum E_ClassId { class_id = 7100 };
+
+                        File(
+                            const String  &     i_sLocalName,
+                            Le_id               i_nParentDirectory );
+    virtual             ~File();
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+};
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/loc_filebase.hxx b/autodoc/inc/ary/loc/loc_filebase.hxx
new file mode 100644
index 000000000000..8cb5c98cbc85
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_filebase.hxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_FILEBASE_HXX
+#define ARY_LOC_FILEBASE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/loc/loc_le.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+
+/** Base class for classes representing source code files.
+*/
+class FileBase : public LocationEntity
+{
+  public:
+    virtual             ~FileBase() {}
+
+  protected:
+                        FileBase(
+                            const String  &     i_localName ,
+                            Le_id               i_parentDirectory );
+  private:
+    // Interface LocationEntity:
+    virtual const String &
+                        inq_LocalName() const;
+    virtual Le_id       inq_ParentDirectory() const;
+
+    // DATA
+    String              sLocalName;
+    Le_id               nParentDirectory;
+};
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/loc_le.hxx b/autodoc/inc/ary/loc/loc_le.hxx
new file mode 100644
index 000000000000..fdf3ad077df5
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_le.hxx
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_LE_HXX
+#define ARY_LOC_LE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/entity.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/loc/loc_types4loc.hxx>
+#include <ary/loc/loc_traits.hxx>
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Base class for all file locations in the Autodoc repository.
+*/
+class LocationEntity : public ::ary::Entity
+{
+  public:
+    typedef Le_Traits       traits_t;
+
+    virtual             ~LocationEntity() {}
+
+    Le_id               LeId() const;
+    const String &      LocalName() const;
+    Le_id               ParentDirectory() const;
+
+  private:
+    virtual const String &
+                        inq_LocalName() const = 0;
+    virtual Le_id       inq_ParentDirectory() const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Le_id
+LocationEntity::LeId() const
+{
+    return TypedId<LocationEntity>(Id());
+}
+
+inline const String &
+LocationEntity::LocalName() const
+{
+    return inq_LocalName();
+}
+
+inline Le_id
+LocationEntity::ParentDirectory() const
+{
+    return inq_ParentDirectory();
+}
+
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/loc_root.hxx b/autodoc/inc/ary/loc/loc_root.hxx
new file mode 100644
index 000000000000..5b789a8cbeaa
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_root.hxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_PROJECT_HXX
+#define ARY_LOC_PROJECT_HXX
+
+// BASE CLASSES
+#include <ary/loc/loc_le.hxx>
+// USED SERVICES
+#include <cosv/ploc.hxx>
+#include <ary/loc/loc_dir.hxx>
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Represents a root directory for source files.
+*/
+class Root : public LocationEntity
+{
+  public:
+    enum E_ClassId { class_id = 7000 };
+
+    explicit            Root(
+                            const csv::ploc::Path &
+                                                i_rRootDirectoryPath );
+    void                Assign_Directory(
+                            Le_id               i_assignedDirectory );
+    virtual             ~Root();
+
+    // INQUIRY
+    const csv::ploc::Path &
+                        Path() const;
+    Le_id               MyDir() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface LocationEntity:
+    virtual const String &
+                        inq_LocalName() const;
+    virtual Le_id       inq_ParentDirectory() const;
+
+    // DATA
+    csv::ploc::Path     aPath;
+    String              sPathAsString;
+    Le_id               aMyDirectory;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Root::Assign_Directory(Le_id i_assignedDirectory)
+{
+    aMyDirectory = i_assignedDirectory;
+}
+
+inline const csv::ploc::Path &
+Root::Path() const
+{
+    return aPath;
+}
+
+inline Le_id
+Root::MyDir() const
+{
+    return aMyDirectory;
+}
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/loc_traits.hxx b/autodoc/inc/ary/loc/loc_traits.hxx
new file mode 100644
index 000000000000..52cd6dd9b22b
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_traits.hxx
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_TRAITS_HXX
+#define ARY_LOC_TRAITS_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/loc/loc_types4loc.hxx>
+
+
+namespace ary
+{
+namespace symtree
+{
+    template <class> class Node;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+
+/** Basic traits for derived ones of ->LocationEntity.
+*/
+struct Le_Traits
+{
+    typedef LocationEntity      entity_base_type;
+    typedef Le_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of SYMBOL_TRAITS for ->::ary::symtree::Node.
+
+    @see ::ary::symtree::Node
+*/
+struct LeNode_Traits : public Le_Traits
+{
+    static symtree::Node<LeNode_Traits> *
+                        NodeOf_(
+                            entity_base_type &  i_entity );
+
+    static entity_base_type *
+                        ParentOf_(
+                            const entity_base_type &
+                                                i_entity );
+    template <class KEY>
+    static id_type      Search_(
+                            const entity_base_type &
+                                                i_entity,
+                            const KEY &         i_localKey );
+};
+
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Le_Compare : public Le_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/loc_types4loc.hxx b/autodoc/inc/ary/loc/loc_types4loc.hxx
new file mode 100644
index 000000000000..fd45476a7187
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_types4loc.hxx
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_TYPES4LOC_HXX
+#define ARY_LOC_TYPES4LOC_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/types.hxx>
+
+
+namespace ary
+{
+namespace loc
+{
+
+class LocationEntity;
+
+
+
+typedef ::ary::TypedId<LocationEntity>  Le_id;
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
diff --git a/autodoc/inc/ary/loc/locp_le.hxx b/autodoc/inc/ary/loc/locp_le.hxx
new file mode 100644
index 000000000000..585282f233f6
--- /dev/null
+++ b/autodoc/inc/ary/loc/locp_le.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOCP_LE_HXX
+#define ARY_LOCP_LE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <cosv/ploc.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+namespace ary
+{
+namespace loc
+{
+    class Root;
+    class Directory;
+    class File;
+}
+}
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+
+/** Provides access to files and directories stored in the
+    repository.
+*/
+class LocationPilot
+{
+  public:
+    virtual             ~LocationPilot() {}
+
+    virtual Root &      CheckIn_Root(
+                            const csv::ploc::Path &
+                                                i_rPath ) = 0;
+    virtual File &      CheckIn_File(
+                            const String  &     i_name,
+                            const csv::ploc::DirectoryChain &
+                                                i_subPath,
+                            Le_id               i_root ) = 0;
+
+    virtual Root &      Find_Root(
+                            Le_id               i_id ) const = 0;
+    virtual Directory & Find_Directory(
+                            Le_id               i_id ) const = 0;
+    virtual File &      Find_File(
+                            Le_id               i_id ) const = 0;
+};
+
+
+
+
+}   // namespace loc
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/namesort.hxx b/autodoc/inc/ary/namesort.hxx
new file mode 100644
index 000000000000..bb766a3773d1
--- /dev/null
+++ b/autodoc/inc/ary/namesort.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_NAMESORT_HXX
+#define ARY_NAMESORT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+
+/** Provides sensible sorting of ASCII names in programming languages.
+
+    @descr
+    Names are compared case insensitive first. Only after they appear
+    equal that way, there is an additional case sensitive comparison.
+    The second comparison sorts upper case before lower case.
+
+*/
+struct LesserName
+{
+    bool                operator()(
+                            const String &      i_s1,
+                            const String &      i_s2 ) const;
+  private:
+    // DATA
+
+    static const csv::CharOrder_Table
+                        aOrdering1_;
+    static const csv::CharOrder_Table
+                        aOrdering2_;
+};
+
+inline bool
+LesserName::operator()( const String &      i_s1,
+                        const String &      i_s2 ) const
+{
+    int result = i_s1.compare(aOrdering1_,i_s2);
+    if (result == 0)
+        result = i_s1.compare(aOrdering2_,i_s2);
+    return result < 0;
+}
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/object.hxx b/autodoc/inc/ary/object.hxx
new file mode 100644
index 000000000000..8212312f8ec7
--- /dev/null
+++ b/autodoc/inc/ary/object.hxx
@@ -0,0 +1,70 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_OBJECT_HXX
+#define ARY_OBJECT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/types.hxx>
+
+
+namespace ary
+{
+
+
+/** Interface for every class, that is stored within the
+    Autodoc Repository.
+*/
+class Object : public csv::ConstProcessorClient
+{
+  public:
+    virtual             ~Object() {}
+
+    /// @return Type id of most derived class.
+    ClassId             AryClass() const;
+
+  private:
+    virtual ClassId     get_AryClass() const = 0;
+};
+
+
+
+inline ClassId
+Object::AryClass() const
+{
+    return get_AryClass();
+}
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/qualiname.hxx b/autodoc/inc/ary/qualiname.hxx
new file mode 100644
index 000000000000..94a886968d10
--- /dev/null
+++ b/autodoc/inc/ary/qualiname.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_QUALINAME_HXX
+#define ARY_QUALINAME_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <cosv/tpl/tpltools.hxx>
+
+
+namespace ary
+{
+
+class QualifiedName
+{
+  public:
+    typedef StringVector::const_iterator  namespace_iterator;
+
+                        QualifiedName(
+                            uintt               i_nSize = 0);
+
+    /// @see AssignText()
+                        QualifiedName(
+                            const char *        i_sText,
+                            const char *        i_sSeparator );
+                        ~QualifiedName();
+
+    QualifiedName &     operator+=(
+                            const String &      i_sNamespaceName )
+                                                { if (i_sNamespaceName.length() > 0)
+                                                        aNamespace.push_back(i_sNamespaceName);
+                                                  return *this; }
+    /// @precond i_nIndex < NamespaceDepth().
+    String &            operator[](
+                            uintt               i_nIndex )
+                                                { csv_assert(i_nIndex < aNamespace.size());
+                                                  return aNamespace[i_nIndex]; }
+    void                Init(
+                            bool                i_bAbsolute )
+                                                { Empty(); bIsAbsolute = i_bAbsolute; }
+    /** Reads a qualified name from a string.
+        If the last two charcters are "()", the inquiry IsFunction() will return
+        true.
+    */
+    void                AssignText(
+                            const char *        i_sText,
+                            const char *        i_sSeparator );
+    void                SetLocalName(
+                            const String &      i_sLocalName )
+                                                { sLocalName = i_sLocalName; }
+    void                Empty()                 { csv::erase_container(aNamespace); sLocalName.clear(); bIsAbsolute = false; }
+
+    const String &      LocalName() const       { return sLocalName; }
+    namespace_iterator  first_namespace() const { return aNamespace.begin(); }
+    namespace_iterator  end_namespace() const   { return aNamespace.end(); }
+    uintt               NamespaceDepth() const  { return aNamespace.size(); }
+
+    bool                IsAbsolute() const      { return bIsAbsolute; }
+    bool                IsQualified() const     { return aNamespace.size() > 0; }
+    bool                IsFunction() const      { return bIsFunction; }
+
+  private:
+    // DATA
+    StringVector        aNamespace;
+    String              sLocalName;
+    bool                bIsAbsolute;            /// true := beginning with "::".
+    bool                bIsFunction;            /// true := ending with "()"
+};
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/sequentialids.hxx b/autodoc/inc/ary/sequentialids.hxx
new file mode 100644
index 000000000000..94b6cfa4823e
--- /dev/null
+++ b/autodoc/inc/ary/sequentialids.hxx
@@ -0,0 +1,153 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_SEQUENTIALIDS_HXX
+#define ARY_SEQUENTIALIDS_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <algorithm>
+
+
+
+namespace ary
+{
+
+
+/** Implementation of a set of children to an entity in the Autodoc
+    repository. The children are in the sequence of addition.
+*/
+template<class ID>
+class SequentialIds
+{
+  public:
+    typedef std::vector<ID>                     data_t;
+    typedef typename data_t::const_iterator     const_iterator;
+
+    // LIFECYCLE
+    explicit            SequentialIds(
+                            std::size_t         i_reserve = 0 );
+                        ~SequentialIds();
+
+    // OPERATIONS
+    void                Add(
+                            const ID &       i_child );
+    // INQUIRY
+    const_iterator      Begin() const;
+    const_iterator      End() const;
+    std::size_t         Size() const;
+
+    template <class IDENTIFY>
+    ID                  Find(
+                            IDENTIFY            i_find ) const;
+    template <class IDENTIFY>
+    // Workaround for Solaris8 compiler: return type has to match alphabetically
+    typename std::vector<ID>::const_iterator
+                        Search(
+                            IDENTIFY            i_find ) const;
+  private:
+    // DATA
+    data_t              aData;
+};
+
+
+
+
+
+
+
+// IMPLEMENTATION
+
+template <class ID>
+SequentialIds<ID>::SequentialIds(std::size_t i_reserve)
+    :   aData()
+{
+    if (i_reserve > 0)
+        aData.reserve(i_reserve);
+}
+
+template <class ID>
+SequentialIds<ID>::~SequentialIds()
+{
+}
+
+template <class ID>
+inline void
+SequentialIds<ID>::Add(const ID & i_child)
+{
+    aData.push_back(i_child);
+}
+
+template <class ID>
+inline typename SequentialIds<ID>::const_iterator
+SequentialIds<ID>::Begin() const
+{
+    return aData.begin();
+}
+
+template <class ID>
+inline typename SequentialIds<ID>::const_iterator
+SequentialIds<ID>::End() const
+{
+    return aData.end();
+}
+
+template <class ID>
+inline std::size_t
+SequentialIds<ID>::Size() const
+{
+    return aData.size();
+}
+
+template <class ID>
+template <class IDENTIFY>
+ID
+SequentialIds<ID>::Find(IDENTIFY i_find) const
+{
+    const_iterator
+        ret = std::find_if(aData.begin(), aData.end(), i_find);
+    csv_assert(ret != aData.end());
+    return *ret;
+}
+
+template <class ID>
+template <class IDENTIFY>
+// Workaround for Solaris8 compiler: return type has to match alphabetically
+// typename SequentialIds<ID>::const_iterator
+typename std::vector<ID>::const_iterator
+SequentialIds<ID>::Search(IDENTIFY i_find) const
+{
+    return std::find_if(aData.begin(), aData.end(), i_find);
+}
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/stdconstiter.hxx b/autodoc/inc/ary/stdconstiter.hxx
new file mode 100644
index 000000000000..5b05ff6279ea
--- /dev/null
+++ b/autodoc/inc/ary/stdconstiter.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_STDCONSTITER_HXX
+#define ARY_STDCONSTITER_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+
+template <class ELEM>
+
+class StdConstIterator
+{
+  public:
+    virtual             ~StdConstIterator() {}
+
+    void                operator++()            { do_Advance(); }
+    const ELEM &        operator*() const       { return *inq_CurElement(); }
+                        operator bool() const   { return inq_CurElement() != 0; }
+
+    /// Needed as replacement for operator bool() in gcc 2.95.
+    bool                IsValid() const         { return operator bool(); }
+    bool                IsSorted() const        { return inq_IsSorted(); }
+
+  protected:
+                        StdConstIterator() {}
+
+  private:
+    //Locals
+    virtual void        do_Advance() = 0;
+    virtual const ELEM *
+                        inq_CurElement() const = 0;
+    virtual bool        inq_IsSorted() const = 0;
+
+    // Forbidden:
+    StdConstIterator(const StdConstIterator<ELEM>&);
+    StdConstIterator<ELEM> & operator=(const StdConstIterator<ELEM>&);
+};
+
+
+template <class ELEM>
+class Dyn_StdConstIterator
+{
+  public:
+    typedef StdConstIterator<ELEM> client_type;
+
+                        Dyn_StdConstIterator(
+                            DYN client_type *   pass_dpIterator = 0 )
+                                                : pClient(pass_dpIterator) {}
+    Dyn_StdConstIterator<ELEM> &
+                        operator=(
+                            DYN client_type *   pass_dpIterator )
+                                                { pClient = pass_dpIterator;
+                                                  return *this; }
+    client_type &       operator*() const       { return *pClient.MutablePtr(); }
+
+  private:
+    Dyn<client_type>    pClient;
+};
+
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/symtreenode.hxx b/autodoc/inc/ary/symtreenode.hxx
new file mode 100644
index 000000000000..8d2f07165ee2
--- /dev/null
+++ b/autodoc/inc/ary/symtreenode.hxx
@@ -0,0 +1,344 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_SYMTREE_NODE_HXX
+#define ARY_SYMTREE_NODE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+
+
+namespace ary
+{
+namespace symtree
+{
+
+
+
+/** Represents a node in a tree of symbols like a namespace tree or a
+    directory tree.
+
+    @tpl NODE_TRAITS
+    Needs to define the types:
+        entity_base_type:   The type of the entities in that storage,
+                            e.g. ->ary::cpp::CodeEntity.
+        id_type:            The type of the ids of those entities,
+                            e.g. ->ary::cpp::Ce_id.
+
+    Needs to define the functions:
+     1. static entity_base_type &
+                            EntityOf_(
+                                id_type             i_id );
+     2. static symtree::Node<LeNode_Traits> *
+                            NodeOf_(
+                                const entity_base_type &
+                                                    i_entity );
+     3. static const String &
+                            LocalNameOf_(
+                                const entity_base_type &
+                                                    i_entity );
+     4. static entity_base_type *
+                            ParentOf_(
+                                const entity_base_type &
+                                                    i_entity );
+     5. template <class KEY>
+        static id_t         Search_(
+                                const entity_base_type &
+                                                    i_entity,
+                                const KEY &         i_localKey );
+*/
+template <class NODE_TRAITS>
+class Node
+{
+  public:
+    typedef Node<NODE_TRAITS>                         node_self;
+    typedef typename NODE_TRAITS::entity_base_type    entity_t;
+    typedef typename NODE_TRAITS::id_type             id_t;
+
+
+    // LIFECYCLE
+    /// @attention Always needs to be followed by ->Assign_Entity()!
+                        Node();
+    explicit            Node(
+                            entity_t &          i_entity );
+    void                Assign_Entity(
+                            entity_t &          i_entity );
+                        ~Node();
+    // INQUIRY
+    id_t                Id();
+    const String        Name() const;
+    int                 Depth() const;
+    const entity_t &    Entity() const;
+    const node_self *   Parent() const;
+
+    /** Gets a child with a specific name and of a specific type.
+
+        There may be more childs with the same name.
+
+        @return id_t(0), if no matching child is found.
+    */
+    template <class KEY>
+    typename NODE_TRAITS::id_type
+                        Search(
+                            const KEY &         i_localKey ) const
+    {
+        // Inline here to workaround SUNW8 compiler bug, works in SUNW12.
+        return NODE_TRAITS::Search_(Entity(), i_localKey);
+    }
+
+
+    /** Gets a child with a specific qualified name below this node.
+
+        The child may not exists.
+    */
+    template <class KEY>
+    void                SearchBelow(
+                            id_t &              o_return,   // Workaround SUNW8 compiler bug
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_begin,
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_end,
+                            const KEY &         i_localKey ) const;
+
+    /** Gets a child with a specific qualified name, either below this node
+        or below any of the parent nodes.
+
+        The child may not exists.
+    */
+    template <class KEY>
+    void                SearchUp(
+                            id_t &              o_return,   // Workaround SUNW8 compiler bug
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_begin,
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_end,
+                            const KEY &         i_localKey ) const;
+    // ACCESS
+    entity_t &          Entity();
+    node_self *         Parent();
+
+  private:
+    // Forbid copying:
+    Node(const node_self&);
+    node_self& operator=(const node_self&);
+
+    // Locals
+    void                InitDepth();
+    node_self *         Get_Parent() const;
+    node_self *         NodeOf(
+                            id_t                i_id ) const;
+
+    // DATA
+    entity_t *          pEntity;
+    int                 nDepth;
+};
+
+
+
+
+// IMPLEMENTATION
+
+template <class NODE_TRAITS>
+inline const typename Node<NODE_TRAITS>::entity_t &
+Node<NODE_TRAITS>::Entity() const
+{
+    csv_assert(pEntity != 0);
+    return *pEntity;
+}
+
+template <class NODE_TRAITS>
+inline Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::NodeOf(id_t i_id) const
+{
+    if (i_id.IsValid())
+        return NODE_TRAITS::NodeOf_(NODE_TRAITS::EntityOf_(i_id));
+    return 0;
+}
+
+template <class NODE_TRAITS>
+inline Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::Get_Parent() const
+{
+    entity_t *
+        parent = NODE_TRAITS::ParentOf_(Entity());
+    if (parent != 0)
+        return NODE_TRAITS::NodeOf_(*parent);
+    return 0;
+}
+
+template <class NODE_TRAITS>
+Node<NODE_TRAITS>::Node()
+    :   pEntity(0),
+        nDepth(0)
+{
+}
+
+template <class NODE_TRAITS>
+Node<NODE_TRAITS>::Node(entity_t & i_entity)
+    :   pEntity(&i_entity),
+        nDepth(0)
+{
+    InitDepth();
+}
+
+template <class NODE_TRAITS>
+void
+Node<NODE_TRAITS>::Assign_Entity(entity_t & i_entity)
+{
+    pEntity = &i_entity;
+    InitDepth();
+}
+
+template <class NODE_TRAITS>
+Node<NODE_TRAITS>::~Node()
+{
+}
+
+template <class NODE_TRAITS>
+inline typename Node<NODE_TRAITS>::id_t
+Node<NODE_TRAITS>::Id()
+{
+    return NODE_TRAITS::IdOf(Entity());
+}
+
+template <class NODE_TRAITS>
+inline const String
+Node<NODE_TRAITS>::Name() const
+{
+    return NODE_TRAITS::LocalNameOf_(Entity());
+}
+
+template <class NODE_TRAITS>
+inline int
+Node<NODE_TRAITS>::Depth() const
+{
+    return nDepth;
+}
+
+template <class NODE_TRAITS>
+inline const Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::Parent() const
+{
+    return Get_Parent();
+}
+
+template <class NODE_TRAITS>
+template <class KEY>
+void
+Node<NODE_TRAITS>::SearchBelow(
+                          id_t &              o_return,   // Workaround SUNW8 compiler bug
+                          StringVector::const_iterator i_qualifiedSearchedName_begin,
+                          StringVector::const_iterator i_qualifiedSearchedName_end,
+                          const KEY &                  i_localKey ) const
+{
+    if (i_qualifiedSearchedName_begin != i_qualifiedSearchedName_end)
+    {
+        id_t
+            next = Search(*i_qualifiedSearchedName_begin);
+        if (next.IsValid())
+        {
+            const node_self *
+                subnode = NodeOf(next);
+            if (subnode != 0)
+            {
+                subnode->SearchBelow( o_return,
+                                      i_qualifiedSearchedName_begin+1,
+                                      i_qualifiedSearchedName_end   ,
+                                      i_localKey );
+                return;
+            }
+        }
+        o_return = id_t(0);
+        return;
+    }
+
+    o_return = Search(i_localKey);
+}
+
+template <class NODE_TRAITS>
+template <class KEY>
+void
+Node<NODE_TRAITS>::SearchUp(
+                          id_t &              o_return,   // Workaround SUNW8 compiler bug
+                          StringVector::const_iterator i_qualifiedSearchedName_begin,
+                          StringVector::const_iterator i_qualifiedSearchedName_end,
+                          const KEY &                  i_localKey ) const
+{
+    SearchBelow( o_return,
+                 i_qualifiedSearchedName_begin,
+                 i_qualifiedSearchedName_end,
+                 i_localKey );
+    if (o_return.IsValid())
+        return;
+
+    node_self *
+        parent = Get_Parent();
+    if (parent != 0)
+    {
+        parent->SearchUp( o_return,
+                          i_qualifiedSearchedName_begin,
+                          i_qualifiedSearchedName_end,
+                          i_localKey );
+    }
+}
+
+template <class NODE_TRAITS>
+typename Node<NODE_TRAITS>::entity_t &
+Node<NODE_TRAITS>::Entity()
+{
+    csv_assert(pEntity != 0);
+    return *pEntity;
+}
+
+template <class NODE_TRAITS>
+inline Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::Parent()
+{
+    return Get_Parent();
+}
+
+template <class NODE_TRAITS>
+void
+Node<NODE_TRAITS>::InitDepth()
+{
+    Node<NODE_TRAITS> *
+        pp = Get_Parent();
+    if (pp != 0)
+        nDepth = pp->Depth() + 1;
+    else
+        nDepth = 0;
+}
+
+
+
+
+}   // namespace symtree
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/types.hxx b/autodoc/inc/ary/types.hxx
new file mode 100644
index 000000000000..0f8d28c6b151
--- /dev/null
+++ b/autodoc/inc/ary/types.hxx
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_TYPES_HXX
+#define ARY_TYPES_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+
+namespace ary
+{
+
+
+typedef uintt           Rid;
+typedef uintt           ClassId;
+
+
+
+// Deprecated:
+typedef Rid             Gid;        /// Group Id. Id of a group.
+typedef UINT8           SlotAccessId;   /// Access to a Slot
+typedef std::set< Rid, std::less< Rid > >   Set_Rid;
+typedef std::vector<Rid>                    List_Rid;
+
+
+
+
+
+/** This is a global id, providing as well an entity's class as its
+    id.
+*/
+class GlobalId
+{
+  public:
+                        GlobalId()
+                            :   nClass(0),
+                                nId(0) {}
+                        GlobalId(
+                            ClassId             i_class,
+                            Rid                 i_id )
+                            :   nClass(i_class),
+                                nId(i_id) {}
+                        ~GlobalId() {}
+
+    bool                IsValid() const         { return nClass != 0
+                                                  AND
+                                                  nId != 0; }
+    ClassId             Class() const           { return nClass; }
+    Rid                 Id() const              { return nId; }
+
+  private:
+    // DATA
+    ClassId             nClass;
+    Rid                 nId;
+};
+
+
+typedef std::vector<GlobalId>   List_GlobalIds;
+
+
+/** This is a typed repository id. It allows to get
+    an object of a specific type.
+*/
+template <class IFC>
+class TypedId
+{
+  public:
+    typedef TypedId<IFC>                        self;
+
+
+    explicit            TypedId(
+                            Rid                 i_nId = 0 )
+                                                : nId(i_nId) {}
+    TypedId<IFC> &      operator=(
+                            Rid                 i_nId )
+                                                { nId = i_nId; return *this; }
+    bool                operator==(
+                            const TypedId<IFC> &
+                                                i_nId ) const
+                                                { return nId == i_nId.nId; }
+    bool                operator!=(
+                            const TypedId<IFC> &
+                                                i_nId ) const
+                                                { return NOT operator==(i_nId); }
+    bool                operator<(
+                            const TypedId<IFC> &
+                                                i_nId ) const
+                                                { return nId < i_nId.nId; }
+
+    bool                IsValid() const         { return nId != 0; }
+    Rid                 Value() const           { return nId; }
+
+    static self         Null_()                 { return self(0); }
+
+  private:
+    // DATA
+    Rid                 nId;
+};
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary/udmhost.hxx b/autodoc/inc/ary/udmhost.hxx
new file mode 100644
index 000000000000..eca8b89c2894
--- /dev/null
+++ b/autodoc/inc/ary/udmhost.hxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_UDMHOST_HXX
+#define ARY_UDMHOST_HXX
+//  KORR_DEPRECATED_3.0
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/host.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+
+
+
+class UdmHost : public Host
+{
+  public:
+    enum E_ClassId { class_id = 1000 };
+
+                        UdmHost();
+    virtual             ~UdmHost();
+
+  private:
+    virtual Host_ClassId
+                       inq_ClassId() const;
+};
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/inc/ary_i/ci_atag2.hxx b/autodoc/inc/ary_i/ci_atag2.hxx
new file mode 100644
index 000000000000..db0caaa5d673
--- /dev/null
+++ b/autodoc/inc/ary_i/ci_atag2.hxx
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CI_ATAG2_HXX
+#define ARY_CI_ATAG2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <ary_i/ci_text2.hxx>
+    // PARAMETERS
+
+
+
+namespace ary
+{
+namespace inf
+{
+
+
+class DocumentationDisplay;
+
+class AtTag2
+{
+  public:
+    virtual             ~AtTag2() {}
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const = 0;
+
+    const char *        Title() const           { return sTitle; }
+    const DocuTex2 &    Text() const            { return aText; }
+    DocuTex2 &          Access_Text()           { return aText; }
+
+  protected:
+                        AtTag2(
+                            const char *        i_sTitle)
+                                                :   sTitle(i_sTitle) {}
+    String              sTitle;
+    DocuTex2            aText;
+};
+
+
+
+// IMPLEMENTATION
+
+}   // namespace inf
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary_i/ci_text2.hxx b/autodoc/inc/ary_i/ci_text2.hxx
new file mode 100644
index 000000000000..fbc7fcbc4095
--- /dev/null
+++ b/autodoc/inc/ary_i/ci_text2.hxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CINFO_CI_TEXT2_HXX
+#define ARY_CINFO_CI_TEXT2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace inf
+{
+
+
+class DocumentationDisplay;
+
+
+class DocuToken
+{
+  public:
+    virtual             ~DocuToken() {}
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const = 0;
+    virtual bool        IsWhiteOnly() const = 0;
+};
+
+
+class DocuTex2
+{
+  public:
+    typedef std::vector< DocuToken * >  TokenList;
+
+                        DocuTex2();
+    virtual             ~DocuTex2();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    void                AddToken(
+                            DYN DocuToken &     let_drToken );
+
+    const TokenList &   Tokens() const          { return aTokens; }
+    bool                IsEmpty() const;
+    const String &      TextOfFirstToken() const;
+
+    String &            Access_TextOfFirstToken();
+
+  private:
+    TokenList           aTokens;
+};
+
+
+
+// IMPLEMENTATION
+
+}   // namespace inf
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/ary_i/d_token.hxx b/autodoc/inc/ary_i/d_token.hxx
new file mode 100644
index 000000000000..39303321c015
--- /dev/null
+++ b/autodoc/inc/ary_i/d_token.hxx
@@ -0,0 +1,282 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef CSI_DSAPI_D_TOKEN_HXX
+#define CSI_DSAPI_D_TOKEN_HXX
+
+// BASE CLASSES
+#include <ary_i/ci_text2.hxx>
+#include <ary_i/ci_atag2.hxx>
+
+
+namespace ary
+{
+namespace inf
+{
+    class DocumentationDisplay;
+}
+}
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+using ary::inf::DocumentationDisplay;
+
+
+class DT_Dsapi : public ary::inf::DocuToken
+{
+  public:
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const  = 0;
+    virtual bool        IsWhiteOnly() const;
+};
+
+
+
+class DT_TextToken : public DT_Dsapi
+{
+  public:
+    explicit            DT_TextToken(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+    explicit            DT_TextToken(
+                            const String &      i_sText )
+                                                :   sText(i_sText) {}
+    virtual             ~DT_TextToken();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const char *        GetText() const         { return sText; }
+    const String &      GetTextStr() const      { return sText; }
+
+    String &            Access_Text()           { return sText; }
+
+    virtual bool        IsWhiteOnly() const;
+
+  private:
+    String              sText;
+};
+
+class DT_White : public DT_Dsapi
+{
+  public:
+                        DT_White() {}
+    virtual             ~DT_White();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    virtual bool        IsWhiteOnly() const;
+};
+
+
+class DT_MLTag : public DT_Dsapi
+{
+  public:
+    enum E_Kind
+    {
+        k_unknown = 0,
+        k_begin,
+        k_end,
+        k_single
+    };
+};
+
+class DT_MupType : public DT_MLTag
+{
+  public:
+    explicit            DT_MupType(             /// Constructor for End-Tag
+                            bool                )   /// Must be there, but is not evaluated.
+                                                :   bIsBegin(false) {}
+    explicit            DT_MupType(             /// Constructor for Begin-Tag
+                            const String &      i_sScope )
+                                                :   sScope(i_sScope), bIsBegin(true) {}
+    virtual             ~DT_MupType();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const String  &     Scope() const           { return sScope; }
+    bool                IsBegin() const         { return bIsBegin; }
+
+  private:
+    String              sScope;
+    bool                bIsBegin;
+};
+
+class DT_MupMember : public DT_MLTag
+{
+  public:
+    explicit            DT_MupMember(           /// Constructor for End-Tag
+                            bool                )   /// Must be there, but is not evaluated.
+                                                :   bIsBegin(false) {}
+                        DT_MupMember(           /// Constructor for Begin-Tag
+                            const String &      i_sScope )
+                                                :   sScope(i_sScope), bIsBegin(true) {}
+    virtual             ~DT_MupMember();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const String  &     Scope() const           { return sScope; }
+    bool                IsBegin() const         { return bIsBegin; }
+
+  private:
+    String              sScope;
+    bool                bIsBegin;
+};
+
+class DT_MupConst : public DT_Dsapi
+{
+  public:
+                        DT_MupConst(
+                            const char *        i_sConstText )
+                                                :   sConstText(i_sConstText) {}
+    virtual             ~DT_MupConst();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const char *        GetText() const         { return sConstText; }
+
+  private:
+    String              sConstText;             /// Without HTML.
+};
+
+
+class DT_Style : public DT_MLTag
+{
+  public:
+                        DT_Style(
+                            const char *        i_sPlainHtmlTag,
+                            bool                i_bNewLine )
+                                                : sText(i_sPlainHtmlTag), bNewLine(i_bNewLine) {}
+    virtual             ~DT_Style();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const char *        GetText() const         { return sText; }
+    bool                IsStartOfNewLine() const
+                                                { return bNewLine; }
+  private:
+    String              sText;                  /// With HTML.
+    E_Kind              eKind;
+    bool                bNewLine;
+};
+
+class DT_EOL : public DT_Dsapi
+{
+  public:
+                        DT_EOL() {}
+    virtual             ~DT_EOL();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    virtual bool        IsWhiteOnly() const;
+};
+
+
+class DT_AtTag : public ary::inf::AtTag2
+{
+  public:
+    void                AddToken(
+                            DYN ary::inf::DocuToken &
+                                                let_drToken )
+                                                {   aText.AddToken(let_drToken); }
+    void                SetName(
+                            const char *        i_sName )
+                                                { sTitle = i_sName; }
+
+  protected:
+                        DT_AtTag(
+                            const char *        i_sTitle )
+                                                :   ary::inf::AtTag2(i_sTitle) {}
+};
+
+class DT_StdAtTag : public DT_AtTag
+{
+  public:
+    explicit            DT_StdAtTag(
+                            const char *        i_sTitle )
+                                                :   DT_AtTag(i_sTitle) {}
+    virtual             ~DT_StdAtTag();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+};
+
+class DT_SeeAlsoAtTag : public DT_AtTag
+{
+  public:
+                        DT_SeeAlsoAtTag()       :   DT_AtTag("") {}
+    virtual             ~DT_SeeAlsoAtTag();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const String  &     LinkText() const        { return sTitle; }  // Missbrauch von sTitle
+};
+
+class DT_ParameterAtTag : public DT_AtTag
+{
+  public:
+                        DT_ParameterAtTag()     :   DT_AtTag("") {}
+    virtual             ~DT_ParameterAtTag();
+
+    void                SetTitle(
+                            const char *        i_sTitle );
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+};
+
+class DT_SinceAtTag : public DT_AtTag
+{
+  public:
+                        DT_SinceAtTag()     :   DT_AtTag("Since version") {}
+    virtual             ~DT_SinceAtTag();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/inc/ary_i/disdocum.hxx b/autodoc/inc/ary_i/disdocum.hxx
new file mode 100644
index 000000000000..51f708a751ea
--- /dev/null
+++ b/autodoc/inc/ary_i/disdocum.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_DISDOCUM_HXX
+#define ARY_DISDOCUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace dsapi
+{
+class DT_TextToken;
+class DT_MupType;
+class DT_MupMember;
+class DT_MupConst;
+class DT_Style;
+class DT_EOL;
+class DT_StdAtTag;
+class DT_SeeAlsoAtTag;
+class DT_ParameterAtTag;
+class DT_SinceAtTag;
+}   // namespace dsapi
+}   // namespace csi
+
+
+namespace ary
+{
+namespace inf
+{
+
+
+
+class DocumentationDisplay
+{
+  public:
+
+    virtual             ~DocumentationDisplay() { }
+
+    virtual void        Display_TextToken(
+                            const csi::dsapi::DT_TextToken &
+                                                i_rToken ) = 0;
+    virtual void        Display_White() = 0;
+    virtual void        Display_MupType(
+                            const csi::dsapi::DT_MupType &  i_rToken ) = 0;
+    virtual void        Display_MupMember(
+                            const csi::dsapi::DT_MupMember &
+                                                i_rToken ) = 0;
+    virtual void        Display_MupConst(
+                            const csi::dsapi::DT_MupConst &
+                                                i_rToken ) = 0;
+    virtual void        Display_Style(
+                            const csi::dsapi::DT_Style &    i_rToken ) = 0;
+    virtual void        Display_EOL() = 0;
+    virtual void        Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag &
+                                                i_rToken ) = 0;
+    virtual void        Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag &
+                                                i_rToken ) = 0;
+    virtual void        Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag &
+                                                i_rToken ) = 0;
+    virtual void        Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag &
+                                                i_rToken ) = 0;
+};
+
+
+class DocuTag_Display : public DocumentationDisplay
+{
+  public:
+    // Dummies, implemented in source\ary_i\kernel\ci_atag2.cxx
+    virtual void        Display_TextToken(
+                            const csi::dsapi::DT_TextToken &
+                                                i_rToken );
+    virtual void        Display_White();
+    virtual void        Display_MupType(
+                            const csi::dsapi::DT_MupType &  i_rToken );
+    virtual void        Display_MupMember(
+                            const csi::dsapi::DT_MupMember &
+                                                i_rToken );
+    virtual void        Display_MupConst(
+                            const csi::dsapi::DT_MupConst &
+                                                i_rToken );
+    virtual void        Display_Style(
+                            const csi::dsapi::DT_Style &    i_rToken );
+    virtual void        Display_EOL();
+};
+
+class DocuText_Display : public DocumentationDisplay
+{
+  public:
+    // Dummies, implemented in source\ary_i\kernel\ci_text2.cxx
+    virtual void        Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag &
+                                                i_rToken );
+    virtual void        Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag &
+                                                i_rToken );
+    virtual void        Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag &
+                                                i_rToken );
+    virtual void        Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag &
+                                                i_rToken );
+};
+
+
+
+}   // namespace inf
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/inc/autodoc/displaying.hxx b/autodoc/inc/autodoc/displaying.hxx
new file mode 100644
index 000000000000..8fb21c6b6ecb
--- /dev/null
+++ b/autodoc/inc/autodoc/displaying.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef AUTODOC_DISPLAYING_HXX
+#define AUTODOC_DISPLAYING_HXX
+
+
+namespace display
+{
+    class CorporateFrame;
+}
+
+
+
+namespace autodoc
+{
+
+class HtmlDisplay_UdkStd;
+class HtmlDisplay_Idl_Ifc;
+
+// class TextDisplay_FunctionList_Ifc;
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class DisplayToolsFactory_Ifc
+{
+  public:
+    virtual             ~DisplayToolsFactory_Ifc() {}
+    static DisplayToolsFactory_Ifc &
+                        GetIt_();
+
+//    virtual DYN autodoc::TextDisplay_FunctionList_Ifc *
+//                        Create_TextDisplay_FunctionList() const = 0;
+
+    virtual DYN autodoc::HtmlDisplay_UdkStd *
+                        Create_HtmlDisplay_UdkStd() const = 0;
+    virtual DYN autodoc::HtmlDisplay_Idl_Ifc *
+                        Create_HtmlDisplay_Idl() const = 0;
+
+    virtual const display::CorporateFrame &
+                        Create_StdFrame() const = 0;
+};
+
+
+} // namespace autodoc
+
+
+
+#endif
+
diff --git a/autodoc/inc/autodoc/dsp_html_std.hxx b/autodoc/inc/autodoc/dsp_html_std.hxx
new file mode 100644
index 000000000000..ff3beae8ff31
--- /dev/null
+++ b/autodoc/inc/autodoc/dsp_html_std.hxx
@@ -0,0 +1,213 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef AUTODOC_DSP_HTML_STD_HXX
+#define AUTODOC_DSP_HTML_STD_HXX
+
+
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Gate;
+    }
+    namespace idl
+    {
+        class Gate;
+    }
+}
+
+namespace display
+{
+    class CorporateFrame;
+}
+
+
+namespace autodoc
+{
+
+
+class HtmlDisplay_UdkStd
+{
+  public:
+    virtual             ~HtmlDisplay_UdkStd() {}
+
+    /** Displays the names of several C++ code entities within the
+        given namespace (or the global namespace as default). All
+        subnamespaces are included.
+
+        Output has following format:
+
+        =========================================================================
+        OutputDirectory
+            index.html
+            def-all.html
+            prj\
+                sal\
+                    index.html                      // Overview about project
+
+                    f-FileName[1,2,...]             // Overview about file
+                    f-OtherFileName[1,2,...]
+                    ...
+                    def-FileName[1,2,...]           // #defines and macros in file
+                    def-OtherFileName[1,2,...]
+                    ...
+                rtl\
+                    ...
+                cppu\
+                    ...
+                cppuhelper\
+                    ...
+                ...
+            ix\
+                ix-a.html
+                ix-b.html
+                ...
+                ix-z.html
+                ix-_.html
+                ix-other.html
+
+            cpp\
+                index.html                          // Overview about global namespace
+
+                Namespace_A\
+                    Namespace_C\
+                        index.html                  // Overview about namespace C
+                        ...
+                    ...
+
+                    index.html                      // Overview about namespace A
+
+                    c-ClassName_X.html              // Description of class
+                    ...
+                    e-EnumName.html                 // Description of enum
+                    ...
+                    t-TypedefName.html              // Description of typedef
+                    ...
+                    o-Filename.html                 // Descriptions of operations in this file in this namespace
+                    ...
+                    d-Filename.html                 // Descriptions of data in this file in this namespace
+                    ...
+
+                    ClassName_X\
+                        c-ClassName_Y.html
+                        e-EnumName.html
+                        t-TypedefName.html
+                        o.html                      // Descriptions of operations in class X
+                        d.html                      // Descriptions of data in class X
+
+                        ClassName_Y\
+                            ...
+                ...
+
+            idl\
+                ...
+            java\
+                ...
+        =========================================================================
+
+
+        @param i_sOutputDirectory
+            Directory for output. Path must be given in correct
+            syntax for the actual operating system without final
+            path delimiter. If this is 0 or "", the current
+            working directory is chosen.
+        @param i_rAryGate
+            The access to the Autodoc Repository.
+        @param i_rLayout
+            Gives parameters for the appearance of the HTML output.
+        @param i_pProjectList
+            If this is != 0, then only code entities which are declared
+            in this projects are displayed.
+    */
+    void                Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+  private:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout ) = 0;
+};
+
+// IMPLEMENTATION
+
+inline void
+HtmlDisplay_UdkStd::Run( const char *                    i_sOutputDirectory,
+                         const ary::cpp::Gate &          i_rAryGate,
+                         const display::CorporateFrame & i_rLayout )
+{
+    do_Run( i_sOutputDirectory, i_rAryGate, i_rLayout );
+}
+
+
+
+// class HtmlDisplay_Idl_Ifc
+
+class HtmlDisplay_Idl_Ifc
+{
+  public:
+    virtual             ~HtmlDisplay_Idl_Ifc() {}
+
+    void                Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+  private:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout ) = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+HtmlDisplay_Idl_Ifc::Run( const char *                    i_sOutputDirectory,
+                          const ary::idl::Gate &          i_rAryGate,
+                          const display::CorporateFrame & i_rLayout )
+{
+    do_Run( i_sOutputDirectory, i_rAryGate, i_rLayout );
+}
+
+
+
+
+} // namespace autodoc
+#endif
diff --git a/autodoc/inc/autodoc/dsp_txt_flist.hxx b/autodoc/inc/autodoc/dsp_txt_flist.hxx
new file mode 100644
index 000000000000..a8015a1d9537
--- /dev/null
+++ b/autodoc/inc/autodoc/dsp_txt_flist.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef AUTODOC_DSP_TXT_FLIST_HXX
+#define AUTODOC_DSP_TXT_FLIST_HXX
+
+#include <iostream>
+
+
+namespace ary
+{
+    namespace cpp
+    {
+        class DisplayGate;
+    }
+}
+
+
+namespace autodoc
+{
+
+class TextDisplay_FunctionList_Ifc
+{
+  public:
+    virtual             ~TextDisplay_FunctionList_Ifc() {}
+
+    /** Displays the names of all C++ functions and methods within the
+        given namespace (or the global namespace as default). All
+        subnamespaces are included.
+    */
+    virtual void        Run(
+                            ostream &           o_rStream,
+                            const ary::cpp::DisplayGate &
+                                                i_rAryGate ) = 0; /// If i_pNamespace == 0, the global namespace is displayed.
+};
+
+
+}   // namespace autodoc
+
+#endif
+
diff --git a/autodoc/inc/autodoc/filecoli.hxx b/autodoc/inc/autodoc/filecoli.hxx
new file mode 100644
index 000000000000..8b13d18649ef
--- /dev/null
+++ b/autodoc/inc/autodoc/filecoli.hxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSER_FILECOLI_HXX
+#define ADC_PARSER_FILECOLI_HXX
+
+
+namespace autodoc
+{
+
+class FileCollector_Ifc
+{
+  public:
+    // TYPES
+    typedef StringVector::const_iterator const_iterator;
+
+    enum E_SearchMode
+    {
+        flat,
+        recursive
+    };
+
+    // LIFECYCLE
+    virtual             ~FileCollector_Ifc() {}
+
+    // OPERATIONS
+    virtual uintt       AddFilesFrom(
+                            const char *        i_sRootDir,
+                            const char *        i_sFilter,
+                            E_SearchMode        i_eSearchMode ) = 0;
+    virtual uintt       AddFile(
+                            const char *        i_sFilePath ) = 0;
+    virtual void        EraseAll() = 0;
+
+    // INQUIRY
+    virtual const_iterator
+                        Begin() const = 0;
+    virtual const_iterator
+                        End() const = 0;
+    virtual uintt       Size() const = 0;
+};
+
+
+} // namespace autodoc
+
+
+#endif
+
diff --git a/autodoc/inc/autodoc/parsing.hxx b/autodoc/inc/autodoc/parsing.hxx
new file mode 100644
index 000000000000..825e84261f89
--- /dev/null
+++ b/autodoc/inc/autodoc/parsing.hxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef AUTODOC_PARSING_HXX
+#define AUTODOC_PARSING_HXX
+
+
+
+namespace autodoc
+{
+
+class CodeParser_Ifc;
+class DocumentationParser_Ifc;
+class FileCollector_Ifc;
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class ParseToolsFactory_Ifc
+{
+  public:
+    virtual             ~ParseToolsFactory_Ifc() {}
+    static ParseToolsFactory_Ifc &
+                        GetIt_();
+
+    virtual DYN autodoc::CodeParser_Ifc *
+                        Create_Parser_Cplusplus() const = 0;
+
+//  virtual DYN autodoc::CodeParser_Ifc *
+//                      CreateParser_UnoIDL() const = 0;
+//  virtual DYN autodoc::CodeParser_Ifc *
+//                      CreateParser_Java() const = 0;
+//  virtual DYN autodoc::CodeParser_Ifc *
+//                      CreateParser_StoredProcedures() const = 0;
+
+    virtual DYN autodoc::DocumentationParser_Ifc *
+                        Create_DocuParser_AutodocStyle() const = 0;
+
+//  virtual DYN autodoc::DocumentationParser_Ifc *
+//                      CreateDocuParser_StarOfficeAPIStyle() const = 0;
+
+    virtual DYN autodoc::FileCollector_Ifc *
+                        Create_FileCollector(
+                            uintt               i_nEstimatedNrOfFiles ) const = 0;  /// Should be somewhat larger than the maximal estimated number of files.
+};
+
+
+} // namespace autodoc
+
+
+
+#endif
+
diff --git a/autodoc/inc/autodoc/prs_code.hxx b/autodoc/inc/autodoc/prs_code.hxx
new file mode 100644
index 000000000000..e50dba1ad7bc
--- /dev/null
+++ b/autodoc/inc/autodoc/prs_code.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef AUTODOC_PRS_CODE_HXX
+#define AUTODOC_PRS_CODE_HXX
+
+
+
+namespace csv
+{
+    namespace ploc
+    {
+        class Path;
+    }
+}
+
+namespace ary
+{
+    class Repository;
+}
+
+namespace autodoc
+{
+    class FileCollector_Ifc;
+    class DocumentationParser_Ifc;
+
+
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class CodeParser_Ifc
+{
+  public:
+    virtual             ~CodeParser_Ifc() {}
+
+    virtual void        Setup(
+                            ary::Repository &   o_rRepository,
+                            const autodoc::DocumentationParser_Ifc &
+                                                i_rDocumentationInterpreter ) = 0;
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles ) = 0;
+};
+
+
+
+
+} // namespace autodoc
+#endif
diff --git a/autodoc/inc/autodoc/prs_docu.hxx b/autodoc/inc/autodoc/prs_docu.hxx
new file mode 100644
index 000000000000..f73b2631af90
--- /dev/null
+++ b/autodoc/inc/autodoc/prs_docu.hxx
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSER_PRS_DOCU_HXX
+#define ADC_PARSER_PRS_DOCU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace autodoc
+{
+
+class TkpDocuContext;
+
+class DocumentationParser_Ifc
+{
+  public:
+    virtual             ~DocumentationParser_Ifc() {}
+
+    virtual DYN TkpDocuContext *
+                        Create_DocuContext() const = 0;
+};
+
+
+} // namespace autodoc
+
+
+#endif
+
diff --git a/autodoc/inc/autodoc/x_parsing.hxx b/autodoc/inc/autodoc/x_parsing.hxx
new file mode 100644
index 000000000000..36f7d71155be
--- /dev/null
+++ b/autodoc/inc/autodoc/x_parsing.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef AUTODOC_X_PARSING_HXX
+#define AUTODOC_X_PARSING_HXX
+
+// USED SERVICES
+#include <iostream>
+
+
+
+
+namespace autodoc
+{
+
+class X_Parser_Ifc
+{
+  public:
+    // TYPES
+    enum E_Event
+    {
+        x_Any                       = 0,
+        x_InvalidChar,
+        x_UnexpectedToken,
+        x_UnexpectedEOF,
+        x_UnspecifiedSyntaxError
+    };
+
+    // LIFECYCLE
+    virtual             ~X_Parser_Ifc() {}
+
+    // INQUIRY
+    virtual E_Event     GetEvent() const = 0;
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const = 0;
+};
+
+
+}   // namespace autodoc
+
+std::ostream &      operator<<(
+                        std::ostream &      o_rOut,
+                        const autodoc::X_Parser_Ifc &
+                                            i_rException );
+
+
+
+
+#endif
diff --git a/autodoc/inc/display/corframe.hxx b/autodoc/inc/display/corframe.hxx
new file mode 100644
index 000000000000..e03659807bec
--- /dev/null
+++ b/autodoc/inc/display/corframe.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CORFRAME_HXX
+#define ADC_CORFRAME_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+class Html_Image;
+
+
+namespace display
+{
+
+
+class CorporateFrame
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CorporateFrame() {}
+
+    // INQUIRY
+    virtual DYN Html_Image *
+                        LogoSrc() const = 0;
+    virtual const char *
+                        LogoLink() const = 0;
+    virtual const char *
+                        CopyrightText() const = 0;
+
+    virtual const char *
+                        CssStyle() const = 0;
+    virtual const char *
+                        CssStylesExplanation() const = 0;
+    virtual const char *
+                        DevelopersGuideHtmlRoot() const = 0;
+    virtual bool        SimpleLinks() const = 0;
+
+    // ACCESS
+    virtual void        Set_DevelopersGuideHtmlRoot(
+                            const String &      i_directory ) = 0;
+    virtual void        Set_SimpleLinks() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace display
+
+
+#endif
+
diff --git a/autodoc/inc/parser/parser.hxx b/autodoc/inc/parser/parser.hxx
new file mode 100644
index 000000000000..ad5f9a7adac4
--- /dev/null
+++ b/autodoc/inc/parser/parser.hxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSER_HXX
+#define ADC_PARSER_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace autodoc
+{
+    class FileCollector_Ifc;
+}
+
+
+class CodeParser
+{
+  public:
+    virtual             ~CodeParser() {}
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles ) = 0;
+};
+
+
+
+#endif
+
diff --git a/autodoc/inc/parser/parserinfo.hxx b/autodoc/inc/parser/parserinfo.hxx
new file mode 100644
index 000000000000..3afe646dd4f0
--- /dev/null
+++ b/autodoc/inc/parser/parserinfo.hxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSERINFO_HXX
+#define ADC_PARSERINFO_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+/** Interface about current state of parsing.
+*/
+class ParserInfo
+{
+  public:
+    // OPERATIONS
+    void                Set_CurFile(
+                            const String &      i_file,
+                            bool                i_bUseLines = false)
+                                                { sCurFile = i_file;
+                                                  nCurLine = i_bUseLines ? 1 : 0; }
+    void                Increment_CurLine()
+                                                { ++nCurLine; }
+
+    // INQUIRY
+    const String &      CurFile() const         { return sCurFile; }
+    uintt               CurLine() const         { return nCurLine; }
+
+  protected:
+    // LIFECYCLE
+                        ParserInfo()            : sCurFile(), nCurLine(0) {}
+                        ~ParserInfo()           {}
+  private:
+    String              sCurFile;
+    uintt               nCurLine;
+
+};
+
+#endif
diff --git a/autodoc/inc/parser/unoidl.hxx b/autodoc/inc/parser/unoidl.hxx
new file mode 100644
index 000000000000..2ec434304756
--- /dev/null
+++ b/autodoc/inc/parser/unoidl.hxx
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UNOIDL_HXX
+#define ADC_UNOIDL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <parser/parser.hxx>
+#include <parser/parserinfo.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+    class Repository;
+}
+namespace autodoc
+{
+    class FileCollector_Ifc;
+}
+
+namespace autodoc
+{
+
+
+class IdlParser : public ::CodeParser,
+                  public ::ParserInfo
+{
+  public:
+                        IdlParser(
+                            ary::Repository &       io_rRepository );
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles );
+
+  private:
+    // DATA
+    ary::Repository *   pRepository;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace autodoc
+
+
+#endif
+
diff --git a/autodoc/prj/build.lst b/autodoc/prj/build.lst
new file mode 100644
index 000000000000..fd4d3f7c7963
--- /dev/null
+++ b/autodoc/prj/build.lst
@@ -0,0 +1,67 @@
+ar	autodoc	:  cosv udm sal NULL
+ar	autodoc								usr1	-	all	ar_mkout NULL
+ar	autodoc\inc							get	    -	all	ar_i NULL
+ar	autodoc\inc\ary			  			get		-	all	ar_ir NULL
+ar	autodoc\inc\ary\cpp		  			get		-	all	ar_ir_cpp NULL
+ar	autodoc\inc\ary\idl		  			get		-	all	ar_ir_idl NULL
+ar	autodoc\inc\ary\info	  			get		-	all	ar_ir_info NULL
+ar	autodoc\inc\ary\loc	  			    get		-	all	ar_ir_loc NULL
+ar	autodoc\inc\ary\task	  			get		-	all	ar_ir_task NULL
+ar	autodoc\inc\ary_i		  			get		-	all	ar_ir_cinfo NULL
+ar	autodoc\inc\autodoc		  			get		-	all	ar_iau NULL
+ar	autodoc\inc\display 	  			get		-	all	ar_idispl2 NULL
+ar	autodoc\inc\parser 		  			get		-	all	ar_iparse2 NULL
+ar	autodoc\prj							get		-	all	ar_prj NULL
+ar	autodoc\util						get		-	all	ar_util NULL
+ar	autodoc\source						get		-	all	ar_s NULL
+ar	autodoc\source\inc					get		-	all	ar_si NULL
+ar	autodoc\source\inc\display  		get		-	all	ar_si_display NULL
+ar	autodoc\source\inc\oodb       		get		-	all	ar_si_oodb2 NULL
+ar	autodoc\source\inc\tools     		get		-	all	ar_si_tools NULL
+ar	autodoc\source\inc\utility     		get		-	all	ar_si_util2 NULL
+ar	autodoc\source\ary					get		-	all	ar_sr NULL
+ar	autodoc\source\ary\inc				get		-	all	ar_sri NULL
+ar	autodoc\source\ary\inc\cpp			get		-	all	ar_sri_cpp NULL
+ar	autodoc\source\ary\inc\idl			get		-	all	ar_sri_idl NULL
+ar	autodoc\source\ary\inc\loc			get		-	all	ar_sri_loc NULL
+ar	autodoc\source\ary\inc\store		get		-	all	ar_sri_store NULL
+ar	autodoc\source\ary\cpp	 			nmake	-	all	ar_sr_cpp NULL
+ar	autodoc\source\ary\doc 			    nmake	-	all	ar_sr_doc NULL
+ar	autodoc\source\ary\idl	 			nmake	-	all	ar_sr_idl NULL
+ar	autodoc\source\ary\info	 			nmake	-	all	ar_sr_info NULL
+ar	autodoc\source\ary\kernel			nmake	-	all	ar_sr_kernel NULL
+ar	autodoc\source\ary\loc	 			nmake 	-	all	ar_sr_loc NULL
+ar	autodoc\source\ary_i			    get		-	all	ar_sr_i NULL
+ar	autodoc\source\ary_i\kernel			nmake	-	all	ar_sr_cinfo NULL
+ar	autodoc\source\display				get		-	all	ar_sd NULL
+ar	autodoc\source\display\inc			get		-	all	ar_sdi NULL
+ar	autodoc\source\display\inc\funclist	get		-	all	ar_sdi_flist NULL
+ar	autodoc\source\display\inc\html 	get		-	all	ar_sdi_html NULL
+ar	autodoc\source\display\html	        nmake	-	all	ar_sd_html NULL
+ar	autodoc\source\display\kernel	    nmake	-	all	ar_sd_kernel NULL
+ar	autodoc\source\display\idl          nmake	-	all	ar_sd_idl NULL
+ar	autodoc\source\display\toolkit      nmake	-	all	ar_sd_tkit NULL
+ar	autodoc\source\parser				get		-	all	ar_sp NULL
+ar	autodoc\source\parser\inc			get		-	all	ar_spi NULL
+ar	autodoc\source\parser\inc\adoc		get		-	all	ar_spi_adoc NULL
+ar	autodoc\source\parser\inc\cpp 		get		-	all	ar_spi_cpp NULL
+ar	autodoc\source\parser\inc\semantic	get		-	all	ar_spi_sem NULL
+ar	autodoc\source\parser\inc\tokens	get		-	all	ar_spi_tok NULL
+ar	autodoc\source\parser\adoc			nmake	-	all	ar_sp_adoc NULL
+ar	autodoc\source\parser\cpp			nmake	-	all	ar_sp_cpp NULL
+ar	autodoc\source\parser\kernel		nmake	-	all	ar_sp_krnl NULL
+ar	autodoc\source\parser\semantic		nmake	-	all	ar_sp_sem NULL
+ar	autodoc\source\parser\tokens		nmake	-	all	ar_sp_tok NULL
+ar	autodoc\source\parser_i				get		-	all	ar_sp2 NULL
+ar	autodoc\source\parser_i\inc			    get		-	all	ar_sp2i NULL
+ar	autodoc\source\parser_i\inc\s2_dsapi	get		-	all	ar_sp2i_idoc NULL
+ar	autodoc\source\parser_i\inc\s2_luidl	get		-	all	ar_sp2i_cpp NULL
+ar	autodoc\source\parser_i\inc\semantic	get		-	all	ar_sp2i_sem NULL
+ar	autodoc\source\parser_i\inc\tokens	    get		-	all	ar_sp2i_tok NULL
+ar	autodoc\source\parser_i\idl	  		nmake	-	all	ar_sp2_idl NULL
+ar	autodoc\source\parser_i\idoc  		nmake	-	all	ar_sp2_idoc NULL
+ar	autodoc\source\parser_i\tokens		nmake	-	all	ar_sp2_tok NULL
+ar	autodoc\source\tools				nmake	-	all	ar_st NULL
+ar	autodoc\source\mkinc				get		-	all	ar_smk NULL
+ar	autodoc\source\exes					get		-	all	ar_se NULL
+ar	autodoc\source\exes\adc_uni			nmake	-	all	ar_se_uni ar_sr_cpp ar_sr_doc ar_sr_idl ar_sr_info ar_sr_kernel ar_sr_loc ar_sr_cinfo ar_sd_html ar_sd_kernel ar_sd_idl ar_sp_adoc ar_sp_cpp ar_sp_krnl ar_sp_sem ar_sp_tok ar_sp2_idl ar_sd_tkit ar_sp2_idoc ar_sp2_tok ar_st NULL
diff --git a/autodoc/prj/d.lst b/autodoc/prj/d.lst
new file mode 100644
index 000000000000..c73e559f0729
--- /dev/null
+++ b/autodoc/prj/d.lst
@@ -0,0 +1,3 @@
+..\%__SRC%\bin\autodoc.exe %_DEST%\bin%_EXT%\autodoc.exe
+..\%__SRC%\bin\autodoc %_DEST%\bin%_EXT%\autodoc
+
diff --git a/autodoc/source/ary/cpp/c_builtintype.cxx b/autodoc/source/ary/cpp/c_builtintype.cxx
new file mode 100644
index 000000000000..fc245ae0985b
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_builtintype.cxx
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_builtintype.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_type.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+//**********************        Type        **************************//
+Rid
+Type::inq_RelatedCe() const
+{
+     return 0;
+}
+
+
+//**********************        BuiltInType        **************************//
+
+BuiltInType::BuiltInType( const String  &       i_sName,
+                          E_TypeSpecialisation  i_eSpecialisation )
+    :   sName( i_sName ),
+        eSpecialisation( i_eSpecialisation )
+{
+}
+
+String
+BuiltInType::SpecializedName_( const char *         i_sName,
+                               E_TypeSpecialisation i_eTypeSpecialisation )
+{
+    StreamLock
+        aStrLock(60);
+    StreamStr &
+        ret = aStrLock();
+
+    switch ( i_eTypeSpecialisation )
+    {
+        case TYSP_unsigned:
+                    ret << "u_";
+                    break;
+        case TYSP_signed:
+                    if (strcmp(i_sName,"char") == 0)
+                        ret << "s_";
+                    break;
+        default:
+                    ;
+
+    }   // end switch
+
+    ret << i_sName;
+    return String(ret.c_str());
+}
+
+void
+BuiltInType::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ary::ClassId
+BuiltInType::get_AryClass() const
+{
+    return class_id;
+}
+
+bool
+BuiltInType::inq_IsConst() const
+{
+    return false;
+}
+
+void
+BuiltInType::inq_Get_Text( StreamStr &      ,               // o_rPreName
+                           StreamStr &      o_rName,
+                           StreamStr &      ,               // o_rPostName
+                           const Gate &     ) const         // i_rGate
+{
+    switch (eSpecialisation)
+    {
+        case TYSP_unsigned: o_rName << "unsigned "; break;
+        case TYSP_signed:   o_rName << "signed ";   break;
+
+        default:            // Does nothing.
+                            ;
+    }
+    o_rName << sName;
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_class.cxx b/autodoc/source/ary/cpp/c_class.cxx
new file mode 100644
index 000000000000..8867c1d9e856
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_class.cxx
@@ -0,0 +1,284 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_class.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Class::Class( const String  &     i_sLocalName,
+              Ce_id               i_nOwner,
+              E_Protection        i_eProtection,
+              loc::Le_id          i_nFile,
+              E_ClassKey          i_eClassKey )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        aAssignedNode(),
+           aBaseClasses(),
+           aTemplateParameterTypes(),
+        aClasses(),
+        aEnums(),
+        aTypedefs(),
+        aOperations(),
+        aStaticOperations(),
+        aData(),
+        aStaticData(),
+        aFriendClasses(),
+        aFriendOperations(),
+        aKnownDerivatives(),
+        eClassKey(i_eClassKey),
+        eProtection(i_eProtection),
+        eVirtuality(VIRTUAL_none)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Class::~Class()
+{
+}
+
+void
+Class::Add_BaseClass( const S_Classes_Base & i_rBaseClass )
+{
+    aBaseClasses.push_back(i_rBaseClass);
+}
+
+void
+Class::Add_TemplateParameterType( const String  &     i_sLocalName,
+                                  Type_id             i_nIdAsType )
+{
+    aTemplateParameterTypes.push_back(
+            List_TplParam::value_type(i_sLocalName,i_nIdAsType) );
+}
+
+void
+Class::Add_LocalClass( const String  &     i_sLocalName,
+                       Cid                 i_nId )
+{
+    aClasses.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalEnum( const String  &     i_sLocalName,
+                      Cid                 i_nId )
+{
+    aEnums.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalTypedef( const String  &     i_sLocalName,
+                         Cid                 i_nId )
+{
+    aTypedefs.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalOperation( const String  &          i_sLocalName,
+                           Cid                      i_nId )
+{
+    aOperations.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalStaticOperation( const String  &     i_sLocalName,
+                                 Cid                 i_nId )
+{
+    aStaticOperations.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalData( const String  &     i_sLocalName,
+                      Cid                 i_nId )
+{
+    aData.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalStaticData( const String  &     i_sLocalName,
+                            Cid                 i_nId )
+{
+    aStaticData.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+
+struct find_name
+{
+                        find_name(
+                            const String &      i_name )
+                            :   sName(i_name) {}
+
+    bool                operator()(
+                            const S_LocalCe &   i_lce ) const
+                            { return i_lce.sLocalName == sName; }
+  private:
+    String              sName;
+};
+
+Ce_id
+Class::Search_Child(const String & i_key) const
+{
+    Ce_id
+        ret = Ce_id(Search_LocalClass(i_key));
+    if (ret.IsValid())
+        return ret;
+
+    CIterator_Locals
+        itret = std::find_if(aEnums.begin(), aEnums.end(), find_name(i_key));
+    if (itret != aEnums.end())
+        return (*itret).nId;
+    itret = std::find_if(aTypedefs.begin(), aTypedefs.end(), find_name(i_key));
+    if (itret != aTypedefs.end())
+        return (*itret).nId;
+    itret = std::find_if(aData.begin(), aData.end(), find_name(i_key));
+    if (itret != aData.end())
+        return (*itret).nId;
+    itret = std::find_if(aStaticData.begin(), aStaticData.end(), find_name(i_key));
+    if (itret != aStaticData.end())
+        return (*itret).nId;
+    return Ce_id(0);
+}
+
+Rid
+Class::Search_LocalClass( const String  & i_sName ) const
+{
+     CIterator_Locals itFound = PosOfName(aClasses, i_sName);
+    if (itFound != aClasses.end())
+        return (*itFound).nId.Value();
+    return 0;
+}
+
+const String  &
+Class::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Class::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+loc::Le_id
+Class::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Class::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Class::get_AryClass() const
+{
+    return class_id;
+}
+
+Gid
+Class::inq_Id_Group() const
+{
+     return static_cast<Gid>(Id());
+}
+
+const ary::cpp::CppEntity &
+Class::inq_RE_Group() const
+{
+     return *this;
+}
+
+const group::SlotList &
+Class::inq_Slots() const
+{
+    static const SlotAccessId aProjectSlotData[]
+            = { SLOT_Bases,
+                SLOT_NestedClasses,
+                SLOT_Enums,
+                SLOT_Typedefs,
+                SLOT_Operations,
+                SLOT_StaticOperations,
+                SLOT_Data,
+                SLOT_StaticData,
+                SLOT_FriendClasses,
+                SLOT_FriendOperations };
+    static const std::vector< SlotAccessId >
+            aSlots( &aProjectSlotData[0],
+                      &aProjectSlotData[0]
+                        + sizeof aProjectSlotData / sizeof (SlotAccessId) );
+    return aSlots;
+}
+
+
+DYN Slot *
+Class::inq_Create_Slot( SlotAccessId i_nSlot ) const
+{
+    switch ( i_nSlot )
+    {
+        case SLOT_Bases:                return new Slot_BaseClass(aBaseClasses);
+        case SLOT_NestedClasses:        return new Slot_ListLocalCe(aClasses);
+        case SLOT_Enums:                return new Slot_ListLocalCe(aEnums);
+        case SLOT_Typedefs:             return new Slot_ListLocalCe(aTypedefs);
+        case SLOT_Operations:           return new Slot_ListLocalCe(aOperations);
+        case SLOT_StaticOperations:     return new Slot_ListLocalCe(aStaticOperations);
+        case SLOT_Data:                 return new Slot_ListLocalCe(aData);
+        case SLOT_StaticData:           return new Slot_ListLocalCe(aStaticData);
+        case SLOT_FriendClasses:        return new Slot_SequentialIds<Ce_id>(aFriendClasses);
+        case SLOT_FriendOperations:     return new Slot_SequentialIds<Ce_id>(aFriendOperations);
+        default:
+                                        return new Slot_Null;
+    }   // end switch
+}
+
+Class::CIterator_Locals
+Class::PosOfName( const List_LocalCe &  i_rList,
+                  const String  &       i_sName ) const
+{
+    for ( CIterator_Locals ret = i_rList.begin();
+          ret != i_rList.end();
+          ++ret )
+    {
+         if ( (*ret).sLocalName == i_sName )
+            return ret;
+    }
+    return i_rList.end();
+}
+
+}   //  namespace   cpp
+}   //  namespace   ary
diff --git a/autodoc/source/ary/cpp/c_de.cxx b/autodoc/source/ary/cpp/c_de.cxx
new file mode 100644
index 000000000000..4c8024bbef47
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_de.cxx
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_de.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+DefineEntity::DefineEntity( const String  &     i_name,
+                            loc::Le_id          i_declaringFile )
+    :   sName(i_name),
+        nLocation(i_declaringFile)
+{
+}
+
+
+
+
+}   // end namespace cpp
+}   // end namespace ary
diff --git a/autodoc/source/ary/cpp/c_define.cxx b/autodoc/source/ary/cpp/c_define.cxx
new file mode 100644
index 000000000000..4f91ea38c8e6
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_define.cxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_define.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <prprpr.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+Define::Define( const String  &         i_name,
+                const StringVector &    i_definition,
+                loc::Le_id              i_declaringFile)
+    :   DefineEntity(i_name, i_declaringFile),
+        aDefinition(i_definition)
+{
+}
+
+Define::~Define()
+{
+}
+
+void
+Define::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Define::get_AryClass() const
+{
+    return class_id;
+}
+
+const StringVector &
+Define::inq_DefinitionText() const
+{
+     return aDefinition;
+}
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_enum.cxx b/autodoc/source/ary/cpp/c_enum.cxx
new file mode 100644
index 000000000000..6dd76f183e16
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_enum.cxx
@@ -0,0 +1,134 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_enum.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Enum::Enum( const String  &     i_sLocalName,
+            Ce_id               i_nOwner,
+            E_Protection        i_eProtection,
+            Lid                 i_nFile )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        aValues(),
+        eProtection(i_eProtection)
+{
+}
+
+Enum::~Enum()
+{
+}
+
+void
+Enum::Add_Value( Ce_id i_nId )
+{
+    aValues.Add( i_nId );
+}
+
+const String  &
+Enum::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Enum::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Enum::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Enum::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Enum::get_AryClass() const
+{
+    return class_id;
+}
+
+Gid
+Enum::inq_Id_Group() const
+{
+    return static_cast<Gid>(Id());
+}
+
+const ary::cpp::CppEntity &
+Enum::inq_RE_Group() const
+{
+    return *this;
+}
+
+const group::SlotList &
+Enum::inq_Slots() const
+{
+    static const SlotAccessId aProjectSlotData[]
+            = { SLOT_Values };
+    static const std::vector< SlotAccessId >
+            aSlots( &aProjectSlotData[0],
+                      &aProjectSlotData[0]
+                        + sizeof aProjectSlotData / sizeof (SlotAccessId) );
+    return aSlots;
+}
+
+DYN Slot *
+Enum::inq_Create_Slot( SlotAccessId  i_nSlot ) const
+{
+    switch ( i_nSlot )
+    {
+        case SLOT_Values:               return new Slot_SequentialIds<Ce_id>(aValues);
+        default:
+                                        return new Slot_Null;
+    }   // end switch
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_enuval.cxx b/autodoc/source/ary/cpp/c_enuval.cxx
new file mode 100644
index 000000000000..d133546449bd
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_enuval.cxx
@@ -0,0 +1,87 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_enuval.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+EnumValue::EnumValue( const String  &     i_sLocalName,
+                      Ce_id               i_nOwner,
+                      String              i_sInitialisation )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     Lid(0) ),
+           sInitialisation(i_sInitialisation)
+{
+}
+
+EnumValue::~EnumValue()
+{
+}
+
+const String  &
+EnumValue::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+EnumValue::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+EnumValue::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+EnumValue::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+EnumValue::get_AryClass() const
+{
+    return class_id;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_funct.cxx b/autodoc/source/ary/cpp/c_funct.cxx
new file mode 100644
index 000000000000..cfc0a61909b2
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_funct.cxx
@@ -0,0 +1,247 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_funct.hxx>
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include <algorithm>
+#include <ary/cpp/c_funct.hxx>
+
+
+
+
+
+namespace
+{
+using namespace ::ary::cpp;
+
+
+class Parameter_2_NonTypeParamInfo
+{
+  public:
+    String              operator()(
+                            const S_Parameter & i_rParam ) const;
+};
+
+class Parameter_2_Type
+{
+  public:
+    Type_id             operator()(
+                            const S_Parameter & i_rParam ) const
+                                                { return i_rParam.nType; }
+};
+
+/** @return
+    A vector with Strings like this:
+        "ParamName" or "ParamName[ArraySize]" or "ParamName = InitValue".
+*/
+StringVector        Create_NonTypeParameterInfos(
+                        const std::vector<S_Parameter> &
+                                            i_rParameters );
+/** @return
+    A vector of the parameters' type ids.
+*/
+std::vector<Type_id>
+                    Create_ParameterTypeList(
+                        const std::vector<S_Parameter> &
+                                            i_rParameters );
+
+}   // namspace anonymous
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Function::Function( const String  &             i_sLocalName,
+                    Ce_id                       i_nOwner,
+                    E_Protection                i_eProtection,
+                    Lid                         i_nFile,
+                    Type_id                     i_nReturnType,
+                    const std::vector<S_Parameter> &
+                                                i_parameters,
+                    E_ConVol                    i_conVol,
+                    E_Virtuality                i_eVirtuality,
+                    FunctionFlags               i_aFlags,
+                    bool                        i_bThrowExists,
+                    const std::vector<Type_id> &
+                                                i_rExceptions )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        aTemplateParameterTypes(),
+        aSignature( Create_ParameterTypeList(i_parameters),
+                    i_conVol ),
+        nReturnType(i_nReturnType),
+        eProtection(i_eProtection),
+        eVirtuality(i_eVirtuality),
+        aFlags(i_aFlags),
+        aParameterInfos( Create_NonTypeParameterInfos(i_parameters) ),
+        pExceptions( i_bThrowExists ? new ExceptionTypeList(i_rExceptions) : 0 )
+{
+}
+
+Function::~Function()
+{
+}
+
+bool
+Function::IsIdentical( const Function & i_f ) const
+{
+    return
+        LocalName() == i_f.LocalName()
+        AND
+        Owner() == i_f.Owner()
+        AND
+        aSignature == i_f.aSignature
+        AND
+        nReturnType == i_f.nReturnType
+        AND
+        eProtection == i_f.eProtection
+        AND
+        eVirtuality == i_f.eVirtuality
+        AND
+        aFlags == i_f.aFlags
+        AND
+        ( ( NOT pExceptions AND NOT i_f.pExceptions )
+          OR
+          ( pExceptions AND i_f.pExceptions
+                ?   *pExceptions == *i_f.pExceptions
+                :   false )
+        )
+        AND
+        aTemplateParameterTypes.size() == i_f.aTemplateParameterTypes.size();
+}
+
+void
+Function::Add_TemplateParameterType( const String  &    i_sLocalName,
+                                     Type_id            i_nIdAsType )
+{
+    aTemplateParameterTypes.push_back(
+        List_TplParam::value_type(i_sLocalName, i_nIdAsType) );
+}
+
+
+const String  &
+Function::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Function::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Function::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Function::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Function::get_AryClass() const
+{
+    return class_id;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+
+
+namespace
+{
+
+String
+Parameter_2_NonTypeParamInfo::operator()( const ary::cpp::S_Parameter & i_rParam ) const
+{
+    static StreamStr aParamName_(1020);
+    aParamName_.seekp(0);
+
+    aParamName_ << i_rParam.sName;
+    if ( i_rParam.sSizeExpression.length() > 0 )
+    {
+        aParamName_ << '['
+                    << i_rParam.sSizeExpression
+                    << ']';
+    }
+    if ( i_rParam.sInitExpression.length() > 0 )
+    {
+        aParamName_ << " = "
+                    << i_rParam.sInitExpression;
+    }
+
+    return aParamName_.c_str();
+}
+
+
+StringVector
+Create_NonTypeParameterInfos( const std::vector<S_Parameter> & i_rParameters )
+{
+    static Parameter_2_NonTypeParamInfo
+        aTransformFunction_;
+
+    StringVector
+        ret(i_rParameters.size(), String::Null_());
+    std::transform( i_rParameters.begin(), i_rParameters.end(),
+                    ret.begin(),
+                    aTransformFunction_ );
+    return ret;
+}
+
+std::vector<Type_id>
+Create_ParameterTypeList( const std::vector<S_Parameter> & i_rParameters )
+{
+    static Parameter_2_Type
+        aTransformFunction_;
+
+    std::vector<Type_id>
+        ret(i_rParameters.size(), Type_id(0));
+    std::transform( i_rParameters.begin(), i_rParameters.end(),
+                    ret.begin(),
+                    aTransformFunction_ );
+    return ret;
+}
+
+
+
+
+}   // namespace anonymous
diff --git a/autodoc/source/ary/cpp/c_macro.cxx b/autodoc/source/ary/cpp/c_macro.cxx
new file mode 100644
index 000000000000..6d0e546d4da7
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_macro.cxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_macro.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <prprpr.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+Macro::Macro( const String  &       i_name,
+              const StringVector &  i_params,
+              const StringVector &  i_definition,
+              loc::Le_id            i_declaringFile )
+    :   DefineEntity(i_name, i_declaringFile),
+        aParams(i_params),
+        aDefinition(i_definition)
+{
+}
+
+Macro::~Macro()
+{
+}
+
+void
+Macro::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Macro::get_AryClass() const
+{
+    return class_id;
+
+    // return RCID_MACRO;
+}
+
+const StringVector &
+Macro::inq_DefinitionText() const
+{
+     return aDefinition;
+}
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_namesp.cxx b/autodoc/source/ary/cpp/c_namesp.cxx
new file mode 100644
index 000000000000..bc49099a824a
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_namesp.cxx
@@ -0,0 +1,294 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_namesp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <algorithm>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/getncast.hxx>
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+namespace ary
+{
+namespace cpp
+{
+
+typedef std::multimap<String, Ce_id>::const_iterator      operations_citer;
+
+Namespace::Namespace()
+    :   aEssentials(),
+        aAssignedNode(),
+        // aLocalNamespaces,
+        // aLocalClasses,
+        // aLocalEnums,
+        // aLocalTypedefs,
+        // aLocalOperations,
+        // aLocalVariables,
+        // aLocalConstants,
+        pParent(0),
+        nDepth(0)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Namespace::Namespace( const String  &     i_sLocalName,
+                      Namespace &         i_rParent )
+    :   aEssentials( i_sLocalName,
+                     i_rParent.CeId(),
+                     Lid(0) ),
+        aAssignedNode(),
+        // aLocalNamespaces,
+        // aLocalClasses,
+        // aLocalEnums,
+        // aLocalTypedefs,
+        // aLocalOperations,
+        // aLocalVariables,
+        // aLocalConstants,
+        pParent(&i_rParent),
+        nDepth(i_rParent.Depth()+1)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Namespace::~Namespace()
+{
+}
+
+void
+Namespace::Add_LocalNamespace( DYN Namespace & io_rLocalNamespace )
+{
+    aLocalNamespaces[io_rLocalNamespace.LocalName()] = &io_rLocalNamespace;
+}
+
+void
+Namespace::Add_LocalClass( const String  &     i_sLocalName,
+                           Cid                 i_nId )
+{
+    aLocalClasses[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalEnum( const String  &     i_sLocalName,
+                          Cid                 i_nId )
+{
+    aLocalEnums[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalTypedef( const String  &     i_sLocalName,
+                             Cid                 i_nId )
+{
+    aLocalTypedefs[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalOperation( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+{
+    aLocalOperations.insert( Map_Operations::value_type(i_sLocalName, i_nId) );
+}
+
+
+void
+Namespace::Add_LocalVariable( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    aLocalVariables[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalConstant( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    aLocalConstants[i_sLocalName] = i_nId;
+}
+
+uintt
+Namespace::Depth() const
+{
+    return nDepth;
+}
+
+Namespace *
+Namespace::Parent() const
+{
+    return pParent;
+}
+
+Ce_id
+Namespace::Search_Child(const String & i_key) const
+{
+    Namespace *
+        ret_nsp = Search_LocalNamespace(i_key);
+    if (ret_nsp != 0)
+        return ret_nsp->CeId();
+
+    Ce_id
+        ret = Search_LocalClass(i_key);
+    if (ret.IsValid())
+        return ret;
+
+    ret = csv::value_from_map(aLocalEnums, i_key, Ce_id(0));
+    if (ret.IsValid())
+        return ret;
+    ret = csv::value_from_map(aLocalTypedefs, i_key, Ce_id(0));
+    if (ret.IsValid())
+        return ret;
+    ret = csv::value_from_map(aLocalVariables, i_key, Ce_id(0));
+    if (ret.IsValid())
+        return ret;
+    return csv::value_from_map(aLocalConstants, i_key, Ce_id(0));
+}
+
+Namespace *
+Namespace::Search_LocalNamespace( const String  & i_sLocalName ) const
+{
+    return csv::value_from_map(aLocalNamespaces, i_sLocalName, (Namespace*)(0));
+}
+
+uintt
+Namespace::Get_SubNamespaces( std::vector< const Namespace* > & o_rResultList ) const
+{
+    for ( Map_NamespacePtr::const_iterator it = aLocalNamespaces.begin();
+          it != aLocalNamespaces.end();
+          ++it )
+    {
+        o_rResultList.push_back( (*it).second );
+    }
+    return o_rResultList.size();
+}
+
+Ce_id
+Namespace::Search_LocalClass( const String  & i_sName ) const
+{
+    return csv::value_from_map(aLocalClasses, i_sName, Ce_id(0));
+}
+
+void
+Namespace::Search_LocalOperations( std::vector<Ce_id> & o_result,
+                                   const String &       i_sName ) const
+{
+    operations_citer
+        itLower = aLocalOperations.lower_bound(i_sName);
+    if (itLower == aLocalOperations.end())
+        return;
+    if ( (*itLower).first != i_sName )
+        return;
+
+    operations_citer
+        itEnd = aLocalOperations.end();
+    for ( operations_citer it = itLower;
+          it != aLocalOperations.end() ? (*itLower).first == i_sName : false;
+          ++it )
+    {
+        o_result.push_back((*it).second);
+    }
+}
+
+
+const String  &
+Namespace::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Namespace::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Namespace::inq_Location() const
+{
+    return Lid(0);
+}
+
+void
+Namespace::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Namespace::get_AryClass() const
+{
+    return class_id;
+}
+
+Gid
+Namespace::inq_Id_Group() const
+{
+    return static_cast<Gid>(Id());
+}
+
+const ary::cpp::CppEntity &
+Namespace::inq_RE_Group() const
+{
+    return *this;
+}
+
+const ary::group::SlotList &
+Namespace::inq_Slots() const
+{
+    static const SlotAccessId aProjectSlotData[]
+            = { SLOT_SubNamespaces, SLOT_Classes, SLOT_Enums, SLOT_Typedefs, SLOT_Operations,
+                SLOT_Variables, SLOT_Constants };
+    static const std::vector< SlotAccessId >
+            aSlots( &aProjectSlotData[0],
+                      &aProjectSlotData[0]
+                        + sizeof aProjectSlotData / sizeof (SlotAccessId) );
+    return aSlots;
+}
+
+DYN Slot *
+Namespace::inq_Create_Slot( SlotAccessId i_nSlot ) const
+{
+    switch ( i_nSlot )
+    {
+        case SLOT_SubNamespaces:    return new Slot_SubNamespaces(aLocalNamespaces);
+        case SLOT_Classes:          return new Slot_MapLocalCe(aLocalClasses);
+        case SLOT_Enums:            return new Slot_MapLocalCe(aLocalEnums);
+        case SLOT_Typedefs:         return new Slot_MapLocalCe(aLocalTypedefs);
+        case SLOT_Operations:       return new Slot_MapOperations(aLocalOperations);
+        case SLOT_Variables:        return new Slot_MapLocalCe(aLocalVariables);
+        case SLOT_Constants:        return new Slot_MapLocalCe(aLocalConstants);
+        default:
+                                    return new Slot_Null;
+    }   // end switch
+}
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_osigna.cxx b/autodoc/source/ary/cpp/c_osigna.cxx
new file mode 100644
index 000000000000..70aa1840ef81
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_osigna.cxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_osigna.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+OperationSignature::OperationSignature( std::vector<Type_id>    i_parameterTypes,
+                                        E_ConVol                i_conVol )
+    :   aParameterTypes(i_parameterTypes),
+        eConVol(i_conVol)
+{
+}
+
+int
+OperationSignature::Compare( const OperationSignature & i_rSig ) const
+{
+    if ( aParameterTypes.size() < i_rSig.aParameterTypes.size() )
+        return -1;
+    else if ( i_rSig.aParameterTypes.size() < aParameterTypes.size() )
+        return 1;
+
+    ParameterTypeList::const_iterator iMe = aParameterTypes.begin();
+    ParameterTypeList::const_iterator iOther = i_rSig.aParameterTypes.begin();
+    for ( ; iMe != aParameterTypes.end(); ++iMe, ++iOther )
+    {
+        if ( *iMe < *iOther )
+            return -1;
+        else if ( *iOther < *iMe )
+            return 1;
+    }
+
+    if ( eConVol < i_rSig.eConVol )
+        return -1;
+    else if ( eConVol != i_rSig.eConVol )
+        return 1;
+
+    return 0;
+}
+
+
+} // namespace cpp
+} // namespace ary
diff --git a/autodoc/source/ary/cpp/c_reposypart.cxx b/autodoc/source/ary/cpp/c_reposypart.cxx
new file mode 100644
index 000000000000..e1e8085672be
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_reposypart.cxx
@@ -0,0 +1,523 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "c_reposypart.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/getncast.hxx>
+#include <ary/namesort.hxx>
+#include <ary/cpp/c_builtintype.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_cppentity.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/getncast.hxx>
+#include <loc_internalgate.hxx>
+#include <reposy.hxx>
+#include "ca_ce.hxx"
+#include "ca_def.hxx"
+#include "ca_type.hxx"
+#include "cs_ce.hxx"
+#include "cs_def.hxx"
+#include "cs_type.hxx"
+
+
+
+namespace
+{
+
+using ::ary::GlobalId;
+using ::ary::Rid;
+using namespace ::ary::cpp;
+
+
+inline bool
+IsDefine( const GlobalId & i_id )
+{
+    return i_id.Class() == Define::class_id
+           OR
+           i_id.Class() == Macro::class_id;
+}
+
+
+/// Find Ces
+class TypeConnector
+{
+  public:
+                        TypeConnector(
+                            Gate &              i_gate )
+                            :   pGate(&i_gate) {}
+                        ~TypeConnector() {}
+
+    void                operator()(
+                            Type &              io_rType ) const;
+  private:
+    // DATA
+    Gate *              pGate;
+};
+
+/// Find Ces only known from base class name scope.
+class TypeConnector2ndTry
+{
+  public:
+                        TypeConnector2ndTry(
+                            Gate &              i_gate )
+                            :   pGate(&i_gate) {}
+                        ~TypeConnector2ndTry() {}
+
+    void                operator()(
+                            Type &              io_rType ) const;
+  private:
+    // DATA
+    Gate *              pGate;
+};
+
+/// Reconnect (in both directions) base-derived relations of classes.
+class HierarchyLinker
+{
+  public:
+                        HierarchyLinker(
+                            Gate &              i_gate )
+                            :   pGate(&i_gate) {}
+
+                        ~HierarchyLinker() {}
+
+    void                operator()(
+                            Class &             io_rCe ) const;
+  private:
+    // DATA
+    Gate *              pGate;
+};
+
+
+
+/// Helper functor for ->RepositoryPartition::Get_AlphabeticalList().
+template <class TRAITS>
+struct MakeGlobalId
+{
+    GlobalId            operator()(
+                            typename TRAITS::id_type
+                                                i_id ) const
+                        {
+                            return GlobalId( TRAITS::EntityOf_(i_id).AryClass(),
+                                             i_id.Value() );
+                        }
+};
+
+
+
+
+/** Compare two {->GlobalId}s.
+
+
+    @todo   Move this up to the definition of GlobalId<>.
+*/
+struct LesserGlobal
+{
+                        LesserGlobal(
+                            const Ce_Storage &  i_ces,
+                            const Def_Storage & i_des )
+                            :   rCes(i_ces), rDes(i_des) {}
+
+    bool                operator()(
+                            GlobalId            i_1,
+                            GlobalId            i_2 ) const;
+
+  private:
+    const String &      NameOf(
+                            GlobalId            i_id ) const;
+    // DATA
+    const Ce_Storage &  rCes;
+    const Def_Storage & rDes;
+    ::ary::LesserName   aLess;
+};
+
+
+bool
+LesserGlobal::operator()(   GlobalId            i_1,
+                            GlobalId            i_2 ) const
+                        {
+                            String  s1 = NameOf(i_1);
+                            String  s2 = NameOf(i_2);
+
+                            if (s1 != s2)
+                                return aLess(s1, s2);
+
+                            if ( IsDefine(i_1) != IsDefine(i_2) )
+                            {
+                                return NOT IsDefine(i_2);
+                            }
+                            else if (IsDefine(i_1))
+                            {
+                                return i_1.Class() < i_2.Class();
+                            }
+
+                            return Ce_GlobalCompare::Lesser_(
+                                        rCes[i_1.Id()],
+                                        rCes[i_2.Id()] );
+                        }
+
+
+}   // namespace anonymous
+
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+DYN InternalGate &
+InternalGate::Create_Partition_(RepositoryCenter & i_center)
+{
+    return *new RepositoryPartition(i_center);
+}
+
+
+RepositoryPartition::RepositoryPartition(RepositoryCenter & i_center)
+    :   pRepositoryCenter(&i_center),
+        pCes(0),
+        pTypes(0),
+        pDefs(0),
+        pLocations(& loc::InternalGate::Create_Locations_())
+{
+    pCes        = new CeAdmin(*this);
+    pTypes      = new TypeAdmin(*this);
+    pDefs       = new DefAdmin(*this);
+    pCes->Set_Related(*pTypes);
+}
+
+RepositoryPartition::~RepositoryPartition()
+{
+}
+
+void
+RepositoryPartition::Calculate_AllSecondaryInformation()
+//                                        const ::autodoc::Options & )
+{
+    // KORR_FUTURE
+    //  Forward the options from here.
+
+    Connect_AllTypes_2_TheirRelated_CodeEntites();
+}
+
+const String &
+RepositoryPartition::RepositoryTitle() const
+{
+    return static_cast< ary::Repository* >(pRepositoryCenter)->Title();
+}
+
+const CodeEntity *
+RepositoryPartition::Search_RelatedCe(Type_id i_type) const
+{
+    if (NOT i_type.IsValid())
+        return 0;
+
+    Ce_id
+        ce_id = pTypes->Find_Type(i_type).RelatedCe();
+    return ce_id.IsValid()
+                ?   & pCes->Find_Ce(ce_id)
+                :   (CodeEntity*)(0);
+}
+
+const ::ary::cpp::CppEntity *
+RepositoryPartition::Search_Entity(GlobalId i_id) const
+{
+    if (i_id.Id() == 0)
+        return 0;
+
+    if ( NOT IsDefine(i_id) )
+    {
+        // Shall make sure this is a C++ CodeEntity:
+        csv_assert( i_id.Class() >= Namespace::class_id
+                    AND
+                    i_id.Class() < BuiltInType::class_id
+                    && "Unexpected entity type in cpp::RepositoryPartition"
+                       "::Search_Entity()." );
+        return & Ces().Find_Ce( Ce_id(i_id.Id()) );
+    }
+    else
+    {
+        return & Defs().Find_Def( De_id(i_id.Id()) );
+    }
+}
+
+
+const CePilot &
+RepositoryPartition::Ces() const
+{
+    csv_assert(pCes != 0);
+    return *pCes;
+}
+
+const DefPilot &
+RepositoryPartition::Defs() const
+{
+    csv_assert(pDefs != 0);
+    return *pDefs;
+}
+
+const TypePilot &
+RepositoryPartition::Types() const
+{
+    csv_assert(pTypes != 0);
+    return *pTypes;
+}
+
+const loc::LocationPilot &
+RepositoryPartition::Locations() const
+{
+    csv_assert(pLocations != 0);
+    return *pLocations;
+}
+
+CePilot &
+RepositoryPartition::Ces()
+{
+    csv_assert(pCes != 0);
+    return *pCes;
+}
+
+DefPilot &
+RepositoryPartition::Defs()
+{
+    csv_assert(pDefs != 0);
+    return *pDefs;
+}
+
+TypePilot &
+RepositoryPartition::Types()
+{
+    csv_assert(pTypes != 0);
+    return *pTypes;
+}
+
+loc::LocationPilot &
+RepositoryPartition::Locations()
+{
+    csv_assert(pLocations != 0);
+    return *pLocations;
+}
+
+
+void
+RepositoryPartition::Connect_AllTypes_2_TheirRelated_CodeEntites()
+{
+    TypeConnector
+        aConnector(*this);
+    std::for_each( pTypes->Storage().BeginUnreserved(),
+                   pTypes->Storage().End(),
+                   aConnector );
+
+    typedef ::ary::stg::filter_iterator<CodeEntity,Class>
+        filter_class_iter;
+
+    HierarchyLinker
+        aHierarchyLinker(*this);
+    filter_class_iter itEnd( pCes->Storage().End() );
+    for ( filter_class_iter it( pCes->Storage().BeginUnreserved() );
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        if (is_type<Class>(*it))
+            aHierarchyLinker(ary_cast<Class>(*it));
+    }
+
+    TypeConnector2ndTry
+        aConnector2ndTry(*this);
+    std::for_each( pTypes->Storage().BeginUnreserved(),
+                   pTypes->Storage().End(),
+                   aConnector2ndTry );
+}
+
+template <class COMPARE>
+void                    Add2Result(
+                            List_GlobalIds &    o_result,
+                            const SortedIds<COMPARE> &
+                                                i_data,
+                            const char *        i_begin,
+                            const char *        i_end );
+template <class COMPARE>
+void
+Add2Result( List_GlobalIds &            o_result,
+            const SortedIds<COMPARE> &  i_data,
+            const char *                i_begin,
+            const char *                i_end )
+{
+    const size_t
+        previous_size   = o_result.size();
+    typename std::vector<typename COMPARE::id_type>::const_iterator
+        it_beg          = i_data.LowerBound(i_begin);
+    typename std::vector<typename COMPARE::id_type>::const_iterator
+        it_end          = i_data.LowerBound(i_end);
+    size_t
+        count_added = static_cast<size_t>( std::distance(it_beg,it_end) );
+    o_result.insert(    o_result.end(),
+                        count_added,
+                        GlobalId() );
+    List_GlobalIds::iterator
+        it_out          = o_result.begin() + previous_size;
+    std::transform(     it_beg, it_end,
+                        it_out,
+                        MakeGlobalId<COMPARE>() );
+}
+
+
+uintt
+RepositoryPartition::Get_AlphabeticalList( List_GlobalIds &    o_result,
+                                           const char *        i_begin,
+                                           const char *        i_end ) const
+{
+    size_t
+        ret = o_result.size();
+
+    const Ce_Storage &
+        ce_storage = pCes->Storage();
+    const Def_Storage &
+        def_storage = pDefs->Storage();
+
+    Add2Result( o_result,
+                ce_storage.TypeIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                ce_storage.OperationIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                ce_storage.DataIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                def_storage.DefineIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                def_storage.MacroIndex(),
+                i_begin, i_end );
+
+    LesserGlobal
+        aLess(ce_storage, def_storage);
+
+    std::sort(o_result.begin(), o_result.end(), aLess);
+
+    return o_result.size() - ret;
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+
+
+
+
+namespace
+{
+
+
+void
+TypeConnector::operator()( Type & io_rType ) const
+{
+    csv_assert(pGate != 0);
+    UsedType *
+        pt = ::ary::ary_cast<UsedType>(&io_rType);
+    if (pt != 0)
+        pt->Connect2Ce(pGate->Ces());
+}
+
+void
+TypeConnector2ndTry::operator()( Type & io_rType ) const
+{
+    csv_assert(pGate != 0);
+    UsedType *
+        pt = ::ary::ary_cast<UsedType>(&io_rType);
+    if (pt != 0)
+        pt->Connect2CeOnlyKnownViaBaseClass(*pGate);
+}
+
+void
+HierarchyLinker::operator()( Class & io_rCe ) const
+{
+    csv_assert( ::ary::is_type<Class>(io_rCe) );
+    Class &
+        rClass = io_rCe;
+
+    for ( List_Bases::const_iterator it = rClass.BaseClasses().begin();
+          it != rClass.BaseClasses().end();
+          ++it )
+    {
+        const CodeEntity *
+            pCe = 0;
+        Type_id
+            nTid = (*it).nId;
+        for ( pCe = pGate->Search_RelatedCe(nTid);
+              ary::ary_cast<Typedef>(pCe) != 0;
+              pCe = pGate->Search_RelatedCe(nTid) )
+        {
+            nTid = static_cast< const Typedef* >(pCe)->DescribingType();
+        }
+        const Class *
+            pClass = ary::ary_cast<Class>(pCe);
+        if (pClass == 0)
+            return;
+        // KORR_FUTURE:  we need a non const Find_Class()
+        const_cast< Class* >(pClass)->Add_KnownDerivative( io_rCe.CeId() );
+    }
+}
+
+const String &
+LesserGlobal::NameOf(GlobalId  i_id) const
+{
+    if ( NOT IsDefine(i_id) )
+    {
+        return rCes[i_id.Id()].LocalName();
+    }
+    else
+    {
+        return rDes[i_id.Id()].LocalName();
+    }
+}
+
+
+
+}   // namespace anonymous
diff --git a/autodoc/source/ary/cpp/c_reposypart.hxx b/autodoc/source/ary/cpp/c_reposypart.hxx
new file mode 100644
index 000000000000..355af34eb7c6
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_reposypart.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_REPOSYPART_HXX
+#define ARY_CPP_C_REPOSYPART_HXX
+
+
+
+// BASE CLASSES
+#include <cpp_internalgate.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class CeAdmin;
+    class DefAdmin;
+    class TypeAdmin;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** The C++ partition of the repository.
+*/
+class RepositoryPartition : public InternalGate
+{
+  public:
+                        RepositoryPartition(
+                            RepositoryCenter &  i_reposyImpl );
+    virtual             ~RepositoryPartition();
+
+    // INHERITED
+        // Interface Gate:
+    virtual void        Calculate_AllSecondaryInformation();
+//                            const ::autodoc::Options &
+//                                                i_options );
+    virtual const String &
+                        RepositoryTitle() const;
+    virtual const CodeEntity *
+                        Search_RelatedCe(
+                            Type_id             i_type ) const;
+    virtual const ::ary::cpp::CppEntity *
+                        Search_Entity(
+                            GlobalId            i_id ) const;
+    virtual uintt       Get_AlphabeticalList(
+                            List_GlobalIds &    o_result,
+                            const char *        i_begin,
+                            const char *        i_end ) const;
+    virtual const CePilot &
+                        Ces() const;
+    virtual const DefPilot &
+                        Defs() const;
+    virtual const TypePilot &
+                        Types() const;
+    virtual const loc::LocationPilot &
+                        Locations() const;
+    virtual CePilot &   Ces();
+    virtual DefPilot &  Defs();
+    virtual TypePilot & Types();
+    virtual loc::LocationPilot &
+                        Locations();
+  private:
+    // Locals
+    void                Connect_AllTypes_2_TheirRelated_CodeEntites();
+
+    // DATA
+    RepositoryCenter *  pRepositoryCenter;
+
+    Dyn<CeAdmin>        pCes;
+    Dyn<TypeAdmin>      pTypes;
+    Dyn<DefAdmin>       pDefs;
+    Dyn<loc::LocationPilot>
+                        pLocations;
+};
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/c_slots.cxx b/autodoc/source/ary/cpp/c_slots.cxx
new file mode 100644
index 000000000000..bdb2351f1aad
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_slots.cxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <c_slots.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary_disp.hxx>
+#include <ary/cpp/c_namesp.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+//***********************       Slot_SubNamespaces     ********************//
+
+
+Slot_SubNamespaces::Slot_SubNamespaces( const Map_NamespacePtr & i_rData )
+    :   pData( &i_rData )
+{
+}
+
+Slot_SubNamespaces::~Slot_SubNamespaces()
+{
+}
+
+uintt
+Slot_SubNamespaces::Size() const
+{
+     return pData->size();
+}
+
+void
+Slot_SubNamespaces::StoreEntries( ary::Display &  o_rDestination ) const
+{
+    for ( Map_NamespacePtr::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        (*(*it).second).Accept(o_rDestination);
+    }
+}
+
+
+//***********************       Slot_BaseClass     ********************//
+
+Slot_BaseClass::Slot_BaseClass( const List_Bases & i_rData )
+    :   pData( &i_rData )
+{
+}
+
+Slot_BaseClass::~Slot_BaseClass()
+{
+}
+
+uintt
+Slot_BaseClass::Size() const
+{
+     return pData->size();
+}
+
+void
+Slot_BaseClass::StoreEntries( ary::Display &  o_rDestination ) const
+{
+    for ( List_Bases::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        csv::CheckedCall(o_rDestination, *it);
+    }
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_slots.hxx b/autodoc/source/ary/cpp/c_slots.hxx
new file mode 100644
index 000000000000..b2b662dbed39
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_slots.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_C_SLOTS_HXX
+#define ARY_CPP_C_SLOTS_HXX
+
+// BASE CLASSES
+#include <ary/ceslot.hxx>
+// USED SERVICES
+#include <ary/cpp/c_slntry.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+class Slot_SubNamespaces : public ary::Slot
+{
+  public:
+                        Slot_SubNamespaces(
+                            const Map_NamespacePtr &
+                                                i_rData );
+    virtual             ~Slot_SubNamespaces();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            ary::Display &      o_rDestination ) const;
+    // DATA
+    const Map_NamespacePtr *
+                        pData;
+};
+
+class Slot_BaseClass : public ary::Slot
+{
+  public:
+                        Slot_BaseClass(
+                            const List_Bases &  i_rData );
+    virtual             ~Slot_BaseClass();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            ary::Display &      o_rDestination ) const;
+    // DATA
+    const List_Bases *  pData;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/c_traits.cxx b/autodoc/source/ary/cpp/c_traits.cxx
new file mode 100644
index 000000000000..f269adaf9b65
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_traits.cxx
@@ -0,0 +1,223 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_traits.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/namesort.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <ary/getncast.hxx>
+#include "cs_ce.hxx"
+#include "cs_def.hxx"
+#include "cs_type.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+//********************      Ce_Traits      ********************//
+Ce_Traits::entity_base_type &
+Ce_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Ce_Storage::Instance_()[i_id];
+}
+
+//********************      CeNode_Traits      ********************//
+const symtree::Node<CeNode_Traits> *
+CeNode_Traits::NodeOf_(const entity_base_type & i_entity)
+{
+    if (is_type<Namespace>(i_entity))
+        return & ary_cast<Namespace>(i_entity).AsNode();
+    else if (is_type<Class>(i_entity))
+        return & ary_cast<Class>(i_entity).AsNode();
+    return 0;
+}
+
+symtree::Node<CeNode_Traits> *
+CeNode_Traits::NodeOf_(entity_base_type & io_entity)
+{
+    if (is_type<Namespace>(io_entity))
+        return & ary_cast<Namespace>(io_entity).AsNode();
+    else if (is_type<Class>(io_entity))
+        return & ary_cast<Class>(io_entity).AsNode();
+    return 0;
+}
+
+Ce_Traits::entity_base_type *
+CeNode_Traits::ParentOf_(const entity_base_type & i_entity)
+{
+    Ce_Traits::id_type
+        ret = i_entity.Owner();
+    if (ret.IsValid())
+    {
+        if (is_type<EnumValue>(i_entity))
+        {   // Return not the Enum, but the owner of the Enum:
+            ret = EntityOf_(ret).Owner();
+            csv_assert(ret.IsValid());
+        }
+        return &EntityOf_(ret);
+    }
+    return 0;
+}
+
+Ce_id
+CeNode_Search( const CodeEntity &  i_entity,
+               const String &      i_localKey )
+{
+    if (is_type<Namespace>(i_entity))
+        return ary_cast<Namespace>(i_entity).Search_Child(i_localKey);
+    else if (is_type<Class>(i_entity))
+        return ary_cast<Class>(i_entity).Search_Child(i_localKey);
+    return Ce_id(0);
+}
+
+
+
+
+//********************      Ce_Compare      ********************//
+const Ce_Compare::key_type &
+Ce_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Ce_Compare::Lesser_( const key_type &    i_1,
+                     const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+//********************      Ce_GlobalCompare      ********************//
+void
+Get_Qualified( StreamStr &          o_out,
+               const CodeEntity &   i_ce )
+{
+    if (i_ce.LocalName().empty())
+        return;
+    if (i_ce.Owner().IsValid())
+        Get_Qualified(o_out, Ce_Traits::EntityOf_(i_ce.Owner()));
+
+    o_out << i_ce.LocalName() << "::";
+}
+
+
+bool
+Ce_GlobalCompare::Lesser_( const key_type &    i_1,
+                           const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+
+    if (i_1.LocalName() != i_2.LocalName())
+        return less_(i_1.LocalName(), i_2.LocalName());
+
+    csv_assert(i_1.Owner().IsValid() AND i_2.Owner().IsValid());
+
+    static StreamStr
+        aBuffer1_(300);
+    static StreamStr
+        aBuffer2_(300);
+    aBuffer1_.reset();
+    aBuffer2_.reset();
+
+    Get_Qualified(aBuffer1_, Ce_Traits::EntityOf_(i_1.Owner()));
+    Get_Qualified(aBuffer2_, Ce_Traits::EntityOf_(i_2.Owner()));
+    if (aBuffer1_.size() >= 2)
+        aBuffer1_.pop_back(2);
+    if (aBuffer2_.size() >= 2)
+        aBuffer2_.pop_back(2);
+    return less_(aBuffer1_.c_str(), aBuffer2_.c_str());
+}
+
+
+
+//********************      Def_Traits      ********************//
+Def_Traits::entity_base_type &
+Def_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Def_Storage::Instance_()[i_id];
+}
+
+//********************      Def_Compare      ********************//
+const Def_Compare::key_type &
+Def_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Def_Compare::Lesser_( const key_type &    i_1,
+                      const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+
+//********************      Type_Traits      ********************//
+Type_Traits::entity_base_type &
+Type_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Type_Storage::Instance_()[i_id];
+}
+
+//********************      Type_Compare      ********************//
+const UsedType_Compare::key_type &
+UsedType_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    csv_assert( is_type<UsedType>(i_entity) );
+    return ary_cast<UsedType>(i_entity);
+}
+
+bool
+UsedType_Compare::Lesser_( const key_type &    i_1,
+                           const key_type &    i_2 )
+{
+    return i_1 < i_2;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_tydef.cxx b/autodoc/source/ary/cpp/c_tydef.cxx
new file mode 100644
index 000000000000..284e30810e18
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_tydef.cxx
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_tydef.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Typedef::Typedef( const String  &     i_sLocalName,
+                  Cid                 i_nOwner,
+                  E_Protection        i_eProtection,
+                  Lid                 i_nFile,
+                  Tid                 i_nDescribingType )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        nDescribingType(i_nDescribingType),
+        eProtection(i_eProtection)
+{
+}
+
+Typedef::~Typedef()
+{
+
+}
+
+const String  &
+Typedef::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Typedef::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Typedef::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Typedef::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Typedef::get_AryClass() const
+{
+    return class_id;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/c_vari.cxx b/autodoc/source/ary/cpp/c_vari.cxx
new file mode 100644
index 000000000000..111eddee277b
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_vari.cxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_vari.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Variable::Variable( const String  &     i_sLocalName,
+                    Cid                 i_nOwner,
+                    E_Protection        i_eProtection,
+                    Lid                 i_nFile,
+                    Tid                 i_nType,
+                    VariableFlags       i_aFlags,
+                    const String  &     i_sArraySize,
+                    const String  &     i_sInitValue )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+           nType(i_nType),
+        eProtection(i_eProtection),
+        aFlags(i_aFlags),
+        sArraySize(i_sArraySize),
+        sInitialisation(i_sInitValue)
+{
+}
+
+Variable::~Variable()
+{
+}
+
+const String  &
+Variable::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Variable::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Variable::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Variable::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Variable::get_AryClass() const
+{
+    return class_id;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/ca_ce.cxx b/autodoc/source/ary/cpp/ca_ce.cxx
new file mode 100644
index 000000000000..0bdbc41861a8
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_ce.cxx
@@ -0,0 +1,622 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#include <precomp.h>
+#include "ca_ce.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/qualiname.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/getncast.hxx>
+
+
+
+
+
+
+namespace
+{
+
+String              Get_NewAnonymousNamespaceName();
+String              Get_NewAnonymousName(
+                        char                i_start );
+
+
+}   // anonymous namespace
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+// KORR_FUTURE
+// What about namespace visibility ?
+// Perhaps handle all/some visibility transfer only after parse is complete.
+void
+transfer_visibility( const Class *  i_owner,
+                     CodeEntity &   o_child )
+{
+    if ( i_owner != 0 ? NOT i_owner->IsVisible() : false )
+        o_child.Set_InVisible();
+}
+
+inline const TypePilot &
+CeAdmin::Types() const
+{
+    csv_assert(pTypes != 0);
+    return *pTypes;
+}
+
+
+
+
+
+
+CeAdmin::CeAdmin(RepositoryPartition & io_myReposyPartition)
+    :   aStorage(),
+        pTypes(0),
+        pCppRepositoryPartition(&io_myReposyPartition)
+{
+}
+
+void
+CeAdmin::Set_Related(const TypePilot & i_types)
+{
+    pTypes = &i_types;
+}
+
+CeAdmin::~CeAdmin()
+{
+}
+
+Namespace &
+CeAdmin::CheckIn_Namespace( const InputContext & i_context,
+                            const String  &      i_localName )
+{
+    const String
+        local_name = NOT i_localName.empty()
+                                ?   i_localName
+                                :   Get_NewAnonymousNamespaceName();
+    Namespace &
+        rParent = i_context.CurNamespace();
+    Namespace *
+        ret = rParent.Search_LocalNamespace(local_name);
+    if ( ret == 0 )
+    {
+        ret = &Create_Namespace(rParent, local_name);
+    }
+    return *ret;
+}
+
+Class &
+CeAdmin::Store_Class( const InputContext & i_context,
+                      const String  &      i_localName,
+                      E_ClassKey           i_eClassKey )
+{
+    const String
+        local_name = i_localName.empty()
+                        ?   Get_NewAnonymousName( i_eClassKey == CK_class
+                                                    ?   'c'
+                                                    :   i_eClassKey == CK_struct
+                                                            ?   's'
+                                                            :   'u' )
+                        :   i_localName;
+
+    Class &
+        ret = * new Class( local_name,
+                           i_context.CurOwner().CeId(),
+                           i_context.CurProtection(),
+                           i_context.CurFile().LeId(),
+                           i_eClassKey );
+    aStorage.Store_Type(ret);
+    i_context.CurOwner().Add_Class(local_name, ret.CeId());
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+Enum &
+CeAdmin::Store_Enum( const InputContext & i_context,
+                     const String  &      i_localName )
+{
+    const String
+        local_name = i_localName.empty()
+                        ?   Get_NewAnonymousName('e')
+                        :   i_localName;
+    Enum &
+        ret  = * new Enum( local_name,
+                           i_context.CurOwner().CeId(),
+                           i_context.CurProtection(),
+                           i_context.CurFile().LeId() );
+    aStorage.Store_Type(ret);
+    i_context.CurOwner().Add_Enum(local_name, ret.CeId());
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+Typedef &
+CeAdmin::Store_Typedef( const InputContext& i_context,
+                        const String  &     i_localName,
+                        Type_id             i_referredType )
+{
+    Typedef &
+        ret  = * new Typedef( i_localName,
+                              i_context.CurOwner().CeId(),
+                              i_context.CurProtection(),
+                              i_context.CurFile().LeId(),
+                              i_referredType );
+    aStorage.Store_Type(ret);
+    i_context.CurOwner().Add_Typedef(i_localName, ret.CeId());
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+Function *
+CeAdmin::Store_Operation(   const InputContext &                i_context,
+                            const String  &                     i_localName,
+                            Type_id                             i_returnType,
+                            const std::vector<S_Parameter> &    i_parameters,
+                            E_Virtuality                        i_virtuality,
+                            E_ConVol                            i_conVol,
+                            FunctionFlags                       i_flags,
+                            bool                                i_throwExists,
+                            const std::vector<Type_id> &        i_exceptions )
+{
+    Function &
+        ret     = * new Function(   i_localName,
+                                    i_context.CurOwner().CeId(),
+                                    i_context.CurProtection(),
+                                    i_context.CurFile().LeId(),
+                                    i_returnType,
+                                    i_parameters,
+                                    i_conVol,
+                                    i_virtuality,
+                                    i_flags,
+                                    i_throwExists,
+                                    i_exceptions );
+
+    // Check for double declaration:
+    Ce_id
+        nAlreadyExistingFunction(0);
+    switch ( lhf_CheckAndHandle_DuplicateOperation(
+                                        nAlreadyExistingFunction,
+                                        i_context,
+                                        ret) )
+    {
+        case df_discard_new:
+                delete &ret;
+                return 0;
+        case df_replace:
+                csv_assert(nAlreadyExistingFunction.IsValid());
+                aStorage.Replace_Entity(
+                                nAlreadyExistingFunction,
+                                ret );
+                break;
+        case df_no:
+                aStorage.Store_Operation(ret);   // Now it has a valid id.
+                i_context.CurOwner().Add_Operation( i_localName, ret.CeId(), i_flags.IsStaticMember() );
+                break;
+        default:
+                csv_assert(false);
+    }
+
+    transfer_visibility(i_context.CurClass(), ret);
+    if ( i_context.CurProtection() != PROTECT_global )
+    {
+        Class *
+            pClass = i_context.CurClass();
+        if ( pClass != 0  AND i_virtuality != VIRTUAL_none)
+        {
+            pClass->UpdateVirtuality(i_virtuality);
+        }
+    }
+
+    return &ret;
+}
+
+Variable &
+CeAdmin::Store_Variable( const InputContext& i_context,
+                         const String  &     i_localName,
+                         Type_id             i_type,
+                         VariableFlags       i_flags,
+                         const String  &     i_arraySize,
+                         const String  &     i_initValue )
+{
+    Variable &
+        ret = * new Variable( i_localName,
+                              i_context.CurOwner().CeId(),
+                              i_context.CurProtection(),
+                              i_context.CurFile().LeId(),
+                              i_type,
+                              i_flags,
+                              i_arraySize,
+                              i_initValue );
+
+    bool
+        is_const = Types().Find_Type(i_type).IsConst();
+    aStorage.Store_Datum(ret);
+    i_context.CurOwner().Add_Variable(
+                                i_localName,
+                                ret.CeId(),
+                                is_const,
+                                i_flags.IsStaticMember() );
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+EnumValue &
+CeAdmin::Store_EnumValue( const InputContext & i_context,
+                          const String  &      i_localName,
+                          const String  &      i_initValue )
+{
+    Enum *
+        parent  = i_context.CurEnum();
+    csv_assert( parent != 0 );
+
+    EnumValue &
+        ret = * new EnumValue( i_localName,
+                               parent->CeId(),
+                               i_initValue );
+    aStorage.Store_Datum(ret);
+    parent->Add_Value(ret.CeId());
+
+    // KORR also for current enum:
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+const Namespace &
+CeAdmin::GlobalNamespace() const
+{
+    return ary_cast<Namespace>( aStorage[predefined::ce_GlobalNamespace] );
+}
+
+const CodeEntity &
+CeAdmin::Find_Ce(Ce_id i_id) const
+{
+    return aStorage[i_id];
+}
+
+const CodeEntity *
+CeAdmin::Search_Ce(Ce_id i_id) const
+{
+    return aStorage.Exists(i_id)
+                ?   & aStorage[i_id]
+                :   (const CodeEntity*)(0);
+}
+
+const CodeEntity *
+CeAdmin::Search_CeAbsolute( const CodeEntity &      i_curScope,
+                            const QualifiedName &   i_rSearchedName ) const
+{
+    const symtree::Node<CeNode_Traits> *
+        cur_node = CeNode_Traits::NodeOf_(i_curScope);
+    csv_assert(cur_node != 0);
+
+    Ce_id
+        ret(0);
+    cur_node->SearchUp( ret,
+                        i_rSearchedName.first_namespace(),
+                        i_rSearchedName.end_namespace(),
+                        i_rSearchedName.LocalName()  );
+    return Search_Ce(ret);
+}
+
+const CodeEntity *
+CeAdmin::Search_CeLocal( const String  &     i_localName,
+                         bool                i_bIsFunction,
+                         const Namespace &   i_rCurNamespace,
+                         const Class *       i_pCurClass ) const
+{
+    // KORR_FUTURE
+    // See if this is correct.
+
+    Ce_id
+        ret(0);
+
+    if ( NOT i_bIsFunction )
+    {
+        CesResultList
+            type_instances = aStorage.TypeIndex().SearchAll(i_localName);
+        CesResultList
+            data_instances = aStorage.DataIndex().SearchAll(i_localName);
+        Ce_id
+            ret1 = Search_MatchingInstance(
+                        type_instances,
+                        (i_pCurClass
+                                ?   i_pCurClass->CeId()
+                                :   i_rCurNamespace.CeId())
+                                     );
+        Ce_id
+            ret2 = Search_MatchingInstance(
+                        data_instances,
+                        (i_pCurClass
+                                ?   i_pCurClass->CeId()
+                                :   i_rCurNamespace.CeId())
+                                     );
+        if (NOT ret2.IsValid())
+            ret = ret1;
+        else if (NOT ret1.IsValid())
+            ret = ret2;
+    }
+    else
+    {
+        CesResultList
+            function_instances = aStorage.OperationIndex().SearchAll(i_localName);
+        if ( function_instances.size() == 1 )
+            ret = *function_instances.begin();
+        else
+        {
+            ret = Search_MatchingInstance(
+                        function_instances,
+                        (i_pCurClass
+                                ?   i_pCurClass->CeId()
+                                :   i_rCurNamespace.CeId())
+                                     );
+        }
+    }
+
+    if ( ret.IsValid() )
+        return & Find_Ce(ret);
+
+    return 0;
+}
+
+void
+CeAdmin::Get_QualifiedName( StreamStr &         o_rOut,
+                            const String  &     i_localName,
+                            Ce_id               i_nOwner,
+                            const char *        i_sDelimiter ) const
+{
+    if ( i_localName.empty() OR NOT i_nOwner.IsValid() )
+        return;
+
+    const CodeEntity *
+        pOwner = & Find_Ce( i_nOwner );
+    if ( is_type<Enum>(*pOwner) )
+        pOwner = &Find_Ce( Ce_id(pOwner->Owner()) );
+
+    Get_QualifiedName( o_rOut,
+                       pOwner->LocalName(),
+                       Ce_id(pOwner->Owner()),
+                       i_sDelimiter );
+    o_rOut
+        << i_sDelimiter
+        << i_localName;
+}
+
+void
+CeAdmin::Get_SignatureText( StreamStr &                 o_rOut,
+                            const OperationSignature &  i_signature,
+                            const StringVector *        i_sParameterNames ) const
+{
+    OperationSignature::ParameterTypeList::const_iterator
+            it = i_signature.Parameters().begin();
+    OperationSignature::ParameterTypeList::const_iterator
+            it_end = i_signature.Parameters().end();
+
+    const StringVector aDummy;
+    StringVector::const_iterator
+            itName = i_sParameterNames != 0
+                            ?   i_sParameterNames->begin()
+                            :   aDummy.begin();
+    StringVector::const_iterator
+            itName_end = i_sParameterNames != 0
+                            ?   i_sParameterNames->end()
+                            :   aDummy.end();
+
+    bool
+        bEmpty = (it == it_end);
+    if (NOT bEmpty)
+    {
+        o_rOut << "( ";
+        Types().Get_TypeText(o_rOut, *it);
+        if (itName != itName_end)
+            o_rOut << " " << (*itName);
+
+        for ( ++it; it != it_end; ++it )
+        {
+            o_rOut << ", ";
+            Types().Get_TypeText(o_rOut, *it);
+            if (itName != itName_end)
+            {
+                ++itName;
+                if (itName != itName_end)
+                   o_rOut << " " << (*itName);
+            }
+        }
+        o_rOut << " )";
+    }
+    else
+    {
+        o_rOut << "( )";
+    }
+
+    if ( intt(i_signature.ConVol()) & intt(ary::cpp::CONVOL_const) )
+        o_rOut << " const";
+    if ( intt(i_signature.ConVol()) & intt(ary::cpp::CONVOL_volatile) )
+        o_rOut << " volatile";
+}
+
+CesResultList
+CeAdmin::Search_TypeName(const String & i_sName) const
+{
+    return aStorage.TypeIndex().SearchAll(i_sName);
+}
+
+Namespace &
+CeAdmin::GlobalNamespace()
+{
+    return ary_cast<Namespace>( aStorage[predefined::ce_GlobalNamespace] );
+}
+
+CeAdmin::E_DuplicateFunction
+CeAdmin::lhf_CheckAndHandle_DuplicateOperation(
+                                Ce_id &                 o_existentFunction,
+                                const InputContext &    i_context,
+                                const Function &        i_newFunction )
+{
+    if (i_context.CurProtection() != PROTECT_global)
+    {
+        // Assume, there will be no duplicates within the same class.
+
+        // KORR_FUTURE
+        // Assumption may be wrong in case of #defines providing different
+        // versions for different compilers.
+        return df_no;
+    }
+
+    std::vector<Ce_id>
+        aOperationsWithSameName;
+    i_context.CurNamespace().Search_LocalOperations(
+                                        aOperationsWithSameName,
+                                        i_newFunction.LocalName() );
+
+    for ( std::vector<Ce_id>::const_iterator
+             it = aOperationsWithSameName.begin();
+          it != aOperationsWithSameName.end();
+          ++it )
+    {
+        const Function &
+            rFunction = ary_cast<Function>(aStorage[*it]);
+        if (     rFunction.LocalName() == i_newFunction.LocalName()
+             AND rFunction.Signature() == i_newFunction.Signature() )
+        {
+            if (NOT rFunction.IsIdentical(i_newFunction))
+            {
+                // KORR_FUTURE Make this more detailed.
+                Cerr() << "Non identical function with same signature "
+                       << "found: "
+                       <<  i_context.CurNamespace().LocalName()
+                       << "::"
+                       << i_newFunction.LocalName()
+                       << "(..)"
+                       << Endl();
+            }
+            o_existentFunction = rFunction.CeId();
+            if (rFunction.Docu().Data() == 0)
+                return df_replace;
+            else
+                return df_discard_new;
+        }
+    }   // end for
+
+    return df_no;
+}
+
+Namespace &
+CeAdmin::Create_Namespace( Namespace &      o_parent,
+                           const String  &  i_localName )
+{
+    DYN Namespace &
+        ret = *new Namespace(i_localName, o_parent);
+    aStorage.Store_Entity(ret);
+    o_parent.Add_LocalNamespace(ret);
+    return ret;
+}
+
+Ce_id
+CeAdmin::Search_MatchingInstance( CesResultList         i_list,
+                                  Ce_id                 i_owner ) const
+{
+    // KORR
+    // Multiple results?
+
+    for ( CesList::const_iterator it = i_list.begin();
+          it != i_list.end();
+          ++it )
+    {
+        const CodeEntity &
+            ce = aStorage[*it];
+        if ( ce.Owner() == i_owner)
+        {
+            return *it;
+        }
+    }
+    return Ce_id(0);
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+
+
+namespace
+{
+
+uintt G_nLastFreeAnonymousNamespaceNr = 0;
+uintt G_nLastFreeAnonymousEntityNr = 0;
+
+String
+Get_NewAnonymousNamespaceName()
+{
+    StreamLock
+        sl(100);
+    return String( sl()
+                    << "namespace_anonymous_"
+                    << ++G_nLastFreeAnonymousNamespaceNr
+                    << csv::c_str );
+
+}
+
+String
+Get_NewAnonymousName(char i_cStart)
+{
+    StreamLock
+        sl(100);
+    return String( sl()
+                    << i_cStart
+                    << "_Anonymous__"
+                    << ++G_nLastFreeAnonymousEntityNr
+                    << c_str );
+}
+
+
+
+}   // namespace anonymous
diff --git a/autodoc/source/ary/cpp/ca_ce.hxx b/autodoc/source/ary/cpp/ca_ce.hxx
new file mode 100644
index 000000000000..67f9c444e95b
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_ce.hxx
@@ -0,0 +1,213 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CA_CE_HXX
+#define ARY_CPP_CA_CE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/cp_ce.hxx>
+    // OTHER
+#include "cs_ce.hxx"
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Ce_Storage;
+    class RepositoryPartition;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Administrates all C++ code entities (types, operations, variables).
+*/
+class CeAdmin : public CePilot
+{
+  public:
+    // LIFECYCLE
+                        CeAdmin(
+                            RepositoryPartition &
+                                                io_myReposyPartition );
+    void                Set_Related(
+                            const TypePilot &   i_types );
+    virtual             ~CeAdmin();
+
+    // INQUIRY
+    const Ce_Storage &  Storage() const;
+
+    // ACCESS
+    Ce_Storage &        Storage();
+
+    // INHERITED
+    // Interface CePilot:
+    virtual Namespace & CheckIn_Namespace(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName );
+    virtual Class &     Store_Class(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            E_ClassKey          i_classKey );
+    virtual Enum &      Store_Enum(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName );
+    virtual Typedef &   Store_Typedef(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_referredType );
+    virtual Function *  Store_Operation(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_returnType,
+                            const std::vector<S_Parameter> &
+                                                i_parameters,
+                            E_Virtuality        i_virtuality,
+                            E_ConVol            i_conVol,
+                            FunctionFlags       i_flags,
+                            bool                i_throwExists,
+                            const std::vector<Type_id> &
+                                                i_exceptions );
+    virtual Variable &  Store_Variable(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_type,
+                            VariableFlags       i_flags,
+                            const String  &     i_arraySize,
+                            const String  &     i_initValue );
+    virtual EnumValue & Store_EnumValue(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            const String  &     i_initValue );
+    virtual const Namespace &
+                        GlobalNamespace() const;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_id ) const;
+    virtual const CodeEntity *
+                        Search_Ce(
+                            Ce_id               i_id ) const;
+    virtual const CodeEntity *
+                        Search_CeAbsolute(
+                            const CodeEntity &  i_curScope,
+                            const QualifiedName &
+                                                i_absoluteName ) const;
+    virtual const CodeEntity *
+                        Search_CeLocal(
+                            const String  &     i_relativeName,
+                            bool                i_isFunction,
+                            const Namespace &   i_curNamespace,
+                            const Class *       i_curClass ) const;
+    virtual void        Get_QualifiedName(
+                            StreamStr &         o_result,
+                            const String  &     i_localName,
+                            Ce_id               i_owner,
+                            const char *        i_delimiter = "::" ) const;
+    virtual void        Get_SignatureText(
+                            StreamStr &         o_rOut,
+                            const OperationSignature &
+                                                i_signature,
+                            const StringVector *
+                                                i_sParameterNames = 0 ) const;
+    virtual CesResultList
+                        Search_TypeName(
+                            const String  &     i_sName ) const;
+       virtual Namespace & GlobalNamespace();
+
+  private:
+    // Locals
+    /// @return true, if function is duplicate.
+    enum E_DuplicateFunction
+    {
+        df_no,
+        df_replace,
+        df_discard_new
+    };
+
+    /** @param o_existentFunction
+            The id of the already existing function, else unset.
+    */
+    E_DuplicateFunction lhf_CheckAndHandle_DuplicateOperation(
+                            Ce_id &             o_existentFunction,
+                            const InputContext &
+                                                i_context,
+                            const Function &    i_newFunction );
+    Namespace &         Create_Namespace(
+                            Namespace &         o_parent,
+                            const String  &     i_localName );
+    Ce_id               Search_MatchingInstance(
+                            CesResultList       i_list,
+                            Ce_id               i_owner ) const;
+    const TypePilot  &  Types() const;
+
+    // DATA
+    Ce_Storage          aStorage;
+    const TypePilot *   pTypes;
+    RepositoryPartition *
+                        pCppRepositoryPartition;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const Ce_Storage &
+CeAdmin::Storage() const
+{
+    return aStorage;
+}
+
+inline Ce_Storage &
+CeAdmin::Storage()
+{
+    return aStorage;
+}
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/ca_def.cxx b/autodoc/source/ary/cpp/ca_def.cxx
new file mode 100644
index 000000000000..6fa2bf087996
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_def.cxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "ca_def.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/cpp/inpcontx.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+DefAdmin::DefAdmin(RepositoryPartition & io_myReposyPartition)
+    :   aStorage(),
+        pCppRepositoryPartition(&io_myReposyPartition)
+{
+}
+
+DefAdmin::~DefAdmin()
+{
+}
+
+Define &
+DefAdmin::Store_Define( const InputContext&     i_rContext,
+                        const String  &         i_sName,
+                        const StringVector &    i_rDefinition )
+{
+    Define &
+        ret = *new Define( i_sName,
+                           i_rDefinition,
+                           i_rContext.CurFile().LeId() );
+    aStorage.Store_Define(ret);
+    return ret;
+
+}
+
+Macro &
+DefAdmin::Store_Macro(  const InputContext&     i_rContext,
+                        const String  &         i_sName,
+                        const StringVector &    i_rParams,
+                        const StringVector &    i_rDefinition )
+{
+    Macro &
+        ret = *new Macro( i_sName,
+                          i_rParams,
+                          i_rDefinition,
+                          i_rContext.CurFile().LeId() );
+    aStorage.Store_Macro(ret);
+    return ret;
+}
+
+const DefineEntity &
+DefAdmin::Find_Def(De_id i_id) const
+{
+    return aStorage[i_id];
+}
+
+DefsResultList
+DefAdmin::AllDefines() const
+{
+    return csv::make_range( aStorage.DefineIndex().Begin(),
+                            aStorage.DefineIndex().End() );
+}
+
+DefsResultList
+DefAdmin::AllMacros() const
+{
+    return csv::make_range( aStorage.MacroIndex().Begin(),
+                            aStorage.MacroIndex().End() );
+}
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/ca_def.hxx b/autodoc/source/ary/cpp/ca_def.hxx
new file mode 100644
index 000000000000..266382c8577f
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_def.hxx
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CA_DEF_HXX
+#define ARY_CPP_CA_DEF_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/cp_def.hxx>
+    // OTHER
+#include "cs_def.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Def_Storage;
+    class RepositoryPartition;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+class DefAdmin : public DefPilot
+{
+  public:
+    // LIFECYCLE
+                        DefAdmin(
+                            RepositoryPartition &
+                                                io_myReposyPartition );
+                        ~DefAdmin();
+
+    // INQUIRY
+    const Def_Storage & Storage() const;
+
+    // INHERITED
+    // Interface DefPilot:
+    virtual Define &    Store_Define(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rDefinition );
+    virtual Macro &     Store_Macro(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rParams,
+                            const StringVector &
+                                                i_rDefinition );
+    virtual const DefineEntity &
+                        Find_Def(
+                            De_id               i_id ) const;
+    virtual DefsResultList
+                        AllDefines() const;
+    virtual DefsResultList
+                        AllMacros() const;
+
+  private:
+    // DATA
+    Def_Storage     aStorage;
+    RepositoryPartition *
+                    pCppRepositoryPartition;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const Def_Storage &
+DefAdmin::Storage() const
+{
+    return aStorage;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/ca_type.cxx b/autodoc/source/ary/cpp/ca_type.cxx
new file mode 100644
index 000000000000..4ebfae31b869
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_type.cxx
@@ -0,0 +1,136 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "ca_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_builtintype.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <ary/getncast.hxx>
+#include "c_reposypart.hxx"
+#include "cs_type.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+TypeAdmin::TypeAdmin(RepositoryPartition & io_myReposyPartition)
+    :   aStorage(),
+        pCppRepositoryPartition(&io_myReposyPartition)
+{
+}
+
+TypeAdmin::~TypeAdmin()
+{
+}
+
+
+// KORR_FUTURE
+//  Remove unused parameter.
+
+const Type &
+TypeAdmin::CheckIn_UsedType( const InputContext &   ,
+                             DYN UsedType &         pass_type )
+{
+    Dyn<UsedType>
+        pNewType(&pass_type);  // Ensure clean up of heap object.
+
+    Type_id
+        tid(0);
+    if (pass_type.IsBuiltInType())
+    {
+        tid = aStorage.Search_BuiltInType(
+                        BuiltInType::SpecializedName_( pass_type.LocalName().c_str(),
+                                                       pass_type.TypeSpecialisation() ));
+        csv_assert(tid.IsValid());
+        return aStorage[tid];
+    }
+
+    tid = aStorage.UsedTypeIndex().Search(pass_type);
+    if (tid.IsValid())
+    {
+        return aStorage[tid];
+    }
+
+    // Type does not yet exist:
+        // Transfer ownership from pNewTypeand assign id:
+    aStorage.Store_Entity(*pNewType.Release());
+
+    aStorage.UsedTypeIndex().Add(pass_type.TypeId());
+    return pass_type;
+}
+
+const Type &
+TypeAdmin::Find_Type(Type_id i_type) const
+{
+    return aStorage[i_type];
+}
+
+bool
+TypeAdmin::Get_TypeText( StreamStr &         o_result,
+                         Type_id             i_type ) const
+{
+    if (NOT i_type.IsValid())
+        return false;
+    aStorage[i_type].Get_Text(o_result, *pCppRepositoryPartition);
+    return true;
+}
+
+bool
+TypeAdmin::Get_TypeText( StreamStr &         o_preName,
+                         StreamStr &         o_name,
+                         StreamStr &         o_postName,
+                         Type_id             i_type ) const
+{
+    if (NOT i_type.IsValid())
+        return false;
+    aStorage[i_type].Get_Text(o_preName, o_name, o_postName, *pCppRepositoryPartition);
+    return true;
+}
+
+Type_id
+TypeAdmin::Tid_Ellipse() const
+{
+    return Type_id(predefined::t_ellipse);
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/ca_type.hxx b/autodoc/source/ary/cpp/ca_type.hxx
new file mode 100644
index 000000000000..ae0580709ce8
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_type.hxx
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CA_TYPE_HXX
+#define ARY_CPP_CA_TYPE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/cp_type.hxx>
+    // OTHER
+#include "cs_type.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class RepositoryPartition;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Administrates all C++ types as uses in user declarations
+    as return-, parameter- or variable-types.
+*/
+class TypeAdmin : public TypePilot
+{
+  public:
+    // LIFECYCLE
+                        TypeAdmin(
+                            RepositoryPartition &
+                                                io_myReposyPartition );
+    virtual             ~TypeAdmin();
+
+    // INQUIRY
+    /// @return A list of all stored types that are not C++ or STL builtin types.
+    const Type_Storage &
+                        Storage() const;
+
+    // ACCESS
+    Type_Storage &      Storage();
+
+    // INHERITED
+    // Interface TypePilot:
+    virtual const Type &
+                        CheckIn_UsedType(
+                            const InputContext &
+                                                i_context,
+                            DYN UsedType &      pass_type );
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_type ) const;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_result,
+                            Type_id             i_type ) const;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_preName,              ///  ::ary::cpp::
+                            StreamStr &         o_name,                 ///  MyClass
+                            StreamStr &         o_postName,             ///  <TplArgument> * const &
+                            Type_id             i_type ) const;
+    virtual Type_id     Tid_Ellipse() const;
+
+  private:
+    // DATA
+    Type_Storage        aStorage;
+    RepositoryPartition *
+                        pCppRepositoryPartition;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const Type_Storage &
+TypeAdmin::Storage() const
+{
+    return aStorage;
+}
+
+inline Type_Storage &
+TypeAdmin::Storage()
+{
+    return aStorage;
+}
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/cs_ce.cxx b/autodoc/source/ary/cpp/cs_ce.cxx
new file mode 100644
index 000000000000..e8c34567e4fd
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_ce.cxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cs_ce.hxx"
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_namesp.hxx>
+
+
+
+namespace
+{
+const uintt
+    C_nReservedElements = ::ary::cpp::predefined::ce_MAX;    // Skipping "0" and the GlobalNamespace
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Ce_Storage *    Ce_Storage::pInstance_ = 0;
+
+
+
+Ce_Storage::Ce_Storage()
+    :   stg::Storage<CodeEntity>(C_nReservedElements),
+        aTypes(),
+        aOperations(),
+        aData()
+
+{
+    Set_Reserved( predefined::ce_GlobalNamespace,
+                  *new Namespace );
+
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Ce_Storage::~Ce_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+Ce_id
+Ce_Storage::Store_Type(DYN CodeEntity & pass_ce)
+{
+    Ce_id
+        ret = Store_Entity(pass_ce);
+    aTypes.Add(ret);
+    return ret;
+}
+
+Ce_id
+Ce_Storage::Store_Operation(DYN CodeEntity & pass_ce)
+{
+    Ce_id
+        ret = Store_Entity(pass_ce);
+    aOperations.Add(ret);
+    return ret;
+}
+
+Ce_id
+Ce_Storage::Store_Datum(DYN CodeEntity & pass_ce)
+{
+    Ce_id
+        ret = Store_Entity(pass_ce);
+    aData.Add(ret);
+    return ret;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/cs_ce.hxx b/autodoc/source/ary/cpp/cs_ce.hxx
new file mode 100644
index 000000000000..fa150aa71664
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_ce.hxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CS_CE_HXX
+#define ARY_CPP_CS_CE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <store/s_storage.hxx>
+    // OTHER
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <sortedids.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** The data base for all ->ary::cpp::CodeEntity objects.
+*/
+class Ce_Storage : public ::ary::stg::Storage<CodeEntity>
+{
+  public:
+    typedef SortedIds<Ce_Compare>       Index;
+
+                        Ce_Storage();
+    virtual             ~Ce_Storage();
+
+    Ce_id               Store_Type(
+                            DYN CodeEntity &    pass_ce );
+    Ce_id               Store_Operation(
+                            DYN CodeEntity &    pass_ce );
+    Ce_id               Store_Datum(
+                            DYN CodeEntity &    pass_ce );
+
+    const Index &       TypeIndex() const           { return aTypes; }
+    const Index &       OperationIndex() const      { return aOperations; }
+    const Index &       DataIndex() const           { return aData; }
+
+    Index &             TypeIndex()                 { return aTypes; }
+    Index &             OperationIndex()            { return aOperations; }
+    Index &             DataIndex()                 { return aData; }
+
+    static Ce_Storage & Instance_()                 { csv_assert(pInstance_ != 0);
+                                                      return *pInstance_; }
+  private:
+    // DATA
+    Index               aTypes;
+    Index               aOperations;
+    Index               aData;
+
+    static Ce_Storage * pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_CodeEntity
+{
+    ce_GlobalNamespace = 1,
+    ce_MAX
+};
+
+}   // namespace predefined
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/cs_def.cxx b/autodoc/source/ary/cpp/cs_def.cxx
new file mode 100644
index 000000000000..d12e5de24164
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_def.cxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cs_def.hxx"
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace
+{
+const uintt
+    C_nReservedElements = ::ary::cpp::predefined::de_MAX;    // Skipping "0"
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Def_Storage *    Def_Storage::pInstance_ = 0;
+
+
+
+
+Def_Storage::Def_Storage()
+    :   stg::Storage<DefineEntity>(C_nReservedElements)
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Def_Storage::~Def_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+De_id
+Def_Storage::Store_Define(DYN DefineEntity &  pass_de)
+{
+    De_id
+        ret = Store_Entity(pass_de);
+    aDefines.Add(ret);
+    return ret;
+}
+
+De_id
+Def_Storage::Store_Macro(DYN DefineEntity &  pass_de)
+{
+    De_id
+        ret = Store_Entity(pass_de);
+    aMacros.Add(ret);
+    return ret;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/cs_def.hxx b/autodoc/source/ary/cpp/cs_def.hxx
new file mode 100644
index 000000000000..6e1e2ad380c3
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_def.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CS_DE_HXX
+#define ARY_CPP_CS_DE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <store/s_storage.hxx>
+    // OTHER
+#include <ary/cpp/c_de.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <sortedids.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+/** The data base for all ->ary::cpp::Type objects.
+*/
+class Def_Storage : public ::ary::stg::Storage<DefineEntity>
+{
+  public:
+    typedef SortedIds<Def_Compare>      Index;
+
+    // LIFECYCLE
+                        Def_Storage();
+    virtual             ~Def_Storage();
+
+    De_id               Store_Define(
+                            DYN DefineEntity &  pass_de );
+    De_id               Store_Macro(
+                            DYN DefineEntity &  pass_de );
+
+    const Index &       DefineIndex() const     { return aDefines; }
+    const Index &       MacroIndex() const      { return aMacros; }
+
+    Index &             DefineIndex()           { return aDefines; }
+    Index &             MacroIndex()            { return aMacros; }
+
+    static Def_Storage &
+                        Instance_()             { csv_assert(pInstance_ != 0);
+                                                  return *pInstance_; }
+  private:
+    // DATA
+    Index               aDefines;
+    Index               aMacros;
+
+
+    static Def_Storage *
+                        pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_DefineEntity
+{
+    // 0 is always unused with repository storages.
+    de_MAX = 1
+};
+
+}   // namespace predefined
+
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/cs_type.cxx b/autodoc/source/ary/cpp/cs_type.cxx
new file mode 100644
index 000000000000..723108dbc49e
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_type.cxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cs_type.hxx"
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_builtintype.hxx>
+
+
+namespace
+{
+    const uintt
+        C_nReservedElements = ary::cpp::predefined::t_MAX;    // Skipping "0" and the builtin types
+}
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+Type_Storage *    Type_Storage::pInstance_ = 0;
+
+
+
+
+Type_Storage::Type_Storage()
+    :   stg::Storage<Type>(C_nReservedElements),
+        aBuiltInTypes()
+{
+    Setup_BuiltInTypes();
+
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Type_Storage::~Type_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+Type_id
+Type_Storage::Search_BuiltInType( const String & i_specializedName ) const
+{
+    return csv::value_from_map(aBuiltInTypes, i_specializedName, Tid(0));
+}
+
+void
+Type_Storage::Setup_BuiltInTypes()
+{
+    Set_BuiltInType( predefined::t_void, "void" );
+    Set_BuiltInType( predefined::t_bool, "bool" );
+    Set_BuiltInType( predefined::t_char, "char" );
+    Set_BuiltInType( predefined::t_signed_char, "char", TYSP_signed );
+    Set_BuiltInType( predefined::t_unsigned_char, "char", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_short, "short" );
+    Set_BuiltInType( predefined::t_unsigned_short, "short", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_int, "int" );
+    Set_BuiltInType( predefined::t_unsigned_int, "int", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_long, "long" );
+    Set_BuiltInType( predefined::t_unsigned_long, "long", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_float, "float" );
+    Set_BuiltInType( predefined::t_double, "double" );
+    Set_BuiltInType( predefined::t_size_t, "size_t" );
+    Set_BuiltInType( predefined::t_wchar_t, "wchar_t" );
+    Set_BuiltInType( predefined::t_ptrdiff_t, "ptrdiff_t" );
+    Set_BuiltInType( predefined::t_ellipse, "..." );
+}
+
+void
+Type_Storage::Set_BuiltInType( Rid                              i_id,
+                               const char *                     i_sName,
+                               ary::cpp::E_TypeSpecialisation   i_eSpecialisation )
+{
+    DYN BuiltInType &
+        rNew = *new BuiltInType(i_sName, i_eSpecialisation);
+    Set_Reserved( i_id, rNew);  // Here goes the ownership for rNew.
+    aBuiltInTypes[rNew.SpecializedName()] = rNew.TypeId();
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/cs_type.hxx b/autodoc/source/ary/cpp/cs_type.hxx
new file mode 100644
index 000000000000..ee8ceee06c12
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_type.hxx
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_CS_TYPE_HXX
+#define ARY_CPP_CS_TYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <store/s_storage.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <sortedids.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** The data base for all ->ary::cpp::Type objects.
+*/
+class Type_Storage : public ::ary::stg::Storage<Type>
+{
+  public:
+    typedef SortedIds<UsedType_Compare>     UT_Index;
+
+                        Type_Storage();
+    virtual             ~Type_Storage();
+
+    const UT_Index &    UsedTypeIndex() const;
+
+    UT_Index &          UsedTypeIndex();
+    Type_id             Search_BuiltInType(
+                            const String &      i_specializedName ) const;
+
+    static Type_Storage &
+                        Instance_()             { csv_assert(pInstance_ != 0);
+                                                  return *pInstance_; }
+  private:
+    // Locals
+    void                Setup_BuiltInTypes();
+    void                Set_BuiltInType(
+                            Rid                 i_nId,
+                            const char *        i_sName,
+                            ary::cpp::E_TypeSpecialisation
+                                                i_eSpecialisation = TYSP_none );
+    // DATA
+    UT_Index            aUsedTypes;
+    std::map<String,Type_id>
+                        aBuiltInTypes;
+
+
+    static Type_Storage *
+                        pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_Type
+{
+    // 0 is always unused with repository storages.
+    t_void = 1,
+    t_bool,
+    t_char,
+    t_signed_char,
+    t_unsigned_char,
+    t_short,
+    t_unsigned_short,
+    t_int,
+    t_unsigned_int,
+    t_long,
+    t_unsigned_long,
+    t_float,
+    t_double,
+    t_size_t,
+    t_wchar_t,
+    t_ptrdiff_t,
+    t_ellipse,
+    t_MAX
+};
+
+}   // namespace predefined
+
+
+
+// IMPLEMENTATION
+inline const Type_Storage::UT_Index &
+Type_Storage::UsedTypeIndex() const
+{
+    return aUsedTypes;
+}
+
+inline Type_Storage::UT_Index &
+Type_Storage::UsedTypeIndex()
+{
+    return aUsedTypes;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/makefile.mk b/autodoc/source/ary/cpp/makefile.mk
new file mode 100644
index 000000000000..5c20a59bd82e
--- /dev/null
+++ b/autodoc/source/ary/cpp/makefile.mk
@@ -0,0 +1,80 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_cpp
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/c_builtintype.obj   \
+    $(OBJ)$/c_class.obj		    \
+    $(OBJ)$/c_de.obj	        \
+    $(OBJ)$/c_define.obj	    \
+    $(OBJ)$/c_enum.obj		    \
+    $(OBJ)$/c_enuval.obj	    \
+    $(OBJ)$/c_funct.obj		    \
+    $(OBJ)$/c_macro.obj	        \
+    $(OBJ)$/c_namesp.obj	    \
+    $(OBJ)$/c_osigna.obj	    \
+    $(OBJ)$/c_reposypart.obj	\
+    $(OBJ)$/c_slots.obj		    \
+    $(OBJ)$/c_traits.obj        \
+    $(OBJ)$/c_tydef.obj		    \
+    $(OBJ)$/c_vari.obj		    \
+    $(OBJ)$/ca_ce.obj           \
+    $(OBJ)$/ca_def.obj          \
+    $(OBJ)$/ca_type.obj         \
+    $(OBJ)$/cs_ce.obj           \
+    $(OBJ)$/cs_def.obj          \
+    $(OBJ)$/cs_type.obj         \
+    $(OBJ)$/namechain.obj	    \
+    $(OBJ)$/tplparam.obj	    \
+    $(OBJ)$/usedtype.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/ary/cpp/namechain.cxx b/autodoc/source/ary/cpp/namechain.cxx
new file mode 100644
index 000000000000..d164a588dcb9
--- /dev/null
+++ b/autodoc/source/ary/cpp/namechain.cxx
@@ -0,0 +1,196 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/namechain.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/usedtype.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include "tplparam.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+namespace ut
+{
+
+
+//*********************     NameSegment     ******************//
+
+NameSegment::NameSegment( const char * i_sName )
+    :   sName( i_sName )
+        // pTemplate
+{
+}
+
+NameSegment::NameSegment( const NameSegment & i_rSeg )
+    :   sName(i_rSeg.sName)
+        // pTemplate
+{
+    // KORR_FUTURE :   Handling of copying of templates.
+//  csv_assert( NOT i_rSeg.pTemplate );
+}
+
+NameSegment& NameSegment::operator=(const NameSegment & i_rSeg)
+{
+    sName = i_rSeg.sName;
+    return *this;
+}
+
+NameSegment::~NameSegment()
+{
+}
+
+List_TplParameter &
+NameSegment::AddTemplate()
+{
+    return * (pTemplate = new List_TplParameter);
+}
+
+intt
+NameSegment::Compare( const NameSegment & i_rOther ) const
+{
+    intt nResult = strcmp( sName.c_str(), i_rOther.sName.c_str() );
+    if (nResult != 0)
+        return nResult;
+    if ( bool(pTemplate) != bool(i_rOther.pTemplate) )
+    {
+        if ( NOT pTemplate )
+            return -1;
+        else
+            return +1;
+    }
+    else if ( NOT pTemplate )
+        return 0;
+    else
+        return pTemplate->Compare( *i_rOther.pTemplate );
+}
+
+void
+NameSegment::Get_Text_AsScope( StreamStr &   o_rOut,
+                               const Gate &  i_rGate ) const
+{
+    o_rOut << sName;
+    if ( pTemplate )
+        pTemplate->Get_Text( o_rOut, i_rGate );
+}
+
+void
+NameSegment::Get_Text_AsMainType( StreamStr &   o_rName,
+                                  StreamStr &   o_rPostName,
+                                  const Gate &  i_rGate ) const
+{
+    o_rName << sName;
+    if ( pTemplate )
+        pTemplate->Get_Text( o_rPostName, i_rGate );
+}
+
+
+//*********************     NameChain     ******************//
+
+NameChain::NameChain()
+//  :   aSegments
+{
+}
+
+NameChain::~NameChain()
+{
+}
+
+void
+NameChain::Add_Segment( const char * i_sSeg )
+{
+    aSegments.push_back( NameSegment(i_sSeg) );
+}
+
+List_TplParameter &
+NameChain::Templatize_LastSegment()
+{
+    csv_assert( aSegments.size() > 0 );
+
+    return aSegments.back().AddTemplate();
+}
+
+intt
+NameChain::Compare( const NameChain & i_rChain ) const
+{
+    intt nResult = intt(aSegments.size()) - intt(i_rChain.aSegments.size());
+    if (nResult != 0)
+        return nResult;
+
+    std::vector< NameSegment >::const_iterator it1 = aSegments.begin();
+    std::vector< NameSegment >::const_iterator it1End = aSegments.end();
+    std::vector< NameSegment >::const_iterator it2 = i_rChain.aSegments.begin();
+
+    for ( ; it1 != it1End; ++it1, ++it2 )
+    {
+        nResult = (*it1).Compare(*it2);
+        if (nResult != 0)
+            return nResult;
+    }
+
+    return 0;
+}
+
+const String  &
+NameChain::LastSegment() const
+{
+    if ( aSegments.size() > 0 )
+        return aSegments.back().Name();
+    return String::Null_();
+}
+
+void
+NameChain::Get_Text( StreamStr &    o_rPreName,
+                     StreamStr &    o_rName,
+                     StreamStr &    o_rPostName,
+                     const Gate &   i_rGate ) const
+{
+    std::vector< NameSegment >::const_iterator it = aSegments.begin();
+    std::vector< NameSegment >::const_iterator itEnd = aSegments.end();
+
+    if ( it == itEnd )
+        return;
+
+    for ( --itEnd; it != itEnd; ++it )
+    {
+        (*it).Get_Text_AsScope( o_rPreName, i_rGate );
+        o_rPreName << "::";
+    }
+    (*it).Get_Text_AsMainType( o_rName, o_rPostName, i_rGate );
+}
+
+
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/tplparam.cxx b/autodoc/source/ary/cpp/tplparam.cxx
new file mode 100644
index 000000000000..67f8439c0c59
--- /dev/null
+++ b/autodoc/source/ary/cpp/tplparam.cxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "tplparam.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_type.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+namespace ut
+{
+
+TplParameter_Type::TplParameter_Type( Tid i_nType )
+    :   nType(i_nType)
+{
+}
+
+TplParameter_Type::~TplParameter_Type()
+{
+}
+
+intt
+TplParameter_Type::Compare( const TemplateParameter & i_rOther ) const
+{
+    const TplParameter_Type * pOther
+            = dynamic_cast< const TplParameter_Type* >( &i_rOther );
+    if (pOther == 0)
+        return -1;
+
+    return static_cast<long>(nType.Value())
+           - static_cast<long>(pOther->nType.Value());
+}
+
+void
+TplParameter_Type::Get_Text( StreamStr &                    o_rOut,
+                             const ary::cpp::Gate & i_rGate ) const
+{
+    i_rGate.Types().Get_TypeText( o_rOut, nType );
+}
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/cpp/tplparam.hxx b/autodoc/source/ary/cpp/tplparam.hxx
new file mode 100644
index 000000000000..f8ee57b968c7
--- /dev/null
+++ b/autodoc/source/ary/cpp/tplparam.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_TPLPARAM_HXX
+#define ARY_CPP_TPLPARAM_HXX
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class UsedType;
+    class Gate;
+
+namespace ut
+{
+
+
+class TemplateParameter
+{
+  public:
+    virtual             ~TemplateParameter() {}
+
+    virtual intt        Compare(
+                            const TemplateParameter &
+                                                i_rOther ) const = 0;
+    virtual void        Get_Text(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const = 0;
+};
+
+
+class TplParameter_Type : public TemplateParameter
+{
+  public:
+                        TplParameter_Type(
+                            Tid                 i_nType );
+                        ~TplParameter_Type();
+
+    virtual intt        Compare(
+                            const TemplateParameter &
+                                                i_rOther ) const;
+    virtual void        Get_Text(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+  private:
+    Tid                 nType;
+};
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/cpp/usedtype.cxx b/autodoc/source/ary/cpp/usedtype.cxx
new file mode 100644
index 000000000000..bf1d864ad68b
--- /dev/null
+++ b/autodoc/source/ary/cpp/usedtype.cxx
@@ -0,0 +1,575 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/usedtype.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/symtreenode.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/getncast.hxx>
+#include "tplparam.hxx"
+
+
+
+namespace
+{
+
+using namespace ::ary::cpp;
+typedef std::vector< ary::cpp::E_ConVol >   PtrLevelVector;
+
+
+inline bool
+result2bool( intt i_nResult )
+    { return i_nResult < 0; }
+
+
+intt                compare_PtrLevelVector(
+                        const PtrLevelVector &
+                                            i_r1,
+                        const PtrLevelVector &
+                                            i_r2 );
+inline intt
+compare_ConVol( E_ConVol i_e1,
+                E_ConVol i_e2 )
+    { return intt(i_e1) - intt(i_e2); }
+
+inline intt
+compare_bool(   bool i_b1,
+                bool i_b2 )
+    { return i_b1 == i_b2
+                    ?   0
+                    :   i_b1
+                            ?   -1
+                            :   +1; }
+inline intt
+compare_Specialisation( E_TypeSpecialisation i_e1,
+                        E_TypeSpecialisation i_e2 )
+    { return intt(i_e1) - intt(i_e2); }
+
+inline bool
+is_const( E_ConVol i_eCV )
+    { return ( intt(i_eCV) & intt(CONVOL_const) ) != 0; }
+
+inline bool
+is_volatile( E_ConVol i_eCV )
+    { return ( intt(i_eCV) & intt(CONVOL_volatile) ) != 0; }
+
+
+intt
+compare_PtrLevelVector( const PtrLevelVector & i_r1,
+                        const PtrLevelVector & i_r2 )
+{
+    intt nResult = i_r1.size() - i_r2.size();
+    if ( nResult != 0 )
+        return nResult;
+
+    PtrLevelVector::const_iterator it1 = i_r1.begin();
+    PtrLevelVector::const_iterator it1End = i_r1.end();
+    PtrLevelVector::const_iterator it2 = i_r2.begin();
+
+    for ( ; it1 != it1End; ++it1, ++it2 )
+    {
+        nResult = compare_ConVol(*it1, *it2);
+        if ( nResult != 0 )
+            return nResult;
+    }
+
+    return 0;
+}
+
+
+}   // anonymous namespace
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+typedef symtree::Node<CeNode_Traits>    CeNode;
+typedef ut::NameChain::const_iterator   nc_iter;
+
+Ce_id               CheckForRelatedCe_inNode(
+                        const CeNode &      i_node,
+                        const StringVector& i_qualification,
+                        const String &      i_name );
+
+
+UsedType::UsedType(Ce_id i_scope )
+    :   aPath(),
+        aPtrLevels(),
+        eConVol_Type(CONVOL_none),
+        bIsReference(false),
+        bIsAbsolute(false),
+        bRefers2BuiltInType(false),
+        eTypeSpecialisation(TYSP_none),
+        nRelatedCe(0),
+        nScope(i_scope)
+{
+}
+
+UsedType::~UsedType()
+{
+}
+
+
+bool
+UsedType::operator<( const UsedType & i_rType ) const
+{
+    intt nResult = compare_bool( bIsAbsolute, i_rType.bIsAbsolute );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = static_cast<intt>(nScope.Value())
+                -
+              static_cast<intt>(i_rType.nScope.Value());
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = aPath.Compare( i_rType.aPath );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_ConVol( eConVol_Type, i_rType.eConVol_Type );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_PtrLevelVector( aPtrLevels, i_rType.aPtrLevels );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_bool( bIsReference, i_rType.bIsReference );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_Specialisation( eTypeSpecialisation, i_rType.eTypeSpecialisation );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    return false;
+}
+
+void
+UsedType::Set_Absolute()
+{
+    bIsAbsolute = true;
+}
+
+void
+UsedType::Add_NameSegment( const char * i_sSeg )
+{
+    aPath.Add_Segment(i_sSeg);
+}
+
+ut::List_TplParameter &
+UsedType::Enter_Template()
+{
+    return aPath.Templatize_LastSegment();
+}
+
+void
+UsedType::Set_Unsigned()
+{
+    eTypeSpecialisation = TYSP_unsigned;
+}
+
+void
+UsedType::Set_Signed()
+{
+    eTypeSpecialisation = TYSP_signed;
+}
+
+void
+UsedType::Set_BuiltIn( const char * i_sType )
+{
+    aPath.Add_Segment(i_sType);
+    bRefers2BuiltInType = true;
+}
+
+void
+UsedType::Set_Const()
+{
+    if (PtrLevel() == 0)
+        eConVol_Type = E_ConVol(eConVol_Type | CONVOL_const);
+    else
+        aPtrLevels.back() = E_ConVol(aPtrLevels.back() | CONVOL_const);
+}
+
+void
+UsedType::Set_Volatile()
+{
+    if (PtrLevel() == 0)
+        eConVol_Type = E_ConVol(eConVol_Type | CONVOL_volatile);
+    else
+        aPtrLevels.back() = E_ConVol(aPtrLevels.back() | CONVOL_volatile);
+}
+
+void
+UsedType::Add_PtrLevel()
+{
+    aPtrLevels.push_back(CONVOL_none);
+}
+
+void
+UsedType::Set_Reference()
+{
+    bIsReference = true;
+}
+
+inline bool
+IsInternal(const ary::cpp::CodeEntity & i_ce)
+{
+    const ary::doc::OldCppDocu *
+        docu = dynamic_cast< const ary::doc::OldCppDocu* >(i_ce.Docu().Data());
+    if (docu != 0)
+        return docu->IsInternal();
+    return false;
+}
+
+
+void
+UsedType::Connect2Ce( const CePilot & i_ces)
+{
+    StringVector
+        qualification;
+    String
+        name;
+    Get_NameParts(qualification, name);
+
+    for ( const CeNode * scope_node = CeNode_Traits::NodeOf_(
+                                            i_ces.Find_Ce(nScope));
+          scope_node != 0;
+          scope_node = scope_node->Parent() )
+    {
+        nRelatedCe = CheckForRelatedCe_inNode(*scope_node, qualification, name);
+        if ( nRelatedCe.IsValid() )
+        {
+            if (  IsInternal(i_ces.Find_Ce(nRelatedCe)) )
+                nRelatedCe = Ce_id(0);
+            return;
+        }
+    }   // end for
+}
+
+void
+UsedType::Connect2CeOnlyKnownViaBaseClass(const Gate & i_gate)
+{
+    csv_assert(nScope.IsValid());
+    CesResultList
+        instances = i_gate.Ces().Search_TypeName( LocalName() );
+
+    // If there are no matches, or only one match that was already
+    //   accepted, all work is done.
+    if (     (nRelatedCe.IsValid() AND instances.size() == 1)
+         OR  instances.size() == 0 )
+        return;
+
+    StringVector
+        qualification;
+    String
+        name;
+    Get_NameParts(qualification, name);
+
+    const CodeEntity &
+        scopece = i_gate.Ces().Find_Ce(nScope);
+
+    // Else search for declaration in own class and then in base classes.
+    //   These would be of higher priority than those in parent namespaces.
+    Ce_id
+        foundce = RecursiveSearchCe_InBaseClassesOf(
+                                    scopece, qualification, name, i_gate);
+    if (foundce.IsValid())
+        nRelatedCe = foundce;
+
+    if ( nRelatedCe.IsValid() AND IsInternal(i_gate.Ces().Find_Ce(nRelatedCe)) )
+    {
+        nRelatedCe = Ce_id(0);
+    }
+}
+
+bool
+UsedType::IsBuiltInType() const
+{
+    return bRefers2BuiltInType
+           AND aPtrLevels.size() == 0
+           AND NOT bIsReference
+           AND eConVol_Type == ary::cpp::CONVOL_none;
+}
+
+const String  &
+UsedType::LocalName() const
+{
+    return aPath.LastSegment();
+}
+
+E_TypeSpecialisation
+UsedType::TypeSpecialisation() const
+{
+    return eTypeSpecialisation;
+}
+
+void
+UsedType::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ary::ClassId
+UsedType::get_AryClass() const
+{
+    return class_id;
+}
+
+Rid
+UsedType::inq_RelatedCe() const
+{
+     return nRelatedCe.Value();
+}
+
+bool
+UsedType::inq_IsConst() const
+{
+    if ( is_const(eConVol_Type) )
+        return true;
+    for ( PtrLevelVector::const_iterator it = aPtrLevels.begin();
+          it != aPtrLevels.end();
+          ++it )
+    {
+        if ( is_const(*it) )
+            return true;
+    }
+
+    return false;
+}
+
+void
+UsedType::inq_Get_Text( StreamStr &         o_rPreName,
+                        StreamStr &         o_rName,
+                        StreamStr &         o_rPostName,
+                        const Gate &        i_rGate ) const
+{
+    if ( is_const(eConVol_Type) )
+        o_rPreName << "const ";
+    if ( is_volatile(eConVol_Type) )
+        o_rPreName << "volatile ";
+    if ( bIsAbsolute )
+        o_rPreName << "::";
+
+    aPath.Get_Text( o_rPreName, o_rName, o_rPostName, i_rGate );
+
+    for ( PtrLevelVector::const_iterator it = aPtrLevels.begin();
+          it != aPtrLevels.end();
+          ++it )
+    {
+        o_rPostName << " *";
+        if ( is_const(*it) )
+            o_rPostName << " const";
+        if ( is_volatile(*it) )
+            o_rPostName << " volatile";
+    }
+    if ( bIsReference )
+        o_rPostName << " &";
+}
+
+Ce_id
+UsedType::RecursiveSearchCe_InBaseClassesOf( const CodeEntity &   i_mayBeClass,
+                                             const StringVector & i_myQualification,
+                                             const String &       i_myName,
+                                             const Gate &         i_gate  ) const
+{
+    // Find in this class?
+    const CeNode *
+        basenode = CeNode_Traits::NodeOf_(i_mayBeClass);
+    if (basenode == 0)
+        return Ce_id(0);
+    Ce_id
+        found = CheckForRelatedCe_inNode(*basenode, i_myQualification, i_myName);
+    if (found.IsValid())
+        return found;
+
+
+    const Class *
+        cl = ary_cast<Class>(&i_mayBeClass);
+    if (cl == 0)
+        return Ce_id(0);
+
+    for ( List_Bases::const_iterator it = cl->BaseClasses().begin();
+          it != cl->BaseClasses().end();
+          ++it )
+    {
+        csv_assert((*it).nId.IsValid());
+        Ce_id
+            base = i_gate.Types().Find_Type((*it).nId).RelatedCe();
+        while (base.IsValid() AND is_type<Typedef>(i_gate.Ces().Find_Ce(base)) )
+        {
+            base = i_gate.Types().Find_Type(
+                            ary_cast<Typedef>(i_gate.Ces().Find_Ce(base))
+                            .DescribingType() )
+                            .RelatedCe();
+        }
+
+        if (base.IsValid())
+        {
+            const CodeEntity &
+                basece = i_gate.Ces().Find_Ce(base);
+            found = RecursiveSearchCe_InBaseClassesOf(
+                        basece, i_myQualification, i_myName, i_gate);
+            if (found.IsValid())
+                return found;
+        }
+    }   // end for
+
+    return Ce_id(0);
+}
+
+
+void
+UsedType::Get_NameParts(    StringVector &      o_qualification,
+                            String &            o_name )
+{
+    nc_iter nit     = aPath.begin();
+    nc_iter nit_end = aPath.end();
+    csv_assert(nit != nit_end); // Each UsedType has to have a local name.
+
+    --nit_end;
+    o_name = (*nit_end).Name();
+    for ( ;
+          nit != nit_end;
+          ++nit )
+    {
+        o_qualification.push_back( (*nit).Name() );
+    }
+}
+
+Ce_id
+CheckForRelatedCe_inNode( const CeNode &        i_node,
+                          const StringVector &  i_qualification,
+                          const String &        i_name )
+{
+    if (i_qualification.size() > 0)
+    {
+        Ce_id
+            ret(0);
+        i_node.SearchBelow( ret,
+                            i_qualification.begin(),
+                            i_qualification.end(),
+                            i_name );
+        return ret;
+    }
+    else
+    {
+        return i_node.Search(i_name);
+    }
+}
+
+
+namespace ut
+{
+
+List_TplParameter::List_TplParameter()
+  :   aTplParameters()
+{
+}
+
+List_TplParameter::~List_TplParameter()
+{
+    csv::erase_container_of_heap_ptrs(aTplParameters);
+}
+
+void
+List_TplParameter::AddParam_Type( Type_id i_nType )
+{
+    aTplParameters.push_back( new TplParameter_Type(i_nType) );
+}
+
+void
+List_TplParameter::Get_Text( StreamStr &                    o_rOut,
+                             const ary::cpp::Gate &  i_rGate ) const
+{
+    Vector_TplArgument::const_iterator it    = aTplParameters.begin();
+    Vector_TplArgument::const_iterator itEnd = aTplParameters.end();
+
+    if ( it == itEnd )
+    {
+        o_rOut << "<>";
+        return;
+    }
+
+    o_rOut << "< ";
+
+    (*it)->Get_Text( o_rOut, i_rGate );
+
+    for ( ++it; it != itEnd; ++it )
+    {
+        o_rOut << ", ";
+        (*it)->Get_Text( o_rOut, i_rGate );
+    }
+
+    o_rOut << " >";
+}
+
+intt
+List_TplParameter::Compare( const List_TplParameter & i_rOther ) const
+{
+    intt nResult = intt(aTplParameters.size()) - intt(i_rOther.aTplParameters.size());
+
+    if (nResult != 0)
+        return nResult;
+
+    Vector_TplArgument::const_iterator it1      = aTplParameters.begin();
+    Vector_TplArgument::const_iterator it1End   = aTplParameters.end();
+    Vector_TplArgument::const_iterator it2      = i_rOther.aTplParameters.begin();
+
+    for ( ; it1 != it1End; ++it1, ++it2 )
+    {
+        nResult = (*it1)->Compare( *(*it2) );
+        if (nResult != 0)
+            return nResult;
+    }
+
+    return 0;
+}
+
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/doc/d_boolean.cxx b/autodoc/source/ary/doc/d_boolean.cxx
new file mode 100644
index 000000000000..9d28b822ce1b
--- /dev/null
+++ b/autodoc/source/ary/doc/d_boolean.cxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/doc/d_boolean.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+Boolean::~Boolean()
+{
+}
+
+void
+Boolean::do_Accept(csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
diff --git a/autodoc/source/ary/doc/d_docu.cxx b/autodoc/source/ary/doc/d_docu.cxx
new file mode 100644
index 000000000000..50c841e2fb00
--- /dev/null
+++ b/autodoc/source/ary/doc/d_docu.cxx
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/doc/d_docu.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_node.hxx>
+
+namespace ary
+{
+namespace doc
+{
+
+Documentation::Documentation()
+    :   pData(0)
+{
+}
+
+Documentation::~Documentation()
+{
+}
+
+void
+Documentation::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
diff --git a/autodoc/source/ary/doc/d_node.cxx b/autodoc/source/ary/doc/d_node.cxx
new file mode 100644
index 000000000000..23e30c6ca286
--- /dev/null
+++ b/autodoc/source/ary/doc/d_node.cxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/doc/d_node.hxx>
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+
+Node::~Node()
+{
+}
+
+Node::Node(nodetype::id  i_type)
+    :   nType(i_type),
+        pNext(0)
+{
+}
+
+void
+Node::Add_toChain( DYN Node & pass_nextNode )
+{
+    if (NOT pNext)
+        pNext = &pass_nextNode;
+    else
+        pNext->Add_toChain(pass_nextNode);
+}
+
+uintt
+Node::ListSize() const
+{
+    return pNext
+            ?   pNext->ListSize() + 1
+            :   1;
+}
+
+
+
+}   // namespace doc
+}   // namespace ary
diff --git a/autodoc/source/ary/doc/d_oldcppdocu.cxx b/autodoc/source/ary/doc/d_oldcppdocu.cxx
new file mode 100644
index 000000000000..26ab84fb768e
--- /dev/null
+++ b/autodoc/source/ary/doc/d_oldcppdocu.cxx
@@ -0,0 +1,336 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/doc/d_oldcppdocu.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/all_tags.hxx>
+#include <ary/info/docstore.hxx>
+#include <ary/info/infodisp.hxx>
+#include <docu_node_ids.hxx>
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+using namespace info;
+
+
+
+
+unsigned char  C_ucNO_INDEX = 255;
+typedef DYN StdTag * (F_CREATE)();
+
+
+OldCppDocu::OldCppDocu()
+    :   Node(docnt::nt_OldCppDocu),
+        bIsObsolete(false),
+        bIsInternal(false),
+        bIsInterface(false)
+{
+    memset( nTags, C_ucNO_INDEX, size_t(C_eAtTag_NrOfClasses) );
+}
+
+OldCppDocu::~OldCppDocu()
+{
+}
+
+void
+OldCppDocu::Store2( info::DocuStore & o_rDocuStore )
+{
+    o_rDocuStore.Store2ConnectedDeclaration(*this);
+}
+
+AtTag *
+OldCppDocu::Create_StdTag( E_AtTagId i_eId )
+{
+    UINT8 nIndex = static_cast<UINT8>(i_eId);
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new StdTag(i_eId);
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_BaseTag()
+{
+    UINT8 nIndex = atc_base;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new BaseTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_ExceptionTag()
+{
+    UINT8 nIndex = atc_exception;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new ExceptionTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_ImplementsTag()
+{
+    UINT8 nIndex = atc_implements;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new ImplementsTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_KeywordTag()
+{
+    UINT8 nIndex = atc_keyword;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new KeywordTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_ParameterTag()
+{
+    UINT8 nIndex = atc_parameter;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new ParameterTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_SeeTag()
+{
+    UINT8 nIndex = atc_see;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new SeeTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_TemplateTag()
+{
+    UINT8 nIndex = atc_template;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new TemplateTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_LabelTag()
+{
+    UINT8 nIndex = atc_label;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new LabelTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_DefaultTag()
+{
+    UINT8 nIndex = atid_descr;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new StdTag(atid_descr);
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_SinceTag()
+{
+    UINT8 nIndex = atc_since;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new SinceTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+
+void
+OldCppDocu::Replace_AtShort_By_AtDescr()
+{
+    unsigned char nPosInTags = nTags[atid_short];
+    if ( nPosInTags == C_ucNO_INDEX )
+        return;
+
+    AtTag * pTag = aTags[ nPosInTags ];
+    if ( pTag == 0 )    // Should be csv_assert().
+        return;
+
+    csv_assert( dynamic_cast< StdTag* >(pTag) != 0 );
+    StdTag * pStdTag = static_cast< StdTag* >(pTag);
+
+    pStdTag->ChangeId2(atid_descr);
+    nTags[atid_short] = C_ucNO_INDEX;
+    nTags[atid_descr] = nPosInTags;
+}
+
+void
+OldCppDocu::Set_Obsolete()
+{
+    bIsObsolete = true;
+}
+
+void
+OldCppDocu::Set_Internal()
+{
+    bIsInternal = true;
+}
+
+const AtTag &
+OldCppDocu::Short() const
+{
+    static const StdTag aNull_(atid_short);
+
+    unsigned char nPosInTags = nTags[atid_short];
+    if ( nPosInTags != C_ucNO_INDEX )
+    {
+        AtTag * pTag = aTags[ nPosInTags ];
+        if ( pTag != 0 )    // Should be csv_assert().
+        {
+            return *pTag;
+        }
+    }
+
+    return aNull_;
+}
+
+AtTag * &
+OldCppDocu::NewTag(UINT8 i_nIndex)
+{
+    nTags[i_nIndex] = static_cast<UINT8>(aTags.size());
+    aTags.push_back(0);
+    return aTags.back();
+}
+
+AtTag &
+OldCppDocu::GetTag( UINT8   i_nIndex )
+{
+    csv_assert( i_nIndex < C_eAtTag_NrOfClasses );
+    csv_assert( nTags[i_nIndex] != C_ucNO_INDEX );
+    csv_assert( aTags[nTags[i_nIndex]] != 0 );
+    return * aTags[nTags[i_nIndex]];
+}
+
+bool
+OldCppDocu::IsInternal() const
+{
+    return bIsInternal;
+}
+
+bool
+OldCppDocu::IsInterface() const
+{
+    return bIsInterface;
+}
+
+void
+OldCppDocu::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+}   // namespace doc
+}   // namespace ary
diff --git a/autodoc/source/ary/doc/d_oldidldocu.cxx b/autodoc/source/ary/doc/d_oldidldocu.cxx
new file mode 100644
index 000000000000..1c61a6ac0fb0
--- /dev/null
+++ b/autodoc/source/ary/doc/d_oldidldocu.cxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/doc/d_oldidldocu.hxx>
+
+// NOT FULLY DEFINED SERVICES
+#include <docu_node_ids.hxx>
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+using namespace ::ary::inf;
+
+
+OldIdlDocu::OldIdlDocu()
+    :   Node(docnt::nt_OldIdlDocu),
+        aShort(),
+        aDescription(),
+        aDeprecatedText(),
+        aTags(),
+        pExternShort(0),
+        bIsPublished(false),
+        bIsDeprecated(false),
+        bIsOptional(false)
+{
+}
+
+OldIdlDocu::~OldIdlDocu()
+{
+}
+
+void
+OldIdlDocu::AddToken2DeprecatedText( DYN DocuToken & let_drToken )
+{
+    aDeprecatedText.AddToken(let_drToken);
+}
+
+void
+OldIdlDocu::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+
+
+}   // namespace info
+}   // namespace ary
diff --git a/autodoc/source/ary/doc/makefile.mk b/autodoc/source/ary/doc/makefile.mk
new file mode 100644
index 000000000000..21989dcc5827
--- /dev/null
+++ b/autodoc/source/ary/doc/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_doc
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/d_boolean.obj           \
+    $(OBJ)$/d_docu.obj              \
+    $(OBJ)$/d_node.obj              \
+    $(OBJ)$/d_oldcppdocu.obj        \
+    $(OBJ)$/d_oldidldocu.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/ary/idl/i2s_calculator.cxx b/autodoc/source/ary/idl/i2s_calculator.cxx
new file mode 100644
index 000000000000..111e9548b941
--- /dev/null
+++ b/autodoc/source/ary/idl/i2s_calculator.cxx
@@ -0,0 +1,992 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "i2s_calculator.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <string.h>
+#include <cosv/file.hxx>
+//#include <adc_manager.hxx>
+//#include <adc_options.hxx>
+#include <ary/qualiname.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_function.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <ary/namesort.hxx>
+#include <nametreenode.hxx>
+#include "i_nnfinder.hxx"
+#include "ia_ce.hxx"
+#include "ia_type.hxx"
+#include "is_ce.hxx"
+#include "is_type.hxx"
+#include "it_ce.hxx"
+#include "it_explicit.hxx"
+#include "it_sequence.hxx"
+#include "it_xnameroom.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+template <class DEST>
+DEST *
+SecondariesCalculator::SearchCe4Type(Type_id i_type)
+{
+    Ce_id
+        ce = lhf_Search_CeFromTypeId(i_type);
+    if (ce.IsValid())
+        return ary_cast<DEST>(& my_CeStorage()[ce]);
+    return 0;
+}
+
+
+typedef stg::const_iterator<CodeEntity> stg_citerator;
+typedef stg::iterator<CodeEntity>       stg_iterator;
+
+typedef stg::filter_iterator<CodeEntity,Interface>
+                                        interface_iterator;
+
+typedef stg::filter_iterator<Type,ExplicitType>
+                                        explicittype_iterator;
+
+typedef ary::stg::const_filter_iterator<CodeEntity,Typedef>
+                                        typedef_citerator;
+
+
+inline Service *
+SecondariesCalculator::lhf_SearchService( Type_id i_nType )
+{
+    return SearchCe4Type<Service>(i_nType);
+}
+
+inline Interface *
+SecondariesCalculator::lhf_SearchInterface( Type_id i_nType )
+{
+    return SearchCe4Type<Interface>(i_nType);
+}
+
+inline Struct *
+SecondariesCalculator::lhf_SearchStruct( Type_id i_nType )
+{
+    return SearchCe4Type<Struct>(i_nType);
+}
+
+inline Exception *
+SecondariesCalculator::lhf_SearchException( Type_id i_nType )
+{
+    return SearchCe4Type<Exception>(i_nType);
+}
+
+inline const Ce_Storage &
+SecondariesCalculator::my_CeStorage() const
+{
+    csv_assert(pCes != 0);
+    return pCes->Storage();
+}
+
+inline const Type_Storage &
+SecondariesCalculator::my_TypeStorage() const
+{
+    csv_assert(pTypes != 0);
+    return pTypes->Storage();
+}
+
+inline Ce_Storage &
+SecondariesCalculator::my_CeStorage()
+{
+    csv_assert(pCes != 0);
+    return pCes->Storage();
+}
+
+inline Type_Storage &
+SecondariesCalculator::my_TypeStorage()
+{
+    csv_assert(pTypes != 0);
+    return pTypes->Storage();
+}
+
+inline void
+SecondariesCalculator::insert_into2sList( CodeEntity &        o_out,
+                                          int                 i_listIndex,
+                                          Ce_id               i_nCe )
+    { o_out.Secondaries().Access_List(i_listIndex).push_back(i_nCe); }
+
+
+SecondariesCalculator::SecondariesCalculator( CeAdmin &      i_ces,
+                                              TypeAdmin &    i_types )
+    :   pCes(&i_ces),
+        pTypes(&i_types)
+{
+}
+
+SecondariesCalculator::~SecondariesCalculator()
+{
+}
+
+
+void
+SecondariesCalculator::CheckAllInterfaceBases()
+{
+    Module &
+        rGlobalNamespace = pCes->GlobalNamespace();
+    QualifiedName
+        aXInterface("::com::sun::star::uno::XInterface","::");
+
+    const Type &
+        rType = pTypes->CheckIn_Type(   aXInterface,
+                                        0,
+                                        rGlobalNamespace.CeId(),
+                                        0 );
+    Type_id
+        nTypeXInterface = rType.TypeId();
+    const ExplicitType &
+        rExplType = ary_cast<ExplicitType>(rType);
+    Ce_id
+        nCeXInterface = lhf_Search_CeForType(rExplType);
+
+    interface_iterator itEnd( my_CeStorage().End() );
+    for ( interface_iterator it( my_CeStorage().BeginUnreserved() );
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        Interface &
+            rInterface = *it;
+        if (     NOT rInterface.HasBase()               // According to UNO IDL syntax, an interface without base has com::sun::star::uno::XInterface as base.
+             AND rInterface.CeId() != nCeXInterface )   // XInterface must not be base of itself.
+        {
+            rInterface.Add_Base(nTypeXInterface, 0);
+        }
+    }   // end for
+}
+
+void
+SecondariesCalculator::Connect_Types2Ces()
+{
+    explicittype_iterator itEnd( my_TypeStorage().End() );
+    for ( explicittype_iterator it( my_TypeStorage().BeginUnreserved() );
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        ExplicitType &
+            rType = ary_cast<ExplicitType>(*it);
+        Ce_id
+            nRelatedCe = lhf_Search_CeForType(rType);
+        if (nRelatedCe.IsValid())
+        {
+            Ce_Type *
+                pNew = new Ce_Type(nRelatedCe, rType.TemplateParameters());
+            my_TypeStorage().Replace_Entity( rType.TypeId(),
+                                             *pNew );
+        }
+    }   // end for
+}
+
+void
+SecondariesCalculator::Gather_CrossReferences()
+{
+    gather_Synonyms();
+
+    for ( stg_iterator it = my_CeStorage().Begin();
+          it != my_CeStorage().End();
+          ++it )
+    {
+        (*it).Accept( static_cast< SPInst_asHost& >(*this) );
+
+    }   // end for
+
+    sort_All2s();
+}
+
+void
+SecondariesCalculator::Make_Links2DeveloperManual(
+                                const String &      i_devman_reffilepath )
+{
+//    const autodoc::Options &
+//        rOptions = TheAutodocManager().TheOptions();
+//
+//    const String &
+//        rDeveloperManual_URL
+//            = rOptions.Get_Extra(autodoc::OPT_developer_guide);
+//    const String
+//        rDeveloperManual_ReferenceFile
+//            = rOptions.Get_Extra(autodoc::OPT_developer_guide_refs_file);
+
+//    if ( rDeveloperManual_URL.length() == 0
+//         OR
+//         rDeveloperManual_ReferenceFile.length() == 0 )
+//    {
+//        return;
+//    }
+
+    csv::File
+        aFile(i_devman_reffilepath, csv::CFM_READ);
+    csv::OpenCloseGuard
+        aFileOpener(aFile);
+    if (aFileOpener)
+    {
+        Read_Links2DevManual(aFile);
+    }
+}
+
+namespace
+{
+
+enum E_LinkMode
+{
+    link2descr,
+    link2ref
+};
+
+struct OrderCeIdsByName
+{
+                        OrderCeIdsByName(
+                            const Ce_Storage &      i_storage )
+                                :   rStorage(i_storage),
+                                    aNameComparison() {}
+    bool                operator()(
+                            Ce_id                   i_ce1,
+                            Ce_id                   i_ce2 ) const
+    {
+        return aNameComparison( rStorage[i_ce1].LocalName(),
+                                rStorage[i_ce2].LocalName() );
+    }
+
+  private:
+    const Ce_Storage &  rStorage;
+    LesserName          aNameComparison;
+};
+
+
+}
+
+
+
+void
+SecondariesCalculator::do_Process( const Service & i_rData )
+{
+    const Service &
+        rService = ary_cast<Service>(i_rData);
+
+    // Interfaces:
+    assignImplementation_toAServicesInterfaces( rService.CeId(),
+                                                rService.CeId(),
+                                                interface_2s_ExportingServices );
+    // Services and their interfaces:
+    recursive_AssignIncludingService(rService.CeId(), rService);
+}
+
+void
+SecondariesCalculator::do_Process( const Interface & i_rData )
+{
+    assign_AsDerivedInterface( ary_cast<Interface>(i_rData) );
+}
+
+void
+SecondariesCalculator::do_Process( const Struct &  i_rData )
+{
+    assign_AsDerivedStruct( ary_cast<Struct>(i_rData) );
+}
+
+void
+SecondariesCalculator::do_Process( const Exception &  i_rData )
+{
+    assign_AsDerivedException( ary_cast<Exception>(i_rData) );
+}
+
+void
+SecondariesCalculator::do_Process( const Typedef &  )
+{
+    // KORR_FUTURE
+    // Find out what was meant here ???
+
+//    const Typedef &
+//        rTypedef = ary_cast<Typedef>(i_rData);
+}
+
+void
+SecondariesCalculator::do_Process( const Singleton &  i_rData )
+{
+    const Singleton &
+        rSingleton = ary_cast<Singleton>(i_rData);
+
+    Service *
+        pServ = lhf_SearchService(rSingleton.AssociatedService());
+    if (pServ != 0)
+    {
+        insert_into2sUnique( *pServ,
+                             service_2s_InstantiatingSingletons,
+                             rSingleton.CeId() );
+    }
+
+    // Interfaces:
+    assignImplementation_toAServicesInterfaces( rSingleton.CeId(),
+                                                lhf_Search_CeFromTypeId(rSingleton.AssociatedService()),
+                                                interface_2s_ExportingSingletons );
+}
+
+void
+SecondariesCalculator::do_Process( const SglIfcService &  i_rData )
+{
+    const SglIfcService &
+        rSglIfcService = ary_cast<SglIfcService>(i_rData);
+
+    assignImplementation_toAServicesInterfaces( rSglIfcService.CeId(),
+                                                rSglIfcService.CeId(),
+                                                interface_2s_ExportingServices );
+}
+
+void
+SecondariesCalculator::do_Process( const SglIfcSingleton &  i_rData )
+{
+    const SglIfcSingleton &
+        rSglIfcSingleton = ary_cast<SglIfcSingleton>(i_rData);
+
+    Type_id nBase = rSglIfcSingleton.BaseInterface();
+    recursive_AssignImplementation_toExportedInterface( rSglIfcSingleton.CeId(),
+                                                        nBase,
+                                                        interface_2s_ExportingSingletons );
+}
+
+void
+SecondariesCalculator::do_Process( const Function & i_rData )
+{
+    const Function &
+        rFunction = ary_cast<Function>(i_rData);
+
+    recursive_AssignFunction_toCeAsReturn(rFunction.CeId(), rFunction.ReturnType());
+
+    for ( Function::ParamList::const_iterator itp = rFunction.Parameters().begin();
+          itp != rFunction.Parameters().end();
+          ++itp )
+    {
+        recursive_AssignFunction_toCeAsParameter(rFunction.CeId(), (*itp).Type());
+    }   // end for (itp)
+
+    for ( Function::ExceptionList::const_iterator itx = rFunction.Exceptions().begin();
+          itx != rFunction.Exceptions().end();
+          ++itx )
+    {
+        Exception *
+            pX = lhf_SearchException(*itx);
+        if (pX != 0)
+        {
+            insert_into2sUnique(*pX, exception_2s_RaisingFunctions, rFunction.CeId());
+        }
+    }   // end for (itx)
+}
+
+void
+SecondariesCalculator::do_Process( const StructElement & i_rData )
+{
+    const StructElement &
+        rStructElement = ary_cast<StructElement>(i_rData);
+
+    recursive_AssignStructElement_toCeAsDataType(rStructElement.CeId(), rStructElement.Type());
+}
+
+void
+SecondariesCalculator::do_Process( const Property & i_rData )
+{
+    const Property &
+        rProperty = ary_cast<Property>(i_rData);
+
+    recursive_AssignStructElement_toCeAsDataType(rProperty.CeId(), rProperty.Type());
+}
+
+Ce_id
+SecondariesCalculator::lhf_Search_CeForType( const ExplicitType & i_rType ) const
+{
+    const ExplicitNameRoom &
+        rExplicitNameRoom = ary_cast<ExplicitNameRoom>(
+                                my_TypeStorage()[i_rType.NameRoom()] );
+    Find_ModuleNode
+        rNodeFinder( my_CeStorage(),
+                     rExplicitNameRoom.NameChain_Begin(),
+                     rExplicitNameRoom.NameChain_End(),
+                     i_rType.Name() );
+
+    if ( rExplicitNameRoom.IsAbsolute() )
+    {
+        const Module &
+            rGlobalNamespace = ary_cast<Module>(
+                                my_CeStorage()[predefined::ce_GlobalNamespace]);
+        return Search_SubTree(  rGlobalNamespace,
+                                rNodeFinder );
+    }
+    else
+    {
+        const Module &
+            rStartModule = ary_cast<Module>(
+                                my_CeStorage()[i_rType.ModuleOfOccurrence()]);
+        Ce_id ret = Search_SubTree_UpTillRoot( rStartModule,
+                                               rNodeFinder );
+        return ret;
+    }   // endif (rExplicitNameRoom.IsAbsolute()) else
+}
+
+Ce_id
+SecondariesCalculator::lhf_Search_CeFromTypeId( Type_id i_nType ) const
+{
+    if (NOT i_nType.IsValid())
+        return Ce_id(0);
+    const Ce_Type *
+        pType = ary_cast<Ce_Type>( & my_TypeStorage()[i_nType] );
+    return pType != 0
+                ?   pType->RelatedCe()
+                :   Ce_id_Null();
+}
+
+void
+SecondariesCalculator::assign_CurLink( char *              i_text,
+                                       const String &      i_link,
+                                       const String &      i_linkUI,
+                                       bool                i_isDescr,
+                                       int                 i_lineCount )
+{
+    csv_assert(i_text != 0);
+
+    const ary::idl::Module *
+        pModule = & ary_cast<Module>(
+                        my_CeStorage()[predefined::ce_GlobalNamespace]);
+
+    char * pPastNext = 0;
+    char * pNext = i_text;
+    for ( ;
+          (pPastNext = strstr(pNext,".")) != 0;
+          pNext = pPastNext + 1 )
+    {
+        String sNext(pNext, pPastNext-pNext);
+        Ce_id nModule = pModule->Search_Name(sNext);
+        if (nModule.IsValid())
+        {
+            pModule = ary_cast<Module>( & my_CeStorage()[nModule] );
+        }
+        else
+        {
+            pModule = 0;
+        }
+
+        if (pModule == 0)
+        {
+            Cerr() << "Warning: Invalid line nr. "
+                   << i_lineCount
+                   << " in DevelopersGuide reference file:\n"
+                   << reinterpret_cast< const char* >(i_text)
+                   << "\n"
+                   << Endl();
+            return;
+        }
+    }   // end for
+
+    pPastNext = strchr(pNext,':');
+    bool bMember = pPastNext != 0;
+    String sCe( pNext, (bMember ? csv::str::size(pPastNext-pNext) : csv::str::maxsize) );
+
+//  KORR_FUTURE
+//  String sMember(bMember ? pPastNext+1, "");
+
+    Ce_id nCe = pModule->Search_Name(sCe);
+    if (NOT nCe.IsValid())
+    {
+        Cerr() << "Warning: Invalid line nr. "
+               << i_lineCount
+               << " in DevelopersGuide reference file:\n"
+               << reinterpret_cast< const char* >(i_text)
+               << "\n"
+               << Endl();
+        return;
+    }
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    if (NOT bMember)
+    {
+        if (i_isDescr)
+            rCe.Secondaries().Add_Link2DescriptionInManual(i_link, i_linkUI);
+        else
+            rCe.Secondaries().Add_Link2RefInManual(i_link, i_linkUI);
+        return;
+    }
+    else
+    {
+    // KORR_FUTURE
+    //   Provisorial just doing nothing (or may be
+    //   adding a link at main Ces lists).
+//    if (i_isDescr)
+//        rCe.Secondaries().Add_Link2DescriptionInManual(i_link);
+//    else
+//        rCe.Secondaries().Add_Link2RefInManual(i_link);
+    }
+}
+
+void
+SecondariesCalculator::gather_Synonyms()
+{
+    const Ce_Storage &
+        cstrg = my_CeStorage();
+    typedef_citerator itEnd(cstrg.End());
+    for ( typedef_citerator it(cstrg.Begin());
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        const Typedef &
+            rTypedef = *it;
+        recursive_AssignAsSynonym(rTypedef.CeId(), rTypedef);
+    }   // end for (itTd)
+}
+
+void
+SecondariesCalculator::recursive_AssignAsSynonym( Ce_id               i_synonymousTypedefsId,
+                                                  const Typedef &     i_TypedefToCheck )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_TypedefToCheck.DefiningType());
+    if (NOT nCe.IsValid())
+        return;
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    recursive_AssignAsSynonym( i_synonymousTypedefsId,
+                                               static_cast< Typedef& >(rCe) );
+                    break;
+                // default: do nothing.
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignIncludingService( Ce_id               i_includingServicesId,
+                                                         const Service &     i_ServiceToCheckItsIncludes )
+{
+    Dyn_StdConstIterator<CommentedRelation>
+        pIncludedServices;
+    i_ServiceToCheckItsIncludes.Get_IncludedServices(pIncludedServices);
+
+    for ( StdConstIterator<CommentedRelation> &
+                itServ = *pIncludedServices;
+          itServ;
+          ++itServ )
+    {
+        Service *
+            pServ = lhf_SearchService((*itServ).Type());
+        if (pServ != 0)
+        {
+            insert_into2sUnique( *pServ,
+                                 service_2s_IncludingServices,
+                                 i_includingServicesId
+                               );
+            recursive_AssignIncludingService(i_includingServicesId, *pServ);
+
+        }   // end if
+
+        assignImplementation_toAServicesInterfaces( i_includingServicesId,
+                                                    lhf_Search_CeFromTypeId( (*itServ).Type() ),
+                                                    interface_2s_ExportingServices );
+    }   // end for
+}
+
+void
+SecondariesCalculator::assign_AsDerivedInterface( const Interface & i_rDerived )
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        pHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(pHelp, i_rDerived);
+
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *pHelp;
+          it.operator bool();
+          ++it )
+    {
+        Interface *
+            pIfc = lhf_SearchInterface( (*it).Type() );
+        if (pIfc == 0)
+            continue;
+
+        insert_into2sList( *pIfc,
+                           interface_2s_Derivations,
+                           i_rDerived.CeId() );
+    }   // end for
+}
+
+void
+SecondariesCalculator::assign_AsDerivedStruct( const Struct &   i_rDerived )
+{
+    Type_id
+        nBase = i_rDerived.Base();
+    if (nBase.IsValid())
+    {
+        Struct *
+            pParent = lhf_SearchStruct(nBase);
+        if (pParent != 0)
+        {
+            insert_into2sList( *pParent,
+                               struct_2s_Derivations,
+                               i_rDerived.CeId() );
+        }
+    }
+}
+
+void
+SecondariesCalculator::assign_AsDerivedException( const Exception &   i_rDerived )
+{
+    Type_id
+        nBase = i_rDerived.Base();
+    if (nBase.IsValid())
+    {
+        Exception *
+            pParent = lhf_SearchException(nBase);
+        if (pParent != 0)
+        {
+            insert_into2sList( *pParent,
+                               exception_2s_Derivations,
+                               i_rDerived.CeId() );
+        }   // end if
+    }   // end if
+}
+
+void
+SecondariesCalculator::assignImplementation_toAServicesInterfaces(
+                                                    Ce_id               i_nImpl,
+                                                    Ce_id               i_nService,
+                                                    E_2s_of_Interface   i_eList )
+{
+    if (NOT i_nService.IsValid())
+        return;
+    Service *
+        pService = ary_cast<Service>( & my_CeStorage()[i_nService] );
+    SglIfcService *
+        pSglIfcService = ary_cast<SglIfcService>( & my_CeStorage()[i_nService] );
+
+    if (pService != 0)
+    {
+        Dyn_StdConstIterator<CommentedRelation>
+            pSupportedInterfaces;
+        pService->Get_SupportedInterfaces(pSupportedInterfaces);
+
+        for ( StdConstIterator<CommentedRelation> &
+                    itInfc = *pSupportedInterfaces;
+              itInfc.operator bool();
+              ++itInfc )
+        {
+            recursive_AssignImplementation_toExportedInterface( i_nImpl,
+                                                                (*itInfc).Type(),
+                                                                i_eList );
+        }   // end for
+    }
+    else if (pSglIfcService != 0)
+    {
+        Type_id nBase = pSglIfcService->BaseInterface();
+        recursive_AssignImplementation_toExportedInterface( i_nImpl,
+                                                            nBase,
+                                                            i_eList );
+    }   // end if
+}
+
+void
+SecondariesCalculator::recursive_AssignImplementation_toExportedInterface(
+                                                    Ce_id               i_nService,
+                                                    Type_id             i_nExportedInterface,
+                                                    E_2s_of_Interface   i_eList )
+{
+    Interface *
+        pIfc = lhf_SearchInterface(i_nExportedInterface);
+    if (pIfc == 0)
+        return;
+
+    insert_into2sUnique( *pIfc,
+                         i_eList,
+                         i_nService );
+    Dyn_StdConstIterator<CommentedRelation>
+        pBases;
+    ary::idl::ifc_interface::attr::Get_Bases(pBases, *pIfc);
+    for ( StdConstIterator<CommentedRelation> & it = *pBases;
+          it.operator bool();
+          ++it )
+    {
+        recursive_AssignImplementation_toExportedInterface(i_nService, (*it).Type(), i_eList);
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignFunction_toCeAsReturn( Ce_id         i_nFunction,
+                                                              Type_id       i_nReturnType )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_nReturnType);
+    if (NOT nCe.IsValid())
+        return;
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_AsReturns,
+                                       i_nFunction );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_AsReturns,
+                                       i_nFunction );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_AsReturns,
+                                       i_nFunction );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_AsReturns,
+                                       i_nFunction );
+                    recursive_AssignFunction_toCeAsReturn( i_nFunction,
+                                                           static_cast< Typedef& >(rCe).DefiningType() );
+                    break;
+        // default: do nothing.
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignFunction_toCeAsParameter( Ce_id      i_nFunction,
+                                                                 Type_id    i_nParameterType )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_nParameterType);
+    if (NOT nCe.IsValid())
+        return;
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_AsParameters,
+                                       i_nFunction );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_AsParameters,
+                                       i_nFunction );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_AsParameters,
+                                       i_nFunction );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_AsParameters,
+                                       i_nFunction );
+                    recursive_AssignFunction_toCeAsParameter( i_nFunction,
+                                                              static_cast< Typedef& >(rCe).DefiningType() );
+                    break;
+        // default: do nothing.
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignStructElement_toCeAsDataType( Ce_id   i_nDataElement,
+                                                                     Type_id i_nDataType )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_nDataType);
+    if (NOT nCe.IsValid())
+        return;
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_AsDataTypes,
+                                       i_nDataElement );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_AsDataTypes,
+                                       i_nDataElement );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_AsDataTypes,
+                                       i_nDataElement );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_AsDataTypes,
+                                       i_nDataElement );
+                    recursive_AssignFunction_toCeAsParameter( i_nDataElement,
+                                                              static_cast< Typedef& >(rCe).DefiningType() );
+                    break;
+        // default: do nothing.
+    }   // end switch
+}
+
+void
+SecondariesCalculator::insert_into2sUnique( CodeEntity &        o_out,
+                                            int                 i_listIndex,
+                                            Ce_id               i_nCe )
+{
+    std::vector<Ce_id> &
+        rOut = o_out.Secondaries().Access_List(i_listIndex);
+    if (std::find(rOut.begin(),rOut.end(),i_nCe) != rOut.end())
+        return;
+    rOut.push_back(i_nCe);
+}
+
+void
+SecondariesCalculator::sort_All2s()
+{
+    OrderCeIdsByName
+        aIdOrdering(my_CeStorage());
+
+    for ( stg_iterator it = my_CeStorage().Begin();
+          it != my_CeStorage().End();
+          ++it )
+    {
+        Ce_2s &
+            r2s = (*it).Secondaries();
+        int iCount = r2s.CountXrefLists();
+        for (int i = 0; i < iCount; ++i)
+        {
+            std::sort( r2s.Access_List(i).begin(),
+                       r2s.Access_List(i).end(),
+                       aIdOrdering );
+        }   // end for (i)
+    }   // end for (it)
+}
+
+void
+SecondariesCalculator::Read_Links2DevManual( csv::bstream & i_file )
+{
+    StreamLock  aLine(300);
+    StreamStr & rLine = aLine();
+
+
+    String      sCurLink;
+    String      sCurLinkUI;
+    E_LinkMode  eCurMode = link2ref;
+
+    int lineCount = 0;
+    const char * sLink = "LINK:";
+    const char * sDescr = "DESCR:";
+    const char * sTopic = "TOPIC:";
+    const char * sRef = "REF:";
+    const UINT8  cMaxASCIINumWhiteSpace = 32;
+
+    while (NOT i_file.eod())
+    {
+        ++lineCount;
+
+        rLine.reset();
+        rLine.operator_read_line(i_file);
+
+        if ( *rLine.c_str() >= 'a' )
+        {
+            assign_CurLink(rLine.begin(), sCurLink, sCurLinkUI, eCurMode == link2descr, lineCount);
+        }
+        else if ( strncmp(rLine.c_str(), sLink, strlen(sLink)) == 0 )
+        {
+            sCurLink = rLine.c_str()+5;
+            sCurLinkUI.clear();
+        }
+        else if ( strncmp(rLine.c_str(), sDescr, strlen(sDescr)) == 0 )
+        {
+            sCurLinkUI = rLine.c_str()+6;
+        }
+        else if ( strncmp(rLine.c_str(), sTopic, strlen(sTopic)) == 0 )
+        {
+            eCurMode = link2descr;
+        }
+        else if ( strncmp(rLine.c_str(), sRef, strlen(sRef)) == 0 )
+        {
+            eCurMode = link2ref;
+        }
+        else if (static_cast<UINT8>(*rLine.c_str()) > cMaxASCIINumWhiteSpace)
+        {
+            assign_CurLink(rLine.begin(), sCurLink, sCurLinkUI, eCurMode == link2descr, lineCount);
+        }
+     // else
+        //  Ignore empty line.
+
+    }   // end while
+}
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/i2s_calculator.hxx b/autodoc/source/ary/idl/i2s_calculator.hxx
new file mode 100644
index 000000000000..2ebde4d9400c
--- /dev/null
+++ b/autodoc/source/ary/idl/i2s_calculator.hxx
@@ -0,0 +1,295 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I2S_CALCULATOR_HXX
+#define ARY_IDL_I2S_CALCULATOR_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+    class CeAdmin;
+    class Ce_Storage;
+    class TypeAdmin;
+    class Type_Storage;
+    class Module;
+    class ExplicitType;
+    class Function;
+    class Interface;
+    class Property;
+    class Typedef;
+    class Service;
+    class Singleton;
+    class SglIfcService;
+    class SglIfcSingleton;
+    class Struct;
+    class StructElement;
+    class Exception;
+    class Ce_2s;
+}
+}
+
+
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+enum E_2s_of_Service
+{
+    service_2s_IncludingServices,
+    service_2s_InstantiatingSingletons
+};
+
+enum E_2s_of_Interface
+{
+    interface_2s_Derivations,
+    interface_2s_ExportingServices,
+    interface_2s_ExportingSingletons,
+    interface_2s_SynonymTypedefs,
+//    interface_2s_UsingTypedefs,
+    interface_2s_AsReturns,
+//    interface_2s_AsIndirectReturns,
+    interface_2s_AsParameters,
+//    interface_2s_AsIndirectParameters,
+    interface_2s_AsDataTypes
+};
+
+enum E_2s_of_Struct
+{
+    struct_2s_Derivations,
+    struct_2s_SynonymTypedefs,
+//    struct_2s_UsingTypedefs,
+    struct_2s_AsReturns,
+//    struct_2s_AsIndirectReturns,
+    struct_2s_AsParameters,
+//    struct_2s_AsIndirectParameters,
+    struct_2s_AsDataTypes
+};
+
+enum E_2s_of_Enum
+{
+    enum_2s_SynonymTypedefs,
+//    enum_2s_UsingTypedefs,
+    enum_2s_AsReturns,
+//    enum_2s_AsIndirectReturns,
+    enum_2s_AsParameters,
+//    enum_2s_AsIndirectParameters,
+    enum_2s_AsDataTypes
+};
+
+enum E_2s_of_Typedef
+{
+    typedef_2s_SynonymTypedefs,
+//    typedef_2s_UsingTypedefs,
+    typedef_2s_AsReturns,
+//    typedef_2s_AsIndirectReturns,
+    typedef_2s_AsParameters,
+//    typedef_2s_AsIndirectParameters,
+    typedef_2s_AsDataTypes
+};
+
+enum E_2s_of_Exceptions
+{
+    exception_2s_Derivations,
+    exception_2s_RaisingFunctions
+};
+
+
+
+class SPInst_asHost :   public csv::ProcessorIfc,
+                        public csv::ConstProcessor<Service>,
+                        public csv::ConstProcessor<Interface>,
+                        public csv::ConstProcessor<Struct>,
+                        public csv::ConstProcessor<Exception>,
+                        public csv::ConstProcessor<Typedef>,
+                        public csv::ConstProcessor<Singleton>,
+                        public csv::ConstProcessor<Function>,
+                        public csv::ConstProcessor<StructElement>,
+                        public csv::ConstProcessor<Property>,
+                        public csv::ConstProcessor<SglIfcService>,
+                        public csv::ConstProcessor<SglIfcSingleton>
+{
+};
+
+
+
+
+/** This class scans the parsed data and produces several
+    secondary data like cross references and alphabetical indices.
+
+    In this declaration "Secondaries" or "2s" mean those secondary data.
+
+    @see Ce_2s
+*/
+class SecondariesCalculator : public SPInst_asHost
+{
+  public:
+    // LIFECYCLE
+                        SecondariesCalculator(
+                            CeAdmin &           i_ces,
+                            TypeAdmin &         i_types );
+    virtual             ~SecondariesCalculator();
+
+    // OPERATIONS
+    void                CheckAllInterfaceBases();
+    void                Connect_Types2Ces();
+    void                Gather_CrossReferences();
+    void                Make_Links2DeveloperManual(
+                            const String &      i_devman_reffilepath );
+
+  private:
+    // Interface CeHost These are the points to gather cross
+    //   references:
+    virtual void        do_Process(
+                            const Service &     i_rData );
+    virtual void        do_Process(
+                            const Interface &   i_rData );
+    virtual void        do_Process(
+                            const Struct &      i_rData );
+    virtual void        do_Process(
+                            const Exception &   i_rData );
+    virtual void        do_Process(
+                            const Typedef &     i_rData );
+    virtual void        do_Process(
+                            const Singleton &   i_rData );
+    virtual void        do_Process(
+                            const Function &    i_rData );
+    virtual void        do_Process(
+                            const StructElement &
+                                                i_rData );
+    virtual void        do_Process(
+                            const Property &    i_rData );
+    virtual void        do_Process(
+                            const SglIfcService &
+                                                i_rData );
+    virtual void        do_Process(
+                            const SglIfcSingleton &
+                                                i_rData );
+
+    // Locals
+    const Ce_Storage &  my_CeStorage() const;
+    const Type_Storage &
+                        my_TypeStorage() const;
+    Ce_Storage &        my_CeStorage();
+    Type_Storage &      my_TypeStorage();
+
+    template <class DEST>
+    DEST *              SearchCe4Type(
+                            Type_id             i_type );
+    Ce_id               lhf_Search_CeForType(
+                            const ExplicitType &
+                                                i_rType ) const;
+    Ce_id               lhf_Search_CeFromTypeId(
+                            Type_id             i_nType ) const;
+    Service *           lhf_SearchService(
+                            Type_id             i_nServ );
+    Interface *         lhf_SearchInterface(
+                            Type_id             i_nIfc );
+    Struct *            lhf_SearchStruct(
+                            Type_id             i_nIfc );
+    Exception *         lhf_SearchException(
+                            Type_id             i_nIfc );
+    void                assign_CurLink(
+                            char *              i_text,
+                            const String &      i_link,
+                            const String &      i_linkUI,
+                            bool                i_isDescr,      /// @descr true: description, false: reference.
+                            int                 i_lineCount  );
+    void                gather_Synonyms();
+    void                recursive_AssignAsSynonym(
+                            Ce_id               i_synonymousTypedefsId,
+                            const Typedef &     i_TypedefToCheck );
+    void                recursive_AssignIncludingService(
+                            Ce_id               i_includingServicesId,
+                            const Service &     i_ServiceToCheckItsIncludes );
+    void                assign_AsDerivedInterface(
+                            const Interface &   i_rDerived );
+    void                assign_AsDerivedStruct(
+                            const Struct &      i_rDerived );
+    void                assign_AsDerivedException(
+                            const Exception &   i_rDerived );
+    void                assignImplementation_toAServicesInterfaces(
+                            Ce_id               i_nImpl,
+                            Ce_id               i_nService,
+                            E_2s_of_Interface   i_eList );
+    void                recursive_AssignImplementation_toExportedInterface(
+                            Ce_id               i_nService,
+                            Type_id             i_nExportedInterface,
+                            E_2s_of_Interface   i_eList );
+    void                recursive_AssignFunction_toCeAsReturn(
+                            Ce_id               i_nFunction,
+                            Type_id             i_nReturnType );
+    void                recursive_AssignFunction_toCeAsParameter(
+                            Ce_id               i_nFunction,
+                            Type_id             i_nParameterType );
+
+    /** @param i_nDataElement
+        May be the ID of an struct element as well as an exception element
+        or a property.
+    */
+    void                recursive_AssignStructElement_toCeAsDataType(
+                            Ce_id               i_nDataElement,
+                            Type_id             i_nDataType );
+    void                insert_into2sList(
+                            CodeEntity &        o_out,
+                            int                 i_listIndex,
+                            Ce_id               i_nCe );
+    void                insert_into2sUnique(
+                            CodeEntity &        o_out,
+                            int                 i_listIndex,
+                            Ce_id               i_nCe );
+    /// Sorts secondary production lists alphabetical.
+    void                sort_All2s();
+
+    void                Read_Links2DevManual(
+                            csv::bstream &      i_file );
+
+    // DATA
+    CeAdmin *           pCes;
+    TypeAdmin *         pTypes;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/i_attribute.cxx b/autodoc/source/ary/idl/i_attribute.cxx
new file mode 100644
index 000000000000..ec78a58bd758
--- /dev/null
+++ b/autodoc/source/ary/idl/i_attribute.cxx
@@ -0,0 +1,159 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_attribute.hxx>
+#include <ary/idl/ik_attribute.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/getncast.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Attribute::Attribute( const String &      i_sName,
+                      Ce_id               i_nService,
+                      Ce_id               i_nModule,
+                      Type_id             i_nType,
+                      bool                i_bReadonly,
+                      bool                i_bBound )
+    :   sName(i_sName),
+        nOwner(i_nService),
+        nNameRoom(i_nModule),
+        nType(i_nType),
+        aGetExceptions(),
+        aSetExceptions(),
+        bReadonly(i_bReadonly),
+        bBound(i_bBound)
+{
+}
+
+Attribute::~Attribute()
+{
+}
+
+
+void
+Attribute::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Attribute::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Attribute::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Attribute::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Attribute::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Attribute::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+namespace ifc_attribute
+{
+
+inline const Attribute &
+attribute_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( is_type<Attribute>(i_ce) );
+    return static_cast< const Attribute& >(i_ce);
+}
+
+bool
+attr::HasAnyStereotype( const CodeEntity & i_ce )
+{
+    const Attribute & rAttr = attribute_cast(i_ce);
+    return rAttr.bReadonly OR rAttr.bBound;
+}
+
+bool
+attr::IsReadOnly( const CodeEntity & i_ce )
+{
+    return attribute_cast(i_ce).bReadonly;
+}
+
+bool
+attr::IsBound( const CodeEntity & i_ce )
+{
+    return attribute_cast(i_ce).bBound;
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return attribute_cast(i_ce).nType;
+}
+
+void
+attr::Get_GetExceptions( Dyn_TypeIterator &  o_result,
+                         const CodeEntity &  i_ce )
+{
+    o_result
+        = new SCI_Vector<Type_id>( attribute_cast(i_ce).aGetExceptions );
+}
+
+void
+attr::Get_SetExceptions( Dyn_TypeIterator &  o_result,
+                         const CodeEntity &  i_ce )
+{
+    o_result
+        = new SCI_Vector<Type_id>( attribute_cast(i_ce).aSetExceptions );
+}
+
+
+} // namespace ifc_attribute
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_ce.cxx b/autodoc/source/ary/idl/i_ce.cxx
new file mode 100644
index 000000000000..783e3a9b93f7
--- /dev/null
+++ b/autodoc/source/ary/idl/i_ce.cxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_ce.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/getncast.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace
+{
+    const Ce_2s aConstCe2sDummy;
+}
+
+
+
+CodeEntity::CodeEntity()
+    :   aDocu(),
+        p2s(0)
+{
+}
+
+CodeEntity::~CodeEntity()
+{
+}
+
+const Ce_2s &
+CodeEntity::Secondaries() const
+{
+    if (p2s)
+        return *p2s;
+    return aConstCe2sDummy;
+}
+
+Ce_2s &
+CodeEntity::Secondaries()
+{
+    if (p2s)
+        return *p2s;
+    p2s = Ce_2s::Create_(AryClass());
+    return *p2s;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/i_ce2s.cxx b/autodoc/source/ary/idl/i_ce2s.cxx
new file mode 100644
index 000000000000..0898b7867086
--- /dev/null
+++ b/autodoc/source/ary/idl/i_ce2s.cxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_ce.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/getncast.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace
+{
+const std::vector<Ce_id> C_sNullVector_Ce_ids;
+}
+
+
+Ce_2s::~Ce_2s()
+{
+    csv::erase_container_of_heap_ptrs(aXrefLists);
+}
+
+DYN Ce_2s *
+Ce_2s::Create_( ClassId )
+{
+    return new Ce_2s;
+}
+
+
+std::vector<Ce_id> &
+Ce_2s::Access_List( int i_indexOfList )
+{
+    csv_assert(i_indexOfList >= 0 AND i_indexOfList < 1000);
+
+    while (i_indexOfList >= (int) aXrefLists.size())
+    {
+        aXrefLists.push_back(new std::vector<Ce_id>);
+    }
+    return *aXrefLists[i_indexOfList];
+}
+
+const std::vector<Ce_id> &
+Ce_2s::List( int i_indexOfList ) const
+{
+    if (uintt(i_indexOfList) < aXrefLists.size())
+        return *aXrefLists[i_indexOfList];
+    else
+        return C_sNullVector_Ce_ids;
+}
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/i_comrela.cxx b/autodoc/source/ary/idl/i_comrela.cxx
new file mode 100644
index 000000000000..8f5d164b5479
--- /dev/null
+++ b/autodoc/source/ary/idl/i_comrela.cxx
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_comrela.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+// KORR_FUTURE Currently unneeded file. May become useful later.
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_constant.cxx b/autodoc/source/ary/idl/i_constant.cxx
new file mode 100644
index 000000000000..ac6a7124935f
--- /dev/null
+++ b/autodoc/source/ary/idl/i_constant.cxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_constant.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_constant.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+Constant::Constant( const String &      i_sName,
+                    Ce_id               i_nOwner,
+                    Ce_id               i_nNameRoom,
+                    Type_id             i_nType,
+                    const String &      i_sInitValue )
+    :   sName(i_sName),
+        nNameRoom(i_nNameRoom),
+        nOwner(i_nOwner),
+        nType(i_nType),
+        sInitValue(i_sInitValue)
+{
+}
+
+Constant::~Constant()
+{
+}
+
+void
+Constant::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+
+ClassId
+Constant::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Constant::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Constant::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Constant::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Constant::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+namespace ifc_constant
+{
+
+inline const Constant &
+constant_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Constant::class_id );
+    return static_cast< const Constant& >(i_ce);
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return constant_cast(i_ce).nType;
+}
+
+const String &
+attr::Value( const CodeEntity & i_ce )
+{
+    return constant_cast(i_ce).sInitValue;
+}
+
+} // namespace ifc_constant
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_constgroup.cxx b/autodoc/source/ary/idl/i_constgroup.cxx
new file mode 100644
index 000000000000..434b054ea3f1
--- /dev/null
+++ b/autodoc/source/ary/idl/i_constgroup.cxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/ik_constgroup.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+ConstantsGroup::ConstantsGroup( const String &      i_sName,
+                                Ce_id               i_nModule )
+    :   sName(i_sName),
+        nModule(i_nModule),
+        aConstants()
+{
+}
+
+ConstantsGroup::~ConstantsGroup()
+{
+}
+
+void
+ConstantsGroup::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+ConstantsGroup::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+ConstantsGroup::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+ConstantsGroup::inq_NameRoom() const
+{
+    return nModule;
+}
+
+Ce_id
+ConstantsGroup::inq_Owner() const
+{
+    return nModule;
+}
+
+E_SightLevel
+ConstantsGroup::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_constgroup
+{
+
+inline const ConstantsGroup &
+constgroup_cast( const CodeEntity & i_ce )
+{
+    csv_assert( i_ce.AryClass() == ConstantsGroup::class_id );
+    return static_cast< const ConstantsGroup& >(i_ce);
+}
+
+void
+attr::Get_Constants( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(constgroup_cast(i_ce).aConstants);
+}
+
+} // namespace ifc_constgroup
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_enum.cxx b/autodoc/source/ary/idl/i_enum.cxx
new file mode 100644
index 000000000000..30ee8e39e146
--- /dev/null
+++ b/autodoc/source/ary/idl/i_enum.cxx
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/ik_enum.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+Enum::Enum( const String &      i_sName,
+            Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        aValues()
+{
+}
+
+Enum::~Enum()
+{
+}
+
+void
+Enum::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Enum::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Enum::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Enum::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Enum::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Enum::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_enum
+{
+
+inline const Enum &
+enum_cast( const CodeEntity & i_ce )
+{
+    csv_assert( i_ce.AryClass() == Enum::class_id );
+    return static_cast< const Enum& >(i_ce);
+}
+
+void
+attr::Get_Values( Dyn_CeIterator &    o_result,
+                  const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(enum_cast(i_ce).aValues);
+}
+
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_AsDataTypes));
+}
+
+} // namespace ifc_enum
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_enumvalue.cxx b/autodoc/source/ary/idl/i_enumvalue.cxx
new file mode 100644
index 000000000000..7ee139f9ba4c
--- /dev/null
+++ b/autodoc/source/ary/idl/i_enumvalue.cxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_enumvalue.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_enumvalue.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+EnumValue::EnumValue( const String &      i_sName,
+                      Ce_id               i_nOwner,
+                      Ce_id               i_nNameRoom,
+                      const String &      i_sInitValue )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        sValue(i_sInitValue)
+{
+}
+
+EnumValue::~EnumValue()
+{
+}
+
+void
+EnumValue::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+EnumValue::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+EnumValue::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+EnumValue::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+EnumValue::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+EnumValue::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+
+namespace ifc_enumvalue
+{
+
+inline const EnumValue &
+enumvalue_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == EnumValue::class_id );
+    return static_cast< const EnumValue& >(i_ce);
+}
+
+const String &
+attr::Value( const CodeEntity & i_ce )
+{
+    return enumvalue_cast(i_ce).sValue;
+}
+
+
+} // namespace ifc_enumvalue
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_exception.cxx b/autodoc/source/ary/idl/i_exception.cxx
new file mode 100644
index 000000000000..cf98da1719a7
--- /dev/null
+++ b/autodoc/source/ary/idl/i_exception.cxx
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/ik_exception.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+Exception::Exception( const String &      i_sName,
+                      Ce_id               i_nOwner,
+                      Type_id             i_nBase )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBase(i_nBase),
+        aElements()
+{
+}
+
+Exception::~Exception()
+{
+}
+
+void
+Exception::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Exception::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Exception::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Exception::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Exception::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Exception::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_exception
+{
+
+inline const Exception &
+exception_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Exception::class_id );
+    return static_cast< const Exception& >(i_ce);
+}
+
+Type_id
+attr::Base( const CodeEntity & i_ce )
+{
+    return exception_cast(i_ce).nBase;
+}
+
+void
+attr::Get_Elements( Dyn_CeIterator &    o_result,
+                    const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( exception_cast(i_ce).aElements );
+}
+
+
+void
+xref::Get_Derivations( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(exception_2s_Derivations));
+}
+
+void
+xref::Get_RaisingFunctions( Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(exception_2s_RaisingFunctions));
+}
+
+
+} // namespace ifc_exception
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_function.cxx b/autodoc/source/ary/idl/i_function.cxx
new file mode 100644
index 000000000000..141ebb084c32
--- /dev/null
+++ b/autodoc/source/ary/idl/i_function.cxx
@@ -0,0 +1,165 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_function.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+Function::Function( const String &      i_sName,
+                    Ce_id               i_nOwner,
+                    Ce_id               i_nNameRoom,
+                    Type_id             i_nReturnType,
+                    bool                i_bOneWay )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        nReturnType(i_nReturnType),
+        aParameters(),
+        aExceptions(),
+        bOneWay(i_bOneWay),
+        bEllipse(false)
+{
+}
+
+Function::Function( const String &      i_sName,
+                    Ce_id               i_nOwner,
+                    Ce_id               i_nNameRoom )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        nReturnType(0),
+        aParameters(),
+        aExceptions(),
+        bOneWay(false),
+        bEllipse(false)
+{
+}
+
+Function::~Function()
+{
+}
+
+void
+Function::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Function::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Function::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Function::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Function::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Function::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+namespace ifc_function
+{
+
+inline const Function &
+function_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Function::class_id );
+    return static_cast< const Function& >(i_ce);
+}
+
+Type_id
+attr::ReturnType( const CodeEntity & i_ce )
+{
+    return function_cast(i_ce).nReturnType;
+}
+
+bool
+attr::IsOneway( const CodeEntity & i_ce )
+{
+    return function_cast(i_ce).bOneWay;
+}
+
+bool
+attr::HasEllipse( const CodeEntity & i_ce )
+{
+    return function_cast(i_ce).bEllipse;
+}
+
+void
+attr::Get_Parameters( Dyn_StdConstIterator<ary::idl::Parameter> & o_result,
+                      const CodeEntity &                          i_ce )
+{
+    o_result
+        = new SCI_Vector<Parameter>( function_cast(i_ce).aParameters );
+}
+
+void
+attr::Get_Exceptions( Dyn_TypeIterator &  o_result,
+                      const CodeEntity &  i_ce )
+{
+    o_result
+        = new SCI_Vector<Type_id>( function_cast(i_ce).aExceptions );
+}
+
+
+
+
+
+}   // namespace ifc_function
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_interface.cxx b/autodoc/source/ary/idl/i_interface.cxx
new file mode 100644
index 000000000000..4e4b61a071eb
--- /dev/null
+++ b/autodoc/source/ary/idl/i_interface.cxx
@@ -0,0 +1,196 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_interface.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+class Interface_2s
+{
+};
+
+
+Interface::Interface( const String &      i_sName,
+                      Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        aBases(),
+        aFunctions(),
+        aAttributes(),
+        p2s()
+{
+}
+
+Interface::~Interface()
+{
+    for ( RelationList::iterator it = aBases.begin();
+          it != aBases.end();
+          ++it )
+    {
+        delete (*it).Info();
+    }
+}
+
+void
+Interface::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Interface::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Interface::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Interface::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Interface::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Interface::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_interface
+{
+
+inline const Interface &
+interface_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Interface::class_id );
+    return static_cast< const Interface& >(i_ce);
+}
+
+void
+attr::Get_Bases( Dyn_StdConstIterator<CommentedRelation> &     o_result,
+                 const CodeEntity &                             i_ce )
+{
+    o_result = new SCI_Vector<CommentedRelation>(interface_cast(i_ce).aBases);
+}
+
+void
+attr::Get_Functions( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(interface_cast(i_ce).aFunctions);
+}
+
+void
+attr::Get_Attributes( Dyn_CeIterator &    o_result,
+                      const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(interface_cast(i_ce).aAttributes);
+}
+
+void
+xref::Get_Derivations( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_Derivations));
+}
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_ExportingServices( Dyn_CeIterator &    o_result,
+                             const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_ExportingServices));
+}
+
+void
+xref::Get_ExportingSingletons( Dyn_CeIterator &    o_result,
+                               const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_ExportingSingletons));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_AsDataTypes));
+}
+
+
+
+
+}   // namespace ifc_interface
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_module.cxx b/autodoc/source/ary/idl/i_module.cxx
new file mode 100644
index 000000000000..b5b7453fa3b0
--- /dev/null
+++ b/autodoc/source/ary/idl/i_module.cxx
@@ -0,0 +1,204 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ik_module.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <nametreenode.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+Module::Module()
+    :   pImpl( new NameTreeNode<Ce_id> )
+{
+}
+
+Module::Module( const String &      i_sName,
+                const Module &      i_rParent )
+    :   pImpl( new NameTreeNode<Ce_id>( i_sName,
+                                        *i_rParent.pImpl,
+                                        i_rParent.CeId() ) )
+{
+}
+
+Module::~Module()
+{
+}
+
+void
+Module::Add_Name( const String &    i_sName,
+                  Ce_id             i_nCodeEntity )
+{
+    pImpl->Add_Name(i_sName, i_nCodeEntity);
+}
+
+Ce_id
+Module::Search_Name( const String & i_sName ) const
+{
+    return pImpl->Search_Name(i_sName);
+}
+
+void
+Module::Get_Names( Dyn_StdConstIterator<Ce_id> & o_rResult ) const
+{
+    pImpl->Get_Names( o_rResult );
+}
+
+void
+Module::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Module::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Module::inq_LocalName() const
+{
+    return pImpl->Name();
+}
+
+Ce_id
+Module::inq_NameRoom() const
+{
+    return pImpl->Parent();
+}
+
+Ce_id
+Module::inq_Owner() const
+{
+    return pImpl->Parent();
+}
+
+E_SightLevel
+Module::inq_SightLevel() const
+{
+    return sl_Module;
+}
+
+
+namespace ifc_module
+{
+
+inline const Module &
+module_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Module::class_id );
+    return static_cast< const Module& >(i_ce);
+}
+
+typedef NameTreeNode<Ce_id>::Map_LocalNames NameMap;
+
+void
+attr::Get_AllChildrenSeparated( std::vector< const CodeEntity* > & o_nestedModules,
+                                std::vector< const CodeEntity* > & o_services,
+                                std::vector< const CodeEntity* > & o_interfaces,
+                                std::vector< const CodeEntity* > & o_structs,
+                                std::vector< const CodeEntity* > & o_exceptions,
+                                std::vector< const CodeEntity* > & o_enums,
+                                std::vector< const CodeEntity* > & o_typedefs,
+                                std::vector< const CodeEntity* > & o_constantGroups,
+                                std::vector< const CodeEntity* > & o_singletons,
+                                const CePilot &                    i_pilot,
+                                const CodeEntity &                 i_ce )
+{
+    const CodeEntity *
+        pCe = 0;
+    NameMap::const_iterator
+        itEnd = module_cast(i_ce).pImpl->LocalNames().end();
+    for ( NameMap::const_iterator
+            it = module_cast(i_ce).pImpl->LocalNames().begin();
+          it != itEnd;
+          ++it )
+    {
+        pCe = &i_pilot.Find_Ce( (*it).second );
+        switch (pCe->AryClass())
+        {
+            case Module::class_id:
+                        o_nestedModules.push_back(pCe);
+                        break;
+            case SglIfcService::class_id:
+            case Service::class_id:
+                        o_services.push_back(pCe);
+                        break;
+            case Interface::class_id:
+                        o_interfaces.push_back(pCe);
+                        break;
+            case Struct::class_id:
+                        o_structs.push_back(pCe);
+                        break;
+            case Exception::class_id:
+                        o_exceptions.push_back(pCe);
+                        break;
+            case Enum::class_id:
+                        o_enums.push_back(pCe);
+                        break;
+            case Typedef::class_id:
+                        o_typedefs.push_back(pCe);
+                        break;
+            case ConstantsGroup::class_id:
+                        o_constantGroups.push_back(pCe);
+                        break;
+            case SglIfcSingleton::class_id:
+            case Singleton::class_id:
+                        o_singletons.push_back(pCe);
+                        break;
+        }
+    }   // end for
+}
+
+
+} // namespace ifc_module
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_namelookup.cxx b/autodoc/source/ary/idl/i_namelookup.cxx
new file mode 100644
index 000000000000..5b07d5a73c16
--- /dev/null
+++ b/autodoc/source/ary/idl/i_namelookup.cxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_namelookup.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <sci_impl.hxx>
+
+namespace ary
+{
+namespace idl
+{
+
+NameLookup::NameLookup()
+    :   aNames()
+{
+}
+
+NameLookup::~NameLookup()
+{
+}
+
+void
+NameLookup::Add_Name( const String &      i_name,
+                      Ce_id               i_id,
+                      ClassId             i_class,
+                      Ce_id               i_owner )
+{
+    aNames.insert( std::pair< const String, NameProperties>(
+                                   i_name,
+                                   NameProperties( i_id,
+                                                   i_class,
+                                                   i_owner )));
+}
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_nnfinder.hxx b/autodoc/source/ary/idl/i_nnfinder.hxx
new file mode 100644
index 000000000000..3355a5f89030
--- /dev/null
+++ b/autodoc/source/ary/idl/i_nnfinder.hxx
@@ -0,0 +1,118 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_NNFINDER_HXX
+#define ARY_IDL_NNFINDER_HXX
+
+// USED SERVICES
+#include "is_ce.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Gives context info for tree search functions.
+
+    @collab ->ary::Search_SubTree<>()
+    @collab ->ary::Search_SubTree_UpTillRoot<>()
+*/
+class Find_ModuleNode
+{
+  public:
+    typedef Ce_id                           id_type;
+    typedef StringVector::const_iterator    name_iterator;
+
+    // LIFECYCLE
+                        Find_ModuleNode(
+                            const Ce_Storage &  i_rStorage,
+                            name_iterator       it_begin,
+                            name_iterator       it_end,
+                            const String &      i_sName )
+                            :   rStorage(i_rStorage),
+                                itBegin(it_begin),
+                                itEnd(it_end),
+                                sName2Search(i_sName) { if (itBegin != itEnd ? (*itBegin).empty() : false) ++itBegin; }
+    // OPERATIONS
+    const Module *      operator()(
+                            id_type             i_id ) const
+                            { return i_id.IsValid()
+                                        ?   & ary_cast<Module>(rStorage[i_id])
+                                        :   0; }
+
+    name_iterator       Begin() const           { return itBegin; }
+    name_iterator       End() const             { return itEnd; }
+    const String &      Name2Search() const     { return sName2Search; }
+
+  private:
+    // DATA
+    const Ce_Storage &  rStorage;
+    name_iterator       itBegin;
+    name_iterator       itEnd;
+    String              sName2Search;
+};
+
+
+
+
+class Types_forSetCe_Id
+{
+  public:
+    typedef Ce_id                           element_type;
+    typedef Ce_Storage                      find_type;
+
+    //  KORR_FUTURE: Check, if this sorting is right or the ary standard
+    //  sorting should be used.
+    struct sort_type
+    {
+                        sort_type(
+                            const find_type &   i_rFinder )
+                                                : rFinder(i_rFinder) {}
+        bool            operator()(
+                            const element_type   &
+                                                i_r1,
+                            const element_type   &
+                                                i_r2 ) const
+        {
+            return rFinder[i_r1].LocalName()
+                   < rFinder[i_r2].LocalName();
+        }
+
+      private:
+        const find_type &     rFinder;
+
+    };
+};
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/i_param.cxx b/autodoc/source/ary/idl/i_param.cxx
new file mode 100644
index 000000000000..bdaadeee0964
--- /dev/null
+++ b/autodoc/source/ary/idl/i_param.cxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_param.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+Parameter::Parameter( const String &        i_sName,
+                      Type_id               i_nType,
+                      E_ParameterDirection  i_eDirection )
+    :   sName(i_sName),
+        nType(i_nType),
+        eDirection(i_eDirection)
+{
+}
+
+Parameter::~Parameter()
+{
+}
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_property.cxx b/autodoc/source/ary/idl/i_property.cxx
new file mode 100644
index 000000000000..852e06f4ced0
--- /dev/null
+++ b/autodoc/source/ary/idl/i_property.cxx
@@ -0,0 +1,171 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/ik_property.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Property::Property( const String &      i_sName,
+                    Ce_id               i_nService,
+                    Ce_id               i_nModule,
+                    Type_id             i_nType,
+                    Stereotypes         i_stereotypes )
+    :   sName(i_sName),
+        nOwner(i_nService),
+        nNameRoom(i_nModule),
+        nType(i_nType),
+        aStereotypes(i_stereotypes)
+{
+}
+
+Property::~Property()
+{
+}
+
+
+void
+Property::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Property::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Property::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Property::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Property::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Property::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+namespace ifc_property
+{
+
+inline const Property &
+property_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Property::class_id );
+    return static_cast< const Property& >(i_ce);
+}
+
+bool
+attr::HasAnyStereotype( const CodeEntity &  i_ce )
+{
+    return property_cast(i_ce).aStereotypes.HasAny();
+}
+
+bool
+attr::IsReadOnly( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsReadOnly();
+}
+
+bool
+attr::IsBound( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsBound();
+}
+
+bool
+attr::IsConstrained( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsConstrained();
+}
+
+bool
+attr::IsMayBeAmbiguous( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsMayBeAmbiguous();
+}
+
+bool
+attr::IsMayBeDefault( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsMayBeDefault();
+}
+
+bool
+attr::IsMayBeVoid( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsMayBeVoid();
+}
+
+bool
+attr::IsRemovable( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsRemovable();
+}
+
+bool
+attr::IsTransient( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsTransient();
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).nType;
+}
+
+} // namespace ifc_property
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_reposypart.cxx b/autodoc/source/ary/idl/i_reposypart.cxx
new file mode 100644
index 000000000000..c0edd33feeb7
--- /dev/null
+++ b/autodoc/source/ary/idl/i_reposypart.cxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "i_reposypart.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_namelookup.hxx>
+#include <idl_internalgate.hxx>
+#include "ia_ce.hxx"
+#include "ia_type.hxx"
+#include "i2s_calculator.hxx"
+#include "is_ce.hxx"
+#include "is_type.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+DYN InternalGate &
+InternalGate::Create_Partition_(RepositoryCenter & i_center)
+{
+    return *new RepositoryPartition(i_center);
+}
+
+
+
+RepositoryPartition::RepositoryPartition( RepositoryCenter & i_repository )
+    :   pCenter(&i_repository),
+        pCes(0),
+        pTypes(0),
+        pNamesDictionary(new NameLookup)
+{
+    pTypes = new TypeAdmin;
+    pCes = new CeAdmin(*pNamesDictionary, *pTypes);
+}
+
+RepositoryPartition::~RepositoryPartition()
+{
+}
+
+void
+RepositoryPartition::Calculate_AllSecondaryInformation(
+                            const String &      i_devman_reffilepath )
+{
+    // KORR_FUTURE
+    //  Forward the options from here.
+
+    SecondariesCalculator
+        secalc(*pCes,*pTypes);
+
+    secalc.CheckAllInterfaceBases();
+    secalc.Connect_Types2Ces();
+    secalc.Gather_CrossReferences();
+
+    if ( NOT i_devman_reffilepath.empty() )
+    {
+        secalc.Make_Links2DeveloperManual(i_devman_reffilepath);
+    }
+}
+
+const CePilot &
+RepositoryPartition::Ces() const
+{
+    return *pCes;
+}
+
+const TypePilot &
+RepositoryPartition::Types() const
+{
+    return *pTypes;
+}
+
+CePilot &
+RepositoryPartition::Ces()
+{
+    return *pCes;
+}
+
+TypePilot &
+RepositoryPartition::Types()
+{
+    return *pTypes;
+}
+
+
+
+}   //  namespace idl
+}   //  namespace ary
diff --git a/autodoc/source/ary/idl/i_reposypart.hxx b/autodoc/source/ary/idl/i_reposypart.hxx
new file mode 100644
index 000000000000..f28e1f1364d7
--- /dev/null
+++ b/autodoc/source/ary/idl/i_reposypart.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_I_REPOSYPART_HXX
+#define ARY_IDL_I_REPOSYPART_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <idl_internalgate.hxx>
+    // OTHER
+
+
+namespace ary
+{
+namespace idl
+{
+    class CeAdmin;
+    class TypeAdmin;
+    class NameLookup;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+/** The idl part of the Autodoc repository.
+*/
+class RepositoryPartition : public InternalGate
+{
+  public:
+    // LIFECYCLE
+                        RepositoryPartition(
+                            RepositoryCenter &  i_repository );
+                        ~RepositoryPartition();
+    // INHERITED
+        // Interface Gate:
+    virtual void        Calculate_AllSecondaryInformation(
+                            const String &      i_devman_reffilepath );
+//                            const ::autodoc::Options &
+//                                                i_options );
+    virtual const CePilot &
+                        Ces() const;
+    virtual const TypePilot &
+                        Types() const;
+    virtual CePilot &   Ces();
+    virtual TypePilot & Types();
+
+  private:
+    // DATA
+    RepositoryCenter *  pCenter;
+
+    Dyn<CeAdmin>        pCes;
+    Dyn<TypeAdmin>      pTypes;
+    Dyn<NameLookup>     pNamesDictionary;
+};
+
+
+
+
+}   //  namespace idl
+}   //  namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/i_service.cxx b/autodoc/source/ary/idl/i_service.cxx
new file mode 100644
index 000000000000..14eb20a1096d
--- /dev/null
+++ b/autodoc/source/ary/idl/i_service.cxx
@@ -0,0 +1,171 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_service.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_service.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+Service::Service( const String &      i_sName,
+                  Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        aIncludedServices(),
+        aSupportedInterfaces(),
+        aProperties()
+{
+}
+
+Service::~Service()
+{
+    for ( RelationList::iterator it = aIncludedServices.begin();
+          it != aIncludedServices.end();
+          ++it )
+    {
+        delete (*it).Info();
+    }
+
+    for ( RelationList::iterator it = aSupportedInterfaces.begin();
+          it != aSupportedInterfaces.end();
+          ++it )
+    {
+        delete (*it).Info();
+    }
+}
+
+void
+Service::Get_SupportedInterfaces( Dyn_StdConstIterator<CommentedRelation> & o_rResult ) const
+{
+    o_rResult = new SCI_Vector<CommentedRelation>(aSupportedInterfaces);
+}
+
+void
+Service::Get_IncludedServices( Dyn_StdConstIterator<CommentedRelation> & o_rResult ) const
+{
+    o_rResult = new SCI_Vector<CommentedRelation>(aIncludedServices);
+}
+
+void
+Service::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Service::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Service::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Service::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Service::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Service::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_service
+{
+
+inline const Service &
+service_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Service::class_id );
+    return static_cast< const Service& >(i_ce);
+}
+
+void
+attr::Get_IncludedServices( Dyn_StdConstIterator<CommentedRelation> & o_result,
+                            const CodeEntity &                        i_ce )
+{
+    o_result = new SCI_Vector<CommentedRelation>( service_cast(i_ce).aIncludedServices );
+}
+
+void
+attr::Get_ExportedInterfaces( Dyn_StdConstIterator<CommentedRelation> & o_result,
+                              const CodeEntity &                            i_ce )
+{
+    o_result = new SCI_Vector<CommentedRelation>( service_cast(i_ce).aSupportedInterfaces );
+}
+
+void
+attr::Get_Properties( Dyn_CeIterator &    o_result,
+                      const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( service_cast(i_ce).aProperties );
+}
+
+void
+xref::Get_IncludingServices( Dyn_CeIterator &    o_result,
+                             const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(service_2s_IncludingServices));
+}
+
+void
+xref::Get_InstantiatingSingletons( Dyn_CeIterator &    o_result,
+                                   const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(service_2s_InstantiatingSingletons));
+}
+
+
+} // namespace ifc_service
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_singleton.cxx b/autodoc/source/ary/idl/i_singleton.cxx
new file mode 100644
index 000000000000..fcc6ef580756
--- /dev/null
+++ b/autodoc/source/ary/idl/i_singleton.cxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_singleton.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_singleton.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+Singleton::Singleton( const String &      i_sName,
+                  Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nService()
+{
+}
+
+Singleton::~Singleton()
+{
+}
+
+void
+Singleton::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Singleton::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Singleton::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Singleton::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Singleton::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Singleton::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_singleton
+{
+
+inline const Singleton &
+singleton_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Singleton::class_id );
+    return static_cast< const Singleton& >(i_ce);
+}
+
+Type_id
+attr::AssociatedService( const CodeEntity & i_ce )
+{
+    return singleton_cast(i_ce).nService;
+}
+
+} // namespace ifc_singleton
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_siservice.cxx b/autodoc/source/ary/idl/i_siservice.cxx
new file mode 100644
index 000000000000..2aff0288cec3
--- /dev/null
+++ b/autodoc/source/ary/idl/i_siservice.cxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/ik_siservice.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+SglIfcService::SglIfcService( const String &      i_sName,
+                              Ce_id               i_nOwner,
+                              Type_id             i_nBaseInterface )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBaseInterface(i_nBaseInterface),
+        aConstructors()
+{
+}
+
+SglIfcService::~SglIfcService()
+{
+}
+
+void
+SglIfcService::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+SglIfcService::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+SglIfcService::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+SglIfcService::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+SglIfcService::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+SglIfcService::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_sglifcservice
+{
+
+inline const SglIfcService &
+sglifcservice_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == SglIfcService::class_id );
+    return static_cast< const SglIfcService& >(i_ce);
+}
+
+Type_id
+attr::BaseInterface( const CodeEntity & i_ce )
+{
+    return sglifcservice_cast(i_ce).nBaseInterface;
+}
+
+void
+attr::Get_Constructors( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( sglifcservice_cast(i_ce).aConstructors );
+}
+
+} // namespace ifc_sglifcservice
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_sisingleton.cxx b/autodoc/source/ary/idl/i_sisingleton.cxx
new file mode 100644
index 000000000000..d731f341153b
--- /dev/null
+++ b/autodoc/source/ary/idl/i_sisingleton.cxx
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_sisingleton.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_sisingleton.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+SglIfcSingleton::SglIfcSingleton( const String &      i_sName,
+                                  Ce_id               i_nOwner,
+                                  Type_id             i_nBaseInterface )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBaseInterface(i_nBaseInterface)
+{
+}
+
+SglIfcSingleton::~SglIfcSingleton()
+{
+}
+
+void
+SglIfcSingleton::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+SglIfcSingleton::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+SglIfcSingleton::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+SglIfcSingleton::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+SglIfcSingleton::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+SglIfcSingleton::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+namespace ifc_sglifcsingleton
+{
+
+inline const SglIfcSingleton &
+sglifcsingleton_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == SglIfcSingleton::class_id );
+    return static_cast< const SglIfcSingleton& >(i_ce);
+}
+
+Type_id
+attr::BaseInterface( const CodeEntity & i_ce )
+{
+    return sglifcsingleton_cast(i_ce).nBaseInterface;
+}
+
+
+} // namespace ifc_sglifcsingleton
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_struct.cxx b/autodoc/source/ary/idl/i_struct.cxx
new file mode 100644
index 000000000000..dfffa3522813
--- /dev/null
+++ b/autodoc/source/ary/idl/i_struct.cxx
@@ -0,0 +1,163 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/ik_struct.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+Struct::Struct( const String &      i_sName,
+                Ce_id               i_nOwner,
+                Type_id             i_nBase,
+                const String &      i_sTemplateParameter,
+                Type_id             i_nTemplateParameterType )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBase(i_nBase),
+        sTemplateParameter(i_sTemplateParameter),
+        nTemplateParameterType(i_nTemplateParameterType),
+        aElements()
+{
+}
+
+Struct::~Struct()
+{
+}
+
+void
+Struct::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Struct::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Struct::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Struct::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Struct::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Struct::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_struct
+{
+
+inline const Struct &
+struct_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Struct::class_id );
+    return static_cast< const Struct& >(i_ce);
+}
+
+Type_id
+attr::Base( const CodeEntity & i_ce )
+{
+    return struct_cast(i_ce).nBase;
+}
+
+void
+attr::Get_Elements( Dyn_CeIterator &    o_result,
+                    const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( struct_cast(i_ce).aElements );
+}
+
+
+void
+xref::Get_Derivations( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_Derivations));
+}
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_AsDataTypes));
+}
+
+} // namespace ifc_struct
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_structelem.cxx b/autodoc/source/ary/idl/i_structelem.cxx
new file mode 100644
index 000000000000..1a19d195f457
--- /dev/null
+++ b/autodoc/source/ary/idl/i_structelem.cxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/ik_structelem.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+StructElement::StructElement( const String &      i_sName,
+                              Ce_id               i_nOwner,
+                              Ce_id               i_nNameRoom,
+                              Type_id             i_nType )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        nType(i_nType)
+{
+}
+
+StructElement::~StructElement()
+{
+}
+
+void
+StructElement::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+StructElement::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+StructElement::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+StructElement::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+StructElement::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+StructElement::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+namespace ifc_structelement
+{
+
+inline const StructElement &
+selem_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == StructElement::class_id );
+    return static_cast< const StructElement& >(i_ce);
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return selem_cast(i_ce).nType;
+}
+
+} // namespace ifc_structelement
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/i_traits.cxx b/autodoc/source/ary/idl/i_traits.cxx
new file mode 100644
index 000000000000..1c12c5bc996f
--- /dev/null
+++ b/autodoc/source/ary/idl/i_traits.cxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_traits.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/namesort.hxx>
+#include "is_ce.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+//********************      Ce_Traits      ********************//
+Ce_Traits::entity_base_type &
+Ce_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Ce_Storage::Instance_()[i_id];
+}
+
+//********************      Ce_Compare      ********************//
+const Ce_Compare::key_type &
+Ce_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Ce_Compare::Lesser_( const key_type &    i_1,
+                     const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/i_typedef.cxx b/autodoc/source/ary/idl/i_typedef.cxx
new file mode 100644
index 000000000000..f33ef60921ca
--- /dev/null
+++ b/autodoc/source/ary/idl/i_typedef.cxx
@@ -0,0 +1,145 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/ik_typedef.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Typedef::Typedef( const String &      i_sName,
+                  Ce_id               i_nOwner,
+                  Type_id             i_nDefiningType )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nDefiningType(i_nDefiningType)
+{
+}
+
+Typedef::~Typedef()
+{
+}
+
+void
+Typedef::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Typedef::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Typedef::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Typedef::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Typedef::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Typedef::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_typedef
+{
+
+inline const Typedef &
+typedef_cast( const CodeEntity & i_ce )
+{
+    csv_assert( i_ce.AryClass() == Typedef::class_id );
+    return static_cast< const Typedef& >(i_ce);
+}
+
+Type_id
+attr::DefiningType( const CodeEntity & i_ce )
+{
+    return typedef_cast(i_ce).nDefiningType;
+}
+
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_AsDataTypes));
+}
+
+} // namespace ifc_typedef
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
diff --git a/autodoc/source/ary/idl/ia_ce.cxx b/autodoc/source/ary/idl/ia_ce.cxx
new file mode 100644
index 000000000000..f78f5050a7db
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_ce.cxx
@@ -0,0 +1,581 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "ia_ce.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/idl/i_attribute.hxx>
+#include <ary/idl/i_constant.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_function.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_namelookup.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/i_traits.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <idsort.hxx>
+#include "ia_type.hxx"
+#include "is_ce.hxx"
+#include "it_tplparam.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+inline Module &
+CeAdmin::lhf_Access_Module( Ce_id i_nId )
+    { return ary_cast<Module>(Storage()[i_nId]); }
+
+inline void
+CeAdmin::lhf_Put2Storage_and_AssignId( CodeEntity & pass_io_rCe )
+    { // This also assigns an ID to pass_io_rCe:
+      Storage().Store_Entity(pass_io_rCe);
+      my_NameDictionary().Add_Name( pass_io_rCe.LocalName(),
+                                    pass_io_rCe.CeId(),
+                                    pass_io_rCe.AryClass(),
+                                    pass_io_rCe.Owner() );
+    }
+
+inline void
+CeAdmin::lhf_Store_NewEntity( DYN CodeEntity &  pass_io_rCe,
+                                   Module &          i_rOwner )
+{
+    lhf_Put2Storage_and_AssignId(pass_io_rCe);
+    i_rOwner.Add_Name(pass_io_rCe.LocalName(), pass_io_rCe.CeId());
+}
+
+inline void
+CeAdmin::lhf_Store_NewEntity( DYN CodeEntity &  pass_io_rCe,
+                                   Ce_id             i_nOwnerModule )
+{
+    lhf_Store_NewEntity(pass_io_rCe, lhf_Access_Module(i_nOwnerModule));
+}
+
+
+
+CeAdmin::CeAdmin( NameLookup &        io_rNameDictionary,
+                  TypeAdmin &         io_rTypePilot )
+    :   pStorage(new Ce_Storage),
+        pGlobalNamespace(0),
+        pNameDictionary(&io_rNameDictionary),
+        pTypePilot(&io_rTypePilot)
+{
+    Storage().Set_Reserved(
+                    predefined::ce_GlobalNamespace,
+                    *new Module );
+    pGlobalNamespace = &lhf_Access_Module(Ce_id(predefined::ce_GlobalNamespace));
+}
+
+CeAdmin::~CeAdmin()
+{
+}
+
+
+
+Module &
+CeAdmin::CheckIn_Module( Ce_id               i_nParentId,
+                            const String &      i_sName )
+{
+    Module & rOwner  = lhf_Access_Module(i_nParentId);
+    Ce_id    nId     = rOwner.Search_Name(i_sName);
+    if (nId.IsValid())
+    {
+        return lhf_Access_Module(nId);
+    }
+
+    Module & ret = *new Module( i_sName,
+                                rOwner );
+    lhf_Store_NewEntity(ret, rOwner);
+    return ret;
+}
+
+Service &
+CeAdmin::Store_Service( Ce_id           i_nOwner,
+                        const String &  i_sName )
+{
+    Service & ret = *new Service( i_sName,
+                                  i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+SglIfcService &
+CeAdmin::Store_SglIfcService( Ce_id               i_nOwner,
+                                   const String &      i_sName,
+                                   Type_id             i_nBaseInterface )
+{
+    SglIfcService &
+        ret = *new SglIfcService( i_sName,
+                                  i_nOwner,
+                                  i_nBaseInterface );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Interface &
+CeAdmin::Store_Interface( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  Type_id             i_nBase )
+{
+    Interface & ret = *new Interface( i_sName,
+                                      i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    if (i_nBase.IsValid())
+        ret.Add_Base(i_nBase, 0);
+    return ret;
+}
+
+Struct &
+CeAdmin::Store_Struct( Ce_id               i_nOwner,
+                               const String &      i_sName,
+                               Type_id             i_nBase,
+                               const String &      i_sTemplateParam )
+{
+    if (NOT i_sTemplateParam.empty())
+    {
+        return lhf_Store_TplStruct( i_nOwner,
+                                    i_sName,
+                                    i_nBase,
+                                    i_sTemplateParam );
+    }
+
+    Struct & ret = *new Struct( i_sName,
+                                i_nOwner,
+                                i_nBase,
+                                String::Null_(),
+                                Type_id::Null_() );
+    lhf_Store_NewEntity(ret, i_nOwner);
+
+    return ret;
+}
+
+Exception &
+CeAdmin::Store_Exception( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  Type_id             i_nBase )
+{
+    Exception & ret = *new Exception( i_sName,
+                                      i_nOwner,
+                                      i_nBase );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Enum &
+CeAdmin::Store_Enum( Ce_id               i_nOwner,
+                             const String &      i_sName )
+{
+    Enum & ret = *new Enum( i_sName,
+                            i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Typedef &
+CeAdmin::Store_Typedef( Ce_id               i_nOwner,
+                                const String &      i_sName,
+                                Type_id             i_nDefiningType )
+{
+    Typedef & ret = *new Typedef( i_sName,
+                                  i_nOwner,
+                                  i_nDefiningType );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+
+ConstantsGroup &
+CeAdmin::Store_ConstantsGroup( Ce_id               i_nOwner,
+                                       const String &      i_sName )
+{
+    ConstantsGroup & ret = *new ConstantsGroup( i_sName,
+                                                i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Singleton &
+CeAdmin::Store_Singleton( Ce_id               i_nOwner,
+                                  const String &      i_sName )
+{
+    Singleton & ret = *new Singleton( i_sName,
+                                      i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+SglIfcSingleton &
+CeAdmin::Store_SglIfcSingleton( Ce_id               i_nOwner,
+                                     const String &      i_sName,
+                                     Type_id             i_nBaseInterface )
+{
+    SglIfcSingleton &
+        ret = *new SglIfcSingleton( i_sName,
+                                    i_nOwner,
+                                    i_nBaseInterface );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Constant &
+CeAdmin::Store_Constant( Ce_id               i_nOwner,
+                                 const String &      i_sName,
+                                 Type_id             i_nType,
+                                 const String &      i_sValue )
+{
+    ConstantsGroup &
+        rOwner  = ary_cast<ConstantsGroup>(Storage()[i_nOwner]);
+    Constant & ret = *new Constant( i_sName,
+                                    i_nOwner,
+                                    rOwner.NameRoom(),
+                                    i_nType,
+                                    i_sValue );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Constant(ret.CeId());
+    return ret;
+}
+
+Property &
+CeAdmin::Store_Property( Ce_id                  i_nOwner,
+                                 const String &         i_sName,
+                                 Type_id                i_nType,
+                                 Property::Stereotypes  i_stereotypes )
+{
+    Service &
+        rOwner = ary_cast<Service>(Storage()[i_nOwner]);
+    Property & ret = *new Property( i_sName,
+                                    i_nOwner,
+                                    rOwner.NameRoom(),
+                                    i_nType,
+                                    i_stereotypes );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Property(ret.CeId());
+    return ret;
+}
+
+Function &
+CeAdmin::Store_Function( Ce_id               i_nOwner,
+                                 const String &      i_sName,
+                                 Type_id             i_nReturnType,
+                                 bool                i_bOneWay )
+{
+    Interface &
+        rOwner = ary_cast<Interface>(Storage()[i_nOwner]);
+    Function & ret = *new Function( i_sName,
+                                    i_nOwner,
+                                    rOwner.NameRoom(),
+                                    i_nReturnType,
+                                      i_bOneWay);
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Function(ret.CeId());
+    return ret;
+}
+
+Function &
+CeAdmin::Store_ServiceConstructor( Ce_id               i_nOwner,
+                                        const String &      i_sName )
+{
+    SglIfcService &
+                rOwner = ary_cast<SglIfcService>(Storage()[i_nOwner]);
+    Function &  ret = *new Function( i_sName,
+                                     i_nOwner,
+                                     rOwner.NameRoom() );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Constructor(ret.CeId());
+    return ret;
+}
+
+StructElement &
+CeAdmin::Store_StructMember( Ce_id               i_nOwner,
+                                     const String &      i_sName,
+                                     Type_id             i_nType )
+{
+    Struct &
+        rOwner = ary_cast<Struct>(Storage()[i_nOwner]);
+    StructElement & ret = *new StructElement( i_sName,
+                                              i_nOwner,
+                                              rOwner.NameRoom(),
+                                              i_nType );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Member(ret.CeId());
+    return ret;
+}
+
+StructElement &
+CeAdmin::Store_ExceptionMember( Ce_id               i_nOwner,
+                                        const String &      i_sName,
+                                        Type_id             i_nType )
+{
+    Exception &
+        rOwner = ary_cast<Exception>(Storage()[i_nOwner]);
+    StructElement & ret = *new StructElement( i_sName,
+                                              i_nOwner,
+                                              rOwner.NameRoom(),
+                                              i_nType );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Member(ret.CeId());
+    return ret;
+}
+
+EnumValue &
+CeAdmin::Store_EnumValue( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  const String &      i_sValue )
+{
+    Enum &
+        rOwner = ary_cast<Enum>(Storage()[i_nOwner]);
+    EnumValue & ret = *new EnumValue( i_sName,
+                                      i_nOwner,
+                                      rOwner.NameRoom(),
+                                      i_sValue );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Value(ret.CeId());
+    return ret;
+}
+
+Attribute &
+CeAdmin::Store_Attribute( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  Type_id             i_nType,
+                                  bool                i_bReadOnly,
+                                  bool                i_bBound )
+{
+    Interface &
+        rOwner = ary_cast<Interface>(Storage()[i_nOwner]);
+
+    Attribute & ret = *new Attribute ( i_sName,
+                                       i_nOwner,
+                                       rOwner.NameRoom(),
+                                       i_nType,
+                                       i_bReadOnly,
+                                       i_bBound );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Attribute(ret.CeId());
+    return ret;
+}
+
+const Module &
+CeAdmin::GlobalNamespace() const
+{
+    csv_assert(pGlobalNamespace);
+    return *pGlobalNamespace;
+}
+
+const CodeEntity &
+CeAdmin::Find_Ce( Ce_id i_nId ) const
+{
+    return Storage()[i_nId];
+
+}
+
+const Module &
+CeAdmin::Find_Module( Ce_id i_nId ) const
+{
+    return ary_cast<Module>(Storage()[i_nId]);
+}
+
+const Module *
+CeAdmin::Search_Module( Ce_id i_nId ) const
+{
+    if (NOT i_nId.IsValid())
+        return 0;
+    return ary_cast<Module>( & Storage()[i_nId] );
+}
+
+const Function &
+CeAdmin::Find_Function( Ce_id i_nId ) const
+{
+    return ary_cast<Function>(Storage()[i_nId]);
+}
+
+const Property &
+CeAdmin::Find_Property( Ce_id i_nId ) const
+{
+    return ary_cast<Property>(Storage()[i_nId]);
+}
+
+const EnumValue &
+CeAdmin::Find_EnumValue( Ce_id i_nId ) const
+{
+    return ary_cast<EnumValue>(Storage()[i_nId]);
+}
+
+const Constant &
+CeAdmin::Find_Constant( Ce_id i_nId ) const
+{
+    return ary_cast<Constant>(Storage()[i_nId]);
+}
+
+const StructElement &
+CeAdmin::Find_StructElement( Ce_id i_nId ) const
+{
+    return ary_cast<StructElement>(Storage()[i_nId]);
+}
+
+void
+CeAdmin::Get_Text( StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const CodeEntity &  i_ce ) const
+{
+    const CodeEntity * pCe = &i_ce;
+    csv::erase_container(o_module);
+    o_ce.clear();
+    o_member.clear();
+
+    switch ( pCe->SightLevel() )
+    {
+        // Here are intentionally no breaks!
+        case sl_Member:
+                        if ( is_type<Function>(*pCe) )
+                            o_member = StreamLock(200)()
+                                            << pCe->LocalName()
+                                            << "()"
+                                            << c_str;
+                        else
+                            o_member = pCe->LocalName();
+                        pCe = & Storage()[pCe->Owner()];
+        case sl_File:
+                        o_ce = pCe->LocalName();
+                        pCe = & Storage()[pCe->NameRoom()];
+        case sl_Module:
+                        get_ModuleText(o_module,*pCe);
+                        break;
+        default:
+                        csv_assert(false);
+    }   // end switch
+}
+
+const NameLookup &
+CeAdmin::NameDictionary() const
+{
+    return *pNameDictionary;
+}
+
+
+void
+CeAdmin::Get_AlphabeticalIndex( std::vector<Ce_id> &            o_rResult,
+                                alphabetical_index::E_Letter    i_cLetter ) const
+{
+    const int C_nLowerUpperDiff = 'a'-'A';
+
+    // Establishing filter:
+    UINT8 filter[256];
+
+    UINT8 nLetter = static_cast<UINT8>(i_cLetter);
+    memset(filter, 0, 256);
+    filter[nLetter] = 1;
+    if ( i_cLetter != alphabetical_index::non_alpha )
+        filter[nLetter - C_nLowerUpperDiff] = 1;
+
+    // Gather entities which start with i_cLetter:
+    o_rResult.reserve(1000);
+    idl::Ce_Storage::c_iter
+        itEnd = Storage().End();
+    for ( idl::Ce_Storage::c_iter it = Storage().BeginUnreserved();
+          it != itEnd;
+          ++it )
+    {
+        if ( filter[ static_cast<UINT8>(*(*it).LocalName().c_str()) ] == 1 )
+            o_rResult.push_back( (*it).CeId() );
+    }
+
+    std::sort( o_rResult.begin(),
+               o_rResult.end(),
+               IdSorter<Ce_Compare>() );
+}
+
+
+Module &
+CeAdmin::GlobalNamespace()
+{
+    csv_assert(pGlobalNamespace);
+    return *pGlobalNamespace;
+}
+
+CodeEntity &
+CeAdmin::Find_Ce( Ce_id i_nId )
+{
+    return Storage()[i_nId];
+}
+
+void
+CeAdmin::get_ModuleText( StringVector &      o_module,
+                              const CodeEntity &  i_ce ) const
+{
+    if (i_ce.NameRoom().IsValid())
+    {
+        const CodeEntity &
+            rParent = Storage()[i_ce.NameRoom()];
+        get_ModuleText(o_module, rParent);
+        o_module.push_back(i_ce.LocalName());
+    }
+}
+
+Struct &
+CeAdmin::lhf_Store_TplStruct( Ce_id               i_nOwner,
+                                   const String &      i_sName,
+                                   Type_id             i_nBase,
+                                   const String &      i_sTemplateParam )
+{
+    csv_assert(NOT i_sTemplateParam.empty());
+
+    TemplateParamType &
+        rTpt = pTypePilot->Store_TemplateParamType(i_sTemplateParam);
+
+    Struct & ret = *new Struct( i_sName,
+                                i_nOwner,
+                                i_nBase,
+                                i_sTemplateParam,
+                                rTpt.TypeId() );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    rTpt.Set_StructId(ret.CeId());
+
+    return ret;
+}
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/ia_ce.hxx b/autodoc/source/ary/idl/ia_ce.hxx
new file mode 100644
index 000000000000..48d8907eb3a3
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_ce.hxx
@@ -0,0 +1,253 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IA_CE_HXX
+#define ARY_IDL_IA_CE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ip_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+class Ce_Storage;
+class TypeAdmin;
+
+
+/** @resp
+    Implements ::ary::idl::CePilot. Provides the access logic for all
+    IDL code entities.
+
+    @collab Ce_Storage
+    @collab TypeAdmin
+
+    @see CodeEntity
+*/
+class CeAdmin : public CePilot
+{
+  public:
+    // LIFECYCLE
+                        CeAdmin(
+                            NameLookup &        io_rNameDictionary,
+                            TypeAdmin &         io_rTypePilot );
+    virtual             ~CeAdmin();
+
+    // OPERATIONS
+
+    // INQUIRY
+    const Ce_Storage &  Storage() const;
+
+    // ACCESS
+    Ce_Storage &        Storage();
+
+    // INHERITED
+        // Interface ::ary::idl::CePilot:
+    virtual Module &    CheckIn_Module(
+                            Ce_id               i_nParentId,
+                            const String &      i_sName );
+    virtual Service &   Store_Service(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual SglIfcService &
+                        Store_SglIfcService(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface );
+    virtual Interface & Store_Interface(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase );
+    virtual Struct &    Store_Struct(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParam );
+    virtual Exception & Store_Exception(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase );
+    virtual Enum &      Store_Enum(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual Typedef &   Store_Typedef(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nDefiningType );
+    virtual ConstantsGroup &
+                        Store_ConstantsGroup(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual Singleton & Store_Singleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual SglIfcSingleton &
+                        Store_SglIfcSingleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface );
+
+    virtual Constant &  Store_Constant(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            const String &      i_sValue );
+    virtual Property &  Store_Property(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            Property::Stereotypes
+                                                i_stereotypes );
+    virtual Function &  Store_Function(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nReturnType,
+                            bool                i_bOneWay );
+    virtual Function &  Store_ServiceConstructor(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual StructElement &
+                        Store_StructMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType );
+    virtual StructElement &
+                        Store_ExceptionMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType );
+    virtual EnumValue & Store_EnumValue(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            const String &      i_sValue );
+    virtual Attribute & Store_Attribute(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            bool                i_bReadOnly,
+                            bool                i_bBound );
+
+    virtual const Module &
+                        GlobalNamespace() const;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId ) const;
+    virtual const Module &
+                        Find_Module(
+                            Ce_id               i_nId ) const;
+    virtual const Module *
+                        Search_Module(
+                            Ce_id               i_nId ) const;
+    virtual const Function &
+                        Find_Function(
+                            Ce_id               i_nId ) const;
+    virtual const Property &
+                        Find_Property(
+                            Ce_id               i_nId ) const;
+    virtual const EnumValue &
+                        Find_EnumValue(
+                            Ce_id               i_nId ) const;
+    virtual const Constant &
+                        Find_Constant(
+                            Ce_id               i_nId ) const;
+    virtual const StructElement &
+                        Find_StructElement(
+                            Ce_id               i_nId ) const;
+    virtual void        Get_Text(
+                            StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const CodeEntity &  i_ce ) const;
+    virtual const NameLookup &
+                        NameDictionary() const;
+    virtual void        Get_AlphabeticalIndex(
+                            std::vector<Ce_id> &
+                                                o_rResult,
+                            alphabetical_index::E_Letter
+                                                i_cLetter) const;
+    // ACCESS
+    virtual Module &    GlobalNamespace();
+    virtual CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId );
+  private:
+    // Locals
+    Module &            lhf_Access_Module(
+                            Ce_id               i_nId );
+    void                lhf_Put2Storage_and_AssignId(
+                            CodeEntity &        pass_io_rCe );
+    void                lhf_Store_NewEntity(
+                            DYN CodeEntity &    pass_io_rCe,
+                            Module &            i_rOwner );
+    void                lhf_Store_NewEntity(
+                            DYN CodeEntity &    pass_io_rCe,
+                            Ce_id               i_nOwnerModule );
+    void                get_ModuleText(
+                            StringVector &      o_module,
+                            const CodeEntity &  i_ce ) const;
+    Struct &            lhf_Store_TplStruct(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParam );
+
+    const Ce_Storage &  my_Storage() const;
+    Ce_Storage &        my_Storage();
+    NameLookup &        my_NameDictionary()     { return *pNameDictionary; }
+
+    // DATA
+    Dyn<Ce_Storage>     pStorage;           /// @inv pStorage != 0;
+    Module *            pGlobalNamespace;
+    NameLookup *        pNameDictionary;
+    TypeAdmin *         pTypePilot;
+};
+
+
+// IMPLEMENTATION
+inline const Ce_Storage &
+CeAdmin::Storage() const
+{
+    return *pStorage;
+}
+
+inline Ce_Storage &
+CeAdmin::Storage()
+{
+    return *pStorage;
+}
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/ia_type.cxx b/autodoc/source/ary/idl/ia_type.cxx
new file mode 100644
index 000000000000..eb47d355c9ae
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_type.cxx
@@ -0,0 +1,364 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "ia_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/qualiname.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include "ia_ce.hxx"
+#include "is_type.hxx"
+#include "it_builtin.hxx"
+#include "it_ce.hxx"
+#include "it_explicit.hxx"
+#include "it_sequence.hxx"
+#include "it_tplparam.hxx"
+#include "it_xnameroom.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+String              MakeTemplateName(
+                        const String &      i_localName,
+                        const std::vector<Type_id> &
+                                            i_templateParameters );
+
+
+
+inline CeAdmin &
+TypeAdmin::my_Ces() const
+    { return *pCes; }
+
+inline void
+TypeAdmin::lhf_Put2Storage_and_AssignId( DYN Type & pass_io_rType )
+    { // This also assigns an ID to pass_io_rType:
+      Storage().Store_Entity(pass_io_rType); }
+
+inline Type_id
+TypeAdmin::lhf_findBuiltInType( const String & i_sName )
+    { return ary_cast<ExplicitNameRoom>(Storage()[nXNameRoom_Root])
+                        .Search_Name(i_sName); }
+
+inline const ExplicitNameRoom &
+TypeAdmin::find_ExplicitNameRoom( Type_id i_nType ) const
+{
+    return ary_cast<ExplicitNameRoom>(Storage()[i_nType]);
+}
+
+inline ExplicitNameRoom &
+TypeAdmin::find_ExplicitNameRoom( Type_id i_nType )
+{
+    return ary_cast<ExplicitNameRoom>(Storage()[i_nType]);
+}
+
+ExplicitNameRoom &
+TypeAdmin::lhf_CheckIn_XNameRoom( const QualifiedName & i_rName,
+                                       Ce_id                 i_nModuleOfOccurrence )
+{
+    Type_id nRoot = i_rName.IsAbsolute()
+                        ?   Type_id( predefined::type_GlobalXNameRoom )
+                        :   lhf_Get_NameRoomRoot_forModuleofOccurrence( i_nModuleOfOccurrence ).TypeId();
+
+    if ( i_rName.NamespaceDepth() == 0 )
+        return find_ExplicitNameRoom(nRoot);
+
+    QualifiedName::namespace_iterator it = i_rName.first_namespace();
+    ExplicitNameRoom *
+        ret = & find_ExplicitNameRoom(nRoot);
+    for ( ; it != i_rName.end_namespace(); ++it )
+    {
+        Type_id
+            found = ret->Search_Name(*it);
+        if (found.IsValid())
+        {
+            ret = & find_ExplicitNameRoom(found);
+        }
+        else
+        {
+            ExplicitNameRoom &
+                rNew = *new ExplicitNameRoom(*it, *ret);
+            lhf_Put2Storage_and_AssignId(rNew);
+            ret->Add_Name( rNew.Name(), rNew.TypeId() );
+            ret = &rNew;
+        }
+
+    }   // end for
+    return *ret;
+}
+
+Type_id
+TypeAdmin::lhf_CheckIn_TypeName( const String &        i_sLocalName,
+                                      ExplicitNameRoom &    io_rXNameRoom,
+                                      Ce_id                 i_nModuleOfOccurrence,
+                                 const std::vector<Type_id> *   i_templateParameters )
+{
+    String sSearchLocalName( i_sLocalName );
+    if ( i_templateParameters != 0
+         ?  i_templateParameters->size() > 0
+         :  false )
+    {
+        sSearchLocalName = MakeTemplateName(
+                                i_sLocalName,
+                                *i_templateParameters);
+    }
+
+    Type_id
+        ret = io_rXNameRoom.Search_Name(sSearchLocalName);
+    if (NOT ret.IsValid())
+    {
+        DYN Type &
+            rNewType = *new ExplicitType(  i_sLocalName,
+                                           io_rXNameRoom.TypeId(),
+                                           i_nModuleOfOccurrence,
+                                           i_templateParameters );
+        lhf_Put2Storage_and_AssignId(rNewType);
+        ret = rNewType.TypeId();
+        io_rXNameRoom.Add_Name( sSearchLocalName, ret );
+    }
+    return ret;
+}
+
+Type_id
+TypeAdmin::lhf_CheckIn_Sequence(Type_id i_nType)
+{
+    Type_id
+        ret = Storage().Search_SequenceOf(i_nType);
+
+    if (NOT ret.IsValid())
+    {
+        DYN Type &
+            rNewSeq = *new Sequence(i_nType);
+        lhf_Put2Storage_and_AssignId(rNewSeq);
+        ret = rNewSeq.Id();
+        Storage().Add_Sequence(i_nType, ret);
+    }
+    return ret;
+}
+
+void
+TypeAdmin::lhf_CheckIn_BuiltInType( const char *       i_sName,
+                                    Rid                i_nId )
+{
+    DYN BuiltInType &
+        rNewType = *new BuiltInType(i_sName);
+    Storage().Set_Reserved(i_nId, rNewType);
+
+    // Put them into both roots, to catch the syntactically correct
+    //   (though unlikely) ::Any, ::long etc.
+    Type_id
+        nId(i_nId);
+    find_ExplicitNameRoom(nXNameRoom_Root).Add_Name(i_sName, nId);
+    find_ExplicitNameRoom(nXNameRoom_Global).Add_Name(i_sName, nId);
+}
+
+ExplicitNameRoom &
+TypeAdmin::lhf_Get_NameRoomRoot_forModuleofOccurrence( Ce_id i_nModuleOfOccurrence )
+{
+    const Type_id *
+        pFound = csv::find_in_map( aMap_ModuleOfOccurrence2NameRoomRoot,
+                                   i_nModuleOfOccurrence );
+    if (pFound != 0)
+        return find_ExplicitNameRoom(*pFound);
+
+    ExplicitNameRoom &
+        ret = *new ExplicitNameRoom;
+    lhf_Put2Storage_and_AssignId(ret);
+    aMap_ModuleOfOccurrence2NameRoomRoot.insert(std::pair< const Ce_id, Type_id>(i_nModuleOfOccurrence,ret.TypeId()));
+    return ret;
+}
+
+TypeAdmin::TypeAdmin()
+    :   pStorage(new Type_Storage),
+        pCes(0),    // Needs to be set directly after creation.
+        nXNameRoom_Root( static_cast<ary::Rid>(predefined::type_Root_ofXNameRooms) ),
+        nXNameRoom_Global( static_cast<ary::Rid>(predefined::type_GlobalXNameRoom) ),
+        aMap_ModuleOfOccurrence2NameRoomRoot()
+{
+    DYN ExplicitNameRoom &
+        drRoot = *new ExplicitNameRoom;
+    Storage().Set_Reserved( nXNameRoom_Root.Value(), drRoot );
+
+    DYN ExplicitNameRoom &
+        drGlobal = *new ExplicitNameRoom(String::Null_(), drRoot);
+    Storage().Set_Reserved( nXNameRoom_Global.Value(), drGlobal );
+    drRoot.Add_Name( drGlobal.Name(), nXNameRoom_Global );
+
+    lhf_Setup_BuildInTypes();
+}
+
+TypeAdmin::~TypeAdmin()
+{
+}
+
+void
+TypeAdmin::lhf_Setup_BuildInTypes()
+{
+    lhf_CheckIn_BuiltInType("any", predefined::type_any);
+    lhf_CheckIn_BuiltInType("boolean", predefined::type_boolean);
+    lhf_CheckIn_BuiltInType("byte", predefined::type_byte);
+    lhf_CheckIn_BuiltInType("char", predefined::type_char);
+    lhf_CheckIn_BuiltInType("double", predefined::type_double);
+    lhf_CheckIn_BuiltInType("float", predefined::type_float);
+    lhf_CheckIn_BuiltInType("hyper", predefined::type_hyper);
+    lhf_CheckIn_BuiltInType("long", predefined::type_long);
+    lhf_CheckIn_BuiltInType("short", predefined::type_short);
+    lhf_CheckIn_BuiltInType("string", predefined::type_string);
+    lhf_CheckIn_BuiltInType("type", predefined::type_type);
+    lhf_CheckIn_BuiltInType("void", predefined::type_void);
+    lhf_CheckIn_BuiltInType("unsigned hyper", predefined::type_u_hyper);
+    lhf_CheckIn_BuiltInType("unsigned long", predefined::type_u_long);
+    lhf_CheckIn_BuiltInType("unsigned short", predefined::type_u_short);
+}
+
+const Type &
+TypeAdmin::CheckIn_Type( QualifiedName &     i_rFullName,
+                                 uintt               i_nSequenceCount,
+                                 Ce_id               i_nModuleOfOccurrence,
+                         const std::vector<Type_id> *   i_templateParameters )
+{
+    // Look in built-in types:
+    Type_id
+        nType = lhf_findBuiltInType(i_rFullName.LocalName());
+    if (NOT nType.IsValid())
+    {   // No built-in type:
+        ExplicitNameRoom &
+            rNameRoom = lhf_CheckIn_XNameRoom(i_rFullName,i_nModuleOfOccurrence);
+        nType = lhf_CheckIn_TypeName( i_rFullName.LocalName(),
+                                      rNameRoom,
+                                      i_nModuleOfOccurrence,
+                                      i_templateParameters );
+    }   // endif
+
+    for ( uintt s = 0; s < i_nSequenceCount; ++s )
+    {
+        nType = lhf_CheckIn_Sequence(nType);
+    }
+
+    return Storage()[nType];
+}
+
+TemplateParamType &
+TypeAdmin::Store_TemplateParamType( String i_sName )
+{
+    DYN TemplateParamType &
+        ret = *new TemplateParamType( i_sName );
+    lhf_Put2Storage_and_AssignId(ret);
+    return ret;
+}
+
+const Type &
+TypeAdmin::Find_Type( Type_id i_nType ) const
+{
+    return Storage()[i_nType];
+}
+
+String
+TypeAdmin::Search_LocalNameOf( Type_id i_nType ) const
+{
+    const Type *
+        pType = Storage().Exists(i_nType)
+                    ? 0
+                    : & Storage()[i_nType];
+    if (pType != 0)
+    {
+        switch (pType->AryClass())
+        {
+            case Ce_Type::class_id:
+            case ExplicitType::class_id:
+            case BuiltInType::class_id:
+                    return static_cast< const Named_Type& >(*pType).Name();
+        }
+    }
+    return String::Null_();
+}
+
+Ce_id
+TypeAdmin::Search_CeRelatedTo( Type_id i_nType ) const
+{
+    const Ce_Type *
+        ret = ary_cast<Ce_Type>( & Storage()[i_nType] );
+    return ret != 0
+            ?   ret->RelatedCe()
+            :   Ce_id_Null();
+}
+
+const ExplicitNameRoom &
+TypeAdmin::Find_XNameRoom( Type_id i_nType ) const
+{
+    return find_ExplicitNameRoom(i_nType);
+}
+
+bool
+TypeAdmin::IsBuiltInOrRelated( const Type & i_rType ) const
+{
+    if ( is_type<BuiltInType>(i_rType) )
+        return true;
+    else
+    {
+        const Type *
+            pType = &i_rType;
+        while (is_type<Sequence>(*pType))
+        {
+            Type_id
+                nt = ary_cast<Sequence>(pType)->RelatedType();
+            if (NOT nt.IsValid())
+                return false;
+            pType = & Storage()[nt];
+        }
+        return is_type<BuiltInType>(*pType);
+    }
+}
+
+
+String
+MakeTemplateName( const String &                i_localName,
+                  const std::vector<Type_id> &  )
+{
+    StreamLock
+        sl(200);
+
+    // This is the simple solution, assuming that there is only
+    // one version of templatisation allowed with a given name.
+    return
+        sl()
+            << i_localName
+            << C_cTemplateDelimiter
+            << c_str;
+}
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/ia_type.hxx b/autodoc/source/ary/idl/ia_type.hxx
new file mode 100644
index 000000000000..050519234626
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_type.hxx
@@ -0,0 +1,170 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IA_TYPE_HXX
+#define ARY_IDL_IA_TYPE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ip_type.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include "is_type.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+class Type_Storage;
+class CeAdmin;
+class TemplateParamType;
+
+
+class TypeAdmin : public TypePilot
+{
+  public:
+    // LIFECYCLE
+                        TypeAdmin();
+
+    void                Assign_CePilot(
+                            CeAdmin &           io_rCes );
+    virtual             ~TypeAdmin();
+
+    // OPERATIONS
+    TemplateParamType & Store_TemplateParamType(
+                            String              i_sName );
+    // INQUIRY
+    const Type_Storage &
+                        Storage() const;
+    // ACCESS
+    Type_Storage &      Storage();
+
+    // INHERITED
+        // Interface TypePilot:
+    virtual const Type &
+                        CheckIn_Type(
+                            QualifiedName &     i_rFullName,
+                            uintt               i_nSequenceCount,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_nType ) const;
+    virtual String      Search_LocalNameOf(
+                            Type_id             i_nType ) const;
+    virtual Ce_id       Search_CeRelatedTo(
+                            Type_id             i_nType ) const;
+    virtual const ExplicitNameRoom &
+                        Find_XNameRoom(
+                            Type_id             i_nType ) const;
+    virtual bool        IsBuiltInOrRelated(
+                            const Type &        i_rType ) const;
+  private:
+    // Locals
+    CeAdmin &           my_Ces() const;
+
+    void                lhf_Put2Storage_and_AssignId(
+                            DYN Type &          pass_io_rType );
+
+    ExplicitNameRoom &  lhf_CheckIn_XNameRoom(
+                            const QualifiedName &
+                                                i_rName,
+                            Ce_id               i_nModuleOfOccurrence );
+    Type_id             lhf_CheckIn_TypeName(
+                            const String &      i_sLocalName,
+                            ExplicitNameRoom &  io_rExplicitNameRoom,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    Type_id             lhf_CheckIn_Sequence(
+                            Type_id             i_nType );
+    void                lhf_CheckIn_BuiltInType(
+                            const char *        i_sName,
+                            Rid                 i_nId );
+    const ExplicitNameRoom &
+                        find_ExplicitNameRoom(
+                            Type_id             i_nType ) const;
+    ExplicitNameRoom &  find_ExplicitNameRoom(
+                            Type_id             i_nType );
+    ExplicitNameRoom &  lhf_Get_NameRoomRoot_forModuleofOccurrence(
+                            Ce_id               i_nModuleOfOccurrence );
+
+    /// @return Type_id::Null_(), if not found.
+    Type_id             lhf_findBuiltInType(
+                            const String &      i_sName );
+    /// @precond nGlobalNamespace must be valid.
+    void                lhf_Setup_BuildInTypes();
+
+    // DATA
+    Type_Storage *      pStorage;           /// @inv pStorage != 0
+    CeAdmin *           pCes;               /// @inv pCes != 0
+
+    // Data for saving time:
+    Type_id             nXNameRoom_Root;    /** @descr  This is different from nXNameRoom_Global, because
+                                                the root of explicit name rooms in code without leading "::" is unknown.
+                                            */
+    Type_id             nXNameRoom_Global;
+
+    // HACK, because this needs to be saved somehow and is not in storage:
+    std::map<Ce_id, Type_id>
+                        aMap_ModuleOfOccurrence2NameRoomRoot;
+};
+
+
+
+
+
+// IMPLEMENTATION
+inline const Type_Storage &
+TypeAdmin::Storage() const
+{
+    return *pStorage;
+}
+
+inline Type_Storage &
+TypeAdmin::Storage()
+{
+    return *pStorage;
+}
+
+inline void
+TypeAdmin::Assign_CePilot( CeAdmin & io_rCes )
+{
+    pCes = &io_rCes;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/is_ce.cxx b/autodoc/source/ary/idl/is_ce.cxx
new file mode 100644
index 000000000000..eb4b93a6dfce
--- /dev/null
+++ b/autodoc/source/ary/idl/is_ce.cxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "is_ce.hxx"
+
+// NOT FULLY DEFINED SERVICES
+
+namespace
+{
+    const uintt
+    C_nReservedElements = ary::idl::predefined::ce_MAX;    // Skipping "0" and the GlobalNamespace
+}
+
+
+namespace ary
+{
+namespace idl
+{
+
+Ce_Storage *        Ce_Storage::pInstance_ = 0;
+
+
+
+
+Ce_Storage::Ce_Storage()
+    :   stg::Storage<CodeEntity>(C_nReservedElements)
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Ce_Storage::~Ce_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/is_ce.hxx b/autodoc/source/ary/idl/is_ce.hxx
new file mode 100644
index 000000000000..c1edee0b23ff
--- /dev/null
+++ b/autodoc/source/ary/idl/is_ce.hxx
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IS_CE_HXX
+#define ARY_IDL_IS_CE_HXX
+
+// BASE CLASSES
+#include <store/s_storage.hxx>
+// USED SERVICES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** The data base for all ->ary::idl::CodeEntity objects.
+*/
+class Ce_Storage : public ::ary::stg::Storage< ::ary::idl::CodeEntity >
+{
+  public:
+                        Ce_Storage();
+    virtual             ~Ce_Storage();
+
+    static Ce_Storage & Instance_()               { csv_assert(pInstance_ != 0);
+                                                    return *pInstance_; }
+  private:
+    // DATA
+    static Ce_Storage * pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_CodeEntity
+{
+    ce_GlobalNamespace = 1,
+    ce_MAX
+};
+
+}   // namespace predefined
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/is_type.cxx b/autodoc/source/ary/idl/is_type.cxx
new file mode 100644
index 000000000000..269286413b17
--- /dev/null
+++ b/autodoc/source/ary/idl/is_type.cxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "is_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+
+namespace
+{
+
+const uintt
+    C_nReservedElements = ary::idl::predefined::type_MAX;    // Skipping "0" and the built in types.
+}
+
+
+namespace ary
+{
+namespace idl
+{
+
+Type_Storage *          Type_Storage::pInstance_ = 0;
+
+
+
+Type_Storage::Type_Storage()
+    :   stg::Storage<Type>(C_nReservedElements),
+        aSequenceIndex()
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Type_Storage::~Type_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+void
+Type_Storage::Add_Sequence( Type_id             i_nRelatedType,
+                            Type_id             i_nSequence )
+{
+    aSequenceIndex[i_nRelatedType] = i_nSequence;
+}
+
+Type_id
+Type_Storage::Search_SequenceOf( Type_id i_nRelatedType )
+{
+    return csv::value_from_map(aSequenceIndex, i_nRelatedType);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/is_type.hxx b/autodoc/source/ary/idl/is_type.hxx
new file mode 100644
index 000000000000..b905602238f0
--- /dev/null
+++ b/autodoc/source/ary/idl/is_type.hxx
@@ -0,0 +1,122 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IS_TYPE_HXX
+#define ARY_IDL_IS_TYPE_HXX
+
+// BASE CLASSES
+#include <store/s_storage.hxx>
+// USED SERVICES
+#include <ary/idl/i_type.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** The data base for all ->ary::idl::CodeEntity objects.
+*/
+class Type_Storage : public ::ary::stg::Storage< ::ary::idl::Type >
+{
+  public:
+                        Type_Storage();
+                        ~Type_Storage();
+
+
+    void                Add_Sequence(
+                            Type_id             i_nRelatedType,
+                            Type_id             i_nSequence );
+
+    Type_id             Search_SequenceOf(
+                            Type_id             i_nRelatedType );
+
+    static Type_Storage &
+                        Instance_();
+  private:
+    /**  value_type.first   := id of the base type
+         value_type.second  := id of the sequence<base type>
+    */
+    typedef std::map<Type_id,Type_id>           Map_Sequences;
+
+    // DATA
+    Map_Sequences       aSequenceIndex;
+
+    static Type_Storage *
+                        pInstance_;
+};
+
+
+
+namespace predefined
+{
+
+enum E_Type
+{
+    type_Root_ofXNameRooms = 1,
+    type_GlobalXNameRoom,
+    type_any,
+    type_boolean,
+    type_byte,
+    type_char,
+    type_double,
+    type_float,
+    type_hyper,
+    type_long,
+    type_short,
+    type_string,
+    type_type,
+    type_void,
+    type_u_hyper,
+    type_u_long,
+    type_u_short,
+    type_ellipse,    // ...
+    type_MAX
+};
+
+}   // namespace predefined
+
+
+
+
+// IMPLEMENTATION
+inline Type_Storage &
+Type_Storage::Instance_()
+{
+    csv_assert(pInstance_ != 0);
+    return *pInstance_;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/it_builtin.cxx b/autodoc/source/ary/idl/it_builtin.cxx
new file mode 100644
index 000000000000..9c543a7bc798
--- /dev/null
+++ b/autodoc/source/ary/idl/it_builtin.cxx
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_builtin.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+BuiltInType::BuiltInType( const char * i_sName )
+    :   Named_Type(i_sName)
+{
+}
+
+BuiltInType::~BuiltInType()
+{
+}
+
+ClassId
+BuiltInType::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+BuiltInType::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+BuiltInType::inq_Get_Text( StringVector &      ,            // o_module
+                           String &            o_name,
+                           Ce_id &             ,            // o_nRelatedCe
+                           int &               ,            // o_nSequenceCount
+                           const Gate &        ) const      // i_rGate
+{
+    o_name = Name();
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/it_builtin.hxx b/autodoc/source/ary/idl/it_builtin.hxx
new file mode 100644
index 000000000000..1e3ca7fcc90f
--- /dev/null
+++ b/autodoc/source/ary/idl/it_builtin.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IT_BUILTIN_HXX
+#define ARY_IDL_IT_BUILTIN_HXX
+
+// BASE CLASSES
+#include "it_named.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A type defined by the IDL language.
+*/
+class BuiltInType : public Named_Type
+{
+  public:
+    enum E_ClassId { class_id = 2200 };
+
+    // LIFECYCLE
+                        BuiltInType(
+                            const char *        i_sName );
+    virtual             ~BuiltInType();
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/it_ce.cxx b/autodoc/source/ary/idl/it_ce.cxx
new file mode 100644
index 000000000000..1fca8585f941
--- /dev/null
+++ b/autodoc/source/ary/idl/it_ce.cxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_ce.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Ce_Type::Ce_Type( Ce_id                        i_relatedCe,
+                  const std::vector<Type_id> * i_templateParameters )
+    :   nRelatedCe(i_relatedCe),
+        pTemplateParameters(0)
+{
+    if (i_templateParameters != 0)
+        pTemplateParameters = new std::vector<Type_id>(*i_templateParameters);
+}
+
+Ce_Type::~Ce_Type()
+{
+}
+
+ClassId
+Ce_Type::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+Ce_Type::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+Ce_Type::inq_Get_Text( StringVector &      o_module,
+                       String &            o_name,
+                       Ce_id &             o_nRelatedCe,
+                       int &               ,                // o_nSequenceCount
+                       const Gate &        i_rGate ) const
+{
+    String sDummyMember;
+
+    const CodeEntity &
+        rCe = i_rGate.Ces().Find_Ce(nRelatedCe);
+    i_rGate.Ces().Get_Text( o_module,
+                            o_name,
+                            sDummyMember,
+                            rCe );
+    o_nRelatedCe = nRelatedCe;
+}
+
+const std::vector<Type_id> *
+Ce_Type::inq_TemplateParameters() const
+{
+    return pTemplateParameters.Ptr();
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/it_ce.hxx b/autodoc/source/ary/idl/it_ce.hxx
new file mode 100644
index 000000000000..f2de201503d8
--- /dev/null
+++ b/autodoc/source/ary/idl/it_ce.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IT_CE_HXX
+#define ARY_IDL_IT_CE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_type.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A named ->Type related to its corresponding
+     ->CodeEntity.
+*/
+class Ce_Type : public Type
+{
+  public:
+    enum E_ClassId { class_id = 2201 };
+
+    // LIFECYCLE
+                        Ce_Type(
+                            Ce_id               i_relatedCe,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    virtual             ~Ce_Type();
+
+    // INQUIRY
+    Ce_id               RelatedCe() const       { return nRelatedCe; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    virtual const std::vector<Type_id> *
+                        inq_TemplateParameters() const;
+    // DATA
+    Ce_id               nRelatedCe;
+    Dyn< std::vector<Type_id> >
+                        pTemplateParameters;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/it_explicit.cxx b/autodoc/source/ary/idl/it_explicit.cxx
new file mode 100644
index 000000000000..552abe5b586b
--- /dev/null
+++ b/autodoc/source/ary/idl/it_explicit.cxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_explicit.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include "it_xnameroom.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+ExplicitType::ExplicitType( const String &      i_sName,
+                            Type_id             i_nXNameRoom,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters )
+    :   Named_Type(i_sName),
+        nXNameRoom(i_nXNameRoom),
+        nModuleOfOccurrence(i_nModuleOfOccurrence),
+        pTemplateParameters(0)
+{
+    if (i_templateParameters != 0)
+        pTemplateParameters = new std::vector<Type_id>(*i_templateParameters);
+}
+
+ExplicitType::~ExplicitType()
+{
+}
+
+ClassId
+ExplicitType::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+ExplicitType::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+ExplicitType::inq_Get_Text( StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const
+{
+    const ExplicitNameRoom &
+        rNameRoom = i_rGate.Types().Find_XNameRoom(nXNameRoom);
+    rNameRoom.Get_Text(o_module,o_name,o_nRelatedCe,o_nSequenceCount,i_rGate);
+
+    o_name = Name();
+}
+
+const std::vector<Type_id> *
+ExplicitType::inq_TemplateParameters() const
+{
+    return pTemplateParameters.Ptr();
+}
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/it_explicit.hxx b/autodoc/source/ary/idl/it_explicit.hxx
new file mode 100644
index 000000000000..8a3d8d76a24d
--- /dev/null
+++ b/autodoc/source/ary/idl/it_explicit.hxx
@@ -0,0 +1,93 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IT_EXPLICIT_HXX
+#define ARY_IDL_IT_EXPLICIT_HXX
+
+// BASE CLASSES
+#include "it_named.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A named @->Type, not yet related to its corresponding
+    @->CodeEntity.
+*/
+class ExplicitType : public Named_Type
+{
+  public:
+    enum E_ClassId { class_id = 2203 };
+
+    // LIFECYCLE
+                        ExplicitType(
+                            const String &      i_sName,
+                            Type_id             i_nXNameRoom,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    virtual             ~ExplicitType();
+
+    // INQUIRY
+    Ce_id               ModuleOfOccurrence() const
+                                                { return nModuleOfOccurrence; }
+    Type_id             NameRoom() const        { return nXNameRoom; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface CppEntity:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    virtual const std::vector<Type_id> *
+                        inq_TemplateParameters() const;
+    // DATA
+    Type_id             nXNameRoom;             // As written in code.
+    Ce_id               nModuleOfOccurrence;
+    Dyn< const std::vector<Type_id> >
+                        pTemplateParameters;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/it_named.hxx b/autodoc/source/ary/idl/it_named.hxx
new file mode 100644
index 000000000000..a1f431368b6d
--- /dev/null
+++ b/autodoc/source/ary/idl/it_named.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IT_NAMED_HXX
+#define ARY_IDL_IT_NAMED_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/i_type.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+
+/** Represents types with a name - in opposite to e.g. sequences,
+    which do not have one.
+*/
+class Named_Type : public Type
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Named_Type()           {}
+
+    // INQUIRY
+    const String &      Name() const            { return sName; }
+
+  protected:
+                        Named_Type(
+                            const String &      i_sName )
+                                                : sName(i_sName) { }
+  private:
+    // DATA
+    String              sName;
+};
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
diff --git a/autodoc/source/ary/idl/it_sequence.cxx b/autodoc/source/ary/idl/it_sequence.cxx
new file mode 100644
index 000000000000..144c64ca6c80
--- /dev/null
+++ b/autodoc/source/ary/idl/it_sequence.cxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_sequence.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Sequence::Sequence( Type_id i_nRelatedType )
+    :   nRelatedType(i_nRelatedType)
+{
+}
+
+Sequence::~Sequence()
+{
+}
+
+ClassId
+Sequence::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+Sequence::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+Sequence::inq_Get_Text( StringVector &      o_module,
+                        String &            o_name,
+                        Ce_id &             o_nRelatedCe,
+                        int &               o_nSequenceCount,
+                        const Gate &        i_rGate ) const
+{
+    ++o_nSequenceCount;
+
+    i_rGate.Types().Find_Type(nRelatedType)
+            .Get_Text(  o_module,
+                        o_name,
+                        o_nRelatedCe,
+                        o_nSequenceCount,
+                        i_rGate );
+}
+
+const Type &
+Sequence::inq_FirstEnclosedNonSequenceType(const Gate & i_rGate) const
+{
+    return i_rGate.Types().Find_Type(nRelatedType).FirstEnclosedNonSequenceType(i_rGate);
+}
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/it_sequence.hxx b/autodoc/source/ary/idl/it_sequence.hxx
new file mode 100644
index 000000000000..c4a29d410fd5
--- /dev/null
+++ b/autodoc/source/ary/idl/it_sequence.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IT_SEQUENCE_HXX
+#define ARY_IDL_IT_SEQUENCE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_type.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A sequence (an array of a type).
+*/
+class Sequence : public Type
+{
+  public:
+    enum E_ClassId { class_id = 2202 };
+
+    // LIFECYCLE
+                        Sequence(
+                            Type_id             i_nRelatedType );
+    virtual             ~Sequence();
+
+    // INQUIRY
+    Type_id             RelatedType() const     { return nRelatedType; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    virtual const Type &
+                        inq_FirstEnclosedNonSequenceType(
+                            const Gate &        i_rGate ) const;
+    // DATA
+    Type_id             nRelatedType;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/it_tplparam.cxx b/autodoc/source/ary/idl/it_tplparam.cxx
new file mode 100644
index 000000000000..cde0d096c85f
--- /dev/null
+++ b/autodoc/source/ary/idl/it_tplparam.cxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_tplparam.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+TemplateParamType::TemplateParamType( const char * i_sName )
+    :   Named_Type(i_sName)
+{
+}
+
+TemplateParamType::~TemplateParamType()
+{
+}
+
+ClassId
+TemplateParamType::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+TemplateParamType::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+TemplateParamType::inq_Get_Text( StringVector &      ,          // o_module
+                                 String &            o_name,
+                                 Ce_id &             ,          // o_nRelatedCe
+                                 int &               ,          // o_nSequenceCount
+                                 const Gate &        ) const    // i_rGate
+{
+    o_name = Name();
+}
+
+
+//*************    Implemented default function for idl::Type ********//
+
+const std::vector<Type_id> *
+Type::inq_TemplateParameters() const
+{
+    return 0;
+}
+
+const Type &
+Type::inq_FirstEnclosedNonSequenceType(const Gate & ) const
+{
+    return *this;
+}
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/it_tplparam.hxx b/autodoc/source/ary/idl/it_tplparam.hxx
new file mode 100644
index 000000000000..608332d6c9de
--- /dev/null
+++ b/autodoc/source/ary/idl/it_tplparam.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IT_TPLPARAM_HXX
+#define ARY_IDL_IT_TPLPARAM_HXX
+
+// BASE CLASSES
+#include "it_named.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** @resp Represents a template type when it is used within the
+    declaring struct.
+*/
+class TemplateParamType : public Named_Type
+{
+  public:
+    enum E_ClassId { class_id = 2205 };
+
+    // LIFECYCLE
+                        TemplateParamType(
+                            const char *        i_sName );
+    virtual             ~TemplateParamType();
+
+    Ce_id               StructId() const;       /// The struct which declares this type.
+    void                Set_StructId(
+                            Ce_id               i_nStruct );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const;
+    // DATA
+    Ce_id               nStruct;                /// The struct which declares this type.
+};
+
+
+
+
+// IMPLEMENTATION
+inline Ce_id
+TemplateParamType::StructId() const
+{
+    return nStruct;
+}
+
+inline void
+TemplateParamType::Set_StructId( Ce_id i_nStruct )
+{
+    nStruct = i_nStruct;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/it_xnameroom.cxx b/autodoc/source/ary/idl/it_xnameroom.cxx
new file mode 100644
index 000000000000..a990fdb7982e
--- /dev/null
+++ b/autodoc/source/ary/idl/it_xnameroom.cxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_xnameroom.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+ExplicitNameRoom::ExplicitNameRoom()
+    :   aImpl()
+{
+}
+
+ExplicitNameRoom::ExplicitNameRoom( const String &           i_sName,
+                                    const ExplicitNameRoom & i_rParent )
+    :   aImpl( i_sName, i_rParent.aImpl, i_rParent.TypeId() )
+{
+}
+
+ExplicitNameRoom::~ExplicitNameRoom()
+{
+}
+
+ClassId
+ExplicitNameRoom::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+ExplicitNameRoom::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+ExplicitNameRoom::inq_Get_Text( StringVector &      o_module,
+                                String &            ,           // o_name
+                                Ce_id &             ,           // o_nRelatedCe
+                                int &               ,           // o_nSequemceCount
+                                const Gate &        ) const     // i_rGate
+{
+    StringVector::const_iterator it = NameChain_Begin();
+    if ( it != NameChain_End()
+            ? (*it).empty()
+            : false )
+    {   // Don't put out the root global namespace
+        ++it;
+    }
+
+    for ( ;
+          it != NameChain_End();
+          ++it )
+    {
+        o_module.push_back(*it);
+    }
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
diff --git a/autodoc/source/ary/idl/it_xnameroom.hxx b/autodoc/source/ary/idl/it_xnameroom.hxx
new file mode 100644
index 000000000000..ea9513605cb6
--- /dev/null
+++ b/autodoc/source/ary/idl/it_xnameroom.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_IT_XNAMEROOM_HXX
+#define ARY_IDL_IT_XNAMEROOM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_type.hxx>
+#include <nametreenode.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A namespace for ->Type s, as they are explicitely written in code.
+
+    The search/identification string is usually the local name of
+    the Type. But for templated structs, the search string has this
+    pattern:
+                <LocalName> '<' <StringOfTemplateTypeId>
+*/
+class ExplicitNameRoom : public Type
+{
+  public:
+    enum E_ClassId { class_id = 2204 };
+
+    // LIFECYCLE
+                        ExplicitNameRoom();
+                        ExplicitNameRoom(
+                            const String &      i_sName,
+                            const ExplicitNameRoom &
+                                                i_rParent );
+    virtual             ~ExplicitNameRoom();
+
+    // OPERATIONS
+    /** @param i_sSearchString
+                A local type name  usually.
+                For templated types see class docu.
+        @see ExplicitNameRoom
+    */
+    void                Add_Name(
+                            const String &      i_sSearchString,
+                            Type_id             i_nId )
+                            { aImpl.Add_Name(i_sSearchString,i_nId); }
+    // INQUIRY
+    const String &      Name() const            { return aImpl.Name(); }
+    intt                Depth() const           { return aImpl.Depth(); }
+    void                Get_FullName(
+                            StringVector &      o_rText,
+                            Ce_idList *         o_pRelatedCes,
+                            const Gate &        i_rGate ) const;
+    bool                IsAbsolute() const      { return Depth() > 0
+                                                    ?   (*NameChain_Begin()).empty()
+                                                    :   false; }
+    /** @param i_sSearchString
+                A local type name  usually.
+                For templated types see class docu.
+        @see ExplicitNameRoom
+    */
+    Type_id             Search_Name(
+                            const String &      i_sSearchString ) const
+                            { return aImpl.Search_Name(i_sSearchString); }
+
+    StringVector::const_iterator
+                        NameChain_Begin() const
+                            { return aImpl.NameChain_Begin(); }
+    StringVector::const_iterator
+                        NameChain_End() const
+                            { return aImpl.NameChain_End(); }
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    // DATA
+    NameTreeNode<Type_id>
+                        aImpl;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/idl/makefile.mk b/autodoc/source/ary/idl/makefile.mk
new file mode 100644
index 000000000000..bf260e2c521e
--- /dev/null
+++ b/autodoc/source/ary/idl/makefile.mk
@@ -0,0 +1,87 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_idl
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/i_attribute.obj     \
+    $(OBJ)$/i_ce.obj            \
+    $(OBJ)$/i_ce2s.obj          \
+    $(OBJ)$/i_comrela.obj       \
+    $(OBJ)$/i_constant.obj      \
+    $(OBJ)$/i_constgroup.obj    \
+    $(OBJ)$/i_enum.obj          \
+    $(OBJ)$/i_enumvalue.obj     \
+    $(OBJ)$/i_exception.obj     \
+    $(OBJ)$/i_function.obj      \
+    $(OBJ)$/i_interface.obj     \
+    $(OBJ)$/i_module.obj        \
+    $(OBJ)$/i_namelookup.obj    \
+    $(OBJ)$/i_param.obj         \
+    $(OBJ)$/i_property.obj      \
+    $(OBJ)$/i_reposypart.obj    \
+    $(OBJ)$/i_service.obj       \
+    $(OBJ)$/i_singleton.obj     \
+    $(OBJ)$/i_siservice.obj     \
+    $(OBJ)$/i_sisingleton.obj   \
+    $(OBJ)$/i_struct.obj        \
+    $(OBJ)$/i_structelem.obj    \
+    $(OBJ)$/i_traits.obj        \
+    $(OBJ)$/i_typedef.obj       \
+    $(OBJ)$/i2s_calculator.obj  \
+    $(OBJ)$/ia_ce.obj           \
+    $(OBJ)$/ia_type.obj         \
+    $(OBJ)$/is_ce.obj           \
+    $(OBJ)$/is_type.obj         \
+    $(OBJ)$/it_builtin.obj      \
+    $(OBJ)$/it_ce.obj           \
+    $(OBJ)$/it_explicit.obj     \
+    $(OBJ)$/it_sequence.obj     \
+    $(OBJ)$/it_tplparam.obj     \
+    $(OBJ)$/it_xnameroom.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/ary/inc/cpp_internalgate.hxx b/autodoc/source/ary/inc/cpp_internalgate.hxx
new file mode 100644
index 000000000000..723e019cb4f6
--- /dev/null
+++ b/autodoc/source/ary/inc/cpp_internalgate.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_INTERNALGATE_HXX
+#define ARY_CPP_INTERNALGATE_HXX
+
+// BASE CLASSES
+#include <ary/cpp/c_gate.hxx>
+
+namespace ary
+{
+    class RepositoryCenter;
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Provides access to the ->cpp::RepositoryPartition as far as is needed
+    by the ->RepositoryCenter.
+*/
+class InternalGate : public ::ary::cpp::Gate
+{
+  public:
+    virtual             ~InternalGate() {}
+
+    static DYN InternalGate &
+                        Create_Partition_(
+                            RepositoryCenter &  i_center );
+};
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/cross_refs.hxx b/autodoc/source/ary/inc/cross_refs.hxx
new file mode 100644
index 000000000000..8f6b98aabc05
--- /dev/null
+++ b/autodoc/source/ary/inc/cross_refs.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CROSS_REFS_HXX
+#define ARY_CROSS_REFS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include "sorted_idset.hxx"
+
+
+template <class VALUE_LIST, class TYPES>
+class CrossReferences
+{
+  public:
+    typedef TYPES::element_type         element;
+
+    /// Checks for double occurences
+    void                Add(
+                            VALUE_LIST::index_type
+                                                i_nPosition
+                            const element &     i_rElem );
+    void                Get_List(
+                            Dyn_StdConstIterator<element> &
+                                                o_rResult ) const;
+  private:
+    SortedIdSet<TYPES>  aData[VALUE_LIST::max];
+};
+
+
+
+namespace ary
+{
+
+template <class TYPES>
+class SortedIdSet
+{
+  public:
+    typedef typename TYPES::element_type   element;
+    typedef typename TYPES::sort_type      sorter;
+    typedef typename TYPES::find_type      finder;
+
+                        SortedIdSet(
+                            const finder &      i_rFinder )
+                                                : aSorter(i_rFinder),
+                                                  aData(aSorter) {}
+                        ~SortedIdSet()          {}
+
+    void                Get_Begin(
+                            Dyn_StdConstIterator<element> &
+                                                o_rResult )
+                                                { o_rResult = new SCI_Set<FINDER>(aData); }
+    void                Add(
+                            const element &     i_rElement )
+                                                { aData.insert(i_rElement); }
+
+  private:
+    typedef std::set<element, sorter>       Set;
+
+    // DATA
+    sorter              aSorter;
+    Set                 aData;
+};
+
+
+}   // namespace ary
+
+
+
+#endif
+
diff --git a/autodoc/source/ary/inc/idl_internalgate.hxx b/autodoc/source/ary/inc/idl_internalgate.hxx
new file mode 100644
index 000000000000..783971f7295f
--- /dev/null
+++ b/autodoc/source/ary/inc/idl_internalgate.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDL_INTERNALGATE_HXX
+#define ARY_IDL_INTERNALGATE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_gate.hxx>
+
+namespace ary
+{
+    class RepositoryCenter;
+}
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Provides access to the ->idl::RepositoryPartition as far as is needed
+    by the ->RepositoryCenter.
+*/
+class InternalGate : public ::ary::idl::Gate
+{
+  public:
+    virtual             ~InternalGate() {}
+
+    static DYN InternalGate &
+                        Create_Partition_(
+                            RepositoryCenter &  i_center );
+};
+
+
+
+
+}   //  namespace idl
+}   //  namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/idsort.hxx b/autodoc/source/ary/inc/idsort.hxx
new file mode 100644
index 000000000000..d0bbaa37e7a2
--- /dev/null
+++ b/autodoc/source/ary/inc/idsort.hxx
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_IDSORT_HXX
+#define ARY_IDSORT_HXX
+
+
+/** A compare function that sorts ids of repository entities in the same
+    storage.
+
+    @see ::ary::SortedIds
+*/
+template<class COMPARE>
+struct IdSorter
+{
+    bool                operator()(
+                            typename COMPARE::id_type
+                                                i_1,
+                            typename COMPARE::id_type
+                                                i_2 ) const
+                            { return COMPARE::Lesser_(
+                                        COMPARE::KeyOf_(COMPARE::EntityOf_(i_1)),
+                                        COMPARE::KeyOf_(COMPARE::EntityOf_(i_2)) );
+                            }
+};
+
+
+#endif
diff --git a/autodoc/source/ary/inc/loc_internalgate.hxx b/autodoc/source/ary/inc/loc_internalgate.hxx
new file mode 100644
index 000000000000..13409e6364de
--- /dev/null
+++ b/autodoc/source/ary/inc/loc_internalgate.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_INTERNALGATE_HXX
+#define ARY_LOC_INTERNALGATE_HXX
+
+// USED SERVICES
+
+namespace ary
+{
+namespace loc
+{
+    class LocationPilot;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Additional access to locations for the repository implementation.
+*/
+class InternalGate
+{
+  public:
+
+    static DYN LocationPilot &
+                        Create_Locations_();
+};
+
+
+}   // namespace loc
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/nametreenode.hxx b/autodoc/source/ary/inc/nametreenode.hxx
new file mode 100644
index 000000000000..c7d77faaab34
--- /dev/null
+++ b/autodoc/source/ary/inc/nametreenode.hxx
@@ -0,0 +1,210 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_NAMETREENODE_HXX
+#define ARY_NAMETREENODE_HXX
+//  KORR_DEPRECATED_3.0
+//      Replace by ::ary::symtree::Node.
+
+// USED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <sci_impl.hxx>
+// HACK because of SunPro 5.2 compiler bug with templates:
+#include <ary/idl/i_module.hxx>
+
+
+
+
+namespace ary
+{
+
+
+/** Implementation of a node in a namespace-tree.
+*/
+template<class ITEM_ID>
+class NameTreeNode
+{
+  public:
+    typedef NameTreeNode                    self;
+    typedef ITEM_ID                         item_id;
+    typedef StringVector::const_iterator    name_iterator;
+    typedef std::map<String, item_id>       Map_LocalNames;
+
+    // LIFECYCLE
+                        NameTreeNode();
+                        NameTreeNode(
+                            const String &      i_sName,
+                            const self &        i_rParent,
+                            ITEM_ID             i_nParentId );
+    virtual             ~NameTreeNode();
+
+    // OPERATIONS
+    void                Add_Name(
+                            const String &      i_sName,
+                            item_id             i_nId );
+    // INQUIRY
+    const String &      Name() const            { return Depth() > 0 ? aCompleteNameChain.back() : String::Null_(); }
+    item_id             Parent() const          { return nParent; }
+    intt                Depth() const           { return aCompleteNameChain.size(); }
+
+    bool                IsEquivalent(
+                            const NameTreeNode &
+                                                i_rNode ) const;
+    name_iterator       NameChain_Begin() const { return aCompleteNameChain.begin(); }
+    name_iterator       NameChain_End() const   { return aCompleteNameChain.end(); }
+
+    item_id             Search_Name(
+                            const String &      i_sName ) const;
+    void                Get_Names(
+                            Dyn_StdConstIterator<ITEM_ID> &
+                                                o_rResult ) const;
+    const Map_LocalNames &
+                        LocalNames() const      { return aLocalNames; }
+  private:
+    // Locals
+    Map_LocalNames &    LocalNames()            { return aLocalNames; }
+
+    // DATA
+    Map_LocalNames      aLocalNames;
+    StringVector        aCompleteNameChain;
+    item_id             nParent;
+};
+
+
+
+
+// IMPLEMENTATION
+template<class ITEM_ID>
+NameTreeNode<ITEM_ID>::NameTreeNode()
+    :   aLocalNames(),
+        aCompleteNameChain(),
+        nParent(0)
+{
+}
+
+template<class ITEM_ID>
+NameTreeNode<ITEM_ID>::NameTreeNode( const String &      i_sName,
+                                     const self &        i_rParent,
+                                     ITEM_ID             i_nParentId )
+    :   aLocalNames(),
+        aCompleteNameChain(),
+        nParent(i_nParentId)
+{
+    aCompleteNameChain.reserve(i_rParent.Depth()+1);
+    for ( name_iterator it = i_rParent.NameChain_Begin();
+          it != i_rParent.NameChain_End();
+          ++it )
+    {
+        aCompleteNameChain.push_back(*it);
+    }
+    aCompleteNameChain.push_back(i_sName);
+}
+
+template<class ITEM_ID>
+NameTreeNode<ITEM_ID>::~NameTreeNode()
+{
+}
+
+
+template<class ITEM_ID>
+inline void
+NameTreeNode<ITEM_ID>::Add_Name( const String &      i_sName,
+                                 item_id             i_nId )
+{
+    LocalNames().insert( typename Map_LocalNames::value_type(i_sName, i_nId) );
+}
+
+
+template<class ITEM_ID>
+inline bool
+NameTreeNode<ITEM_ID>::IsEquivalent( const NameTreeNode & i_rNode ) const
+{
+    return aCompleteNameChain == i_rNode.aCompleteNameChain;
+}
+
+template<class ITEM_ID>
+inline ITEM_ID
+NameTreeNode<ITEM_ID>::Search_Name( const String & i_sName ) const
+{
+    return csv::value_from_map(LocalNames(),i_sName, ITEM_ID(0));
+}
+
+template<class ITEM_ID>
+inline void
+NameTreeNode<ITEM_ID>::Get_Names( Dyn_StdConstIterator<ITEM_ID> & o_rResult ) const
+{
+    o_rResult = new SCI_DataInMap<String,item_id>(LocalNames());
+}
+
+
+// HACK because of SunPro 5.2 compiler bug with templates:
+//   ary::idl::Module has to be "FIND_NODE::node_type"
+//   must be solved later somehow.
+template <class FIND_NODE>
+typename FIND_NODE::id_type
+Search_SubTree( const ary::idl::Module &    i_rStart,
+                const FIND_NODE &           i_rNodeFinder )
+{
+    const ary::idl::Module *
+        ret = &i_rStart;
+
+    for ( StringVector::const_iterator  it = i_rNodeFinder.Begin();
+          it != i_rNodeFinder.End() AND ret != 0;
+          ++it )
+    {
+        ret = i_rNodeFinder(ret->Search_Name(*it));
+    }
+
+    typename FIND_NODE::id_type nret(0);
+    return ret != 0
+            ?   ret->Search_Name(i_rNodeFinder.Name2Search())
+            :   nret;
+}
+
+template <class  FIND_NODE>
+typename FIND_NODE::id_type
+Search_SubTree_UpTillRoot( const ary::idl::Module &    i_rStart,
+                           const FIND_NODE &           i_rNodeFinder )
+{
+    typename FIND_NODE::id_type
+        ret(0);
+    for ( const ary::idl::Module * start = &i_rStart;
+          start != 0 AND NOT ret.IsValid();
+          start = i_rNodeFinder(start->Owner()) )
+    {
+        ret = Search_SubTree( *start,
+                              i_rNodeFinder );
+    }
+    return ret;
+}
+// END Hack for SunPro 5.2 compiler bug.
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/reposy.hxx b/autodoc/source/ary/inc/reposy.hxx
new file mode 100644
index 000000000000..6bdfd907ce04
--- /dev/null
+++ b/autodoc/source/ary/inc/reposy.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_REPOSY_HXX
+#define ARY_REPOSY_HXX
+
+// BASE CLASSES
+#include <ary/ary.hxx>
+// USED SERVICES
+#include <cosv/ploc_dir.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class InternalGate;
+}
+namespace idl
+{
+    class InternalGate;
+}
+}   // namespace ary
+
+
+
+
+namespace ary
+{
+
+
+/** Implements ::ary::Repository.
+
+    @see Repository
+*/
+
+class RepositoryCenter : public ::ary::Repository
+{
+  public:
+    //  LIFECYCLE
+                        RepositoryCenter();
+    virtual             ~RepositoryCenter();
+
+    // INHERITED
+        // Interface Repository:
+    virtual const cpp::Gate &   Gate_Cpp() const;
+    virtual const idl::Gate &   Gate_Idl() const;
+    virtual const String &      Title() const;
+    virtual cpp::Gate &         Gate_Cpp();
+    virtual idl::Gate &         Gate_Idl();
+    virtual void                Set_Title(const String & i_sName );
+
+  private:
+    // DATA
+    String              sDisplayedName;     /// Name to be displayed for human users.
+    csv::ploc::Directory
+                        aLocation;
+    Dyn<cpp::InternalGate>
+                        pCppPartition;
+    Dyn<idl::InternalGate>
+                        pIdlPartition;
+};
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/sci_impl.hxx b/autodoc/source/ary/inc/sci_impl.hxx
new file mode 100644
index 000000000000..26c5236904b9
--- /dev/null
+++ b/autodoc/source/ary/inc/sci_impl.hxx
@@ -0,0 +1,413 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_SCI_IMPL_HXX
+#define ARY_SCI_IMPL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/stdconstiter.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+
+
+//*************************     SCI_Vector      **********************************//
+
+template <class ELEM>
+class SCI_Vector : public StdConstIterator<ELEM>
+{
+  public:
+    typedef std::vector<ELEM>       source;
+    typedef typename source::const_iterator source_iterator;
+
+                        SCI_Vector(
+                            const source &      i_rSource  );
+    virtual             ~SCI_Vector();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const ELEM *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+
+//*************************     SCI_Map      **********************************//
+
+template <class KEY, class VALUE>
+class SCI_Map : public StdConstIterator< typename std::map<KEY,VALUE>::value_type >
+{
+  public:
+    typedef std::map<KEY,VALUE>     source;
+    typedef typename source::const_iterator source_iterator;
+
+                        SCI_Map(
+                            const source &      i_rSource  );
+    virtual             ~SCI_Map();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const typename std::map<KEY,VALUE>::value_type *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+//*************************     SCI_MultiMap      **********************************//
+
+template <class KEY, class VALUE>
+class SCI_MultiMap : public StdConstIterator< typename std::multimap<KEY,VALUE>::value_type >
+{
+  public:
+    typedef std::multimap<KEY,VALUE>    source;
+    typedef typename source::const_iterator      source_iterator;
+
+                        SCI_MultiMap(
+                            const source &      i_rSource  );
+                        SCI_MultiMap(
+                            source_iterator     i_begin,
+                            source_iterator     i_end );
+    virtual             ~SCI_MultiMap();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const typename std::multimap<KEY,VALUE>::value_type *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+
+//*************************     SCI_Set     **********************************//
+
+
+template <class TYPES>
+class SCI_Set : public StdConstIterator<typename TYPES::element_type>
+{
+  public:
+    typedef typename TYPES::element_type    element;
+    typedef typename TYPES::sort_type       sorter;
+    typedef std::set<element, sorter>       source;
+    typedef typename source::const_iterator source_iterator;
+
+                        SCI_Set(
+                            const source &      i_rSource  );
+    virtual             ~SCI_Set();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const element *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+//*************************     SCI_DataInMap    **********************************//
+
+template <class KEY, class VALUE>
+class SCI_DataInMap : public StdConstIterator<VALUE>
+{
+  public:
+    typedef std::map<KEY,VALUE>     source;
+    typedef typename source::const_iterator  source_iterator;
+
+                        SCI_DataInMap(
+                            const source &      i_rSource  );
+    virtual             ~SCI_DataInMap();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const VALUE *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+
+
+
+//********************************************************************//
+
+
+// IMPLEMENTATION
+
+template <class ELEM>
+SCI_Vector<ELEM>::SCI_Vector( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class ELEM>
+SCI_Vector<ELEM>::~SCI_Vector()
+{
+}
+
+
+template <class ELEM>
+void
+SCI_Vector<ELEM>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class ELEM>
+const ELEM *
+SCI_Vector<ELEM>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+template <class ELEM>
+bool
+SCI_Vector<ELEM>::inq_IsSorted() const
+{
+    return false;
+}
+
+
+
+
+template <class KEY, class VALUE>
+SCI_Map<KEY,VALUE>::SCI_Map( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class KEY, class VALUE>
+SCI_Map<KEY,VALUE>::~SCI_Map()
+{
+}
+
+template <class KEY, class VALUE>
+void
+SCI_Map<KEY,VALUE>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class KEY, class VALUE>
+const typename std::map<KEY,VALUE>::value_type *
+SCI_Map<KEY,VALUE>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+
+template <class KEY, class VALUE>
+bool
+SCI_Map<KEY,VALUE>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+template <class KEY, class VALUE>
+SCI_MultiMap<KEY,VALUE>::SCI_MultiMap( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class KEY, class VALUE>
+SCI_MultiMap<KEY,VALUE>::SCI_MultiMap( source_iterator i_begin,
+                                       source_iterator i_end )
+    :   itRun(i_begin),
+        itEnd(i_end)
+{
+}
+
+template <class KEY, class VALUE>
+SCI_MultiMap<KEY,VALUE>::~SCI_MultiMap()
+{
+}
+
+template <class KEY, class VALUE>
+void
+SCI_MultiMap<KEY,VALUE>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class KEY, class VALUE>
+const typename std::multimap<KEY,VALUE>::value_type *
+SCI_MultiMap<KEY,VALUE>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+
+template <class KEY, class VALUE>
+bool
+SCI_MultiMap<KEY,VALUE>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+
+template <class ELEM>
+SCI_Set<ELEM>::SCI_Set( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class ELEM>
+SCI_Set<ELEM>::~SCI_Set()
+{
+}
+
+
+template <class ELEM>
+void
+SCI_Set<ELEM>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class ELEM>
+const typename SCI_Set<ELEM>::element *
+SCI_Set<ELEM>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+template <class ELEM>
+bool
+SCI_Set<ELEM>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+template <class KEY, class VALUE>
+SCI_DataInMap<KEY,VALUE>::SCI_DataInMap( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class KEY, class VALUE>
+SCI_DataInMap<KEY,VALUE>::~SCI_DataInMap()
+{
+}
+
+template <class KEY, class VALUE>
+void
+SCI_DataInMap<KEY,VALUE>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class KEY, class VALUE>
+const VALUE *
+SCI_DataInMap<KEY,VALUE>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun).second;
+    return 0;
+}
+
+
+template <class KEY, class VALUE>
+bool
+SCI_DataInMap<KEY,VALUE>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+}   // namespace ary
+
+
+#endif
diff --git a/autodoc/source/ary/inc/slots.hxx b/autodoc/source/ary/inc/slots.hxx
new file mode 100644
index 000000000000..f5c449f7a30a
--- /dev/null
+++ b/autodoc/source/ary/inc/slots.hxx
@@ -0,0 +1,163 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_SLOTS_HXX
+#define ARY_SLOTS_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/ceslot.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/ary_disp.hxx>
+#include <ary/types.hxx>
+#include <ary/sequentialids.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+
+
+namespace ary
+{
+
+
+class Slot_Null : public Slot
+{
+  public:
+    virtual             ~Slot_Null();
+
+    virtual void        StoreAt(
+                            Display &           o_rDestination ) const;
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+};
+
+class Slot_MapLocalCe : public Slot
+{
+  public:
+                        Slot_MapLocalCe(
+                            const cpp::Map_LocalCe & i_rData );
+    virtual             ~Slot_MapLocalCe();
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const cpp::Map_LocalCe *
+                        pData;
+};
+
+class Slot_MapOperations : public Slot
+{
+  public:
+                        Slot_MapOperations(
+                            const std::multimap<String, cpp::Ce_id> &
+                                                i_rData );
+    virtual             ~Slot_MapOperations();
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const std::multimap<String, cpp::Ce_id> *
+                        pData;
+};
+
+class Slot_ListLocalCe : public Slot
+{
+  public:
+                        Slot_ListLocalCe(
+                            const cpp::List_LocalCe &
+                                                i_rData );
+    virtual             ~Slot_ListLocalCe();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const cpp::List_LocalCe *
+                        pData;
+};
+
+template <class ID>
+class Slot_SequentialIds : public Slot
+{
+  public:
+                        Slot_SequentialIds(
+                            const SequentialIds<ID> &
+                                                i_rData )
+                            :   pData(&i_rData) {}
+    virtual             ~Slot_SequentialIds();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const SequentialIds<ID> *
+                        pData;
+};
+
+
+template <class ID>
+Slot_SequentialIds<ID>::~Slot_SequentialIds()
+{
+}
+
+template <class ID>
+uintt
+Slot_SequentialIds<ID>::Size() const
+{
+     return pData->Size();
+}
+
+template <class ID>
+void
+Slot_SequentialIds<ID>::StoreEntries( Display     & o_rDestination ) const
+{
+    for ( typename SequentialIds<ID>::const_iterator it = pData->Begin();
+          it != pData->End();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_Rid( (*it).Value() );
+    }
+}
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/sorted_idset.hxx b/autodoc/source/ary/inc/sorted_idset.hxx
new file mode 100644
index 000000000000..93c00a1091ca
--- /dev/null
+++ b/autodoc/source/ary/inc/sorted_idset.hxx
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_SORTED_IDSET_HXX
+#define ARY_SORTED_IDSET_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <set>
+    // PARAMETERS
+#include "csi_impl.hxx"
+
+
+template <class XY> class SortedIdSet;
+
+class Interface_2s
+{
+  public:
+    /// Checks for double occurences
+    void                Add_ExportingService(
+                            Ce_id               i_nId );
+    void                Get_ExportingServices(
+                            Dyn_StdConstIterator<Ce_id> &
+                                                o_rResult ) const;
+  private:
+    Dyn<SortedIdSet>    pExportingServices;
+};
+
+
+
+namespace ary
+{
+
+template <class TYPES>
+class SortedIdSet
+{
+  public:
+    typedef typename TYPES::element_type   element;
+    typedef typename TYPES::sort_type      sorter;
+    typedef typename TYPES::find_type      finder;
+
+                        SortedIdSet(
+                            const finder &      i_rFinder )
+                                                : aSorter(i_rFinder),
+                                                  aData(aSorter) {}
+                        ~SortedIdSet()          {}
+
+    void                Get_Begin(
+                            Dyn_StdConstIterator<element> &
+                                                o_rResult )
+                                                { o_rResult = new SCI_Set<FINDER>(aData); }
+    void                Add(
+                            const element &     i_rElement )
+                                                { aData.insert(i_rElement); }
+
+  private:
+    typedef std::set<element, sorter>       Set;
+
+    // DATA
+    sorter              aSorter;
+    Set                 aData;
+};
+
+
+}   // namespace ary
+
+
+
+#endif
+
diff --git a/autodoc/source/ary/inc/sortedids.hxx b/autodoc/source/ary/inc/sortedids.hxx
new file mode 100644
index 000000000000..9bebaa9b19a5
--- /dev/null
+++ b/autodoc/source/ary/inc/sortedids.hxx
@@ -0,0 +1,237 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_SORTEDIDS_HXX
+#define ARY_SORTEDIDS_HXX
+
+
+// USED SERVICES
+#include <algorithm>
+#include <cosv/tpl/range.hxx>
+
+
+
+
+namespace ary
+{
+
+
+/** Implementation of a set of children to an entity in the Autodoc
+    repository. The children are sorted.
+
+    @tpl COMPARE
+    Needs to provide types:
+        entity_base_type
+        id_type
+        key_type
+
+    and functions:
+        static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+        static const key_type &
+                        KeyOf_(
+                            const entity_type & i_entity );
+        static bool     Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+*/
+template<class COMPARE>
+class SortedIds
+{
+  public:
+    typedef typename COMPARE::id_type                   element_t;
+    typedef typename COMPARE::key_type                  key_t;
+    typedef std::vector<element_t>                      data_t;
+    typedef typename data_t::const_iterator             const_iterator;
+    typedef typename data_t::iterator                   iterator;
+    typedef csv::range<const_iterator>                  search_result_t;
+
+    // LIFECYCLE
+    explicit            SortedIds(
+                            std::size_t         i_reserve = 0 );
+                        ~SortedIds();
+
+    // OPERATIONS
+    void                Add(
+                            element_t           i_elem );
+    // INQUIRY
+    const_iterator      Begin() const;
+    const_iterator      End() const;
+
+    element_t           Search(
+                            const key_t &       i_key ) const;
+    search_result_t     SearchAll(
+                            const key_t &       i_key ) const;
+    const_iterator      LowerBound(
+                            const key_t &       i_key ) const;
+
+  private:
+    typedef typename COMPARE::entity_base_type      entity_t;
+
+    // Locals
+    iterator            LowerBound(
+                            const key_t &       i_key );
+
+    static const key_t  &
+                        KeyOf_(
+                            element_t           i_child );
+    template <class ITER>
+    static ITER         impl_LowerBound_(
+                            ITER                i_begin,
+                            ITER                i_end,
+                            const key_t &       i_key );
+
+    // DATA
+    data_t              aData;
+};
+
+
+
+
+// IMPLEMENTATION
+template<class COMPARE>
+inline const typename SortedIds<COMPARE>::key_t &
+SortedIds<COMPARE>::KeyOf_(element_t i_child)
+{
+    return COMPARE::KeyOf_(COMPARE::EntityOf_(i_child));
+}
+
+template<class COMPARE>
+SortedIds<COMPARE>::SortedIds(std::size_t i_reserve)
+    :   aData()
+{
+    if (i_reserve > 0)
+        aData.reserve(i_reserve);
+}
+
+template<class COMPARE>
+SortedIds<COMPARE>::~SortedIds()
+{
+}
+
+template<class COMPARE>
+void
+SortedIds<COMPARE>::Add(element_t i_elem)
+{
+    aData.insert(   LowerBound( KeyOf_(i_elem) ),
+                    i_elem );
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::const_iterator
+SortedIds<COMPARE>::Begin() const
+{
+    return aData.begin();
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::const_iterator
+SortedIds<COMPARE>::End() const
+{
+    return aData.end();
+}
+
+template<class COMPARE>
+typename SortedIds<COMPARE>::element_t
+SortedIds<COMPARE>::Search(const key_t & i_key) const
+{
+    const_iterator
+        ret = LowerBound(i_key);
+    return ret != aData.end() AND NOT COMPARE::Lesser_(i_key, KeyOf_(*ret))
+            ?   *ret
+            :   element_t(0);
+}
+
+template<class COMPARE>
+typename SortedIds<COMPARE>::search_result_t
+SortedIds<COMPARE>::SearchAll(const key_t & i_key) const
+{
+    const_iterator
+        r1 = LowerBound(i_key);
+    const_iterator
+        r2 = r1;
+    while (     r2 != aData.end()
+            AND NOT COMPARE::Lesser_(i_key, KeyOf_(*r2)) )
+    {
+        ++r2;
+    }
+
+    return csv::make_range(r1,r2);
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::const_iterator
+SortedIds<COMPARE>::LowerBound(const key_t & i_key) const
+{
+    return impl_LowerBound_( aData.begin(),
+                             aData.end(),
+                             i_key );
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::iterator
+SortedIds<COMPARE>::LowerBound(const key_t & i_key)
+{
+    return impl_LowerBound_( aData.begin(),
+                             aData.end(),
+                             i_key );
+}
+
+template<class COMPARE>
+template <class ITER>
+ITER
+SortedIds<COMPARE>::impl_LowerBound_( ITER            i_begin,
+                                      ITER            i_end,
+                                      const key_t &   i_key )
+{
+    ITER i1 = i_begin;
+    ITER i2 = i_end;
+
+    for ( ITER it = i1 + (i2-i1)/2;
+          i1 != i2;
+          it = i1 + (i2-i1)/2 )
+    {
+        if ( COMPARE::Lesser_(KeyOf_(*it), i_key) )
+        {
+            i1 = it;
+            ++i1;
+        }
+        else
+        {
+            i2 = it;
+        }
+    }   // end for
+
+    return i1;
+}
+
+
+
+
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/store/s_base.hxx b/autodoc/source/ary/inc/store/s_base.hxx
new file mode 100644
index 000000000000..e14fc2652293
--- /dev/null
+++ b/autodoc/source/ary/inc/store/s_base.hxx
@@ -0,0 +1,180 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_STORE_S_BASE_HXX
+#define ARY_STORE_S_BASE_HXX
+
+// USED SERVICES
+#include <deque>
+#include <cosv/tpl/tpltools.hxx>
+
+
+
+
+namespace ary
+{
+namespace stg
+{
+
+
+/** The basic storage container of the repository.
+
+    @collab Storage
+    Implements Storage. Not used elsewhere.
+
+    @tpl ENTITY
+    The type of *it, where it is of type c_iter, has to be ENTITY * const.
+*/
+template <class ENTITY>
+class Base
+{
+  public:
+    // LIFECYCLE
+    typedef std::deque< ENTITY* >               impl_type;
+    typedef typename impl_type::const_iterator  c_iter;
+
+
+    /** @param i_nrOfReservedItems
+        The number of actual items to reserve, including the item
+        at index [0] that is always empty and unused.
+    */
+                        Base(
+                            uintt               i_nrOfReservedItems );
+                        ~Base();
+
+    // OPERATORS
+    ENTITY *            operator[](
+                            uintt               i_index ) const;
+    // OPERATIONS
+    uintt               Add_Entity(             /// @return the index of the new element.
+                            DYN ENTITY &        pass_newEntity );
+    DYN ENTITY *        Set_Entity(             /// @return the previous value.
+                            uintt               i_index,
+                            DYN ENTITY &        pass_newEntity );
+    // INQUIRY
+    uintt               Size() const;           /// Incl. reserved size.
+    uintt               ReservedSize() const;   /// Incl. zero for element at [0].
+
+    c_iter              Begin() const;          /// @return location of index 1, because 0 is always empty.
+    c_iter              BeginUnreserved() const;
+    c_iter              End() const;
+
+  private:
+    // DATA
+    impl_type               aData;
+    uintt                   nReservedSize;
+};
+
+
+
+// IMPLEMENTATION
+
+template <class ENTITY>
+Base<ENTITY>::Base(uintt i_nrOfReservedItems)
+    :   aData(i_nrOfReservedItems, 0),
+        nReservedSize(i_nrOfReservedItems)
+{
+}
+
+template <class ENTITY>
+Base<ENTITY>::~Base()
+{
+    csv::erase_container_of_heap_ptrs(aData);
+}
+
+
+template <class ENTITY>
+ENTITY *
+Base<ENTITY>::operator[](uintt i_index) const
+{
+    if (i_index < aData.size())
+        return aData[i_index];
+    return 0;
+}
+
+template <class ENTITY>
+uintt
+Base<ENTITY>::Add_Entity(DYN ENTITY & pass_newEntity)
+{
+    aData.push_back(&pass_newEntity);
+    return aData.size() - 1;
+}
+
+template <class ENTITY>
+DYN ENTITY *
+Base<ENTITY>::Set_Entity( uintt         i_index,
+                          DYN ENTITY &  pass_newEntity )
+{
+    csv_assert(i_index != 0 AND i_index < aData.size());
+
+    Dyn<ENTITY>
+        ret(aData[i_index]);
+    aData[i_index] = &pass_newEntity;
+    return ret.Release();
+}
+
+template <class ENTITY>
+uintt
+Base<ENTITY>::Size() const
+{
+    return aData.size();
+}
+
+template <class ENTITY>
+uintt
+Base<ENTITY>::ReservedSize() const
+{
+    return nReservedSize;
+}
+
+template <class ENTITY>
+typename Base<ENTITY>::c_iter
+Base<ENTITY>::Begin() const
+{
+    return aData.begin() + 1;
+}
+
+template <class ENTITY>
+typename Base<ENTITY>::c_iter
+Base<ENTITY>::BeginUnreserved() const
+{
+    return aData.begin() + nReservedSize;
+}
+
+template <class ENTITY>
+typename Base<ENTITY>::c_iter
+Base<ENTITY>::End() const
+{
+    return aData.end();
+}
+
+
+
+
+}   // namespace stg
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/store/s_iterator.hxx b/autodoc/source/ary/inc/store/s_iterator.hxx
new file mode 100644
index 000000000000..af5c991ba9a9
--- /dev/null
+++ b/autodoc/source/ary/inc/store/s_iterator.hxx
@@ -0,0 +1,237 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_STORE_S_ITERATOR_HXX
+#define ARY_STORE_S_ITERATOR_HXX
+
+// USED SERVICES
+#include <ary/getncast.hxx>
+#include "s_base.hxx"
+
+
+
+
+namespace ary
+{
+namespace stg
+{
+
+
+template <class>        class const_iterator;
+template <class, class> class const_filter_iterator;
+
+
+/** A non-const iterator that runs on a ->Storage<>.
+
+    @collab Storage<>
+*/
+template <class ENTITY>
+class iterator : public std::iterator<std::forward_iterator_tag, ENTITY>
+{
+  public:
+    typedef iterator<ENTITY>                            self;
+    typedef typename Base<ENTITY>::impl_type            impl_container;
+    typedef typename impl_container::const_iterator     impl_type;
+
+    // OPERATORS
+                        iterator()
+                            :   itImpl()        {}
+    explicit            iterator(
+                            impl_type           i_impl)
+                            :   itImpl(i_impl)  {}
+                        ~iterator()             {}
+
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itImpl == i_other.itImpl; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itImpl != i_other.itImpl; }
+    ENTITY &            operator*() const       { csv_assert(*itImpl != 0);
+                                                  return *(*itImpl); }
+    self &              operator++()            { ++itImpl; return *this; }
+    self                operator++(int)         { return self(itImpl++); }
+
+  private:
+    friend class const_iterator<ENTITY>;        // For const_iterator(iterator);
+    impl_type           ImplIterator() const    { return itImpl; }
+
+    // DATA
+    impl_type           itImpl;
+};
+
+
+/** A const iterator that runs on a ->Storage<>.
+
+    @collab Storage<>
+*/
+template <class ENTITY>
+class const_iterator :
+    public std::iterator<std::forward_iterator_tag, const ENTITY>
+{
+  public:
+    typedef const_iterator<ENTITY>                      self;
+    typedef typename Base<ENTITY>::impl_type            impl_container;
+    typedef typename impl_container::const_iterator     impl_type;
+
+    // OPERATORS
+                        const_iterator()
+                            :   itImpl()        {}
+    explicit            const_iterator(
+                            impl_type           i_impl)
+                            :   itImpl(i_impl)  {}
+                        const_iterator(         // implicit conversions allowed
+                            ::ary::stg::iterator<ENTITY>    i_it )
+                            :   itImpl(i_it.ImplIterator()) {}
+                        ~const_iterator()       {}
+
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itImpl == i_other.itImpl; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itImpl != i_other.itImpl; }
+    const ENTITY &      operator*() const       { csv_assert(*itImpl != 0);
+                                                  return *(*itImpl); }
+    self &              operator++()            { ++itImpl; return *this; }
+    self                operator++(int)         { return self(itImpl++); }
+
+  private:
+    // DATA
+    impl_type           itImpl;
+};
+
+
+
+
+
+/** A non const iterator that runs on a ->Storage<> and returns only
+    the elements of a specific type.
+
+    @tpl ENTITY
+    The element type of the ->Storage<>
+
+    @tpl FILTER
+    The actual type of the returned items. FILTER needs to be derived from
+    ENTITY.
+
+    @collab Storage<>
+*/
+template <class ENTITY, class FILTER>
+class filter_iterator :
+    public std::iterator<std::forward_iterator_tag, FILTER>
+{
+  public:
+    typedef filter_iterator<ENTITY,FILTER>              self;
+    typedef ::ary::stg::iterator<ENTITY>                impl_type;
+
+    // OPERATORS
+                        filter_iterator()
+                            :   itCur()         {}
+    explicit            filter_iterator(
+                            impl_type           i_cur )
+                            :   itCur(i_cur)    {}
+                        ~filter_iterator()      {}
+
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itCur == i_other.itCur; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itCur != i_other.itCur; }
+    FILTER &            operator*() const       { csv_assert(IsValid());
+                                                  return static_cast< FILTER& >(*itCur); }
+    self &              operator++()            { ++itCur;
+                                                  return *this; }
+    self                operator++(int)         { return self(itCur++); }
+    bool                IsValid() const         { return ary::is_type<FILTER>(*itCur); }
+
+  private:
+    friend class const_filter_iterator<ENTITY,FILTER>;  // For const_filter_iterator(filter_iterator);
+    impl_type           ImplCur() const         { return itCur; }
+
+    // DATA
+    impl_type           itCur;
+};
+
+
+/** A const iterator that runs on a ->Storage<> and returns only
+    the elements of a specific type.
+
+    @tpl ENTITY
+    The element type of the ->Storage<>
+
+    @tpl FILTER
+    The actual type of the returned items. FILTER needs to be derived from
+    ENTITY.
+
+    @collab Storage<>
+*/
+template <class ENTITY, class FILTER>
+class const_filter_iterator :
+    public std::iterator<std::forward_iterator_tag, const FILTER>
+{
+  public:
+    typedef const_filter_iterator<ENTITY,FILTER>        self;
+    typedef ::ary::stg::const_iterator<ENTITY>          impl_type;
+
+    // OPERATORS
+                        const_filter_iterator()
+                            :   itCur()         {}
+    explicit            const_filter_iterator(
+                            impl_type           i_cur )
+                            :   itCur(i_cur)    {}
+    explicit            const_filter_iterator(  // implicit conversions allowed
+                            filter_iterator<ENTITY,FILTER>
+                                                i_it )
+                            :   itCur(i_it.ImplCur())   {}
+                        ~const_filter_iterator()
+                                                {}
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itCur == i_other.itCur; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itCur != i_other.itCur; }
+    const FILTER &      operator*() const       { csv_assert(IsValid());
+                                                  return static_cast< const FILTER& >(*itCur); }
+    self &              operator++()            { ++itCur;
+                                                  return *this; }
+    self                operator++(int)         { return self(itCur++); }
+    bool                IsValid() const         { return ary::is_type<FILTER>(*itCur); }
+
+  private:
+    // DATA
+    impl_type           itCur;
+};
+
+
+
+
+}   // namespace stg
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/store/s_storage.hxx b/autodoc/source/ary/inc/store/s_storage.hxx
new file mode 100644
index 000000000000..aace69ef6678
--- /dev/null
+++ b/autodoc/source/ary/inc/store/s_storage.hxx
@@ -0,0 +1,294 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_STORE_S_STORAGE_HXX
+#define ARY_STORE_S_STORAGE_HXX
+
+// USED SERVICES
+#include <ary/types.hxx>
+#include "s_iterator.hxx"
+
+
+
+
+namespace ary
+{
+namespace stg
+{
+
+
+/** The storage unit of one class of commomly stored repository
+    entities.
+*/
+template <class ENTITY>
+class Storage
+{
+  public:
+    typedef Base<ENTITY>                        container_type;
+    typedef ary::TypedId<ENTITY>                key_type;
+    typedef stg::const_iterator<ENTITY>         c_iter;
+    typedef stg::iterator<ENTITY>               iter;
+
+    // LIFECYCLE
+    virtual             ~Storage() {}
+
+    // OPERATORS
+    const ENTITY &      operator[](
+                            key_type            i_id ) const;
+    ENTITY &            operator[](
+                            key_type            i_id );
+    const ENTITY &      operator[](
+                            Rid                 i_index ) const;
+    ENTITY &            operator[](
+                            Rid                 i_index );
+    // OPERATIONS
+    /// Sets the id of the new entity.
+    key_type            Store_Entity(
+                            DYN ENTITY &        pass_newEntity );
+    /// Sets the id of the new entity.
+    void                Set_Reserved(
+                            uintt               i_index,
+                            DYN ENTITY &        pass_newEntity );
+    /// Sets the id of the new entity.
+    void                Replace_Entity(
+                            key_type            i_index,
+                            DYN ENTITY &        pass_newEntity );
+    // INQUIRY
+    bool                Exists(
+                            key_type            i_id ) const;
+    bool                Exists(
+                            Rid                 i_index ) const;
+
+    c_iter              Begin() const;
+    c_iter              BeginUnreserved() const;
+    c_iter              End() const;
+
+    // ACCESS
+    iter                Begin();
+    iter                BeginUnreserved();
+    iter                End();
+
+  protected:
+                        Storage(
+                            uintt               i_nrOfReservedItems );
+  private:
+    // DATA
+    container_type      aData;
+};
+
+
+
+
+
+
+// IMPLEMENTATION
+
+// Used later, so implemented first.
+template <class ENTITY>
+inline bool
+Storage<ENTITY>::Exists(Rid i_index) const
+{
+    return 0 < i_index AND i_index < aData.Size();
+}
+
+template <class ENTITY>
+inline bool
+Storage<ENTITY>::Exists(key_type i_id) const
+{
+    return Exists(i_id.Value());
+}
+
+template <class ENTITY>
+inline const ENTITY &
+Storage<ENTITY>::operator[](Rid i_index) const
+{
+    csv_assert(Exists(i_index));
+    return * aData[i_index];
+}
+
+template <class ENTITY>
+inline ENTITY &
+Storage<ENTITY>::operator[](Rid i_index)
+{
+    csv_assert(Exists(i_index));
+    return * aData[i_index];
+}
+
+template <class ENTITY>
+inline const ENTITY &
+Storage<ENTITY>::operator[](key_type i_id) const
+{
+    return operator[](i_id.Value());
+}
+
+template <class ENTITY>
+inline ENTITY &
+Storage<ENTITY>::operator[](key_type i_id)
+{
+    return operator[](i_id.Value());
+}
+
+template <class ENTITY>
+typename Storage<ENTITY>::key_type
+Storage<ENTITY>::Store_Entity(DYN ENTITY & pass_newEntity)
+{
+    csv_assert( aData.Size() >= aData.ReservedSize() );
+    Rid
+        ret( aData.Add_Entity(pass_newEntity) );
+    pass_newEntity.Set_Id(ret);
+    return key_type(ret);
+}
+
+template <class ENTITY>
+void
+Storage<ENTITY>::Set_Reserved(uintt           i_index,
+                              DYN ENTITY &    pass_newEntity)
+{
+    // 0 must not be used.
+    csv_assert( i_index != 0 );
+    // Make sure, i_index actually is the id of a reserved item.
+    csv_assert( i_index < aData.ReservedSize() );
+
+    // If there was a previous entity, it will be deleted by
+    // the destructor of pOldEntity.
+    Dyn<ENTITY>
+        pOldEntity(aData.Set_Entity(i_index, pass_newEntity));
+    pass_newEntity.Set_Id(i_index);
+}
+
+template <class ENTITY>
+void
+Storage<ENTITY>::Replace_Entity( key_type       i_index,
+                                 DYN ENTITY &   pass_newEntity )
+{
+    uintt
+        nIndex = i_index.Value();
+    // Make sure, i_index actually is the id of an existing,
+    // non reserved entity.
+    csv_assert( csv::in_range(aData.ReservedSize(), nIndex, aData.Size()) );
+
+    // If there was a previous entity, it will be deleted by
+    // the destructor of pOldEntity.
+    Dyn<ENTITY>
+        pOldEntity(aData.Set_Entity(nIndex, pass_newEntity));
+    pass_newEntity.Set_Id(nIndex);
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::c_iter
+Storage<ENTITY>::Begin() const
+{
+    return c_iter(aData.Begin());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::c_iter
+Storage<ENTITY>::BeginUnreserved() const
+{
+    return c_iter(aData.BeginUnreserved());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::c_iter
+Storage<ENTITY>::End() const
+{
+    return c_iter(aData.End());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::iter
+Storage<ENTITY>::Begin()
+{
+    return iter(aData.Begin());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::iter
+Storage<ENTITY>::BeginUnreserved()
+{
+    return iter(aData.BeginUnreserved());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::iter
+Storage<ENTITY>::End()
+{
+    return iter(aData.End());
+}
+
+template <class ENTITY>
+inline
+Storage<ENTITY>::Storage(uintt i_nrOfReservedItems)
+    :   aData(i_nrOfReservedItems)
+{
+    // Make sure Rid and uintt are the same type, because
+    // the interface of this uses Rid, but the interface of
+    // container_type uses uintt.
+    csv_assert( sizeof(uintt) == sizeof(Rid) );
+}
+
+
+
+
+// HELPER FUNCTIONS
+
+/** @return 0, if data are not there.
+*/
+template <class ENTITY>
+inline const ENTITY *
+Search( const Storage<ENTITY> &     i_storage,
+        Rid                         i_id )
+{
+    if (NOT i_storage.Exists(i_id))
+        return 0;
+    return &i_storage[i_id];
+}
+
+/** @return 0, if data are not there.
+*/
+template <class ENTITY>
+inline ENTITY *
+SearchAccess( const Storage<ENTITY> &   i_storage,
+              Rid                       i_id )
+{
+    if (NOT i_storage.Exists(i_id))
+        return 0;
+    return &i_storage[i_id];
+}
+
+
+
+
+}   // namespace stg
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/inc/traits_impl.hxx b/autodoc/source/ary/inc/traits_impl.hxx
new file mode 100644
index 000000000000..77c84c819ba6
--- /dev/null
+++ b/autodoc/source/ary/inc/traits_impl.hxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_TRAITS_IMPL_HXX
+#define ARY_TRAITS_IMPL_HXX
+
+
+// USED SERVICES
+#include <ary/getncast.hxx>
+
+
+namespace ary
+{
+namespace traits
+{
+
+
+/** Finds the node assigned to an entity, if that entity has a specific
+    actual type.
+
+    @tpl NODE
+    The assumed actual type of io_node.
+*/
+template<class NODE>
+const typename NODE::node_t *
+                    NodeOf(
+                        const typename NODE::traits_t::entity_base_type &
+                                                io_node );
+
+/** Finds the node assigned to an entity, if that entity has a specific
+    actual type.
+
+    @tpl NODE
+    The assumed actual type of io_node.
+*/
+template<class NODE>
+typename NODE::node_t *
+                    NodeOf(
+                        typename NODE::traits_t::entity_base_type &
+                                                io_node );
+
+/** Finds a child to a node.
+*/
+template<class NODE, class KEY>
+typename NODE::traits_t::id_type
+                    Search_Child(
+                        const typename NODE::traits_t::entity_base_type &
+                                                i_node,
+                        const KEY &             i_localKey );
+
+
+
+
+// IMPLEMENTATION
+
+template<class NODE>
+const typename NODE::node_t *
+NodeOf(const typename NODE::traits_t::entity_base_type & io_node)
+{
+    const NODE *
+        pn = ary_cast<NODE>(&io_node);
+    if (pn != 0)
+        return & pn->AsNode();
+    return 0;
+}
+
+template<class NODE>
+typename NODE::node_t *
+NodeOf(typename NODE::traits_t::entity_base_type & io_node)
+{
+    NODE *
+        pn = ary_cast<NODE>(&io_node);
+    if (pn != 0)
+        return & pn->AsNode();
+    return 0;
+}
+
+template<class NODE, class KEY>
+typename NODE::traits_t::id_type
+Search_Child( const typename NODE::traits_t::entity_base_type & i_node,
+              const KEY &                                       i_localKey )
+{
+    const NODE *
+        pn = ary_cast<NODE>(&i_node);
+    if (pn != 0)
+        return pn->Search_Child(i_localKey);
+    return typename NODE::traits_t::id_type(0);
+}
+
+
+
+
+}   // namespace traits
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/info/all_dts.cxx b/autodoc/source/ary/info/all_dts.cxx
new file mode 100644
index 000000000000..7dfbf737538b
--- /dev/null
+++ b/autodoc/source/ary/info/all_dts.cxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/info/all_dts.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/infodisp.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+
+void
+DT_Text::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Text(*this);
+}
+
+bool
+DT_Text::inq_IsWhite() const
+{
+     return false;
+}
+
+void
+DT_MaybeLink::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_MaybeLink(*this);
+}
+
+bool
+DT_MaybeLink::inq_IsWhite() const
+{
+     return false;
+}
+
+void
+DT_Whitespace::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Whitespace(*this);
+}
+
+bool
+DT_Whitespace::inq_IsWhite() const
+{
+     return true;
+}
+
+void
+DT_Eol::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Eol(*this);
+}
+
+bool
+DT_Eol::inq_IsWhite() const
+{
+     return true;
+}
+
+void
+DT_Xml::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Xml(*this);
+}
+
+bool
+DT_Xml::inq_IsWhite() const
+{
+     return false;
+}
+
+
+}   // namespace info
+}   // namespace ary
+
diff --git a/autodoc/source/ary/info/all_tags.cxx b/autodoc/source/ary/info/all_tags.cxx
new file mode 100644
index 000000000000..76d8192690ff
--- /dev/null
+++ b/autodoc/source/ary/info/all_tags.cxx
@@ -0,0 +1,569 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/info/all_tags.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <limits>
+#include <ary/info/infodisp.hxx>
+#include <adc_cl.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+
+
+//*****************************     StdTag      ***********************//
+
+
+StdTag::StdTag( E_AtTagId i_eId )
+    :   eId(i_eId),
+        // aText,
+        pNext(0)
+{
+}
+
+bool
+StdTag::Add_SpecialMeaningToken( const char *   ,
+                                 intt           )
+{
+    // Does nothing
+
+    // KORR_FUTURE
+    //   Should be a logical exception:
+    // csv_assert(false);
+    return false;
+}
+
+UINT8
+StdTag::NrOfSpecialMeaningTokens() const
+{
+    return 0;
+}
+
+AtTag *
+StdTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new StdTag(eId);
+    return pNext;
+}
+
+void
+StdTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_StdTag( *this );
+}
+
+DocuText *
+StdTag::Text()
+{
+    return &aText;
+}
+
+
+
+//*****************************     BaseTag     ***********************//
+
+BaseTag::BaseTag()
+    :   // sBase
+        // aText
+        pNext(0)
+{
+}
+
+bool
+BaseTag::Add_SpecialMeaningToken( const char *      i_sText,
+                                  intt              i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sBase.AssignText(i_sText,"::");
+        return true;
+    }
+    return false;
+}
+
+const char *
+BaseTag::Title() const
+{
+    return "Base Classes";
+}
+
+UINT8
+BaseTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+BaseTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new BaseTag;
+    return pNext;
+}
+
+DocuText *
+BaseTag::Text()
+{
+    return &aText;
+}
+
+
+
+//*****************************     ExceptionTag    ***********************//
+
+ExceptionTag::ExceptionTag()
+    :   // sException,
+        // aText
+        pNext(0)
+{
+}
+
+bool
+ExceptionTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                       intt             i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sException.AssignText(i_sText,"::");
+        return true;
+    }
+    return false;
+}
+
+const char *
+ExceptionTag::Title() const
+{
+    return "Thrown Exceptions";
+}
+
+UINT8
+ExceptionTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+ExceptionTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new ExceptionTag;
+    return pNext;
+}
+
+DocuText *
+ExceptionTag::Text()
+{
+    return &aText;
+}
+
+
+//*****************************     ImplementsTag   ***********************//
+
+ImplementsTag::ImplementsTag()
+    :   // sBase
+        // aText
+        pNext(0)
+{
+}
+
+bool
+ImplementsTag::Add_SpecialMeaningToken( const char *        i_sText,
+                                        intt                i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sName.AssignText(i_sText,"::");
+    }
+    else
+    {
+        GetFollower()->Add_SpecialMeaningToken(i_sText,1);
+    }
+    return true;
+}
+
+const char *
+ImplementsTag::Title() const
+{
+    return "Implements";
+}
+
+UINT8
+ImplementsTag::NrOfSpecialMeaningTokens() const
+{
+    return std::numeric_limits<UINT8>::max();
+}
+
+AtTag *
+ImplementsTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new ImplementsTag;
+    return pNext;
+}
+
+DocuText *
+ImplementsTag::Text()
+{
+    return 0;
+}
+
+
+//*****************************     KeywordTag      ***********************//
+
+
+KeywordTag::KeywordTag()
+//  :   sKeys
+{
+}
+
+bool
+KeywordTag::Add_SpecialMeaningToken( const char *       i_sText,
+                                     intt               )
+{
+    sKeys.push_back(i_sText);
+    return true;
+}
+
+const char *
+KeywordTag::Title() const
+{
+    return "Keywords";
+}
+
+UINT8
+KeywordTag::NrOfSpecialMeaningTokens() const
+{
+    return std::numeric_limits<UINT8>::max();
+}
+
+AtTag *
+KeywordTag::GetFollower()
+{
+    return this;
+}
+
+DocuText *
+KeywordTag::Text()
+{
+    return 0;
+}
+
+
+
+//*****************************     ParameterTag    ***********************//
+
+
+ParameterTag::ParameterTag()
+    :   // sName
+        // aText
+        pNext(0)
+{
+}
+
+bool
+ParameterTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                       intt             i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sName = i_sText;
+        return true;
+    }
+    else if (i_nNr == 2)
+    {
+        uintt nLen = strlen(i_sText);
+        if (*i_sText == '[' AND i_sText[nLen-1] == ']')
+        {
+            sValidRange = String(i_sText+1, nLen-2);
+            return true;
+        }
+    }
+    return false;
+}
+
+UINT8
+ParameterTag::NrOfSpecialMeaningTokens() const
+{
+    return 2;
+}
+
+AtTag *
+ParameterTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    return  pNext = new ParameterTag;
+}
+
+DocuText *
+ParameterTag::Text()
+{
+    return &aText;
+}
+
+void
+ParameterTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_ParameterTag( *this );
+}
+
+
+
+//*****************************     SeeTag          ***********************//
+
+
+
+SeeTag::SeeTag()
+//  :   sReferences
+{
+}
+
+bool
+SeeTag::Add_SpecialMeaningToken( const char *       i_sText,
+                                 intt               )
+{
+    static QualifiedName aNull_;
+    sReferences.push_back(aNull_);
+    sReferences.back().AssignText(i_sText,"::");
+
+    return true;
+}
+
+const char *
+SeeTag::Title() const
+{
+    return "See Also";
+}
+
+UINT8
+SeeTag::NrOfSpecialMeaningTokens() const
+{
+    return std::numeric_limits<UINT8>::max();
+}
+
+AtTag *
+SeeTag::GetFollower()
+{
+    return this;
+}
+
+void
+SeeTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_SeeTag( *this );
+}
+
+DocuText *
+SeeTag::Text()
+{
+    return 0;
+}
+
+
+
+//*****************************     TemplateTag     ***********************//
+
+
+TemplateTag::TemplateTag()
+    :   // sName
+        // aText
+        pNext(0)
+{
+}
+
+bool
+TemplateTag::Add_SpecialMeaningToken( const char *      i_sText,
+                                       intt             i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sName = i_sText;
+        return true;
+    }
+    return false;
+}
+
+const char *
+TemplateTag::Title() const
+{
+    return "Template Parameters";
+}
+
+UINT8
+TemplateTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+TemplateTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    return  pNext = new TemplateTag;
+}
+
+void
+TemplateTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_TemplateTag( *this );
+}
+
+
+DocuText *
+TemplateTag::Text()
+{
+    return &aText;
+}
+
+
+//*****************************     LabelTag        ***********************//
+
+
+
+LabelTag::LabelTag()
+    :   sLabel()
+{
+}
+
+bool
+LabelTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                   intt             i_nNr )
+{
+    if ( i_nNr == 1 AND sLabel.length() == 0 )
+    {
+        sLabel = i_sText;
+        return true;
+    }
+    // KORR_FUTURE
+//  else    // Throw exception because of double label.
+    return false;
+}
+
+const char *
+LabelTag::Title() const
+{
+    return "Label";
+}
+
+UINT8
+LabelTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+LabelTag::GetFollower()
+{
+    return this;
+}
+
+DocuText *
+LabelTag::Text()
+{
+    return 0;
+}
+
+
+//*****************************     SinceTag        ***********************//
+
+SinceTag::SinceTag()
+    :   sVersion()
+{
+}
+
+bool
+SinceTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                   intt             )
+{
+    const char cCiphersend = '9' + 1;
+    if ( sVersion.empty()
+         AND NOT csv::in_range('0', *i_sText, cCiphersend)
+         AND autodoc::CommandLine::Get_().DoesTransform_SinceTag() )
+    {
+        return true;
+    }
+
+    if (sVersion.empty())
+    {
+        sVersion = i_sText;
+    }
+    else
+    {
+        StreamLock sHelp(100);
+        sVersion = sHelp() << sVersion << " " << i_sText << c_str;
+    }
+
+    return true;
+}
+
+const char *
+SinceTag::Title() const
+{
+    return "Label";
+}
+
+UINT8
+SinceTag::NrOfSpecialMeaningTokens() const
+{
+    return UINT8(-1);
+}
+
+AtTag *
+SinceTag::GetFollower()
+{
+    return this;
+}
+
+void
+SinceTag::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_SinceTag( *this );
+}
+
+DocuText *
+SinceTag::Text()
+{
+    return 0;
+}
+
+
+}   // namespace info
+}   // namespace ary
+
diff --git a/autodoc/source/ary/info/ci_attag.cxx b/autodoc/source/ary/info/ci_attag.cxx
new file mode 100644
index 000000000000..e9afb6e106f7
--- /dev/null
+++ b/autodoc/source/ary/info/ci_attag.cxx
@@ -0,0 +1,93 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/info/ci_attag.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/all_dts.hxx>
+#include <ary/info/ci_text.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+void
+AtTag::Set_HtmlUseInDocuText( bool i_bUseIt )
+{
+    DocuText * pText = Text();
+    if ( pText != 0 )
+        pText->Set_HtmlUse(i_bUseIt);
+}
+
+void
+AtTag::Add_Token( const char * i_sText )
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_Text(i_sText) );
+}
+
+void
+AtTag::Add_PotentialLink( const char *  i_sText,
+                          bool          i_bIsGlobal,
+                          bool          i_bIsFunction )
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_MaybeLink(i_sText, i_bIsGlobal, i_bIsFunction) );
+}
+
+void
+AtTag::Add_Whitespace( UINT8 i_nLength )
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_Whitespace(i_nLength) );
+}
+
+void
+AtTag::Add_Eol()
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_Eol );
+}
+
+void
+AtTag::do_StoreAt( DocuDisplay &  ) const
+{
+    // Dummy
+}
+
+}   // namespace info
+}   // namespace ary
+
+
diff --git a/autodoc/source/ary/info/ci_text.cxx b/autodoc/source/ary/info/ci_text.cxx
new file mode 100644
index 000000000000..12710c5fd53b
--- /dev/null
+++ b/autodoc/source/ary/info/ci_text.cxx
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/info/ci_text.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/all_dts.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+DocuText::DocuText()
+    :   bUsesHtml(false)
+{
+}
+
+DocuText::~DocuText()
+{
+    for ( TokenList::iterator iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        delete (*iter);
+    }
+}
+
+void
+DocuText::StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    ary::info::DocuText::TokenList::const_iterator itEnd = aTokens.end();
+    for ( ary::info::DocuText::TokenList::const_iterator it = aTokens.begin();
+          it != itEnd;
+          ++it )
+    {
+        (*it)->StoreAt(o_rDisplay);
+    }
+}
+
+}   // namespace info
+}   // namespace ary
+
+
diff --git a/autodoc/source/ary/info/makefile.mk b/autodoc/source/ary/info/makefile.mk
new file mode 100644
index 000000000000..0c507ba3f4fe
--- /dev/null
+++ b/autodoc/source/ary/info/makefile.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_info
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/all_dts.obj		\
+    $(OBJ)$/all_tags.obj	\
+    $(OBJ)$/ci_attag.obj	\
+    $(OBJ)$/ci_text.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/ary/kernel/ary_disp.cxx b/autodoc/source/ary/kernel/ary_disp.cxx
new file mode 100644
index 000000000000..2e652f28a664
--- /dev/null
+++ b/autodoc/source/ary/kernel/ary_disp.cxx
@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/ary_disp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+
+
+
+namespace ary
+{
+
+void
+Display::DisplaySlot_Rid( ary::Rid i_nId )
+{
+    const cpp::Gate *
+        pGate = Get_ReFinder();
+    if (pGate != 0)
+    {
+         const  ary::cpp::CodeEntity *
+             pRE = pGate->Ces().Search_Ce( cpp::Ce_id(i_nId) );
+        if (pRE != 0)
+        {
+             pRE->Accept( *this );
+            return;
+        }
+    }
+
+    do_DisplaySlot_Rid( i_nId );
+}
+
+
+void
+Display::DisplaySlot_LocalCe( ary::cpp::Ce_id   i_nId,
+                              const String  &   i_sName )
+{
+    const cpp::Gate *
+        pGate = Get_ReFinder();
+    if (pGate != 0)
+    {
+         const ary::cpp::CodeEntity *
+             pRE = pGate->Ces().Search_Ce(i_nId);
+        if (pRE != 0)
+        {
+             pRE->Accept( *this );
+            return;
+        }
+    }
+
+    do_DisplaySlot_LocalCe( i_nId, i_sName );
+}
+
+
+
+// Dummy implementations for class Display
+
+void
+Display::do_StartSlot()
+{
+}
+
+void
+Display::do_FinishSlot()
+{
+}
+
+void
+Display::do_DisplaySlot_Rid( ary::Rid )
+{
+}
+
+void
+Display::do_DisplaySlot_LocalCe( ary::cpp::Ce_id    ,
+                                 const String  &    )
+{
+}
+
+
+}   // namespace ary
diff --git a/autodoc/source/ary/kernel/cessentl.cxx b/autodoc/source/ary/kernel/cessentl.cxx
new file mode 100644
index 000000000000..ea32736b6a2a
--- /dev/null
+++ b/autodoc/source/ary/kernel/cessentl.cxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cessentl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+CeEssentials::CeEssentials()
+    :   sLocalName(),
+        nOwner(0),
+        nLocation(0)
+{
+}
+
+CeEssentials::CeEssentials( const String  &     i_sLocalName,
+                            Cid                 i_nOwner,
+                            loc::Le_id          i_nLocation )
+    :   sLocalName(i_sLocalName),
+        nOwner(i_nOwner),
+        nLocation(i_nLocation)
+{
+}
+
+CeEssentials::~CeEssentials()
+{
+}
+
+
+
+inline bool
+IsInternal(const doc::Documentation & i_doc)
+{
+    const ary::doc::OldCppDocu *
+        docu = dynamic_cast< const ary::doc::OldCppDocu* >(i_doc.Data());
+    if (docu != 0)
+        return docu->IsInternal();
+    return false;
+}
+
+
+bool
+CodeEntity::IsVisible() const
+{
+    // KORR_FUTURE:   Improve the whole handling of internal and visibility.
+    return bIsVisible && NOT IsInternal(Docu());
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
diff --git a/autodoc/source/ary/kernel/makefile.mk b/autodoc/source/ary/kernel/makefile.mk
new file mode 100644
index 000000000000..6c90252bc3b8
--- /dev/null
+++ b/autodoc/source/ary/kernel/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_kernel
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/ary_disp.obj        \
+    $(OBJ)$/cessentl.obj        \
+    $(OBJ)$/namesort.obj        \
+    $(OBJ)$/qualiname.obj       \
+    $(OBJ)$/reposy.obj          \
+    $(OBJ)$/slots.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/ary/kernel/namesort.cxx b/autodoc/source/ary/kernel/namesort.cxx
new file mode 100644
index 000000000000..a404d754fb07
--- /dev/null
+++ b/autodoc/source/ary/kernel/namesort.cxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/namesort.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace
+{
+
+
+int C_cAutodocNameOrdering1[256] =
+    {   0,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //  0 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, // 32 ..
+       70, 71, 72, 73,  74, 75, 76, 77,      78, 79,255,255, 255,255,255,255,
+
+      255, 11, 13, 15,  17, 19, 21, 23,      25, 27, 29, 31,  33, 35, 37, 39, // 64 ..
+       41, 43, 45, 47,  49, 51, 53, 55,      57, 59, 61,255, 255,255,255, 63,
+      255, 11, 13, 15,  17, 19, 21, 23,      25, 27, 29, 31,  33, 35, 37, 39, // 96 ..
+       41, 43, 45, 47,  49, 51, 53, 55,      57, 59, 61,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //128 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //160 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255
+    };
+
+int C_cAutodocNameOrdering2[256] =
+    {   0,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //  0 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, // 32 ..
+       70, 71, 72, 73,  74, 75, 76, 77,      78, 79,255,255, 255,255,255,255,
+
+      255, 11, 13, 15,  17, 19, 21, 23,      25, 27, 29, 31,  33, 35, 37, 39, // 64 ..
+       41, 43, 45, 47,  49, 51, 53, 55,      57, 59, 61,255, 255,255,255, 63,
+      255, 12, 14, 16,  18, 20, 22, 24,      26, 28, 30, 32,  34, 36, 38, 40, // 96 ..
+       42, 44, 46, 48,  50, 52, 54, 56,      58, 60, 62,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //128 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //160 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255
+    };
+
+
+}   // namespace anonymous
+
+
+namespace ary
+{
+
+
+const csv::CharOrder_Table
+LesserName::aOrdering1_(C_cAutodocNameOrdering1);
+
+const csv::CharOrder_Table
+LesserName::aOrdering2_(C_cAutodocNameOrdering2);
+
+
+
+}   // namespace ary
diff --git a/autodoc/source/ary/kernel/qualiname.cxx b/autodoc/source/ary/kernel/qualiname.cxx
new file mode 100644
index 000000000000..1c844b20a731
--- /dev/null
+++ b/autodoc/source/ary/kernel/qualiname.cxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/qualiname.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace ary
+{
+
+
+QualifiedName::QualifiedName( uintt i_nSize )
+    :   aNamespace(),
+        sLocalName(),
+        bIsAbsolute(false),
+        bIsFunction()
+{
+    if (i_nSize > 0)
+        aNamespace.reserve(i_nSize);
+}
+
+QualifiedName::QualifiedName( const char *        i_sText,
+                              const char *        i_sSeparator )
+    :   aNamespace(),
+        sLocalName(),
+        bIsAbsolute(false),
+        bIsFunction()
+{
+    AssignText(i_sText,i_sSeparator);
+}
+
+QualifiedName::~QualifiedName()
+{
+}
+
+void
+QualifiedName::AssignText(  const char *        i_sText,
+                            const char *        i_sSeparator )
+{
+    csv_assert(NOT csv::no_str(i_sText) AND NOT csv::no_str(i_sSeparator));
+    bIsAbsolute = false;
+    bIsFunction = false;
+    csv::erase_container( aNamespace );
+
+    uintt nSepLen = strlen(i_sSeparator);
+    const char * sNext = i_sText;
+
+    const char * ps = strstr( i_sText, i_sSeparator );
+    if (ps == i_sText)
+    {
+        bIsAbsolute = true;
+        sNext = ps + nSepLen;
+    }
+
+    for ( ps = strstr(sNext, i_sSeparator);
+          ps != 0;
+          ps = strstr(sNext, i_sSeparator) )
+    {
+        String sPart(sNext, ps - sNext);
+        aNamespace.push_back(sPart);
+        sNext = ps + nSepLen;
+    }
+
+    uintt sNameLen = strlen(sNext);
+    if ( sNameLen > 2 )
+    {
+        ps = sNext + sNameLen - 2;
+        if (*ps == '(' AND *(ps+1) == ')')
+        {
+            sNameLen -= 2;
+            bIsFunction = true;
+        }
+    }
+    sLocalName = String(sNext,sNameLen);
+}
+
+
+}   // namespace ary
diff --git a/autodoc/source/ary/kernel/reposy.cxx b/autodoc/source/ary/kernel/reposy.cxx
new file mode 100644
index 000000000000..9ef4b3f4ca7f
--- /dev/null
+++ b/autodoc/source/ary/kernel/reposy.cxx
@@ -0,0 +1,218 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <reposy.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cpp_internalgate.hxx>
+#include <idl_internalgate.hxx>
+
+
+namespace ary
+{
+
+
+//*****************     Repository          ************//
+
+DYN Repository &
+Repository::Create_()
+{
+    return *new RepositoryCenter;
+}
+
+
+
+
+RepositoryCenter::RepositoryCenter()
+    :   sDisplayedName(),
+        aLocation(),
+        pCppPartition(0),
+        pIdlPartition(0)
+{
+    pCppPartition = & cpp::InternalGate::Create_Partition_(*this);
+    pIdlPartition = & idl::InternalGate::Create_Partition_(*this);
+}
+
+RepositoryCenter::~RepositoryCenter()
+{
+}
+
+const ::ary::cpp::Gate &
+RepositoryCenter::Gate_Cpp() const
+{
+    csv_assert(pCppPartition);
+    return *pCppPartition;
+}
+
+const ::ary::idl::Gate &
+RepositoryCenter::Gate_Idl() const
+{
+    csv_assert(pIdlPartition);
+    return *pIdlPartition;
+}
+
+const String &
+RepositoryCenter::Title() const
+{
+    return sDisplayedName;
+}
+
+
+::ary::cpp::Gate &
+RepositoryCenter::Gate_Cpp()
+{
+    csv_assert(pCppPartition);
+    return *pCppPartition;
+}
+
+::ary::idl::Gate &
+RepositoryCenter::Gate_Idl()
+{
+    csv_assert(pIdlPartition);
+    return *pIdlPartition;
+}
+
+void
+RepositoryCenter::Set_Title(const String & i_sName)
+{
+    sDisplayedName = i_sName;
+}
+
+
+
+
+//*********************     Repository Type Info Data       ****************//
+
+// !!! IMPORTANT - NEVER DELETE OR CHANGE - ADDING ALLOWED
+
+
+
+/*  ClassType-Ids
+    -------------
+
+    cpp                 1000
+    idl                 2000
+    corba               3000
+    java                4000
+    information         5000
+    logic location      6000
+    phys location       7000
+    sec. prod.          8000
+
+
+    cpp
+    ---
+    Namespace           1000
+    Class               1001
+    Enum                1002
+    Typedef             1003
+    Function            1004
+    Variable            1005
+    EnumValue           1006
+    NamespaceAlias      1007
+
+    BuiltInType         1200
+    CeType_Final        1201
+    CeType_Extern       1202
+    UsedType            1203
+    PtrType             1211
+    RefType             1212
+    ConstType           1221
+    VolatileType        1222
+    ArrayType           1230
+    TemplateInstance    1235
+    FunctionPtr         1240
+    DataMemberPtr       1250
+    OperationMemberPtr  1260
+
+    TplParam_Type       1301
+    TplParam_Value      1302
+
+    OpSignature         1400
+
+    Define              1601
+    Macro               1602
+
+    ProjectGroup        1901
+    FileGroup           1902
+
+    TopProject          1921
+
+
+
+    idl
+    ---
+
+    Module              2000
+    Interface           2001
+    Function            2002
+    Service             2003
+    Property            2004
+    Enum                2005
+    EnumValue           2006
+    Typedef             2007
+    Struct              2008
+    StructElement       2009
+    Exception           2010
+    ConstantGroup       2011
+    Constant            2012
+    Singleton           2013
+    Attribute           2014
+    SglIfcService       2015
+    SglIfcSingleton     2016
+
+    BuiltInType         2200
+    CeType              2201
+    Sequence            2202
+    ExplicitType        2203
+    ExplicitNameRoom    2204
+    TemplateParamType   2205
+
+
+    java
+    ----
+    Package             4000
+    Interface           4001
+    Class               4002
+
+    physical location
+    -----------------
+    Root                7000
+    Directory           7030
+    File                7100
+
+
+    info
+    ----
+    CodeInformation
+        (IDL)          11002
+*/
+
+
+}   // namespace ary
diff --git a/autodoc/source/ary/kernel/slots.cxx b/autodoc/source/ary/kernel/slots.cxx
new file mode 100644
index 000000000000..ef2e06ae8388
--- /dev/null
+++ b/autodoc/source/ary/kernel/slots.cxx
@@ -0,0 +1,164 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <slots.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary_disp.hxx>
+
+
+
+namespace ary
+{
+
+
+//***********************       Slot     ********************//
+
+
+void
+Slot::StoreAt( Display & o_rDestination ) const
+{
+    o_rDestination.StartSlot();
+    StoreEntries(o_rDestination);
+    o_rDestination.FinishSlot();
+}
+
+
+//***********************       Slot_Null     ********************//
+
+Slot_Null::~Slot_Null()
+{
+}
+
+void
+Slot_Null::StoreAt( Display     & ) const
+{
+    // Does nothing
+}
+
+uintt
+Slot_Null::Size() const
+{
+     return 0;
+}
+
+void
+Slot_Null::StoreEntries( Display     & ) const
+{
+    // Does nothing
+}
+
+//***********************       Slot_MapLocalCe     ********************//
+
+Slot_MapLocalCe::Slot_MapLocalCe( const cpp::Map_LocalCe & i_rData )
+    :   pData(&i_rData)
+{
+}
+
+Slot_MapLocalCe::~Slot_MapLocalCe()
+{
+}
+
+uintt
+Slot_MapLocalCe::Size() const
+{
+     return pData->size();;
+}
+
+void
+Slot_MapLocalCe::StoreEntries( Display & o_rDestination ) const
+{
+    for ( cpp::Map_LocalCe::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_LocalCe( (*it).second, (*it).first );
+    }
+}
+
+
+
+//***********************       Slot_MapOperations     ********************//
+
+Slot_MapOperations::Slot_MapOperations( const std::multimap<String, cpp::Ce_id> & i_rData )
+    :   pData(&i_rData)
+{
+}
+
+Slot_MapOperations::~Slot_MapOperations()
+{
+}
+
+uintt
+Slot_MapOperations::Size() const
+{
+     return pData->size();;
+}
+
+void
+Slot_MapOperations::StoreEntries( Display & o_rDestination ) const
+{
+    for ( std::multimap<String, cpp::Ce_id>::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_LocalCe( (*it).second, (*it).first );
+    }
+}
+
+//***********************       Slot_ListLocalCe      ********************//
+
+Slot_ListLocalCe::Slot_ListLocalCe( const cpp::List_LocalCe & i_rData )
+    :   pData(&i_rData)
+{
+}
+
+Slot_ListLocalCe::~Slot_ListLocalCe()
+{
+}
+
+uintt
+Slot_ListLocalCe::Size() const
+{
+     return pData->size();;
+}
+
+void
+Slot_ListLocalCe::StoreEntries( Display     & o_rDestination ) const
+{
+    for ( cpp::List_LocalCe::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_LocalCe( (*it).nId, (*it).sLocalName );
+    }
+}
+
+
+}   // namespace ary
diff --git a/autodoc/source/ary/loc/loc_dir.cxx b/autodoc/source/ary/loc/loc_dir.cxx
new file mode 100644
index 000000000000..616b8775eca0
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_dir.cxx
@@ -0,0 +1,134 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_dir.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/loc/loc_file.hxx>
+#include <sortedids.hxx>
+#include "locs_le.hxx"
+
+
+namespace ary
+{
+namespace loc
+{
+
+struct Directory::Container
+{
+    typedef SortedIds<Le_Compare>           SortedChildList;
+
+    SortedChildList     aSubDirectories;
+    SortedChildList     aFiles;
+
+                        Container()
+                            :   aSubDirectories(),
+                                aFiles()
+                            {}
+};
+
+
+
+
+Directory::Directory(Le_id i_assignedRoot)
+    :   sLocalName(),
+        nParentDirectory(0),
+        nAssignedRoot(i_assignedRoot),
+        aAssignedNode(),
+        pChildren(new Container)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Directory::Directory( const String  &   i_localName,
+                      Le_id             i_parentDirectory )
+    :   sLocalName(i_localName),
+        nParentDirectory(i_parentDirectory),
+        nAssignedRoot(0),
+        aAssignedNode(),
+        pChildren(new Container)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Directory::~Directory()
+{
+}
+
+void
+Directory::Add_Dir(const Directory  &  i_dir)
+{
+    pChildren->aSubDirectories.Add(i_dir.LeId());
+}
+
+void
+Directory::Add_File(const File & i_file)
+{
+    pChildren->aFiles.Add(i_file.LeId());
+}
+
+Le_id
+Directory::Search_Dir(const String & i_name) const
+{
+    return pChildren->aSubDirectories.Search(i_name);
+}
+
+Le_id
+Directory::Search_File(const String & i_name) const
+{
+    return pChildren->aFiles.Search(i_name);
+}
+
+void
+Directory::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Directory::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Directory::inq_LocalName() const
+{
+    return sLocalName;
+}
+
+Le_id
+Directory::inq_ParentDirectory() const
+{
+    return nParentDirectory;
+}
+
+
+} // namespace loc
+} // namespace ary
diff --git a/autodoc/source/ary/loc/loc_file.cxx b/autodoc/source/ary/loc/loc_file.cxx
new file mode 100644
index 000000000000..5a7a67089e17
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_file.cxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_file.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+File::File( const String  &     i_sLocalName,
+            Le_id               i_nParentDirectory )
+    :   FileBase(i_sLocalName, i_nParentDirectory)
+{
+}
+
+File::~File()
+{
+}
+
+void
+File::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+File::get_AryClass() const
+{
+    return class_id;
+}
+
+
+
+} // namespace loc
+} // namespace ary
diff --git a/autodoc/source/ary/loc/loc_filebase.cxx b/autodoc/source/ary/loc/loc_filebase.cxx
new file mode 100644
index 000000000000..f7a6afcc4858
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_filebase.cxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_filebase.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+FileBase::FileBase( const String  &     i_localName,
+                    Le_id               i_parentDirectory )
+    :   sLocalName(i_localName),
+        nParentDirectory(i_parentDirectory)
+{
+}
+
+const String &
+FileBase::inq_LocalName() const
+{
+    return sLocalName;
+}
+
+Le_id
+FileBase::inq_ParentDirectory() const
+{
+    return nParentDirectory;
+}
+
+
+
+} // namespace loc
+} // namespace ary
diff --git a/autodoc/source/ary/loc/loc_root.cxx b/autodoc/source/ary/loc/loc_root.cxx
new file mode 100644
index 000000000000..3cf8e47c1181
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_root.cxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_root.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+Root::Root(const csv::ploc::Path & i_path)
+    :   aPath(i_path),
+        sPathAsString(),
+        aMyDirectory(0)
+{
+    StreamLock
+        path_string(700);
+    path_string() << i_path;
+    sPathAsString = path_string().c_str();
+}
+
+Root::~Root()
+{
+}
+
+void
+Root::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Root::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Root::inq_LocalName() const
+{
+    return sPathAsString;
+}
+
+Le_id
+Root::inq_ParentDirectory() const
+{
+    return Le_id::Null_();
+}
+
+
+
+} // namespace loc
+} // namespace ary
diff --git a/autodoc/source/ary/loc/loc_traits.cxx b/autodoc/source/ary/loc/loc_traits.cxx
new file mode 100644
index 000000000000..875b6aae17ee
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_traits.cxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_traits.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/namesort.hxx>
+#include <ary/getncast.hxx>
+#include "locs_le.hxx"
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+//********************      Le_Traits       ************************//
+Le_Traits::entity_base_type &
+Le_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Le_Storage::Instance_()[i_id];
+}
+
+//********************      LeNode_Traits       ************************//
+symtree::Node<LeNode_Traits> *
+LeNode_Traits::NodeOf_(entity_base_type & io_entity)
+{
+    if (is_type<Directory>(io_entity))
+        return & ary_cast<Directory>(io_entity).AsNode();
+    return 0;
+}
+
+Le_Traits::entity_base_type *
+LeNode_Traits::ParentOf_(const entity_base_type & i_entity)
+{
+    Le_Traits::id_type
+        ret = i_entity.ParentDirectory();
+    if (ret.IsValid())
+        return &EntityOf_(ret);
+    return 0;
+}
+
+//********************      Le_Compare       ************************//
+const Le_Compare::key_type &
+Le_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Le_Compare::Lesser_( const key_type &    i_1,
+                     const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+
+
+}   // namespace loc
+}   // namespace ary
diff --git a/autodoc/source/ary/loc/loca_le.cxx b/autodoc/source/ary/loc/loca_le.cxx
new file mode 100644
index 000000000000..27a4339fc93d
--- /dev/null
+++ b/autodoc/source/ary/loc/loca_le.cxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "loca_le.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/loc/loc_dir.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/loc_root.hxx>
+#include <loc_internalgate.hxx>
+#include "locs_le.hxx"
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+DYN LocationPilot &
+InternalGate::Create_Locations_()
+{
+    return *new LocationAdmin;
+}
+
+
+
+
+inline Le_Storage &
+LocationAdmin::Storage() const
+{
+    csv_assert(pStorage);
+    return *pStorage.MutablePtr();
+}
+
+
+LocationAdmin::LocationAdmin()
+    :   pStorage(new Le_Storage)
+{
+}
+
+LocationAdmin::~LocationAdmin()
+{
+}
+
+Root &
+LocationAdmin::CheckIn_Root(const csv::ploc::Path & i_path)
+{
+    Dyn<Root>
+        p_new( new Root(i_path) );
+
+    Le_id
+        id = Storage().RootIndex().Search(p_new->LocalName());
+    if ( id.IsValid() )
+    {
+        return ary_cast<Root>(Storage()[id]);
+    }
+
+    Root *
+        ret = p_new.Ptr();
+    Storage().Store_Entity(*p_new.Release());
+    Storage().RootIndex().Add(ret->LeId());
+
+    Directory *
+        p_rootdir = new Directory(ret->LeId());
+    Storage().Store_Entity(*p_rootdir);
+    ret->Assign_Directory(p_rootdir->LeId());
+
+    return *ret;
+}
+
+File &
+LocationAdmin::CheckIn_File( const String  &                   i_name,
+                                  const csv::ploc::DirectoryChain & i_subPath,
+                                  Le_id                             i_root )
+{
+    Root &
+        root = Find_Root(i_root);
+    Directory &
+        parent_dir = CheckIn_Directories(
+                        Find_Directory(root.MyDir()),
+                        i_subPath.Begin(),
+                        i_subPath.End() );
+    Le_id
+        fid = parent_dir.Search_File(i_name);
+    if (NOT fid.IsValid())
+    {
+        File *
+            ret = new File(i_name, parent_dir.LeId());
+        Storage().Store_Entity(*ret);
+        parent_dir.Add_File(*ret);
+        return *ret;
+    }
+    else
+    {
+        return Find_File(fid);
+    }
+}
+
+Root &
+LocationAdmin::Find_Root(Le_id  i_id) const
+{
+    return ary_cast<Root>(Storage()[i_id]);
+}
+
+Directory &
+LocationAdmin::Find_Directory(Le_id i_id) const
+{
+    return ary_cast<Directory>(Storage()[i_id]);
+}
+
+File &
+LocationAdmin::Find_File(Le_id i_id) const
+{
+    return ary_cast<File>(Storage()[i_id]);
+}
+
+Directory &
+LocationAdmin::CheckIn_Directory( Directory &         io_parent,
+                                       const String &      i_name )
+{
+    Le_id
+        did = io_parent.Search_Dir(i_name);
+    if (NOT did.IsValid())
+    {
+        Directory *
+            ret = new Directory(i_name, io_parent.LeId());
+        Storage().Store_Entity(*ret);
+        io_parent.Add_Dir(*ret);
+        return *ret;
+    }
+    else
+    {
+        return Find_Directory(did);
+    }
+}
+
+Directory &
+LocationAdmin::CheckIn_Directories(
+                            Directory &                     io_root,
+                            StringVector::const_iterator    i_beginSubPath,
+                            StringVector::const_iterator    i_endSubPath )
+{
+    if (i_beginSubPath == i_endSubPath)
+        return io_root;
+
+    Directory &
+        next = CheckIn_Directory(io_root, *i_beginSubPath);
+    return CheckIn_Directories(next, i_beginSubPath+1, i_endSubPath);
+}
+
+
+}   // namespace loc
+}   // namespace ary
diff --git a/autodoc/source/ary/loc/loca_le.hxx b/autodoc/source/ary/loc/loca_le.hxx
new file mode 100644
index 000000000000..a898f34c104f
--- /dev/null
+++ b/autodoc/source/ary/loc/loca_le.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_LOCA_LE_HXX
+#define ARY_LOC_LOCA_LE_HXX
+
+// BASE CLASSES
+#include <ary/loc/locp_le.hxx>
+
+namespace ary
+{
+namespace loc
+{
+    class Le_Storage;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Provides access to files and directories stored in the
+    repository.
+*/
+class LocationAdmin : public LocationPilot
+{
+  public:
+                        LocationAdmin();
+    virtual              ~LocationAdmin();
+
+    // INHERITED
+        // Interface LocationPilot:
+    virtual Root &      CheckIn_Root(
+                            const csv::ploc::Path &
+                                                i_rPath );
+    virtual File &      CheckIn_File(
+                            const String  &     i_name,
+                            const csv::ploc::DirectoryChain &
+                                                i_subPath,
+                            Le_id               i_root );
+
+    virtual Root &      Find_Root(
+                            Le_id               i_id ) const;
+    virtual Directory & Find_Directory(
+                            Le_id               i_id ) const;
+    virtual File &      Find_File(
+                            Le_id               i_id ) const;
+  private:
+    // Locals
+    Le_Storage &        Storage() const;
+    Directory &         CheckIn_Directory(
+                            Directory &         io_parent,
+                            const String &      i_name );
+    Directory &         CheckIn_Directories(
+                            Directory &         io_root,
+                            StringVector::const_iterator
+                                                i_beginSubPath,
+                            StringVector::const_iterator
+                                                i_endSubPath );
+    // DATA
+    Dyn<Le_Storage>     pStorage;
+};
+
+
+
+
+}   // namespace loc
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/loc/locs_le.cxx b/autodoc/source/ary/loc/locs_le.cxx
new file mode 100644
index 000000000000..6031dc2c92d4
--- /dev/null
+++ b/autodoc/source/ary/loc/locs_le.cxx
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "locs_le.hxx"
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace
+{
+    const uintt
+    C_nReservedElements = ary::loc::predefined::le_MAX;    // Skipping "0"
+}
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+Le_Storage *        Le_Storage::pInstance_ = 0;
+
+
+
+
+Le_Storage::Le_Storage()
+    :   stg::Storage<LocationEntity>(C_nReservedElements)
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Le_Storage::~Le_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+
+}   // namespace loc
+}   // namespace ary
diff --git a/autodoc/source/ary/loc/locs_le.hxx b/autodoc/source/ary/loc/locs_le.hxx
new file mode 100644
index 000000000000..19301dffa2f2
--- /dev/null
+++ b/autodoc/source/ary/loc/locs_le.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_LOC_LOCS_LE_HXX
+#define ARY_LOC_LOCS_LE_HXX
+
+// BASE CLASSES
+#include <store/s_storage.hxx>
+// USED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/loc/loc_le.hxx>
+#include <ary/loc/loc_root.hxx>
+#include <sortedids.hxx>
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** The data base for all ->ary::cpp::CodeEntity objects.
+*/
+class Le_Storage : public ::ary::stg::Storage<LocationEntity>
+{
+  public:
+    typedef SortedIds<Le_Compare>           Index;
+
+                        Le_Storage();
+    virtual             ~Le_Storage();
+
+    const Index &       RootIndex() const         { return aRoots; }
+    Index &             RootIndex()               { return aRoots; }
+
+    static Le_Storage & Instance_()               { csv_assert(pInstance_ != 0);
+                                                    return *pInstance_; }
+  private:
+    // DATA
+    Index               aRoots;
+
+    static Le_Storage * pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_LocationEntity
+{
+    le_MAX = 1
+};
+
+}   // namespace predefined
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
diff --git a/autodoc/source/ary/loc/makefile.mk b/autodoc/source/ary/loc/makefile.mk
new file mode 100644
index 000000000000..e4aa0e9b43f5
--- /dev/null
+++ b/autodoc/source/ary/loc/makefile.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_loc
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/loc_dir.obj         \
+    $(OBJ)$/loc_file.obj        \
+    $(OBJ)$/loc_filebase.obj    \
+    $(OBJ)$/loc_root.obj        \
+    $(OBJ)$/loc_traits.obj      \
+    $(OBJ)$/loca_le.obj         \
+    $(OBJ)$/locs_le.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/ary_i/kernel/ci_atag2.cxx b/autodoc/source/ary_i/kernel/ci_atag2.cxx
new file mode 100644
index 000000000000..d15a86f8aa9d
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/ci_atag2.cxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary_i/ci_atag2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary_i/disdocum.hxx>
+
+
+namespace ary
+{
+namespace inf
+{
+
+void    DocuTag_Display::Display_TextToken(
+                            const csi::dsapi::DT_TextToken & ) {}
+void    DocuTag_Display::Display_White() {}
+void    DocuTag_Display::Display_MupType(
+                            const csi::dsapi::DT_MupType & ) {}
+void    DocuTag_Display::Display_MupMember(
+                            const csi::dsapi::DT_MupMember & ) {}
+void    DocuTag_Display::Display_MupConst(
+                            const csi::dsapi::DT_MupConst & ) {}
+void    DocuTag_Display::Display_Style(
+                            const csi::dsapi::DT_Style & ) {}
+void    DocuTag_Display::Display_EOL() {}
+
+
+}   // namespace inf
+}   // namespace ary
+
diff --git a/autodoc/source/ary_i/kernel/ci_text2.cxx b/autodoc/source/ary_i/kernel/ci_text2.cxx
new file mode 100644
index 000000000000..37dbe4b159a8
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/ci_text2.cxx
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary_i/ci_text2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary_i/disdocum.hxx>
+#include <ary_i/d_token.hxx>
+
+
+namespace ary
+{
+namespace inf
+{
+
+DocuTex2::DocuTex2()
+{
+}
+
+DocuTex2::~DocuTex2()
+{
+    for ( TokenList::iterator iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        delete (*iter);
+    }
+}
+
+void
+DocuTex2::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    for ( ary::inf::DocuTex2::TokenList::const_iterator
+                iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        (*iter)->DisplayAt(o_rDisplay);
+    }
+}
+
+void
+DocuTex2::AddToken( DYN DocuToken & let_drToken )
+{
+    if (aTokens.empty())
+    {
+        if (let_drToken.IsWhiteOnly())
+            return;
+    }
+    aTokens.push_back(&let_drToken);
+}
+
+bool
+DocuTex2::IsEmpty() const
+{
+    for ( ary::inf::DocuTex2::TokenList::const_iterator
+                iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        return false;
+    }
+    return true;
+}
+
+using csi::dsapi::DT_TextToken;
+
+const String &
+DocuTex2::TextOfFirstToken() const
+{
+    if (NOT aTokens.empty())
+    {
+        const DT_TextToken *
+            pTok = dynamic_cast< const DT_TextToken* >(*aTokens.begin());
+
+        if (pTok != 0)
+            return pTok->GetTextStr();
+    }
+    return String::Null_();
+}
+
+String &
+DocuTex2::Access_TextOfFirstToken()
+{
+    if (NOT aTokens.empty())
+    {
+        DT_TextToken *
+            pTok = dynamic_cast< DT_TextToken* >(*aTokens.begin());
+
+        if (pTok != 0)
+            return pTok->Access_Text();
+    }
+
+    static String sDummy_;
+    return sDummy_;
+}
+
+
+
+void    DocuText_Display::Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag & ) {}
+void    DocuText_Display::Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag & ) {}
+void    DocuText_Display::Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag & ) {}
+void    DocuText_Display::Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag & ) {}
+
+
+
+}   // namespace inf
+}   // namespace ary
+
diff --git a/autodoc/source/ary_i/kernel/d_token.cxx b/autodoc/source/ary_i/kernel/d_token.cxx
new file mode 100644
index 000000000000..469c553c965c
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/d_token.cxx
@@ -0,0 +1,187 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary_i/d_token.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary_i/disdocum.hxx>
+
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+bool
+DT_Dsapi::IsWhiteOnly() const
+{
+    return false;
+}
+
+DT_TextToken::~DT_TextToken()
+{
+}
+
+void
+DT_TextToken::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_TextToken( *this );
+}
+
+bool
+DT_TextToken::IsWhiteOnly() const
+{
+    for ( const char * it = sText.c_str();
+          static_cast<UINT8>(*it) > 32;
+          ++it )
+    {
+        return false;
+    }
+    return true;
+}
+
+DT_White::~DT_White()
+{
+}
+
+void
+DT_White::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_White();
+}
+
+bool
+DT_White::IsWhiteOnly() const
+{
+    return true;
+}
+
+DT_MupType::~DT_MupType()
+{
+}
+
+void
+DT_MupType::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_MupType( *this );
+}
+
+DT_MupMember::~DT_MupMember()
+{
+}
+
+void
+DT_MupMember::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_MupMember( *this );
+}
+
+DT_MupConst::~DT_MupConst()
+{
+}
+
+void
+DT_MupConst::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_MupConst( *this );
+}
+
+DT_Style::~DT_Style()
+{
+}
+
+void
+DT_Style::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_Style( *this );
+}
+
+DT_EOL::~DT_EOL()
+{
+}
+
+void
+DT_EOL::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_EOL();
+}
+
+bool
+DT_EOL::IsWhiteOnly() const
+{
+    return true;
+}
+
+DT_StdAtTag::~DT_StdAtTag()
+{
+}
+
+void
+DT_StdAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_StdAtTag( *this );
+}
+
+DT_SeeAlsoAtTag::~DT_SeeAlsoAtTag()
+{
+}
+
+void
+DT_SeeAlsoAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_SeeAlsoAtTag( *this );
+}
+
+DT_ParameterAtTag::~DT_ParameterAtTag()
+{
+}
+
+void
+DT_ParameterAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_ParameterAtTag( *this );
+}
+
+DT_SinceAtTag::~DT_SinceAtTag()
+{
+}
+
+void
+DT_SinceAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_SinceAtTag( *this );
+}
+
+
+
+
+}   // namespace dsapi
+}   // namespace csi
diff --git a/autodoc/source/ary_i/kernel/makefile.mk b/autodoc/source/ary_i/kernel/makefile.mk
new file mode 100644
index 000000000000..79675bc03c81
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/makefile.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary2_cinfo
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/ci_atag2.obj	\
+    $(OBJ)$/ci_text2.obj	\
+    $(OBJ)$/d_token.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/html/aryattrs.cxx b/autodoc/source/display/html/aryattrs.cxx
new file mode 100644
index 000000000000..7b0fcea14cd7
--- /dev/null
+++ b/autodoc/source/display/html/aryattrs.cxx
@@ -0,0 +1,248 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "aryattrs.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/getncast.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include "strconst.hxx"
+
+
+
+
+//********************       HtmlDisplay_Impl        *********************//
+
+const char *
+Get_ClassTypeKey( const ary::cpp::Class & i_rClass )
+{
+    return i_rClass.ClassKey() == ary::cpp::CK_class
+                            ?   C_sHFTypeTitle_Class
+                            :   i_rClass.ClassKey() == ary::cpp::CK_struct
+                                    ?   C_sHFTypeTitle_Struct
+                                    :   C_sHFTypeTitle_Union;
+
+}
+
+const char *
+Get_TypeKey( const ary::cpp::CodeEntity & i_rCe )
+{
+    if ( ary::is_type<ary::cpp::Class>(i_rCe) )
+    {
+        return Get_ClassTypeKey(
+                    ary::ary_cast<ary::cpp::Class>(i_rCe) );
+    }
+    if ( ary::is_type<ary::cpp::Enum>(i_rCe) )
+    {
+         return "enum";
+    }
+    return "";
+}
+
+bool
+Ce_IsInternal( const ary::cpp::CodeEntity & i_rCe )
+{
+    return NOT i_rCe.IsVisible();
+}
+
+const char *
+SyntaxText_PreName( const ary::cpp::Function &      i_rFunction,
+                    const ary::cpp::Gate &   i_rAryGate )
+{
+    static StreamStr  sResult( 150 );
+    sResult.seekp(0);
+
+    // write pre-name:
+    const ary::cpp::FunctionFlags & rFlags = i_rFunction.Flags();
+    if ( rFlags.IsStaticLocal() OR rFlags.IsStaticMember() )
+        sResult << "static ";
+    if ( rFlags.IsExplicit() )
+        sResult << "explicit ";
+    if ( rFlags.IsMutable() )
+        sResult << "mutable ";
+    if ( i_rFunction.Virtuality() != ary::cpp::VIRTUAL_none )
+        sResult << "virtual ";
+    i_rAryGate.Types().Get_TypeText( sResult, i_rFunction.ReturnType() );
+    sResult << " ";
+
+    return sResult.c_str();
+}
+
+const char *
+SyntaxText_PostName( const ary::cpp::Function &     i_rFunction,
+                     const ary::cpp::Gate &  i_rAryGate )
+{
+    static StreamStr  sResult( 850 );
+    sResult.seekp(0);
+
+    // parameters and con_vol
+    i_rAryGate.Ces().Get_SignatureText( sResult, i_rFunction.Signature(), &i_rFunction.ParamInfos() );
+
+    // write Exceptions:
+    const std::vector< ary::cpp::Type_id > *
+            pThrow = i_rFunction.Exceptions();
+    if ( pThrow)
+    {
+
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it = pThrow->begin();
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it_end = pThrow->end();
+
+        if (it != it_end)
+        {
+            sResult << " throw( ";
+            i_rAryGate.Types().Get_TypeText(sResult, *it);
+
+            for ( ++it; it != it_end; ++it )
+            {
+                sResult << ", ";
+                i_rAryGate.Types().Get_TypeText(sResult, *it);
+            }
+            sResult << " )";
+        }
+        else
+        {
+            sResult << " throw( )";
+        }
+    }   // endif // pThrow
+
+    // abstractness:
+    if ( i_rFunction.Virtuality() == ary::cpp::VIRTUAL_abstract )
+        sResult << " = 0";
+
+    // finish:
+    sResult << ";";
+
+    return sResult.c_str();
+}
+
+bool
+Get_TypeText( const char * &                o_rPreName,
+              const char * &                o_rName,
+              const char * &                o_rPostName,
+              ary::cpp::Type_id             i_nTypeid,
+              const ary::cpp::Gate & i_rAryGate )
+{
+    static StreamStr       sResult_PreName(250);
+    static StreamStr       sResult_Name(250);
+    static StreamStr       sResult_PostName(250);
+
+    sResult_PreName.seekp(0);
+    sResult_Name.seekp(0);
+    sResult_PostName.seekp(0);
+
+    bool    ret = i_rAryGate.Types().Get_TypeText(
+                                sResult_PreName,
+                                sResult_Name,
+                                sResult_PostName,
+                                i_nTypeid );
+    if ( sResult_PreName.tellp() > 0 )
+    {
+        char cLast = *( sResult_PreName.c_str() + (sResult_PreName.tellp() - 1) );
+        if (cLast != ':' AND cLast != ' ')
+            sResult_PreName << " ";
+    }
+
+
+    if (ret)
+    {
+        o_rPreName  = sResult_PreName.c_str();
+        o_rName     = sResult_Name.c_str();
+        o_rPostName = sResult_PostName.c_str();
+    }
+    else
+    {
+        o_rPreName  =  o_rName =  o_rPostName = "";
+    }
+    return ret;
+}
+
+
+
+
+//*********************         FunctionParam_Iterator      *****************//
+
+
+FunctionParam_Iterator::FunctionParam_Iterator()
+    :   // itTypes
+        // itTypes_end
+        // itNames_andMore
+        // itNames_andMore_end
+        eConVol(ary::cpp::CONVOL_none)
+{
+    static std::vector<ary::cpp::Type_id>   aTypesNull_;
+    static StringVector                     aNamesNull_;
+
+    itTypes = itTypes_end = aTypesNull_.end();
+    itNames_andMore = itNames_andMore_end = aNamesNull_.end();
+}
+
+FunctionParam_Iterator::~FunctionParam_Iterator()
+{
+}
+
+FunctionParam_Iterator &
+FunctionParam_Iterator::operator++()
+{
+    if ( IsValid() )
+    {
+        ++itTypes;
+        ++itNames_andMore;
+    }
+    return *this;
+}
+
+void
+FunctionParam_Iterator::Assign( const ary::cpp::Function &  i_rFunction )
+{
+    const ary::cpp::OperationSignature &
+        rSigna = i_rFunction.Signature();
+
+    const std::vector<ary::cpp::Type_id> &
+        rTypes = rSigna.Parameters();
+    const StringVector &
+        rNames = i_rFunction.ParamInfos();
+
+    if ( rTypes.size() != rNames.size() OR rTypes.size() == 0 )
+        return;
+
+    itTypes     = rTypes.begin();
+    itTypes_end = rTypes.end();
+    itNames_andMore     = rNames.begin();
+    itNames_andMore_end = rNames.end();
+
+    eConVol = rSigna.ConVol();
+}
diff --git a/autodoc/source/display/html/aryattrs.hxx b/autodoc/source/display/html/aryattrs.hxx
new file mode 100644
index 000000000000..053b445ac7eb
--- /dev/null
+++ b/autodoc/source/display/html/aryattrs.hxx
@@ -0,0 +1,154 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_ARYATTRS_HXX
+#define ADC_DISPLAY_ARYATTRS_HXX
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/doc/d_docu.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+
+namespace ary
+{
+     namespace cpp
+    {
+        class CodeEntity;
+        class Class;
+        class DisplayGate;
+        class Function;
+        class Namespace;
+    }
+}
+
+
+
+
+const char *        Get_ClassTypeKey(
+                        const ary::cpp::Class & i_rClass );
+const char *        Get_TypeKey(
+                        const ary::cpp::CodeEntity &
+                                                i_rCe );
+bool                Ce_IsInternal(
+                        const ary::cpp::CodeEntity &
+                                                i_rCe );
+const char *        SyntaxText_PreName(
+                        const ary::cpp::Function &
+                                                i_rFunction,
+                        const ary::cpp::Gate &  i_rAryGate );
+const char *        SyntaxText_PostName(
+                        const ary::cpp::Function &
+                                                i_rFunction,
+                        const ary::cpp::Gate &  i_rAryGate );
+
+bool                Get_TypeText(
+                        const char * &          o_rPreName,
+                        const char * &          o_rName,
+                        const char * &          o_rPostName,
+                        ary::cpp::Type_id       i_nTypeid,
+                        const ary::cpp::Gate &  i_rAryGate );
+
+
+inline const ary::doc::OldCppDocu *
+Get_CppDocu(const ary::doc::Documentation & i_doc)
+{
+    return dynamic_cast< const ary::doc::OldCppDocu* >(i_doc.Data());
+}
+
+
+class FunctionParam_Iterator
+{
+  public:
+                    FunctionParam_Iterator();
+                    ~FunctionParam_Iterator();
+
+                    operator bool() const;
+    FunctionParam_Iterator &
+                    operator++();
+
+    void            Assign(
+                        const ary::cpp::Function &
+                                                i_rFunction );
+
+    ary::cpp::Type_id
+                    CurType() const;
+    const String  & CurName() const;
+
+    bool            IsFunctionConst() const;
+    bool            IsFunctionVolatile() const;
+
+  private:
+    typedef std::vector<ary::cpp::Type_id>::const_iterator  Type_Iterator;
+    typedef StringVector::const_iterator                    Name_Iterator;
+
+    bool                IsValid() const;
+
+    // Forbidden
+    FunctionParam_Iterator &
+                    operator++(int);
+    // DATA
+    Type_Iterator       itTypes;
+    Type_Iterator       itTypes_end;
+    Name_Iterator       itNames_andMore;        /// Name, init-value.
+    Name_Iterator       itNames_andMore_end;
+
+    ary::cpp::E_ConVol  eConVol;
+};
+
+
+
+
+// IMPLEMENTATION
+inline
+FunctionParam_Iterator::operator bool() const
+    { return IsValid(); }
+
+inline bool
+FunctionParam_Iterator::IsValid() const
+{
+    // By C'tor and Assign(), it is assured, that
+    //   both iterators are valid, if one is valid.
+    return itTypes != itTypes_end;
+}
+
+inline ary::cpp::Type_id
+FunctionParam_Iterator::CurType() const
+    { return IsValid() ? *itTypes : ary::cpp::Type_id(0); }
+inline const String  &
+FunctionParam_Iterator::CurName() const
+    { return IsValid() ? *itNames_andMore : String::Null_(); }
+inline bool
+FunctionParam_Iterator::IsFunctionConst() const
+    { return (eConVol & ary::cpp::CONVOL_const) != 0; }
+inline bool
+FunctionParam_Iterator::IsFunctionVolatile() const
+    { return (eConVol & ary::cpp::CONVOL_volatile) != 0; }
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx
new file mode 100644
index 000000000000..3b45576c17ae
--- /dev/null
+++ b/autodoc/source/display/html/cfrstd.cxx
@@ -0,0 +1,344 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <cfrstd.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <time.h>
+
+
+/*                      CSS Styles
+                        ----------
+
+Colors:
+-   light background color              #eeeeff
+-   dark background color               #ccccff
+-   self in navibar background color    #2222ad
+
+
+Fonts:
+-   page title              20, bold, Arial
+-   navibar main            12, bold, Arial
+-   navibar sub              8, Arial, kapit�lchen
+-   attrtable title line     8, bold, Arial, kapit�lchen
+-   attrtable value line     8, Arial kapit�lchen
+
+-   namespace chain         13, bold
+-   table title             13, bold
+-   template line           13
+
+-   member paragraph title  12, bold
+
+-   docu paragraph title    11, bold
+-   standard text           11
+
+-   hierarchy               11, monospace
+
+
+classes:
+
+    td.title                page title
+    h3                      table title
+    h4                      member paragraph title
+
+    td.nmain                navigation main bar
+    td.nsub                 navigation sub bar
+    a.nmain                 links in navigation main bar
+    a.nsub                  links in navigation sub bar
+
+    td.attr1                attribute table head line
+    td.attr2                attribute table value line
+
+    p.namechain             namespace chain in head of pages
+    p.tpl                   template line in head of pages
+
+    pre.doc                 preformatted docu
+    pre.hierarchy           class bases hierarchy graphic
+
+    dl.syntax               function- or variable-declaration field
+    a.syntax                link in function- or variable-declaration field
+
+    p.dt                    docu paragraph title
+    dl.dt                   docu paragraph title
+
+    p                       standard text
+    dl                      standard text
+    dd                      standard text
+*/
+
+
+#define CRLF "\n"
+
+namespace
+{
+
+bool            bUse_OOoFrameDiv = true;
+
+
+//***************   These are used for IDL currently only!   ********************
+
+const char * const C_sStdStyle =
+    "/*See bottom of file for explanations.*/"CRLF
+    CRLF
+    "body { background-color:#ffffff; }"CRLF
+    CRLF
+    "h3             { font-size:13pt; font-weight:bold;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "p, dt, dd, pre { font-size:11pt;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "pre            { font-family:monospace; }"CRLF
+    CRLF
+    "table.navimain { background-color:#eeeeff; }"CRLF
+    "table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
+    CRLF
+    "td             {                     font-size:11pt; }"CRLF
+    "td.title       { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
+    "                 line-height:30pt;   background-color:#ccccff; text-align:center; }"CRLF
+    "td.subtitle    { font-family: Arial; font-size:13pt;"CRLF
+    "                 line-height:20pt;   background-color:#ccccff; }"CRLF
+    "td.crosstitle  {                     font-size:12pt; font-weight:bold;"CRLF
+    "                 line-height:15pt;   background-color:#eeeeff; }"CRLF
+    "td.imdetail    { width:100%;         background-color:#eeeeff; }"CRLF
+    CRLF
+    "td.imsum_left  { width:30%;  }"CRLF
+    "td.imsum_right { width:70%;  }"CRLF
+    CRLF
+    "td.navimain, a.navimain"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
+    "                     color:#ffffff; background-color:#2222ad; }"CRLF
+    "td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
+    "td.navisub, a.navisub"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
+    "td.navimain, td.navisub"CRLF
+    "                   { padding-left:7pt; padding-right:7pt; }"CRLF
+    CRLF
+    "a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
+    "a.navimain, a.navisub  { color:#000000; }"CRLF
+    ".dt            { font-weight:bold; }"CRLF
+    ".namechain     { font-size:13pt; font-weight:bold;"CRLF
+    "                 margin-top:3pt; margin-bottom:6pt; }"CRLF
+    ".title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
+    ;
+
+
+const char * const C_sCssExplanations =
+    "/* Explanation of CSS classes:"CRLF
+    CRLF
+    ".navimain          Text in main navigation bar."CRLF
+    ".navisub           Text in lower navigation bar."CRLF
+    "td.navimainself    Cell in main navigation bar with \"selected\" shadow: You are here."CRLF
+    "td.navimainnone    Cell in main navigation bar with no link."CRLF
+    CRLF
+    ".namechain         Line with current module path."CRLF
+    CRLF
+    "td.crosstitle      Comment box for bases (base interfaces etc.)"CRLF
+    "td.imsum_left      Left part of such boxes."CRLF
+    "td.imsum_right     Right part of such boxes."CRLF
+    CRLF
+    "td.title           Main title of the page like \"interface XYz\""CRLF
+    ".subtitle          Tables, and head cells of those, which list members"CRLF
+    "                   like \"method summary\" and \"method details\"."CRLF
+    CRLF
+    "td.imdetail        Background table of method's detail description."CRLF
+    "a.membertitle      Method name (as jump label) in method's detail"CRLF
+    "                   description."CRLF
+    ".title2            smaller font prefixes to page titles"CRLF
+    "*/"CRLF
+    ;
+
+const char * const C_sStdStyle_withDivFrame =
+    "/*See bottom of file for explanations.*/"CRLF
+    CRLF
+    "body { background-color:#ffffff; }"CRLF
+    CRLF
+    "#adc-idlref h3 { font-size:13pt; font-weight:bold;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre"CRLF
+    "               { font-size:11pt;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "#adc-idlref pre    { font-family:monospace; }"CRLF
+    CRLF
+    "#adc-idlref table.navimain { background-color:#eeeeff; }"CRLF
+    "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
+    CRLF
+    "#adc-idlref td             { font-size:11pt; }"CRLF
+    "#adc-idlref td.title       { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
+    "                             line-height:30pt;   background-color:#ccccff; text-align:center; }"CRLF
+    "#adc-idlref td.subtitle    { font-family: Arial; font-size:13pt;"CRLF
+    "                             line-height:20pt;   background-color:#ccccff; }"CRLF
+    "#adc-idlref td.crosstitle  { font-size:12pt; font-weight:bold;"CRLF
+    "                             line-height:15pt;   background-color:#eeeeff; }"CRLF
+    "#adc-idlref td.imdetail    { width:100%;         background-color:#eeeeff; }"CRLF
+    CRLF
+    "#adc-idlref td.imsum_left  { width:30%;  }"CRLF
+    "#adc-idlref td.imsum_right { width:70%;  }"CRLF
+    CRLF
+    "#adc-idlref td.navimain, #adc-idlref a.navimain"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "#adc-idlref td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
+    "                                 color:#ffffff; background-color:#2222ad; }"CRLF
+    "#adc-idlref td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
+    "#adc-idlref td.navisub, #adc-idlref a.navisub"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
+    "#adc-idlref td.navimain, #adc-idlref td.navisub"CRLF
+    "                   { padding-left:7pt; padding-right:7pt; }"CRLF
+    CRLF
+    "#adc-idlref a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
+    "#adc-idlref a.navimain, #adc-idlref a.navisub  { color:#000000; }"CRLF
+    "#adc-idlref .dt            { font-weight:bold; }"CRLF
+    "#adc-idlref .namechain     { font-size:13pt; font-weight:bold;"CRLF
+    "                             margin-top:3pt; margin-bottom:6pt; }"CRLF
+    "#adc-idlref .title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
+    ""CRLF
+    "#adc-idlref table { empty-cells:show; }"CRLF
+    ""CRLF
+    "#adc-idlref .childlist td, "CRLF
+    "#adc-idlref .commentedlinks td, "CRLF
+    "#adc-idlref .memberlist td, "CRLF
+    "#adc-idlref .subtitle td, "CRLF
+    "#adc-idlref .crosstitle td  { border: .1pt solid #000000; }"CRLF
+    ""CRLF
+    "#adc-idlref .flag-table td { border: .1pt solid #cccccc; } "CRLF
+    ""CRLF
+    "#adc-idlref .title-table td, "CRLF
+    "#adc-idlref .table-in-method td, "CRLF
+    "#adc-idlref .table-in-data td, "CRLF
+    "#adc-idlref .navimain td, "CRLF
+    "#adc-idlref .navisub td, "CRLF
+    "#adc-idlref .expl-table td, "CRLF
+    "#adc-idlref .param-table td  { border: none; }"CRLF
+    ;
+
+
+}   // anonymous namespace
+
+
+StdFrame::StdFrame()
+    :   sDevelopersGuideHtmlRoot(),
+        bSimpleLinks(false)
+{
+}
+
+DYN Html_Image *
+StdFrame::LogoSrc() const
+{
+    return 0;
+
+//    return  new Html_Image( "logodot-blu.gif",
+//                            "109",
+//                            "54",
+//                            "RIGHT",
+//                            "0",
+//                            "OpenOffice" );
+
+}
+
+const char *
+StdFrame::LogoLink() const
+{
+    return "";
+//  return "http://www.sun.com";
+//  return "http://www.openoffice.org";
+}
+
+
+String              MakeCopyRight();
+
+const char *
+StdFrame::CopyrightText() const
+{
+    static String sCopyRight_( MakeCopyRight() );
+    return sCopyRight_.c_str();
+}
+
+const char *
+StdFrame::CssStyle() const
+{
+    if (bUse_OOoFrameDiv)
+        return C_sStdStyle_withDivFrame;
+    else
+        return C_sStdStyle;
+}
+
+const char *
+StdFrame::CssStylesExplanation() const
+{
+    return C_sCssExplanations;
+}
+
+const char *
+StdFrame::DevelopersGuideHtmlRoot() const
+{
+    return sDevelopersGuideHtmlRoot;
+}
+
+bool
+StdFrame::SimpleLinks() const
+{
+    return bSimpleLinks;
+}
+
+void
+StdFrame::Set_DevelopersGuideHtmlRoot( const String & i_directory )
+{
+    if (NOT i_directory.empty())
+    {
+        if (i_directory.char_at(i_directory.length()-1) == '/')
+        {
+            sDevelopersGuideHtmlRoot.assign(i_directory,i_directory.length()-1);
+            return;
+        }
+    }
+    sDevelopersGuideHtmlRoot = i_directory;
+}
+
+void
+StdFrame::Set_SimpleLinks()
+{
+    bSimpleLinks = true;
+}
+
+String
+MakeCopyRight()
+{
+    StreamStr cr(700);
+    time_t
+        gt;
+    time(&gt);
+    tm *
+        plt = localtime(&gt);
+    int year = 1900 + plt->tm_year;
+
+    cr  << "Copyright &copy; 1995, "
+        << year
+        << ", Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.";
+    return String(cr.c_str());
+
+}
diff --git a/autodoc/source/display/html/chd_udk2.cxx b/autodoc/source/display/html/chd_udk2.cxx
new file mode 100644
index 000000000000..f03a9a297c40
--- /dev/null
+++ b/autodoc/source/display/html/chd_udk2.cxx
@@ -0,0 +1,201 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <html/chd_udk2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/ary_disp.hxx>
+#include <ary/ceslot.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+
+#include "dsply_cl.hxx"
+#include "dsply_da.hxx"
+#include "dsply_op.hxx"
+#include "opageenv.hxx"
+#include "outfile.hxx"
+#include "pagemake.hxx"
+
+
+
+//********************      CppHtmlDisplay_Udk2     ********************//
+
+
+CppHtmlDisplay_Udk2::CppHtmlDisplay_Udk2()
+    :   pCurPageEnv(0)
+{
+}
+
+CppHtmlDisplay_Udk2::~CppHtmlDisplay_Udk2()
+{
+}
+
+void
+CppHtmlDisplay_Udk2::do_Run( const char *                      i_sOutputDirectory,
+                             const ary::cpp::Gate &            i_rAryGate,
+                             const display::CorporateFrame &   i_rLayout )
+{
+    SetRunData( i_sOutputDirectory, i_rAryGate, i_rLayout );
+
+    Create_Css_File();
+    Create_Overview_File();
+    Create_Help_File();
+    Create_AllDefs_File();
+
+    CreateFiles_InSubTree_Namespaces();
+    CreateFiles_InSubTree_Index();
+}
+
+void
+CppHtmlDisplay_Udk2::SetRunData( const char *                       i_sOutputDirectory,
+                                 const ary::cpp::Gate &             i_rAryGate,
+                                 const display::CorporateFrame &    i_rLayout )
+{
+    csv::ploc::Path aOutputDir( i_sOutputDirectory, true );
+    pCurPageEnv = new OuputPage_Environment( aOutputDir, i_rAryGate, i_rLayout );
+}
+
+void
+CppHtmlDisplay_Udk2::Create_Css_File()
+{
+    pCurPageEnv->MoveDir_2Root();
+    pCurPageEnv->SetFile_Css();
+    HtmlDocuFile::WriteCssFile(pCurPageEnv->CurPath());
+}
+
+void
+CppHtmlDisplay_Udk2::Create_Overview_File()
+{
+    pCurPageEnv->MoveDir_2Root();
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_OverviewFile();
+}
+
+void
+CppHtmlDisplay_Udk2::Create_Help_File()
+{
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_HelpFile();
+}
+
+void
+CppHtmlDisplay_Udk2::Create_AllDefs_File()
+{
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_AllDefsFile();
+}
+
+void
+CppHtmlDisplay_Udk2::CreateFiles_InSubTree_Namespaces()
+{
+    Cout() << "\nCreate files in subtree namespaces" << Endl();
+
+    const ary::cpp::Namespace &
+        rGlobalNsp = Gate().Ces().GlobalNamespace();
+
+    RecursiveDisplay_Namespace(rGlobalNsp);
+    Cout() << Endl();
+}
+
+void
+CppHtmlDisplay_Udk2::CreateFiles_InSubTree_Index()
+{
+    Cout() << "\nCreate files in subtree index" << Endl();
+    Cout() << Endl();
+
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_IndexFiles();
+}
+
+void
+CppHtmlDisplay_Udk2::RecursiveDisplay_Namespace( const ary::cpp::Namespace & i_rNsp )
+{
+    if (i_rNsp.Owner().IsValid())
+        pCurPageEnv->MoveDir_Down2( i_rNsp );
+    else
+        pCurPageEnv->MoveDir_2Names();
+    DisplayFiles_InNamespace( i_rNsp );
+
+    typedef std::vector< const ary::cpp::Namespace* > NspList;
+    NspList     aSubNspList;
+    i_rNsp.Get_SubNamespaces( aSubNspList );
+    for ( NspList::const_iterator it = aSubNspList.begin();
+          it != aSubNspList.end();
+          ++it )
+    {
+        RecursiveDisplay_Namespace( *(*it) );
+    }   // end for
+
+    pCurPageEnv->MoveDir_Up();
+}
+
+void
+CppHtmlDisplay_Udk2::DisplayFiles_InNamespace( const ary::cpp::Namespace & i_rNsp )
+{
+    PageDisplay aPageMaker( *pCurPageEnv );
+
+    ary::Slot_AutoPtr pSlot;
+
+    // Namespace
+    aPageMaker.Create_NamespaceFile();
+
+    // Classes
+    ClassDisplayer aClassDisplayer( *pCurPageEnv );
+    DisplaySlot( aClassDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Classes );
+
+    // Enums
+    DisplaySlot( aPageMaker, i_rNsp, ary::cpp::Namespace::SLOT_Enums );
+
+    // Typedefs
+    DisplaySlot( aPageMaker, i_rNsp, ary::cpp::Namespace::SLOT_Typedefs );
+
+    // Operations
+    OperationsDisplay aOperationsDisplayer( *pCurPageEnv );
+    DisplaySlot( aOperationsDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Operations );
+    aOperationsDisplayer.Create_Files();
+
+    // Data
+    DataDisplay aDataDisplayer( *pCurPageEnv );
+
+    aDataDisplayer.PrepareForConstants();
+    DisplaySlot( aDataDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Constants );
+
+    aDataDisplayer.PrepareForVariables();
+    DisplaySlot( aDataDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Variables );
+
+    aDataDisplayer.Create_Files();
+}
+
+const ary::cpp::Gate &
+CppHtmlDisplay_Udk2::Gate() const
+{
+    return pCurPageEnv->Gate();
+}
diff --git a/autodoc/source/display/html/cre_link.cxx b/autodoc/source/display/html/cre_link.cxx
new file mode 100644
index 000000000000..688464d53969
--- /dev/null
+++ b/autodoc/source/display/html/cre_link.cxx
@@ -0,0 +1,269 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cre_link.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include "hdimpl.hxx"
+#include "opageenv.hxx"
+#include "strconst.hxx"
+
+
+
+
+
+LinkCreator::LinkCreator( char *              o_rOutput,
+                          uintt               i_nOutputSize )
+    :   pOut(o_rOutput),
+        nOutMaxSize(i_nOutputSize),
+        pEnv(0)
+{
+}
+
+LinkCreator::~LinkCreator()
+{
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, "index.html" );   // KORR_FUTURE   // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Class & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, ClassFileName(i_rData.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Enum & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, EnumFileName(i_rData.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, TypedefFileName(i_rData.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Function & i_rData )
+{
+    Create_PrePath( i_rData );
+
+    if ( i_rData.Protection() != ary::cpp::PROTECT_global )
+    {
+        strcat( pOut, "o.html" );   // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {
+        csv_assert(i_rData.Location().IsValid());
+        const ary::loc::File &
+            rFile = pEnv->Gate().Locations().Find_File(i_rData.Location());
+        strcat( pOut, HtmlFileName("o-", rFile.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+    }
+
+    csv_assert(pEnv != 0);
+    strcat( pOut, OperationLink(pEnv->Gate(), i_rData.LocalName(), i_rData.CeId()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Variable & i_rData )
+{
+    Create_PrePath( i_rData );
+
+    if ( i_rData.Protection() != ary::cpp::PROTECT_global )
+    {
+        strcat( pOut, "d.html" );       // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {
+        csv_assert(i_rData.Location().IsValid());
+        const ary::loc::File &
+            rFile = pEnv->Gate().Locations().Find_File(i_rData.Location());
+        strcat( pOut, HtmlFileName("d-", rFile.LocalName().c_str()) );  // SAFE STRCAT (#100211# - checked)
+    }
+
+    strcat( pOut, DataLink(i_rData.LocalName()) );  // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::EnumValue & i_rData )
+{
+    const ary::cpp::CodeEntity *
+        pEnum = pEnv->Gate().Ces().Search_Ce(i_rData.Owner());
+    if (pEnum == 0)
+        return;
+
+    pEnum->Accept(*this);
+    strcat(pOut, "#");      // SAFE STRCAT (#100211# - checked)
+    strcat(pOut, i_rData.LocalName().c_str());  // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Define & i_rData )
+{
+    // KORR_FUTURE
+    // Only valid from Index:
+
+    *pOut = '\0';
+    strcat(pOut, "../def-all.html#");               // SAFE STRCAT (#100211# - checked)
+    strcat(pOut, i_rData.LocalName().c_str());      // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Macro & i_rData )
+{
+    // KORR_FUTURE
+    // Only valid from Index:
+
+    *pOut = '\0';
+    strcat(pOut, "../def-all.html#");               // SAFE STRCAT (#100211# - checked)
+    strcat(pOut, i_rData.LocalName().c_str());    // SAFE STRCAT (#100211# - checked)
+}
+
+
+namespace
+{
+
+class NameScope_const_iterator
+{
+  public:
+                        NameScope_const_iterator(
+                            ary::cpp::Ce_id     i_nId,
+                            const ary::cpp::Gate &
+                                                i_rGate );
+
+                        operator bool() const   { return pCe != 0; }
+    const String  &     operator*() const;
+
+    void                go_up();
+
+  private:
+    const ary::cpp::CodeEntity *
+                        pCe;
+    const ary::cpp::Gate *
+                        pGate;
+};
+
+
+NameScope_const_iterator::NameScope_const_iterator(
+                                        ary::cpp::Ce_id         i_nId,
+                                        const ary::cpp::Gate &  i_rGate )
+    :   pCe(i_rGate.Ces().Search_Ce(i_nId)),
+        pGate(&i_rGate)
+{
+}
+
+const String  &
+NameScope_const_iterator::operator*() const
+{
+     return pCe ? pCe->LocalName()
+               : String::Null_();
+}
+
+void
+NameScope_const_iterator::go_up()
+{
+     if (pCe == 0)
+        return;
+    pCe = pGate->Ces().Search_Ce(pCe->Owner());
+}
+
+
+void                Recursive_CreatePath(
+                        char *              o_pOut,
+                        const NameScope_const_iterator &
+                                            i_it        );
+
+void
+Recursive_CreatePath( char *                            o_pOut,
+                      const NameScope_const_iterator &  i_it        )
+{
+    if (NOT i_it)
+        return;
+
+    NameScope_const_iterator it( i_it );
+    it.go_up();
+    if (NOT it)
+        return;     // Global Namespace
+    Recursive_CreatePath( o_pOut, it );
+
+    strcat( o_pOut, (*i_it).c_str() );          // SAFE STRCAT (#100211# - checked)
+    strcat( o_pOut, "/" );                      // SAFE STRCAT (#100211# - checked)
+}
+
+
+}   // anonymous namespace
+
+
+
+
+
+void
+LinkCreator::Create_PrePath( const ary::cpp::CodeEntity & i_rData )
+{
+    *pOut = NULCH;
+
+    if ( pEnv->CurNamespace() != 0 )
+    {
+        if ( pEnv->CurClass()
+                ?   pEnv->CurClass()->CeId() == i_rData.Owner()
+                :   pEnv->CurNamespace()->CeId() == i_rData.Owner() )
+            return;
+
+        strcat( pOut, PathUp(pEnv->Depth() - 1) );      // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {   // Within Index
+        strcat( pOut, "../names/" );                    // SAFE STRCAT (#100211# - checked)
+    }
+
+    NameScope_const_iterator it( i_rData.Owner(), pEnv->Gate() );
+    Recursive_CreatePath( pOut, it );
+}
diff --git a/autodoc/source/display/html/cre_link.hxx b/autodoc/source/display/html/cre_link.hxx
new file mode 100644
index 000000000000..bd37e83384f4
--- /dev/null
+++ b/autodoc/source/display/html/cre_link.hxx
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_CRE_LINK_HXX
+#define ADC_DISPLAY_CRE_LINK_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace cpp
+{
+     class CodeEntity;
+    class Namespace;
+    class Class;
+    class Enum;
+    class Typedef;
+    class Function;
+    class Variable;
+    class EnumValue;
+    class Define;
+    class Macro;
+}
+}
+
+
+class OuputPage_Environment;
+
+
+
+/** Displays links to ->{ary::cpp::CodeEntity CodeEntites}.
+*/
+class LinkCreator : public csv::ProcessorIfc,
+                    public csv::ConstProcessor<ary::cpp::Namespace>,
+                    public csv::ConstProcessor<ary::cpp::Class>,
+                    public csv::ConstProcessor<ary::cpp::Enum>,
+                    public csv::ConstProcessor<ary::cpp::Typedef>,
+                    public csv::ConstProcessor<ary::cpp::Function>,
+                    public csv::ConstProcessor<ary::cpp::Variable>,
+                    public csv::ConstProcessor<ary::cpp::EnumValue>,
+                    public csv::ConstProcessor<ary::cpp::Define>,
+                    public csv::ConstProcessor<ary::cpp::Macro>
+{
+  public:
+                        LinkCreator(
+                            char *              o_rOutput,
+                            uintt               i_nOutputSize );
+                        ~LinkCreator();
+
+
+    void                SetEnv(
+                            const OuputPage_Environment &
+                                                i_rEnv );
+  private:
+    void                Create_PrePath(
+                            const ary::cpp::CodeEntity &
+                                                i_rData );
+    // Interface csv::ConstProcessor<>
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::EnumValue &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Define &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Macro &
+                                                i_rData );
+    // DATA
+    char *              pOut;
+    uintt               nOutMaxSize;
+    const OuputPage_Environment *
+                        pEnv;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+LinkCreator::SetEnv( const OuputPage_Environment & i_rEnv )
+    { pEnv = &i_rEnv; }
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/dsply_cl.cxx b/autodoc/source/display/html/dsply_cl.cxx
new file mode 100644
index 000000000000..656bca79c2cf
--- /dev/null
+++ b/autodoc/source/display/html/dsply_cl.cxx
@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "dsply_cl.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include "dsply_da.hxx"
+#include "dsply_op.hxx"
+#include "hdimpl.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+
+
+
+ClassDisplayer::ClassDisplayer( OuputPage_Environment & io_rEnv )
+    :   pEnv(&io_rEnv)
+{
+}
+
+ClassDisplayer::~ClassDisplayer()
+{
+}
+
+void
+ClassDisplayer::DisplayFiles_InClass( const ary::cpp::Class & i_rData,
+                                      PageDisplay &           io_rPageMaker )
+{
+    // Classes
+    ClassDisplayer aClassDisplayer( Env() );
+    DisplaySlot( aClassDisplayer, i_rData, ary::cpp::Class::SLOT_NestedClasses );
+
+    // Enums
+    DisplaySlot( io_rPageMaker, i_rData, ary::cpp::Class::SLOT_Enums );
+
+    // Typedefs
+    DisplaySlot( io_rPageMaker, i_rData, ary::cpp::Class::SLOT_Typedefs );
+
+    // Operations
+    OperationsDisplay aOperationsDisplayer( Env() );
+
+    aOperationsDisplayer.PrepareForStdMembers();
+    DisplaySlot( aOperationsDisplayer, i_rData, ary::cpp::Class::SLOT_Operations );
+
+    aOperationsDisplayer.PrepareForStaticMembers();
+    DisplaySlot( aOperationsDisplayer, i_rData, ary::cpp::Class::SLOT_StaticOperations );
+
+    aOperationsDisplayer.Create_Files();
+
+    // Data
+    DataDisplay aDataDisplayer( Env() );
+
+    aDataDisplayer.PrepareForStdMembers();
+    DisplaySlot( aDataDisplayer, i_rData, ary::cpp::Class::SLOT_Data );
+
+    aDataDisplayer.PrepareForStaticMembers();
+    DisplaySlot( aDataDisplayer, i_rData, ary::cpp::Class::SLOT_StaticData );
+
+    aDataDisplayer.Create_Files();
+}
+
+void
+ClassDisplayer::do_Process( const ary::cpp::Class & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    PageDisplay aPageMaker( Env() );
+    aPageMaker.Process(i_rData);
+
+    Env().MoveDir_Down2( i_rData );
+    DisplayFiles_InClass( i_rData, aPageMaker );
+    Env().MoveDir_Up();
+}
+
+const ary::cpp::Gate *
+ClassDisplayer::inq_Get_ReFinder() const
+{
+    return & pEnv->Gate();
+}
diff --git a/autodoc/source/display/html/dsply_cl.hxx b/autodoc/source/display/html/dsply_cl.hxx
new file mode 100644
index 000000000000..8f81e4f8c1b0
--- /dev/null
+++ b/autodoc/source/display/html/dsply_cl.hxx
@@ -0,0 +1,87 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_HD_PAGE_HXX
+#define ADC_DISPLAY_HTML_HD_PAGE_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <ary/types.hxx>
+
+class OuputPage_Environment;
+
+namespace ary
+{
+namespace cpp
+{
+    class Class;
+}
+}
+
+class PageDisplay;
+
+
+
+
+class ClassDisplayer : public ary::Display,
+                       public csv::ConstProcessor<ary::cpp::Class>
+{
+  public:
+                        ClassDisplayer(            // TODO
+                            OuputPage_Environment &
+                                                io_rEnv );
+    virtual             ~ClassDisplayer();
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_data );
+    // Interface ary::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+
+    // Locals
+    void                DisplayFiles_InClass(
+                            const ary::cpp::Class &
+                                                i_rData,
+                            PageDisplay &       io_rPageMaker );
+
+    OuputPage_Environment &
+                        Env()                   { return *pEnv; }
+
+    // DATA
+    OuputPage_Environment *
+                        pEnv;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/dsply_da.cxx b/autodoc/source/display/html/dsply_da.cxx
new file mode 100644
index 000000000000..4a8055f74d55
--- /dev/null
+++ b/autodoc/source/display/html/dsply_da.cxx
@@ -0,0 +1,199 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "dsply_da.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/doc/d_docu.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+
+using namespace csi;
+
+
+
+DataDisplay::DataDisplay( OuputPage_Environment & io_rEnv )
+    :   aMap_GlobalDataDisplay(),
+        pClassMembersDisplay(0),
+        pEnv( &io_rEnv ),
+        pDocuShow( new Docu_Display(io_rEnv) )
+{
+}
+
+DataDisplay::~DataDisplay()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+}
+
+void
+DataDisplay::PrepareForConstants()
+{
+    if (pClassMembersDisplay)
+        pClassMembersDisplay = 0;
+
+    csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+}
+
+void
+DataDisplay::PrepareForVariables()
+{
+    // Doesn't need to do anything yet.
+}
+
+void
+DataDisplay::PrepareForStdMembers()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+
+    pClassMembersDisplay = new PageDisplay(*pEnv);
+    const ary::cpp::Class * pClass = pEnv->CurClass();
+    csv_assert( pClass != 0 );
+    pClassMembersDisplay->Setup_DataFile_for(*pClass);
+}
+
+void
+DataDisplay::PrepareForStaticMembers()
+{
+    // Doesn't need to do anything yet.
+}
+
+void
+DataDisplay::Create_Files()
+{
+    if (pClassMembersDisplay)
+    {
+        pClassMembersDisplay->Create_File();
+        pClassMembersDisplay = 0;
+    }
+    else
+    {
+         for ( Map_FileId2PagePtr::const_iterator it = aMap_GlobalDataDisplay.begin();
+              it != aMap_GlobalDataDisplay.end();
+              ++it )
+        {
+             (*it).second->Create_File();
+        }
+        csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+    }
+}
+
+void
+DataDisplay::do_Process( const ary::cpp::Variable & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    PageDisplay & rPage = FindPage_for( i_rData );
+
+    csi::xml::Element & rOut = rPage.CurOut();
+    Display_SglDatum( rOut, i_rData );
+}
+
+const ary::cpp::Gate *
+DataDisplay::inq_Get_ReFinder() const
+{
+    return & pEnv->Gate();
+}
+
+PageDisplay &
+DataDisplay::FindPage_for( const ary::cpp::Variable & i_rData )
+{
+    if ( pClassMembersDisplay )
+        return *pClassMembersDisplay;
+
+    SourceFileId
+            nSourceFile = i_rData.Location();
+    PageDisplay *
+            pFound = csv::value_from_map( aMap_GlobalDataDisplay, nSourceFile, (PageDisplay*)0 );
+    if ( pFound == 0 )
+    {
+         pFound = new PageDisplay( *pEnv );
+        const ary::loc::File &
+                rFile = pEnv->Gate().Locations().Find_File( nSourceFile );
+        pFound->Setup_DataFile_for(rFile);
+        aMap_GlobalDataDisplay[nSourceFile] = pFound;
+    }
+
+    return *pFound;
+}
+
+void
+DataDisplay::Display_SglDatum( csi::xml::Element &        rOut,
+                               const ary::cpp::Variable & i_rData )
+{
+    adcdisp::ExplanationList aDocu(rOut, true);
+    aDocu.AddEntry( 0 );
+
+    aDocu.Term()
+        >> *new html::Label( DataLabel(i_rData.LocalName()) )
+            << " ";
+    aDocu.Term()
+        << i_rData.LocalName();
+
+    dshelp::Get_LinkedTypeText( aDocu.Def(), *pEnv, i_rData.Type() );
+    aDocu.Def()
+        << " "
+        >> *new html::Strong
+            << i_rData.LocalName();
+    if ( i_rData.ArraySize().length() > 0 )
+    {
+        aDocu.Def()
+            << "["
+            << i_rData.ArraySize()
+            << "]";
+    }
+    if ( i_rData.Initialisation().length() > 0 )
+    {
+        aDocu.Def()
+            << " = "
+            << i_rData.Initialisation();
+    }
+    aDocu.Def()
+        << ";"
+        << new html::LineBreak
+        << new html::LineBreak;
+
+    aDocu.AddEntry_NoTerm();
+
+    pDocuShow->Assign_Out(aDocu.Def());
+    pDocuShow->Process(i_rData.Docu());
+    pDocuShow->Unassign_Out();
+
+    rOut << new html::HorizontalLine;
+}
diff --git a/autodoc/source/display/html/dsply_da.hxx b/autodoc/source/display/html/dsply_da.hxx
new file mode 100644
index 000000000000..f3cf563c0f72
--- /dev/null
+++ b/autodoc/source/display/html/dsply_da.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_DSPLY_DA_HXX
+#define ADC_DISPLAY_HTML_DSPLY_DA_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <ary/cpp/c_ce.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Variable;
+    }
+}
+namespace csi
+{
+    namespace xml
+    {
+        class Element;
+    }
+}
+
+
+
+
+class OuputPage_Environment;
+class PageDisplay;
+class Docu_Display;
+
+class DataDisplay : public ary::Display,
+                    public csv::ConstProcessor<ary::cpp::Variable>
+{
+  public:
+                        DataDisplay(
+                            OuputPage_Environment &
+                                                io_rInfo );
+    virtual             ~DataDisplay();
+
+    void                PrepareForConstants();
+    void                PrepareForVariables();
+    void                PrepareForStdMembers();
+    void                PrepareForStaticMembers();
+
+    void                Create_Files();
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    // Interface ary::cpp::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+
+    // Locals
+    typedef ary::cpp::Lid                               SourceFileId;
+    typedef std::map< SourceFileId, DYN PageDisplay* >  Map_FileId2PagePtr;
+
+    PageDisplay &       FindPage_for(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    void                Display_SglDatum(
+                            csi::xml::Element & rOut,
+                            const ary::cpp::Variable &
+                                                i_rData );
+    // DATA
+    Map_FileId2PagePtr  aMap_GlobalDataDisplay;
+    Dyn<PageDisplay>    pClassMembersDisplay;
+
+    OuputPage_Environment *
+                        pEnv;
+    Dyn<Docu_Display>   pDocuShow;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/dsply_op.cxx b/autodoc/source/display/html/dsply_op.cxx
new file mode 100644
index 000000000000..1bae518aae18
--- /dev/null
+++ b/autodoc/source/display/html/dsply_op.cxx
@@ -0,0 +1,207 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "dsply_op.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+using namespace csi;
+using namespace adcdisp;
+
+
+
+
+OperationsDisplay::OperationsDisplay( OuputPage_Environment & io_rEnv )
+    :   // aMap_GlobalFunctionsDisplay,
+        // pClassMembersDisplay,
+        pEnv( &io_rEnv ),
+        pDocuShow( new Docu_Display(io_rEnv) )
+{
+}
+
+OperationsDisplay::~OperationsDisplay()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalFunctionsDisplay );
+}
+
+void
+OperationsDisplay::PrepareForStdMembers()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalFunctionsDisplay );
+
+    pClassMembersDisplay = new PageDisplay(*pEnv);
+    const ary::cpp::Class * pClass = pEnv->CurClass();
+    csv_assert( pClass != 0 );
+    pClassMembersDisplay->Setup_OperationsFile_for(*pClass);
+}
+
+void
+OperationsDisplay::PrepareForStaticMembers()
+{
+    // Doesn't need to do anything yet.
+}
+
+void
+OperationsDisplay::Create_Files()
+{
+    if (pClassMembersDisplay)
+        pClassMembersDisplay->Create_File();
+    else
+    {
+         for ( Map_FileId2PagePtr::const_iterator it = aMap_GlobalFunctionsDisplay.begin();
+              it != aMap_GlobalFunctionsDisplay.end();
+              ++it )
+        {
+             (*it).second->Create_File();
+        }
+    }
+}
+
+void
+OperationsDisplay::do_Process( const ary::cpp::Function & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    PageDisplay & rPage = FindPage_for( i_rData );
+
+    csi::xml::Element & rOut = rPage.CurOut();
+    Display_SglOperation( rOut, i_rData );
+}
+
+const ary::cpp::Gate *
+OperationsDisplay::inq_Get_ReFinder() const
+{
+    return & pEnv->Gate();
+}
+
+PageDisplay &
+OperationsDisplay::FindPage_for( const ary::cpp::Function & i_rData )
+{
+    if ( pClassMembersDisplay )
+        return *pClassMembersDisplay;
+
+    SourceFileId
+            nSourceFile = i_rData.Location();
+    PageDisplay *
+            pFound = csv::value_from_map( aMap_GlobalFunctionsDisplay, nSourceFile, (PageDisplay*)0 );
+    if ( pFound == 0 )
+    {
+         pFound = new PageDisplay( *pEnv );
+        const ary::loc::File &
+                rFile = pEnv->Gate().Locations().Find_File( nSourceFile );
+        pFound->Setup_OperationsFile_for(rFile);
+        aMap_GlobalFunctionsDisplay[nSourceFile] = pFound;
+    }
+
+    return *pFound;
+}
+
+void
+OperationsDisplay::Display_SglOperation( csi::xml::Element &        rOut,
+                                         const ary::cpp::Function & i_rData )
+{
+    adcdisp::ExplanationList aDocu(rOut, true);
+    aDocu.AddEntry( 0 );
+
+
+    adcdisp::OperationTitle fTitle;
+    fTitle( aDocu.Term(),
+            i_rData.LocalName(),
+            i_rData.CeId(),
+            pEnv->Gate() );
+
+    // Syntax
+    adcdisp::ExplanationList aSyntaxHeader(aDocu.Def());
+    aSyntaxHeader.AddEntry( 0, "simple" );
+    csi::xml::Element & rHeader = aSyntaxHeader.Term();
+
+    adcdisp::ParameterTable
+        aParams( aSyntaxHeader.Def() );
+
+    if (i_rData.TemplateParameters().size() > 0)
+    {
+        TemplateClause fTemplateClause;
+        fTemplateClause( rHeader, i_rData.TemplateParameters() );
+        rHeader << new html::LineBreak;
+    }
+    if ( i_rData.Flags().IsExternC() )
+    {
+         rHeader
+                << "extern \"C\""
+                << new html::LineBreak;
+    }
+
+    bool bConst = false;
+    bool bVolatile = false;
+    WriteOut_LinkedFunctionText( rHeader, aParams, i_rData, *pEnv,
+                                 &bConst, &bVolatile );
+    aDocu.Def() << new html::LineBreak;
+
+    // Flags
+    aDocu.AddEntry_NoTerm();
+    adcdisp::FlagTable
+        aFlags( aDocu.Def(), 8 );
+
+    const ary::cpp::FunctionFlags &
+        rFFlags = i_rData.Flags();
+    aFlags.SetColumn( 0, "virtual",
+                      i_rData.Virtuality() != ary::cpp::VIRTUAL_none );
+    aFlags.SetColumn( 1, "abstract",
+                      i_rData.Virtuality() == ary::cpp::VIRTUAL_abstract );
+    aFlags.SetColumn( 2, "const", bConst );
+    aFlags.SetColumn( 3, "volatile", bVolatile );
+    aFlags.SetColumn( 4, "template",
+                      i_rData.TemplateParameters().size() > 0 );
+    aFlags.SetColumn( 5, "static",
+                      rFFlags.IsStaticLocal() OR rFFlags.IsStaticMember() );
+    aFlags.SetColumn( 6, "inline",
+                      rFFlags.IsInline() );
+    aFlags.SetColumn( 7, "C-linkage",
+                      rFFlags.IsExternC() );
+    aDocu.Def() << new html::LineBreak;
+
+    // Docu
+    aDocu.AddEntry_NoTerm();
+    pDocuShow->Assign_Out(aDocu.Def());
+    pDocuShow->Process(i_rData.Docu());
+    pDocuShow->Unassign_Out();
+
+    rOut << new html::HorizontalLine;
+}
diff --git a/autodoc/source/display/html/dsply_op.hxx b/autodoc/source/display/html/dsply_op.hxx
new file mode 100644
index 000000000000..e17989f62c47
--- /dev/null
+++ b/autodoc/source/display/html/dsply_op.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_DSPLY_OP_HXX
+#define ADC_DISPLAY_HTML_DSPLY_OP_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <ary/cpp/c_ce.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Function;
+    }
+}
+namespace csi
+{
+    namespace xml
+    {
+        class Element;
+    }
+}
+
+class OuputPage_Environment;
+class PageDisplay;
+class Docu_Display;
+
+
+
+
+class OperationsDisplay : public ary::Display,
+                          public csv::ConstProcessor<ary::cpp::Function>
+{
+  public:
+                        OperationsDisplay(
+                            OuputPage_Environment &
+                                                io_rInfo );
+    virtual             ~OperationsDisplay();
+
+    void                PrepareForStdMembers();
+    void                PrepareForStaticMembers();
+    void                Create_Files();
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    // Interface ary::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+
+    // Locals
+    typedef ary::cpp::Lid                               SourceFileId;
+    typedef std::map< SourceFileId, DYN PageDisplay* >  Map_FileId2PagePtr;
+
+    PageDisplay &       FindPage_for(
+                            const ary::cpp::Function &
+                                                i_rData );
+    void                Display_SglOperation(
+                            csi::xml::Element & rOut,
+                            const ary::cpp::Function &
+                                                i_rData );
+    // DATA
+    Map_FileId2PagePtr  aMap_GlobalFunctionsDisplay;
+    Dyn<PageDisplay>    pClassMembersDisplay;
+
+    OuputPage_Environment *
+                        pEnv;
+    Dyn<Docu_Display>   pDocuShow;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/easywri.cxx b/autodoc/source/display/html/easywri.cxx
new file mode 100644
index 000000000000..47c6196e5322
--- /dev/null
+++ b/autodoc/source/display/html/easywri.cxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "easywri.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+using namespace csi::html;
+
+
+EasyWriter::EasyWriter()
+{
+}
+
+EasyWriter::~EasyWriter()
+{
+}
+
+void
+EasyWriter::Open_OutputNode( csi::xml::Element & io_rDestination )
+{
+    aCurDestination.push(&io_rDestination);
+}
+
+void
+EasyWriter::Finish_OutputNode()
+{
+    csv_assert( NOT aCurDestination.empty() );
+    aCurDestination.pop();
+}
+
+csi::xml::Element &
+EasyWriter::Out()
+{
+    csv_assert( aCurDestination.size() > 0);
+    return *aCurDestination.top();
+}
+
diff --git a/autodoc/source/display/html/easywri.hxx b/autodoc/source/display/html/easywri.hxx
new file mode 100644
index 000000000000..d5490b0f6133
--- /dev/null
+++ b/autodoc/source/display/html/easywri.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_EASYWRI_HXX
+#define ADC_DISPLAY_HTML_EASYWRI_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <estack.hxx>
+    // PARAMETERS
+#include <udm/html/htmlitem.hxx>
+
+
+class EasyWriter
+{
+  public:
+    // LIFECYCLE
+                        EasyWriter();
+                        ~EasyWriter();
+
+    // OPERATIONS
+    /// Pushes csi::xml::Element on stack.
+    void                Open_OutputNode(
+                            csi::xml::Element & io_rDestination );
+    /// Pops front csi::xml::Element from stack.
+    void                Finish_OutputNode();
+
+    void                Enter(
+                            csi::xml::Element & io_rDestination )
+                                                { Open_OutputNode(io_rDestination); }
+    void                Leave()                 { Finish_OutputNode(); }
+
+    // ACCESS
+    csi::xml::Element & Out();                  // CurOutputNode
+
+  private:
+    EStack< csi::xml::Element * >
+                        aCurDestination;        // The front element is the currently used.
+                                                //   The later ones are the parents.
+};
+
+/*
+inline csi::xml::Element &
+EasyWriter::Out()
+    { csv_assert( aCurDestination.size() > 0 );
+      return *aCurDestination.top(); }
+*/
+
+// IMPLEMENTATION
+
+
+#endif
+
+
diff --git a/autodoc/source/display/html/hd_chlst.cxx b/autodoc/source/display/html/hd_chlst.cxx
new file mode 100644
index 000000000000..4647289a7bc4
--- /dev/null
+++ b/autodoc/source/display/html/hd_chlst.cxx
@@ -0,0 +1,589 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hd_chlst.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ceslot.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/ci_attag.hxx>
+#include <ary/info/ci_text.hxx>
+#include <ary/info/all_dts.hxx>
+#include "hd_docu.hxx"
+#include "opageenv.hxx"
+#include "protarea.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using html::Table;
+using html::TableRow;
+using html::TableCell;
+using html::Font;
+using html::SizeAttr;
+using html::BgColorAttr;
+using html::WidthAttr;
+
+
+const int   ixPublic = 0;
+const int   ixProtected = 1;
+const int   ixPrivate = 2;
+
+struct ChildList_Display::S_AreaCo
+{
+  public:
+    ProtectionArea      aArea;
+    Area_Result *       pResult;
+
+                        S_AreaCo(
+                            Area_Result &       o_rResult,
+                            const char *        i_sLabel,
+                            const char *        i_sTitle );
+                        ~S_AreaCo();
+
+    void                PerformResult();
+
+  private:
+    csi::xml::Element & Out()                   { return pResult->rOut; }
+};
+
+
+const ary::info::DocuText &
+ShortDocu( const ary::cpp::CodeEntity & i_rCe )
+{
+    static const ary::info::DocuText
+        aNull_;
+
+    const ary::doc::OldCppDocu *
+            pInfo = dynamic_cast< const ary::doc::OldCppDocu* >( i_rCe.Docu().Data() );
+    if (pInfo == 0)
+        return aNull_;
+
+    return pInfo->Short().CText();
+}
+
+
+ChildList_Display::ChildList_Display( OuputPage_Environment & io_rEnv )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pShortDocu_Display( new Docu_Display(io_rEnv) ),
+        pActiveParentClass(0),
+        pActiveParentEnum(0),
+        // pSglArea,
+        // aMemberAreas,
+        peClassesFilter(0)
+{
+}
+
+ChildList_Display::ChildList_Display( OuputPage_Environment & io_rEnv,
+                                      const ary::cpp::Class & i_rClass )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pShortDocu_Display( new Docu_Display(io_rEnv) ),
+        pActiveParentClass(&i_rClass),
+        pActiveParentEnum(0),
+        // pSglArea,
+        // aMemberAreas,
+        peClassesFilter(0)
+{
+}
+
+ChildList_Display::ChildList_Display( OuputPage_Environment & io_rEnv,
+                                      const ary::cpp::Enum &  i_rEnum )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pShortDocu_Display( new Docu_Display(io_rEnv) ),
+        pActiveParentClass(0),
+        pActiveParentEnum(&i_rEnum),
+        // pSglArea,
+        // aMemberAreas,
+        peClassesFilter(0)
+{
+}
+
+ChildList_Display::~ChildList_Display()
+{
+}
+
+void
+ChildList_Display::Run_Simple( Area_Result &       o_rResult,
+                               ary::SlotAccessId   i_nSlot,
+                               const char *        i_sListLabel,
+                               const char *        i_sListTitle )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot( i_nSlot ) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    pSglArea = new S_AreaCo( o_rResult,
+                             i_sListLabel,
+                             i_sListTitle );
+
+    pSlot->StoreAt(*this);
+
+    pSglArea->PerformResult();
+    pSglArea = 0;
+}
+
+void
+ChildList_Display::Run_GlobalClasses( Area_Result &        o_rResult,
+                                      ary::SlotAccessId    i_nSlot,
+                                      const char *         i_sListLabel,
+                                      const char *         i_sListTitle,
+                                      ary::cpp::E_ClassKey i_eFilter )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot( i_nSlot ) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    pSglArea = new S_AreaCo( o_rResult,
+                             i_sListLabel,
+                             i_sListTitle );
+
+    SetClassesFilter(i_eFilter);
+    pSlot->StoreAt(*this);
+    UnsetClassesFilter();
+
+    pSglArea->PerformResult();
+    pSglArea = 0;
+}
+
+void
+ChildList_Display::Run_Members( Area_Result &           o_rResult_public,
+                                Area_Result &           o_rResult_protected,
+                                Area_Result &           o_rResult_private,
+                                ary::SlotAccessId       i_nSlot,
+                                const char *            i_sListLabel_public,
+                                const char *            i_sListLabel_protected,
+                                const char *            i_sListLabel_private,
+                                const char *            i_sListTitle )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot(i_nSlot) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    aMemberAreas[ixPublic] = new S_AreaCo( o_rResult_public,
+                                         i_sListLabel_public,
+                                         i_sListTitle );
+    aMemberAreas[ixProtected] = new S_AreaCo( o_rResult_protected,
+                                            i_sListLabel_protected,
+                                            i_sListTitle );
+    aMemberAreas[ixPrivate] = new S_AreaCo( o_rResult_private,
+                                          i_sListLabel_private,
+                                          i_sListTitle );
+
+    pSlot->StoreAt(*this);
+
+    aMemberAreas[ixPublic]->PerformResult();
+    aMemberAreas[ixProtected]->PerformResult();
+    aMemberAreas[ixPrivate]->PerformResult();
+
+    aMemberAreas[ixPublic] = 0;
+    aMemberAreas[ixProtected] = 0;
+    aMemberAreas[ixPrivate] = 0;
+}
+
+void
+ChildList_Display::Run_MemberClasses( Area_Result &         o_rResult_public,
+                                      Area_Result &         o_rResult_protected,
+                                      Area_Result &         o_rResult_private,
+                                      ary::SlotAccessId     i_nSlot,
+                                      const char *          i_sListLabel_public,
+                                      const char *          i_sListLabel_protected,
+                                      const char *          i_sListLabel_private,
+                                      const char *          i_sListTitle,
+                                      ary::cpp::E_ClassKey  i_eFilter )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot(i_nSlot) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    aMemberAreas[ixPublic] = new S_AreaCo( o_rResult_public,
+                                           i_sListLabel_public,
+                                           i_sListTitle );
+    aMemberAreas[ixProtected] = new S_AreaCo( o_rResult_protected,
+                                              i_sListLabel_protected,
+                                              i_sListTitle );
+    aMemberAreas[ixPrivate] = new S_AreaCo( o_rResult_private,
+                                            i_sListLabel_private,
+                                            i_sListTitle );
+
+    SetClassesFilter(i_eFilter);
+    pSlot->StoreAt(*this);
+    UnsetClassesFilter();
+
+    aMemberAreas[ixPublic]->PerformResult();
+    aMemberAreas[ixProtected]->PerformResult();
+    aMemberAreas[ixPrivate]->PerformResult();
+
+    aMemberAreas[ixPublic] = 0;
+    aMemberAreas[ixProtected] = 0;
+    aMemberAreas[ixPrivate] = 0;
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Write_ListItem( i_rData.LocalName(),
+                    Path2ChildNamespace(i_rData.LocalName()),
+                    ShortDocu( i_rData ),
+                    GetArea().GetTable() );
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Class & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    if (peClassesFilter)
+    {
+         if (*peClassesFilter != i_rData.ClassKey() )
+            return;
+    }
+
+    String  sLink;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        sLink = ClassFileName(i_rData.LocalName());
+
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLink = Path2Child( ClassFileName(i_rData.LocalName()), pActiveParentClass->LocalName() );
+    }
+
+    if (peClassesFilter)
+    {
+        Write_ListItem( i_rData.LocalName(),
+                        sLink,
+                        ShortDocu( i_rData ),
+                        GetArea(i_rData.Protection())
+                            .GetTable() );
+    }
+    else
+    {
+        Write_ListItem( i_rData.LocalName(),
+                        sLink,
+                        ShortDocu( i_rData ),
+                        GetArea(i_rData.Protection())
+                            .GetTable(i_rData.ClassKey()) );
+    }
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Enum & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLink;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        sLink = EnumFileName(i_rData.LocalName());
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLink = Path2Child( EnumFileName(i_rData.LocalName()),
+                            pActiveParentClass->LocalName() );
+    }
+
+    Write_ListItem( i_rData.LocalName(),
+                    sLink,
+                    ShortDocu( i_rData ),
+                    GetArea(i_rData.Protection()).GetTable() );
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLink;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        sLink = TypedefFileName(i_rData.LocalName());
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLink = Path2Child( TypedefFileName(i_rData.LocalName()),
+                            pActiveParentClass->LocalName() );
+    }
+
+    Write_ListItem( i_rData.LocalName(),
+                    sLink,
+                    ShortDocu( i_rData ),
+                    GetArea(i_rData.Protection()).GetTable() );
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Function & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLinkPrePath;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        const ary::loc::File &
+                rFile = Env().Gate().Locations().Find_File( i_rData.Location() );
+        sLinkPrePath = HtmlFileName( "o-", rFile.LocalName() );
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLinkPrePath = Path2Child( HtmlFileName( "o", "" ),
+                                   pActiveParentClass->LocalName() );
+    }
+
+    // Out
+    Table & rOut = GetArea(i_rData.Protection()).GetTable();
+    TableRow * dpRow = new TableRow;
+    rOut << dpRow;
+    TableCell & rCell1 = dpRow->AddCell();
+
+    rCell1
+        << SyntaxText_PreName( i_rData, Env().Gate() )
+        << new html::LineBreak;
+    rCell1
+        >> *new html::Link( OperationLink(
+                                Env().Gate(),
+                                i_rData.LocalName(),
+                                i_rData.CeId(),
+                                sLinkPrePath) )
+            << i_rData.LocalName();
+    rCell1
+        << SyntaxText_PostName( i_rData, Env().Gate() );
+    TableCell &
+        rCell2 = dpRow->AddCell();
+    rCell2
+        << new WidthAttr("50%")
+        << " ";
+
+    pShortDocu_Display->Assign_Out( rCell2 );
+    ShortDocu( i_rData ).StoreAt( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Variable & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLinkPrePath;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        const ary::loc::File &
+            rFile = Env().Gate().Locations().Find_File( i_rData.Location() );
+        sLinkPrePath = HtmlFileName( "d-", rFile.LocalName() );
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLinkPrePath = Path2Child( HtmlFileName( "d", "" ),
+                                   pActiveParentClass->LocalName() );
+    }
+
+    TableRow * dpRow = new TableRow;
+    GetArea(i_rData.Protection()).GetTable() << dpRow;
+
+    *dpRow << new html::BgColorAttr("white");
+    csi::xml::Element &
+        rCell1 = dpRow->AddCell();
+
+    dshelp::Get_LinkedTypeText( rCell1, Env(), i_rData.Type() );
+    rCell1
+        << " "
+        >> *new html::Link( DataLink(i_rData.LocalName(), sLinkPrePath.c_str()) )
+            >> *new html::Strong
+                << i_rData.LocalName()
+                << ";";
+
+    TableCell & rShortDocu = dpRow->AddCell();
+    pShortDocu_Display->Assign_Out( rShortDocu );
+    ShortDocu( i_rData ).StoreAt( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::EnumValue & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    Table & rOut = GetArea().GetTable();
+
+    TableRow * dpRow = new TableRow;
+    rOut << dpRow;
+
+    *dpRow << new html::BgColorAttr("white");
+    dpRow->AddCell()
+        << new WidthAttr("20%")
+        << new xml::AnAttribute("valign", "top")
+        >> *new html::Label(i_rData.LocalName())
+            >> *new html::Bold
+                << i_rData.LocalName();
+
+    TableCell & rValueDocu = dpRow->AddCell();
+    pShortDocu_Display->Assign_Out( rValueDocu );
+    i_rData.Docu().Accept( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+void
+ChildList_Display::do_StartSlot()
+{
+}
+
+void
+ChildList_Display::do_FinishSlot()
+{
+}
+
+const ary::cpp::Gate *
+ChildList_Display::inq_Get_ReFinder() const
+{
+    return & Env().Gate();
+}
+
+void
+ChildList_Display::Write_ListItem( const String &               i_sLeftText,
+                                   const char *                 i_sLink,
+                                   const ary::info::DocuText &  i_rRightText,
+                                   csi::xml::Element &          o_rOut )
+{
+    TableRow * dpRow = new TableRow;
+    o_rOut << dpRow;
+
+    *dpRow << new html::BgColorAttr("white");
+    dpRow->AddCell()
+        << new WidthAttr("20%")
+        >> *new html::Link( i_sLink )
+                >> *new html::Bold
+                        << i_sLeftText;
+
+    TableCell & rShortDocu = dpRow->AddCell();
+    pShortDocu_Display->Assign_Out( rShortDocu );
+    i_rRightText.StoreAt( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+const ary::AryGroup &
+ChildList_Display::ActiveParent()
+{
+    return pActiveParentClass != 0
+                ?   static_cast< const ary::AryGroup& >(*pActiveParentClass)
+                :   pActiveParentEnum != 0
+                        ?   static_cast< const ary::AryGroup& >(*pActiveParentEnum)
+                        :   static_cast< const ary::AryGroup& >(*Env().CurNamespace());
+}
+
+ProtectionArea &
+ChildList_Display::GetArea()
+{
+    return pSglArea->aArea;
+}
+
+ProtectionArea &
+ChildList_Display::GetArea( ary::cpp::E_Protection i_eProtection )
+{
+    switch ( i_eProtection )
+    {
+         case ary::cpp::PROTECT_public:
+                        return aMemberAreas[ixPublic]->aArea;
+         case ary::cpp::PROTECT_protected:
+                        return aMemberAreas[ixProtected]->aArea;
+         case ary::cpp::PROTECT_private:
+                        return aMemberAreas[ixPrivate]->aArea;
+        default:
+                        return pSglArea->aArea;
+    }
+}
+
+
+//*******************               ********************//
+
+ChildList_Display::
+S_AreaCo::S_AreaCo( Area_Result &       o_rResult,
+                    const char *        i_sLabel,
+                    const char *        i_sTitle )
+    :   aArea(i_sLabel, i_sTitle),
+        pResult(&o_rResult)
+{
+}
+
+ChildList_Display::
+S_AreaCo::~S_AreaCo()
+{
+}
+
+void
+ChildList_Display::
+S_AreaCo::PerformResult()
+{
+    bool bUsed = aArea.WasUsed_Area();
+    pResult->rChildrenExist = bUsed;
+    if ( bUsed )
+    {
+        Create_ChildListLabel( Out(), aArea.Label() );
+
+        if ( aArea.Size() == 1 )
+        {
+            Out() << aArea.ReleaseTable();
+        }
+        else
+        {
+             Table * pTable = aArea.ReleaseTable( ary::cpp::CK_class );
+            if (pTable != 0)
+                Out() << pTable;
+             pTable = aArea.ReleaseTable( ary::cpp::CK_struct );
+            if (pTable != 0)
+                Out() << pTable;
+             pTable = aArea.ReleaseTable( ary::cpp::CK_union );
+            if (pTable != 0)
+                Out() << pTable;
+        }
+    }
+}
diff --git a/autodoc/source/display/html/hd_chlst.hxx b/autodoc/source/display/html/hd_chlst.hxx
new file mode 100644
index 000000000000..d7d530ce934a
--- /dev/null
+++ b/autodoc/source/display/html/hd_chlst.hxx
@@ -0,0 +1,206 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_HD_CHLST_HXX
+#define ADC_DISPLAY_HTML_HD_CHLST_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+#include "hdimpl.hxx"
+
+
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+        class EnumValue;
+    }
+    namespace info
+    {
+        class DocuText;
+    }
+}
+
+class Docu_Display;
+class ProtectionArea;
+
+class ChildList_Display : public ary::Display,
+                          public csv::ConstProcessor<ary::cpp::Namespace>,
+                          public csv::ConstProcessor<ary::cpp::Class>,
+                          public csv::ConstProcessor<ary::cpp::Enum>,
+                          public csv::ConstProcessor<ary::cpp::Typedef>,
+                          public csv::ConstProcessor<ary::cpp::Function>,
+                          public csv::ConstProcessor<ary::cpp::Variable>,
+                          public csv::ConstProcessor<ary::cpp::EnumValue>,
+                          private HtmlDisplay_Impl
+{
+  public:
+    struct Area_Result
+    {
+        bool &              rChildrenExist;
+        csi::xml::Element & rOut;
+
+                            Area_Result(
+                                bool &                  o_rChildrenExist,
+                                csi::xml::Element &     o_rOut )
+                                :   rChildrenExist(o_rChildrenExist),
+                                    rOut(o_rOut) {}
+    };
+
+
+                        ChildList_Display(
+                            OuputPage_Environment &
+                                                io_rEnv );
+                        ChildList_Display(
+                            OuputPage_Environment &
+                                                io_rEnv,
+                            const ary::cpp::Class &
+                                                i_rClass );
+                        ChildList_Display(
+                            OuputPage_Environment &
+                                                io_rEnv,
+                            const ary::cpp::Enum &
+                                                i_rEnum );
+
+    virtual             ~ChildList_Display();
+
+    void                Run_Simple(
+                            Area_Result &       o_rResult,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel,
+                            const char *        i_sListTitle );
+    void                Run_GlobalClasses(
+                            Area_Result &       o_rResult,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel,
+                            const char *        i_sListTitle,
+                            ary::cpp::E_ClassKey
+                                                i_eFilter );
+    void                Run_Members(
+                            Area_Result &       o_rResult_public,
+                            Area_Result &       o_rResult_protected,
+                            Area_Result &       o_rResult_private,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel_public,
+                            const char *        i_sListLabel_protected,
+                            const char *        i_sListLabel_private,
+                            const char *        i_sListTitle );
+    void                Run_MemberClasses(
+                            Area_Result &       o_rResult_public,
+                            Area_Result &       o_rResult_protected,
+                            Area_Result &       o_rResult_private,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel_public,
+                            const char *        i_sListLabel_protected,
+                            const char *        i_sListLabel_private,
+                            const char *        i_sListTitle,
+                            ary::cpp::E_ClassKey
+                                                i_eFilter );
+  private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    /** i_rData is shown only, if it passes two filters:
+        it must have the right protection, checked with pFilter,
+        and the right class key (class,struct,union), checked with
+        pClassFilter. A not exsting filter allows i_rData to be
+        displayed.
+    */
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::EnumValue &
+                                                i_rData );
+  private:
+    // Interface ary::Display:
+    virtual void        do_StartSlot();
+    virtual void        do_FinishSlot();
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    struct S_AreaCo;
+    void                Write_ListItem(
+                            const String &      i_sLeftText,
+                            const char *        i_sLink,
+                            const ary::info::DocuText &
+                                                i_rRightText,
+                            csi::xml::Element & rOut );
+    const ary::AryGroup &
+                        ActiveParent();
+    ProtectionArea &    GetArea();
+    ProtectionArea &    GetArea(
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    void                SetClassesFilter(
+                            ary::cpp::E_ClassKey
+                                                i_eFilter )
+                                                { peClassesFilter = new ary::cpp::E_ClassKey(i_eFilter); }
+    void                UnsetClassesFilter()    { peClassesFilter = 0; }
+
+    // DATA
+    Dyn<Docu_Display>   pShortDocu_Display;
+    const ary::cpp::Class *
+                        pActiveParentClass;
+    const ary::cpp::Enum *
+                        pActiveParentEnum;
+
+    Dyn<S_AreaCo>       pSglArea;
+    Dyn<S_AreaCo>       aMemberAreas[3];
+
+    Dyn<ary::cpp::E_ClassKey>
+                        peClassesFilter;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/hd_docu.cxx b/autodoc/source/display/html/hd_docu.cxx
new file mode 100644
index 000000000000..5fa62b3ecb14
--- /dev/null
+++ b/autodoc/source/display/html/hd_docu.cxx
@@ -0,0 +1,486 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hd_docu.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/all_tags.hxx>
+#include <ary/info/all_dts.hxx>
+#include <adc_cl.hxx>
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+
+
+
+using namespace ary::info;
+using namespace csi;
+
+using html::DefList;
+using html::DefListTerm;
+using html::DefListDefinition;
+using html::Headline;
+using html::Link;
+
+
+const char *
+C_sTagHeadlines[ ary::info::C_eAtTag_NrOfClasses ] =
+    {
+        "ATTENTION!",   "Author",       "Changes",      "Collaborators",
+                                                                        "Contact",  // Contact may be unused
+        "Copyright",    "Deprecated",   "Description",  "Date of Documentation",
+                                                                        "How to Derive from this Class",
+        "Heap object - owner is responsible for deletion.",
+                        "Important Instances",
+                                        "Interface Only",
+                                                        "Invariant",    "Lifecycle",
+        "Multiplicity", "On Error",     "Persistency",  "Postcondition",
+                                                                        "Precondition",
+        "Responsibilities",
+                        "Return",       "Summary",      "Todos",        "Version",
+        "Base Classes", "Exceptions",   "Implements",   "Keywords",     "Parameters",
+        "See Also",     "Template Parameters",
+                                        "",             "Since "
+    };
+
+
+
+Docu_Display::Docu_Display( OuputPage_Environment & io_rEnv )
+    :   HtmlDisplay_Impl(io_rEnv),
+        bUseHtmlInDocuTokens(false),
+        pCurClassOverwrite(0)
+{
+}
+
+Docu_Display::~Docu_Display()
+{
+}
+
+void
+Docu_Display::Assign_Out( csi::xml::Element & o_rOut )
+{
+    Easy().Enter(o_rOut);
+}
+
+void
+Docu_Display::Unassign_Out()
+{
+    Easy().Leave();
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Class & i_rData )
+{
+    pCurClassOverwrite = &i_rData;
+    Process(i_rData.Docu());
+    pCurClassOverwrite = 0;
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Enum & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Function & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Variable & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+
+
+// --------------       Interface ary::info::DocuDisplay  ------------------ //
+
+
+void
+Docu_Display::do_Process(const ary::doc::Documentation & i_rData)
+{
+    if (i_rData.Data() == 0)
+        return;
+
+    const ary::doc::OldCppDocu *
+        docdata = dynamic_cast< const ary::doc::OldCppDocu* >(i_rData.Data());
+    csv_assert(docdata != 0);
+
+    Start_DocuBlock();
+
+    if ( docdata->IsObsolete() )
+    {
+        CurOut()
+            >> *new html::DefListTerm
+                >> *new html::Strong
+                    << "D E P R E C A T E D";
+
+    }
+
+    ary::doc::OldCppDocu::TagList::const_iterator
+        itEnd = docdata->Tags().end();
+    for ( ary::doc::OldCppDocu::TagList::const_iterator it = docdata->Tags().begin();
+          it != itEnd;
+          ++it )
+    {
+         (*it)->StoreAt( *this );
+    }
+
+    Finish_DocuBlock();
+}
+
+void
+Docu_Display::Display_StdTag( const StdTag & i_rData )
+{
+    csv_assert( uintt(i_rData.Std_Id()) < uintt(ary::info::C_eAtTag_NrOfClasses) );
+
+    const ary::info::DocuText::TokenList &
+        rText = i_rData.CText().Tokens();
+    typedef ary::info::DocuText::TokenList::const_iterator TokenIterator;
+
+    if ( rText.empty() )
+        return;
+    else if ( rText.size() < 3 )
+    {
+        bool bIsWhite = true;
+        for ( TokenIterator it = rText.begin();
+              it != rText.end();
+              ++it )
+        {
+            if (bIsWhite)
+                bIsWhite = (*it)->IsWhite();
+        }
+        if (bIsWhite)
+            return;
+    }
+
+    Write_TagTitle( C_sTagHeadlines[i_rData.Std_Id()] );
+    Write_TagContents( i_rData.CText() );
+}
+
+void
+Docu_Display::Display_BaseTag( const BaseTag & )
+{
+}
+
+void
+Docu_Display::Display_ExceptionTag( const ExceptionTag & )
+{
+}
+
+void
+Docu_Display::Display_ImplementsTag( const ImplementsTag & )
+{
+}
+
+void
+Docu_Display::Display_KeywordTag( const KeywordTag & )
+{
+}
+
+void
+Docu_Display::Display_ParameterTag( const ParameterTag & i_rData )
+{
+    Write_TagTitle( "Parameters" );
+
+    adcdisp::ExplanationTable
+        aParams( CurOut() >> *new DefListDefinition );
+
+    for ( const ParameterTag * pParam = &i_rData;
+          pParam != 0;
+          pParam = pParam->GetNext() )   // KORR_FUTURE
+    {
+        aParams.AddEntry( pParam->ParamName().c_str() );
+
+        Easy().Enter( aParams.Def() );
+        Write_Text( pParam->CText() );
+        Easy().Leave();
+    }   // end for
+}
+
+void
+Docu_Display::Display_SeeTag( const SeeTag & i_rData )
+{
+    Write_TagTitle( "See Also" );
+
+    DefListDefinition * dpDef = new DefListDefinition;
+    CurOut() << dpDef;
+    Easy().Enter(*dpDef);
+
+    for ( std::vector< ary::QualifiedName >::const_iterator
+            it = i_rData.References().begin();
+          it != i_rData.References().end();
+          ++it )
+    {
+        Write_LinkableText( (*it) );
+        CurOut() << new html::LineBreak;
+    }
+
+    Easy().Leave();
+}
+
+void
+Docu_Display::Display_TemplateTag( const TemplateTag & i_rData )
+{
+    Write_TagTitle( "Template Parameters" );
+
+    adcdisp::ExplanationTable
+        aTplParams( CurOut() >> *new DefListDefinition );
+
+    for ( const TemplateTag * pTplParam = &i_rData;
+          pTplParam != 0;
+          pTplParam = pTplParam->GetNext() )
+    {
+        aTplParams.AddEntry( pTplParam->TplParamName().c_str() );
+
+        Easy().Enter( aTplParams.Def() );
+        Write_Text( pTplParam->CText() );
+        Easy().Leave();
+    }   // end for
+}
+
+void
+Docu_Display::Display_LabelTag( const LabelTag & )
+{
+}
+
+void
+Docu_Display::Display_SinceTag( const ary::info::SinceTag & i_rData )
+{
+    if ( i_rData.Version().empty() )
+    {
+         return;
+    }
+
+    // Transform the value of the @since tag into the text to be displayed.
+    String sDisplay;
+    if ( autodoc::CommandLine::Get_().DoesTransform_SinceTag() )
+    {
+        sDisplay = autodoc::CommandLine::Get_()
+                        .DisplayOf_SinceTagValue( i_rData.Version() );
+    }
+    else
+    {
+        sDisplay = i_rData.Version();
+    }
+
+    if (sDisplay.empty())
+        return;
+
+    Write_TagTitle( "Since " );
+
+    DefListDefinition * dpDef = new DefListDefinition;
+    CurOut() << dpDef;
+
+    Easy().Enter(*dpDef);
+    CurOut() << sDisplay;
+    Easy().Leave();
+}
+
+void
+Docu_Display::Display_DT_Text( const DT_Text & i_rData )
+{
+    Write_TextToken(  i_rData.Text() );
+}
+
+void
+Docu_Display::Display_DT_MaybeLink( const DT_MaybeLink & i_rData )
+{
+    // KORR_FUTURE
+    Write_TextToken(  i_rData.Text() );
+}
+
+void
+Docu_Display::Display_DT_Whitespace( const DT_Whitespace & i_rData )
+{
+    static char sSpace[300] =
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                        ";
+    UINT8 nLength = i_rData.Length();
+    sSpace[nLength] = NULCH;
+    CurOut() << sSpace;
+    sSpace[nLength] = ' ';
+}
+
+void
+Docu_Display::Display_DT_Eol( const DT_Eol & )
+{
+    CurOut() << new html::Sbr;
+}
+
+void
+Docu_Display::Display_DT_Xml( const ary::info::DT_Xml & i_rData )
+{
+    CurOut() << new xml::XmlCode( i_rData.Text() );
+}
+
+const ary::cpp::Gate *
+Docu_Display::inq_Get_ReFinder() const
+{
+    return &Env().Gate();
+}
+
+void
+Docu_Display::Start_DocuBlock()
+{
+    DYN DefList * dpDefList = new DefList;
+    CurOut() << dpDefList;
+    Easy().Enter( *dpDefList );
+}
+
+void
+Docu_Display::Finish_DocuBlock()
+{
+    Easy().Leave();
+}
+
+void
+Docu_Display::Write_TagTitle( const char *        i_sText,
+                              const char *        )
+{
+    if ( strcmp(i_sText,"ATTENTION!") == 0 )
+    {
+        CurOut()
+            >> *new html::DefListTerm
+                << new html::ClassAttr("attention")
+                << i_sText;
+    }
+    else
+    {
+        CurOut()
+            >> *new html::DefListTerm
+                << i_sText;
+    }
+}
+
+void
+Docu_Display::Write_TagContents( const DocuText & i_rDocuText )
+{
+    DefListDefinition * dpDef = new DefListDefinition;
+    CurOut() << dpDef;
+
+    Easy().Enter(*dpDef);
+    Write_Text(i_rDocuText);
+    Easy().Leave();
+}
+
+void
+Docu_Display::Write_Text( const ary::info::DocuText & i_rDocuText )
+{
+    if ( i_rDocuText.IsNoHtml() )
+    {
+        CurOut()
+            << new xml::XmlCode("<pre>");
+        bUseHtmlInDocuTokens = false;
+    }
+    else
+    {
+         bUseHtmlInDocuTokens = true;
+    }
+    i_rDocuText.StoreAt( *this );
+    if ( i_rDocuText.IsNoHtml() )
+    {
+        CurOut()
+            << new xml::XmlCode("</pre>");
+    }
+}
+
+void
+Docu_Display::Write_TextToken( const String & i_sText )
+{
+     if ( bUseHtmlInDocuTokens )
+        CurOut() << new xml::XmlCode(i_sText);
+    else
+        CurOut() << i_sText;
+}
+
+void
+Docu_Display::Write_LinkableText( const ary::QualifiedName & i_sQuName )
+{
+    const ary::cpp::CodeEntity *
+        pCe = FindUnambiguousCe( Env(), i_sQuName, pCurClassOverwrite );
+    if ( pCe != 0 )
+    {
+        csi::xml::Element *
+            pLink = new csi::html::Link( Link2Ce(Env(), *pCe) );
+        CurOut() << pLink;
+        Easy().Enter(*pLink);
+        Write_QualifiedName(i_sQuName);
+        Easy().Leave();
+    }
+    else
+    {
+        Write_QualifiedName(i_sQuName);
+    }
+    CurOut() << " ";
+}
+
+void
+Docu_Display::Write_QualifiedName( const ary::QualifiedName & i_sQuName )
+{
+    if ( i_sQuName.IsAbsolute() )
+        CurOut() << "::";
+    for ( ary::QualifiedName::namespace_iterator it = i_sQuName.first_namespace();
+          it != i_sQuName.end_namespace();
+          ++it )
+    {
+        CurOut() <<  (*it) << "::";
+    }
+    CurOut() << i_sQuName.LocalName();
+    if ( i_sQuName.IsFunction() )
+        CurOut() << "()";
+}
+
diff --git a/autodoc/source/display/html/hd_docu.hxx b/autodoc/source/display/html/hd_docu.hxx
new file mode 100644
index 000000000000..812cc7054718
--- /dev/null
+++ b/autodoc/source/display/html/hd_docu.hxx
@@ -0,0 +1,196 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_HD_DOCU_HXX
+#define ADC_DISPLAY_HTML_HD_DOCU_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <ary/info/infodisp.hxx>
+#include <cosv/tpl/processor.hxx>
+#include "hdimpl.hxx"
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+    }
+
+    namespace doc
+    {
+         class Documentation;
+    }
+    namespace info
+    {
+        class DocuText;
+    }
+
+    class QualifiedName;
+}
+
+class OuputPage_Environment;
+
+
+class Docu_Display : public ary::Display,
+                     public csv::ConstProcessor<ary::cpp::Namespace>,
+                     public csv::ConstProcessor<ary::cpp::Class>,
+                     public csv::ConstProcessor<ary::cpp::Enum>,
+                     public csv::ConstProcessor<ary::cpp::Typedef>,
+                     public csv::ConstProcessor<ary::cpp::Function>,
+                     public csv::ConstProcessor<ary::cpp::Variable>,
+                     public csv::ConstProcessor<ary::doc::Documentation>,
+                     public ary::info::DocuDisplay,
+                     private HtmlDisplay_Impl
+{
+  public:
+                        Docu_Display(
+                            OuputPage_Environment &
+                                                io_rEnv );
+    virtual             ~Docu_Display();
+
+    void                Assign_Out(
+                            csi::xml::Element & o_rOut );
+    void                Unassign_Out();
+
+    virtual void        Display_StdTag(
+                            const ary::info::StdTag &
+                                                i_rData );
+    virtual void        Display_BaseTag(
+                            const ary::info::BaseTag &
+                                                i_rData );
+    virtual void        Display_ExceptionTag(
+                            const ary::info::ExceptionTag &
+                                                i_rData );
+    virtual void        Display_ImplementsTag(
+                            const ary::info::ImplementsTag &
+                                                i_rData );
+    virtual void        Display_KeywordTag(
+                            const ary::info::KeywordTag &
+                                                i_rData );
+    virtual void        Display_ParameterTag(
+                            const ary::info::ParameterTag &
+                                                i_rData );
+    virtual void        Display_SeeTag(
+                            const ary::info::SeeTag &
+                                                i_rData );
+    virtual void        Display_TemplateTag(
+                            const ary::info::TemplateTag &
+                                                i_rData );
+    virtual void        Display_LabelTag(
+                            const ary::info::LabelTag &
+                                                i_rData );
+    virtual void        Display_SinceTag(
+                            const ary::info::SinceTag &
+                                                i_rData );
+
+    virtual void        Display_DT_Text(
+                            const ary::info::DT_Text &
+                                                i_rData );
+    virtual void        Display_DT_MaybeLink(
+                            const ary::info::DT_MaybeLink &
+                                                i_rData );
+    virtual void        Display_DT_Whitespace(
+                            const ary::info::DT_Whitespace &
+                                                i_rData );
+    virtual void        Display_DT_Eol(
+                            const ary::info::DT_Eol &
+                                                i_rData );
+    virtual void        Display_DT_Xml(
+                            const ary::info::DT_Xml &
+                                                i_rData );
+
+    using csv::ConstProcessor<ary::doc::Documentation>::Process;
+
+  private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::doc::Documentation &
+                                                i_rData );
+    // Interface ary::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    void                Start_DocuBlock();
+    void                Finish_DocuBlock();
+
+    void                Write_TagTitle(
+                            const char *        i_sText,
+                            const char *        i_nFontSize = "+0" );
+    void                Write_TagContents(
+                            const ary::info::DocuText &
+                                                i_rDocuText );
+    void                Write_Text(
+                            const ary::info::DocuText &
+                                                i_rDocuText );
+    void                Write_TextToken(
+                            const String  &     i_sText );
+    void                Write_LinkableText(
+                            const ary::QualifiedName &
+                                                i_sQuName );
+    void                Write_QualifiedName(
+                            const ary::QualifiedName &
+                                                i_sQuName );
+
+    // DATA
+    bool                bUseHtmlInDocuTokens;
+
+    /** This is used, if a class documentation is displayed,
+        because for links to members then the "current class"
+        is not the parent, but this class itself.
+    */
+    const ary::cpp::Class *
+                        pCurClassOverwrite;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/hdimpl.cxx b/autodoc/source/display/html/hdimpl.cxx
new file mode 100644
index 000000000000..fdd23be5b2e6
--- /dev/null
+++ b/autodoc/source/display/html/hdimpl.cxx
@@ -0,0 +1,546 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hdimpl.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <stdlib.h>
+#include <stdio.h>
+#include <ary/ceslot.hxx>
+#include <ary/qualiname.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_de.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "cre_link.hxx"
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+
+
+//********************       HtmlDisplay_Impl        *********************//
+
+HtmlDisplay_Impl::~HtmlDisplay_Impl()
+{
+}
+
+HtmlDisplay_Impl::HtmlDisplay_Impl( OuputPage_Environment & io_rEnv )
+    :   pEnv(&io_rEnv)
+        // aWriteHelper
+{
+}
+
+
+//********************       Free Functions        *********************//
+
+
+
+namespace dshelp
+{
+
+void
+DisplaySlot( ary::Display &          o_rDisplay,
+             const ary::AryGroup &   i_rGroup,
+             ary::SlotAccessId       i_nSlot )
+{
+     ary::Slot_AutoPtr pSlot( i_rGroup.Create_Slot(i_nSlot) );
+    pSlot->StoreAt( o_rDisplay );
+}
+
+
+const char *
+PathUp( uintt i_nLevels )
+{
+    static char sResult[300];
+
+    sResult[0] = NULCH;
+    for ( uintt lev = 0; lev < i_nLevels; ++lev )
+    {
+        strcat( sResult, "../");        // SAFE STRCAT (#100211# - checked)
+    }
+    return sResult;
+}
+
+const char *
+PathPerLevelsUp( uintt                   i_nLevels,
+                 const char *            i_nPathBelowDestinationLevel )
+{
+    static char sResult[500];
+    strcpy( sResult, PathUp(i_nLevels) );               // SAFE STRCPY (#100211# - checked)
+    // KORR_FUTURE: Make it still safer here:
+    strcat( sResult, i_nPathBelowDestinationLevel );    // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+
+const char *
+PathPerRoot( const OuputPage_Environment & i_rEnv,
+             const char *                  i_sPathFromRootDir )
+{
+    return PathPerLevelsUp( i_rEnv.Depth(), i_sPathFromRootDir );
+}
+
+const char *
+PathPerNamespace( const OuputPage_Environment & i_rEnv,
+                  const char *                  i_sPathFromNamespaceDir )
+{
+    const ary::cpp::Namespace * pNsp = i_rEnv.CurNamespace();
+    if ( pNsp == 0 )
+        return "";
+
+    uintt nCount = i_rEnv.Depth() - (pNsp->Depth() + 1) ;
+    csv_assert( nCount < 100 );
+    return PathPerLevelsUp( nCount, i_sPathFromNamespaceDir );
+}
+
+const char *
+HtmlFileName( const char *            i_sPrefix,
+              const char *            i_sEntityName )
+{
+    // KORR_FUTURE: Make it still safer here:
+    static char sResult[300];
+    strcpy( sResult, i_sPrefix );       // SAFE STRCPY (#100211# - checked)
+    strcat( sResult, i_sEntityName );   // SAFE STRCAT (#100211# - checked)
+    strcat( sResult, ".html" );         // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+const char *
+Path2Class( uintt                   i_nLevelsUp,
+            const char *            i_sClassLocalName )
+{
+    return PathPerLevelsUp( i_nLevelsUp, ClassFileName(i_sClassLocalName) );
+}
+
+const char *
+Path2Child( const char *            i_sFileName,
+            const char *            i_sSubDir )
+{
+    static char sResult[400];
+    if ( i_sSubDir != 0 )
+    {
+        // KORR_FUTURE: Make it still safer here:
+        strcpy( sResult, i_sSubDir );       // SAFE STRCPY (#100211# - checked)
+        strcat( sResult, "/" );             // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {
+        sResult[0] = NULCH;
+    }
+
+    strcat( sResult, i_sFileName );         // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+const char *
+Path2ChildNamespace( const char * i_sLocalName )
+{
+    return Path2Child( C_sHFN_Namespace, i_sLocalName );
+}
+
+String
+OperationLink( const ary::cpp::Gate &               ,
+               const String  &                      i_sOpName,
+               ary::cpp::Ce_id                      i_nOpId,
+               const char *                         i_sPrePath )
+{
+    StreamLock
+        slResult(3000);
+    StreamStr &
+        sResult = slResult();
+
+    sResult
+        << i_sPrePath
+        << "#"
+        << i_sOpName
+        << "-"
+        << i_nOpId.Value();
+
+
+
+    return sResult.c_str();
+}
+
+const char *
+DataLink( const String  &         i_sLocalName,
+          const char *            i_sPrePath )
+{
+    StreamLock
+        slResult(3000);
+    StreamStr &
+        sResult = slResult();
+
+    sResult
+        << i_sPrePath
+        << "#"
+        << i_sLocalName;
+
+    return sResult.c_str();
+}
+
+void
+Get_LinkedTypeText( csi::xml::Element &             o_rOut,
+                    const OuputPage_Environment &   i_rEnv,
+                    ary::cpp::Type_id               i_nId,
+                    bool                            i_bWithAbsolutifier )
+{
+    if (NOT i_nId.IsValid())
+        return;
+
+     const char * sPreName = "";
+     const char * sName = "";
+     const char * sPostName = "";
+
+    bool bTypeExists = Get_TypeText( sPreName,
+                                     sName,
+                                     sPostName,
+                                     i_nId,
+                                     i_rEnv.Gate() );
+    if ( NOT bTypeExists )
+        return;
+
+    if ( NOT i_bWithAbsolutifier AND strncmp(sPreName,"::",2) == 0 )
+        sPreName+=2;
+
+    const ary::cpp::CodeEntity *
+        pCe = i_rEnv.Gate().Search_RelatedCe(i_nId);
+
+    String  sLink;
+    if ( pCe != 0 )
+    {
+        sLink = Link2Ce(i_rEnv,*pCe);
+    }
+    else
+    {
+        if ( strstr(sPreName,"com::sun::star") != 0 )
+        {
+            static StreamStr aLink(400);
+            aLink.seekp(0);
+            aLink << PathPerRoot(i_rEnv, "../../common/ref");
+            if ( *sPreName != ':' )
+                aLink << '/';
+            for ( const char * s = sPreName;
+                  *s != 0;
+                  ++s )
+            {
+                if ( *s == ':' )
+                {
+                     aLink << '/';
+                    ++s;
+                }
+                else
+                {
+                     aLink << *s;
+                }
+            }   // end for
+            aLink << sName
+                  << ".html";
+            sLink = aLink.c_str();
+        }
+    }   // endif( pCe != 0 )
+
+    o_rOut
+        << sPreName;
+    csi::xml::Element &
+        o_Goon = sLink.length() > 0
+                     ?   o_rOut >> * new html::Link( sLink.c_str() )
+                     :   o_rOut;
+    o_Goon
+        <<  sName;
+    o_rOut
+        << sPostName;
+}
+
+void
+Create_ChildListLabel( csi::xml::Element &     o_rParentElement,
+                       const char *            i_sLabel )
+{
+    if ( NOT csv::no_str(i_sLabel) )
+    {
+        o_rParentElement
+            >> *new html::Label(i_sLabel)
+                    << " ";
+    }
+}
+
+DYN csi::html::Table &
+Create_ChildListTable( const char * i_sTitle )
+{
+    html::Table *
+            dpTable = new html::Table;
+    *dpTable
+        << new html::ClassAttr( "childlist")
+        << new xml::AnAttribute( "border", "1" )
+        << new xml::AnAttribute( "cellpadding", "5" )
+        << new xml::AnAttribute( "cellspacing", "0" )
+        << new html::WidthAttr( "100%" );
+
+    html::TableRow &
+            rRow = dpTable->AddRow();
+    rRow
+        << new html::ClassAttr("subtitle")
+        >> *new html::TableCell
+                << new xml::AnAttribute( "colspan","2" )
+                >> *new html::Headline(4)
+                        << i_sTitle;
+    return *dpTable;
+}
+
+const char *
+Link2Ce( const OuputPage_Environment & i_rEnv,
+         const ary::cpp::CodeEntity &  i_rCe )
+{
+    const uintt         nMaxSize
+                            = 3000;
+    static char         sLink[nMaxSize];
+    static LinkCreator  aLinkCreator( &sLink[0], nMaxSize );
+    sLink[0] = NULCH;
+
+    aLinkCreator.SetEnv(i_rEnv);
+    i_rCe.Accept(aLinkCreator);
+
+    return sLink;
+}
+
+const char *
+Link2CppDefinition( const OuputPage_Environment & i_rEnv,
+                    const ary::cpp::DefineEntity &    i_rDef )
+{
+    const uintt         nMaxSize
+                            = 1000;
+    static char         sLink[nMaxSize];
+    static LinkCreator  aLinkCreator( &sLink[0], nMaxSize );
+    sLink[0] = NULCH;
+
+    aLinkCreator.SetEnv(i_rEnv);
+    i_rDef.Accept(aLinkCreator);
+
+    return sLink;
+}
+
+const ary::cpp::CodeEntity *
+FindUnambiguousCe( const OuputPage_Environment & i_rEnv,
+                   const ary::QualifiedName &    i_rQuName,
+                   const ary::cpp::Class *       i_pJustDocumentedClass )
+{
+     if ( i_rEnv.CurNamespace() == 0 )
+        return 0;
+
+    const ary::cpp::CodeEntity * ret = 0;
+
+    if ( NOT i_rQuName.IsQualified() )
+    {
+        if ( i_pJustDocumentedClass != 0 )
+            ret = i_rEnv.Gate().Ces().Search_CeLocal( i_rQuName.LocalName(),
+                                                      i_rQuName.IsFunction(),
+                                                      *i_rEnv.CurNamespace(),
+                                                      i_pJustDocumentedClass );
+        if (ret != 0)
+            return ret;
+
+        ret = i_rEnv.Gate().Ces().Search_CeLocal( i_rQuName.LocalName(),
+                                                  i_rQuName.IsFunction(),
+                                                  *i_rEnv.CurNamespace(),
+                                                  i_rEnv.CurClass() );
+    }
+    if (ret != 0)
+        return ret;
+
+    return i_rEnv.Gate().Ces().Search_CeAbsolute( *i_rEnv.CurNamespace(),
+                                                  i_rQuName );
+}
+
+void
+ShowDocu_On( csi::xml::Element &            o_rOut,
+             Docu_Display &                 io_rDisplay,
+             const ary::cpp::CppEntity &    i_rRE )
+{
+    if (i_rRE.Docu().Data() != 0)
+    {
+        io_rDisplay.Assign_Out( o_rOut );
+        io_rDisplay.Process(i_rRE.Docu());
+        io_rDisplay.Unassign_Out();
+    }
+}
+
+void
+WriteOut_TokenList( csi::xml::Element &     o_rOut,
+                    const StringVector &    i_rTokens,
+                    const char *            i_sSeparator )
+{
+    if ( i_rTokens.size() > 0 )
+    {
+        StringVector::const_iterator
+            it      = i_rTokens.begin();
+        StringVector::const_iterator
+            itEnd   = i_rTokens.end();
+
+        o_rOut << *it;
+        for ( ++it; it != itEnd; ++it )
+        {
+            o_rOut << i_sSeparator << *it;
+        }
+    };
+
+}
+
+void
+EraseLeadingSpace( String  & io_rStr )
+{
+    if ( *io_rStr.c_str() < 33 AND io_rStr.length() > 0 )
+    {
+        const unsigned char * pNew;
+        for ( pNew = (const unsigned char * ) io_rStr.c_str();
+              *pNew < 33 AND *pNew != 0;
+              ++pNew ) {}
+        String  sNew( (const char*)pNew );
+        io_rStr = sNew;
+    }
+}
+
+void
+WriteOut_LinkedFunctionText( csi::xml::Element &            o_rTitleOut,
+                             adcdisp::ParameterTable &      o_rParameters,
+                             const ary::cpp::Function &     i_rFunction,
+                             const OuputPage_Environment &  i_rEnv,
+                             bool *                         o_bIsConst,
+                             bool *                         o_bIsVirtual )
+{
+    // write pre-name:
+    const ary::cpp::FunctionFlags & rFlags = i_rFunction.Flags();
+    if ( rFlags.IsStaticLocal() OR rFlags.IsStaticMember() )
+        o_rTitleOut << "static ";
+    if ( rFlags.IsExplicit() )
+        o_rTitleOut << "explicit ";
+    if ( rFlags.IsMutable() )
+        o_rTitleOut << "mutable ";
+    if ( i_rFunction.Virtuality() != ary::cpp::VIRTUAL_none )
+        o_rTitleOut << "virtual ";
+//    o_rTitleOut << new html::LineBreak;
+
+    Get_LinkedTypeText( o_rTitleOut, i_rEnv, i_rFunction.ReturnType() );
+
+    // write name:
+    o_rTitleOut
+        << " "
+        >> *new html::Strong
+            << i_rFunction.LocalName();
+    o_rTitleOut
+            << "(";
+
+
+    csi::xml::Element * pOutLast = &o_rTitleOut;
+
+    // write post-name:
+    FunctionParam_Iterator fit;
+    fit.Assign(i_rFunction);
+
+    if (fit)
+    {
+        o_rParameters.AddEntry();
+        Get_LinkedTypeText( o_rParameters.Type(), i_rEnv, fit.CurType() );
+        o_rParameters.Type() << " ";
+        o_rParameters.Name() << " " << fit.CurName();
+
+        for ( ++fit; fit; ++fit )
+        {
+            o_rParameters.Name() << ",";
+            o_rParameters.AddEntry();
+            Get_LinkedTypeText( o_rParameters.Type(), i_rEnv, fit.CurType() );
+            o_rParameters.Name() << fit.CurName();
+        }
+
+        pOutLast = &o_rParameters.Name();
+        o_rParameters.Name() << " ";
+    }
+
+    *pOutLast  << ")";
+    if ( fit.IsFunctionConst() )
+    {
+        *pOutLast << " const";
+        if ( o_bIsConst != 0 )
+            *o_bIsConst = true;
+    }
+    if ( fit.IsFunctionVolatile() )
+    {
+        *pOutLast << " volatile";
+        if ( o_bIsVirtual != 0 )
+            *o_bIsVirtual = true;
+    }
+
+    // write Exceptions:
+    const std::vector< ary::cpp::Type_id > *
+            pThrow = i_rFunction.Exceptions();
+    if ( pThrow)
+    {
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it = pThrow->begin();
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it_end = pThrow->end();
+
+        if (it != it_end)
+        {
+            o_rParameters.AddEntry();
+            pOutLast = &o_rParameters.Name();
+
+            o_rParameters.Name() << " throw( ";
+            Get_LinkedTypeText(o_rParameters.Name(), i_rEnv, *it);
+
+            for ( ++it; it != it_end; ++it )
+            {
+                o_rParameters.Name() << ", ";
+                Get_LinkedTypeText(o_rParameters.Name(), i_rEnv, *it);
+            }
+            o_rParameters.Name() << " )";
+        }
+        else
+        {
+            *pOutLast << " throw()";
+        }
+    }   // endif // pThrow
+
+    // abstractness:
+    if ( i_rFunction.Virtuality() == ary::cpp::VIRTUAL_abstract )
+        *pOutLast << " = 0";
+
+    // finish:
+    *pOutLast << ";";
+}
+
+
+
+}   // namespace dshelp
diff --git a/autodoc/source/display/html/hdimpl.hxx b/autodoc/source/display/html/hdimpl.hxx
new file mode 100644
index 000000000000..ca882ec4152f
--- /dev/null
+++ b/autodoc/source/display/html/hdimpl.hxx
@@ -0,0 +1,247 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HDIMPL_HXX
+#define ADC_DISPLAY_HDIMPL_HXX
+
+// BASE CLASSES
+#include <udm/html/htmlitem.hxx>
+// USED SERVICES
+#include "easywri.hxx"
+#include <cosv/bstream.hxx>
+#include <ary/ary_disp.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include "aryattrs.hxx"     // For compatibility with earlier times, when those funtions were in this header.
+
+
+namespace ary
+{
+     namespace cpp
+    {
+        class CodeEntity;
+        class Class;
+         class DisplayGate;
+        class Function;
+        class DefineEntity;
+        class OperationSignature;
+    }
+
+    class QualifiedName;
+}
+namespace csi
+{
+     namespace xml
+    {
+        class Element;
+    }
+     namespace html
+    {
+        class Table;
+    }
+}
+
+namespace adcdisp
+{
+     class ParameterTable;
+}
+
+class OuputPage_Environment;
+class Docu_Display;
+
+class HtmlDisplay_Impl
+{
+  public:
+                        ~HtmlDisplay_Impl();
+
+    const OuputPage_Environment &
+                        Env() const             { return *pEnv; }
+
+    // ACCESS
+    OuputPage_Environment &
+                        Env()                   { return *pEnv; }
+    EasyWriter &        Easy()                  { return aWriteHelper; }
+    csi::xml::Element & CurOut()                { return aWriteHelper.Out(); }
+
+  protected:
+                        HtmlDisplay_Impl(
+                            OuputPage_Environment &
+                                                io_rEnv );
+  private:
+    // DATA
+    OuputPage_Environment *
+                        pEnv;
+    EasyWriter          aWriteHelper;
+};
+
+
+namespace dshelp
+{
+
+void                DisplaySlot(
+                        ary::Display &      o_rDisplay,
+                        const ary::AryGroup &
+                                            i_rGroup,
+                        ary::SlotAccessId   i_nSlot );
+
+
+const char *        PathUp(
+                        uintt                   i_nLevels );
+const char *        PathPerLevelsUp(
+                        uintt                   i_nLevels,
+                        const char *            i_nPathBelowDestinationLevel );
+
+const char *        PathPerRoot(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const char *            i_sPathFromRootDir );
+const char *        PathPerNamespace(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const char *            i_sPathFromNamespaceDir );
+
+void                Create_ChildListLabel(
+                        csi::xml::Element &     o_rParentElement,
+                        const char *            i_sLabel );
+DYN csi::html::Table &
+                    Create_ChildListTable(
+                        const char *            i_sTitle );
+
+const char *        HtmlFileName(
+                        const char *            i_sPrefix,
+                        const char *            i_sEntityName );
+
+inline const char *
+ClassFileName( const char * i_sClassLocalName )
+    { return HtmlFileName( "c-", i_sClassLocalName); }
+inline const char *
+EnumFileName( const char * i_sEnumLocalName )
+    { return HtmlFileName( "e-", i_sEnumLocalName); }
+inline const char *
+TypedefFileName( const char * i_sTypedefLocalName )
+    { return HtmlFileName( "t-", i_sTypedefLocalName); }
+inline const char *
+FileFileName( const char * i_sFileLocalName )
+    { return HtmlFileName( "f-", i_sFileLocalName); }
+
+const char *        Path2Class(
+                        uintt                   i_nLevelsUp,
+                        const char *            i_sClassLocalName );
+
+const char *        Path2Child(
+                        const char *            i_sFileName,
+                        const char *            i_sSubDir = 0 );
+
+const char *        Path2ChildNamespace(
+                        const char *            i_sLocalName );
+
+String              OperationLink(
+                        const ary::cpp::Gate &  i_gate,
+                        const String  &         i_sOpName,
+                        ary::cpp::Ce_id         i_nOpId,
+                        const char *            i_sPrePath = "" );
+const char *        DataLink(
+                        const String  &         i_sLocalName,
+                        const char *            i_sPrePath = ""  );
+
+inline String
+OperationLabel( const String  &                      i_sOpName,
+                ary::cpp::Ce_id                      i_nOpId,
+                const ary::cpp::Gate &               i_gate )
+    { return String(OperationLink(i_gate, i_sOpName, i_nOpId) + 1); }     // Skip '#' in front.
+inline const char *
+DataLabel( const String  &         i_sLocalName )
+    { return DataLink(i_sLocalName) + 1; }     // Skip '#' in front.
+
+
+void                Get_LinkedTypeText(
+                        csi::xml::Element &     o_rOut,
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        ary::cpp::Type_id       i_nId,
+                        bool                    i_bWithAbsolutifier = true );
+
+
+const char *        Link2Ce(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const ary::cpp::CodeEntity &
+                                                i_rCe );
+
+const char *        Link2CppDefinition(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const ary::cpp::DefineEntity &
+                                                i_rDef );
+
+const ary::cpp::CodeEntity *
+                    FindUnambiguousCe(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const ary::QualifiedName &
+                                                i_rQuName,
+                        const ary::cpp::Class * i_pJustDocumentedClass );
+
+void                ShowDocu_On(
+                        csi::xml::Element &     o_rOut,
+                        Docu_Display &          io_rDisplay,
+                        const ary::cpp::CppEntity &
+                                                i_rRE );
+
+void                WriteOut_TokenList(
+                        csi::xml::Element &     o_rOut,
+                        const StringVector &    i_rTokens,
+                        const char *            i_sSeparator );
+
+void                EraseLeadingSpace(
+                        String  &               io_rStr );
+
+/** @param o_bIsConst
+    *o_bIsConst will be set to true, if o_bIsConst != 0 and function is const.
+    If the function is not const, *o_bIsConst remains unchanged!
+
+    @param o_bIsVirtual
+    The same as o_bIsConst.
+*/
+void                WriteOut_LinkedFunctionText(
+                        csi::xml::Element &     o_rTitleOut,
+                        adcdisp::ParameterTable &
+                                                o_rParameters,
+                        const ary::cpp::Function &
+                                                i_rFunction,
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        bool *                  o_bIsConst = 0,
+                        bool *                  o_bIsVirtual = 0 );
+
+
+
+}   // namespace dshelp
+
+using namespace dshelp;
+
+#endif
diff --git a/autodoc/source/display/html/html_kit.cxx b/autodoc/source/display/html/html_kit.cxx
new file mode 100644
index 000000000000..8b43373505fb
--- /dev/null
+++ b/autodoc/source/display/html/html_kit.cxx
@@ -0,0 +1,305 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "html_kit.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <stdio.h>
+#include <ary/cpp/c_slntry.hxx>
+#include "hdimpl.hxx"
+
+
+namespace adcdisp
+{
+
+
+using namespace csi::xml;
+using namespace csi::html;
+
+
+void
+PageTitle_Left::operator()( XmlElement &        o_rOwner,
+                            const char *        i_sTypeTitle,
+                            const String &      i_sLocalName )
+{
+    o_rOwner
+        >> *new Headline(2)
+            << i_sTypeTitle
+            << " "
+            << i_sLocalName;
+}
+
+void
+PageTitle_Std::operator()( XmlElement &         o_rOwner,
+                           const char *         i_sTypeTitle,
+                           const String &       i_sLocalName )
+{
+    o_rOwner
+        >> *new AnElement("div")
+            << new ClassAttr("title")
+            >> *new Headline(2)
+                << i_sTypeTitle
+                << " "
+                << i_sLocalName;
+}
+
+XmlElement &
+PageTitle_Std::operator()( XmlElement & o_rOwner )
+{
+    XmlElement & ret =
+        o_rOwner
+            >> *new AnElement("div")
+                << new ClassAttr("title")
+                >> *new Headline(2);
+    return ret;
+}
+
+void
+OperationTitle::operator()( XmlElement &                o_owner,
+                            const char *                i_itemName,
+                            ary::cpp::Ce_id             i_id,
+                            const ::ary::cpp::Gate &    i_gate )
+{
+    o_owner
+        >> *new Label( OperationLabel(i_itemName, i_id, i_gate) )
+            << " ";
+    o_owner
+        << i_itemName;
+}
+
+
+void
+TemplateClause::operator()( XmlElement &           o_rOwner,
+                            const List_TplParams & i_rTplParams )
+{
+    if ( i_rTplParams.size() == 0 )
+        return;
+
+    Element & rOut =
+        o_rOwner
+            << new LineBreak
+            >> *new Paragraph
+                >> *new Strong
+                    << "template< ";
+
+    List_TplParams::const_iterator
+        it      = i_rTplParams.begin();
+    List_TplParams::const_iterator
+        itEnd   = i_rTplParams.end();
+
+    rOut
+        << (*it).Name();
+    for ( ++it; it != itEnd; ++it )
+    {
+        rOut
+            << ", "
+            << (*it).Name();
+    }  // end for
+      rOut << " >";
+}
+
+ExplanationList::ExplanationList( XmlElement & o_rOwner,
+                                  bool         i_bMemberStyle )
+    :   pList( new DefList),
+        pTerm(0),
+        pDefinition(0),
+        bMemberStyle(i_bMemberStyle)
+{
+    if (bMemberStyle)
+        *pList << new ClassAttr("member");
+
+    o_rOwner << pList;
+}
+
+void
+ExplanationList::AddEntry( const char *        i_sTerm,
+                           const char *        i_sDifferentClass )
+{
+    DefListTerm & rNewTerm = pList->AddTerm();
+    if ( i_sDifferentClass != 0 )
+    {
+        rNewTerm << new ClassAttr(i_sDifferentClass);
+    }
+    else if (bMemberStyle)
+    {
+        rNewTerm << new ClassAttr("member");
+    }
+    if ( i_sTerm != 0 )
+        rNewTerm << i_sTerm;
+
+    pTerm = &rNewTerm;
+    pDefinition = &pList->AddDefinition();
+    if (bMemberStyle)
+        *pDefinition << new ClassAttr("member");
+}
+
+void
+ExplanationList::AddEntry_NoTerm()
+{
+    pTerm = 0;
+    pDefinition = &pList->AddDefinition();
+    if (bMemberStyle)
+        *pDefinition << new ClassAttr("member");
+}
+
+ExplanationTable::ExplanationTable( XmlElement &    o_rOwner )
+    :   pTable(0),
+        pTerm(0),
+        pDefinition(0)
+{
+    pTable = new Table("0", "100%", "3", "0");
+    *pTable << new AnAttribute("class", "expl-table");
+    o_rOwner << pTable;
+}
+
+void
+ExplanationTable::AddEntry( const char *        i_sTerm,
+                            const char *        i_sDifferentStyle )
+{
+    TableRow &
+        rNewRow = pTable->AddRow();
+    TableCell &
+        rNewTerm = rNewRow.AddCell();
+    TableCell &
+        rNewDefinition = rNewRow.AddCell();
+
+    if ( i_sDifferentStyle == 0 )
+    {
+        rNewTerm << new WidthAttr("15%")
+                 << new StyleAttr("vertical-align:top; font-weight:bold");
+    }
+    else
+    {
+        rNewTerm << new StyleAttr(i_sDifferentStyle);
+    }
+    if ( i_sTerm != 0 )
+        rNewTerm << i_sTerm;
+
+    pTerm = &rNewTerm;
+    pDefinition = & (rNewDefinition >> *new APureElement("pre"));
+}
+
+ParameterTable::ParameterTable( XmlElement &    o_rOwner )
+    :   pTable(0),
+        pTerm(0),
+        pDefinition(0)
+{
+    pTable = new Table;
+    *pTable << new AnAttribute("class", "param-table");
+    o_rOwner << pTable;
+}
+
+void
+ParameterTable::AddEntry()
+{
+    TableRow &
+        rNewRow = pTable->AddRow();
+    TableCell &
+        rNewTerm = rNewRow.AddCell();
+    TableCell &
+        rNewDefinition = rNewRow.AddCell();
+
+    pTerm = &rNewTerm;
+    pDefinition = &rNewDefinition;
+}
+
+FlagTable::FlagTable( XmlElement &        o_rOwner,
+                      uintt               i_nNrOfColumns )
+{
+    pTable = new Table;
+    *pTable << new AnAttribute("class", "flag-table");
+    *pTable << new AnAttribute("border", "1");
+    *pTable << new AnAttribute("cellspacing", "0");
+    o_rOwner << pTable;
+
+    TableRow & rRow1 = pTable->AddRow();
+    TableRow & rRow2 = pTable->AddRow();
+
+    for ( uintt c = 0; c < i_nNrOfColumns; ++c )
+    {
+        TableCell & rCell1 = rRow1.AddCell();
+        int nWidth = 100 / i_nNrOfColumns;
+        static char sWidth[20];
+        sprintf( sWidth, "%d%%", nWidth );      // SAFE SPRINTF (#100211# - checked)
+
+        rCell1
+            << new WidthAttr( sWidth )
+            << new ClassAttr( "flagname" );
+        TableCell & rCell2 = rRow2.AddCell();
+        aCells.push_back( CellPair(&rCell1, &rCell2) );
+    }   // end for
+}
+
+void
+FlagTable::SetColumn( uintt               i_nColumnPosition,
+                      const char *        i_sColumnName,
+                      bool                i_bValue )
+{
+    csv_assert( i_nColumnPosition < aCells.size() );
+
+    TableCell &
+        rCell1 = *aCells[i_nColumnPosition].first;
+    TableCell &
+        rCell2 = *aCells[i_nColumnPosition].second;
+    rCell1
+        << i_sColumnName;
+    if (i_bValue)
+    {
+        rCell2
+            << new ClassAttr("flagyes")
+            << "YES";
+    }
+    else //
+    {
+        rCell2
+            << new ClassAttr("flagno")
+            << "NO";
+    }  // endif
+}
+
+IndexList::IndexList( XmlElement & o_rOwner )
+    :   pList( new DefList ),
+        pTerm(0),
+        pDefinition(0)
+{
+    o_rOwner << pList;
+}
+
+void
+IndexList::AddEntry()
+{
+    pTerm = &pList->AddTerm();
+    pDefinition = &pList->AddDefinition();
+}
+
+
+}   // namespace adcdisp
+
+
+
diff --git a/autodoc/source/display/html/html_kit.hxx b/autodoc/source/display/html/html_kit.hxx
new file mode 100644
index 000000000000..ad321d05aac7
--- /dev/null
+++ b/autodoc/source/display/html/html_kit.hxx
@@ -0,0 +1,198 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_KIT_HXX
+#define ADC_DISPLAY_HTML_KIT_HXX
+
+// BASE CLASSES
+#include <udm/xml/xmlitem.hxx>
+#include <udm/html/htmlitem.hxx>
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        struct S_TplParam;
+        class OperationSignature;
+        class Gate;
+    }
+}
+
+
+
+
+namespace adcdisp
+{
+
+typedef csi::xml::Element XmlElement;
+
+class PageTitle_Left
+{
+  public:
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const char *        i_sTypeTitle,
+                            const String  &     i_sLocalName );
+};
+
+class PageTitle_Std
+{
+  public:
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const char *        i_sTypeTitle,
+                            const String  &     i_sLocalName );
+    XmlElement &        operator()(
+                            XmlElement &        o_rOwner );
+};
+
+class OperationTitle
+{
+  public:
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const char *        i_sItemName,
+                            ary::cpp::Ce_id     i_nId,
+                            const ::ary::cpp::Gate &
+                                                i_gate );
+};
+
+
+class TemplateClause
+{
+  public:
+    typedef std::vector< ary::cpp::S_TplParam> List_TplParams;
+
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const List_TplParams &
+                                                i_rTplParams );
+};
+
+
+class ExplanationList
+{
+  public:
+                        ExplanationList(
+                            XmlElement &        o_rOwner,
+                            bool                i_bMemberStyle = false );
+
+    void                AddEntry(
+                            const char *        i_sTerm = 0,
+                            const char *        i_sDifferentClass = 0 );
+    void                AddEntry_NoTerm();
+
+    XmlElement &        Term()                  { return *pTerm; }
+    XmlElement &        Def()                   { return *pDefinition; }
+
+  private:
+    csi::html::DefList* pList;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+    bool                bMemberStyle;
+};
+
+class ExplanationTable
+{
+  public:
+                        ExplanationTable(
+                            XmlElement &        o_rOwner );
+
+    void                AddEntry(
+                            const char *        i_sTerm = 0,
+                            const char *        i_sDifferentStyle = 0 );
+
+    XmlElement &        Term()                  { return *pTerm; }
+    XmlElement &        Def()                   { return *pDefinition; }
+
+  private:
+    csi::html::Table*   pTable;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+};
+
+class ParameterTable
+{
+  public:
+                        ParameterTable(
+                            XmlElement &        o_rOwner );
+
+    void                AddEntry();
+
+    XmlElement &        Type()                  { return *pTerm; }
+    XmlElement &        Name()                  { return *pDefinition; }
+
+  private:
+    csi::html::Table*   pTable;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+};
+
+class FlagTable
+{
+  public:
+                        FlagTable(
+                            XmlElement &        o_rOwner,
+                            uintt               i_nNrOfColumns );
+
+    void                SetColumn(
+                            uintt               i_nColumnPosition,  /// Starting with 0.
+                            const char *        i_sColumnName,
+                            bool                i_bValue );         /// "YES" or "NO"
+  private:
+    typedef std::pair< csi::html::TableCell*, csi::html::TableCell* > CellPair;
+
+    // DATA
+    csi::html::Table*   pTable;
+    std::vector<CellPair>
+                        aCells;
+};
+
+class IndexList
+{
+  public:
+                        IndexList(
+                            XmlElement &        o_rOwner );
+
+    void                AddEntry();
+
+    XmlElement &        Term()                  { return *pTerm; }
+    XmlElement &        Def()                   { return *pDefinition; }
+
+  private:
+    csi::html::DefList* pList;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+};
+
+
+
+
+}   // namespace adcdisp
+#endif
diff --git a/autodoc/source/display/html/makefile.mk b/autodoc/source/display/html/makefile.mk
new file mode 100644
index 000000000000..58046760ebd7
--- /dev/null
+++ b/autodoc/source/display/html/makefile.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_html
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/aryattrs.obj    \
+    $(OBJ)$/cfrstd.obj	    \
+    $(OBJ)$/chd_udk2.obj	\
+    $(OBJ)$/cre_link.obj	\
+    $(OBJ)$/dsply_cl.obj	\
+    $(OBJ)$/dsply_da.obj    \
+    $(OBJ)$/dsply_op.obj	\
+    $(OBJ)$/easywri.obj	    \
+    $(OBJ)$/hd_chlst.obj  	\
+    $(OBJ)$/hd_docu.obj  	\
+    $(OBJ)$/hdimpl.obj  	\
+    $(OBJ)$/html_kit.obj  	\
+    $(OBJ)$/nav_main.obj  	\
+    $(OBJ)$/navibar.obj  	\
+    $(OBJ)$/outfile.obj     \
+    $(OBJ)$/opageenv.obj    \
+    $(OBJ)$/pagemake.obj    \
+    $(OBJ)$/pm_aldef.obj    \
+    $(OBJ)$/pm_base.obj     \
+    $(OBJ)$/pm_class.obj    \
+    $(OBJ)$/pm_help.obj     \
+    $(OBJ)$/pm_index.obj    \
+    $(OBJ)$/pm_namsp.obj    \
+    $(OBJ)$/pm_start.obj    \
+    $(OBJ)$/protarea.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/html/nav_main.cxx b/autodoc/source/display/html/nav_main.cxx
new file mode 100644
index 000000000000..e61099fc502f
--- /dev/null
+++ b/autodoc/source/display/html/nav_main.cxx
@@ -0,0 +1,377 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "nav_main.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "hdimpl.hxx"
+#include "opageenv.hxx"
+#include "strconst.hxx"
+
+
+using namespace ::csi::html;
+using namespace ::csi::xml;
+
+
+const String  sOverview("Overview");
+const String  sNamespace("Namespace");
+const String  sClass("Class");
+const String  sTree("Tree");
+const String  sProject("Project");
+const String  sFile("File");
+const String  sIndex("Index");
+const String  sHelp("Help");
+
+
+
+//********************    MainItem and derived ones      ***************//
+class MainItem
+{
+  public:
+    virtual             ~MainItem() {}
+    void                Write2(
+                            TableRow &          o_rOut );
+  private:
+    virtual void        do_Write2(
+                            TableRow &          o_rOut ) = 0;
+};
+
+inline void
+MainItem::Write2( TableRow & o_rOut )
+    { do_Write2(o_rOut); }
+
+
+namespace
+{
+
+class MainRowItem : public MainItem
+{
+  public:
+                        MainRowItem(
+                            const String  &     i_sText,
+                            const char *        i_sLink,
+                            const char *        i_sTip );
+                        ~MainRowItem();
+  private:
+    enum E_Style { eSelf, eNo, eStd };
+
+    virtual void        do_Write2(
+                            TableRow &          o_rOut );
+    String              sText;
+    String              sLink;
+    String              sTip;
+};
+
+MainRowItem::MainRowItem( const String  &     i_sText,
+                          const char *        i_sLink,
+                          const char *        i_sTip )
+    :   sText(i_sText),
+        sLink(i_sLink),
+        sTip(i_sTip)
+{
+}
+
+MainRowItem::~MainRowItem()
+{
+}
+
+void
+MainRowItem::do_Write2( TableRow & o_rOut )
+{
+    TableCell & rCell = o_rOut.AddCell();
+
+    rCell
+        << new ClassAttr( "navimain" )
+        << new XmlCode("&nbsp;")
+        >> *new Link(sLink.c_str())
+            << sText.c_str();
+    rCell
+        << new XmlCode("&nbsp;");
+}
+
+
+class SelectedItem : public MainItem
+{
+  public:
+                        SelectedItem(
+                            const String  &     i_sText )
+                                                :   sText(i_sText) {}
+  private:
+    virtual void        do_Write2(
+                            TableRow &          o_rOut );
+    String              sText;
+};
+
+void
+SelectedItem::do_Write2( TableRow & o_rOut )
+{
+    TableCell & rCell = o_rOut.AddCell();
+
+    rCell
+        << new ClassAttr( "navimainself" )
+        << new XmlCode("&nbsp;")
+        << sText.c_str()
+        << new XmlCode("&nbsp;");
+}
+
+class UnavailableItem : public MainItem
+{
+  public:
+                        UnavailableItem(
+                            const String  &     i_sText )
+                                                :   sText(i_sText) {}
+  private:
+    virtual void        do_Write2(
+                            TableRow &          o_rOut );
+    String              sText;
+};
+
+void
+UnavailableItem::do_Write2( TableRow & o_rOut )
+{
+    TableCell & rCell = o_rOut.AddCell();
+
+    rCell
+        << new ClassAttr( "navimainnone" )
+        << new XmlCode("&nbsp;")
+        << sText.c_str()
+        << new XmlCode("&nbsp;");
+}
+
+}   // anonymous namespace
+
+//************************      MainRow      ***************************//
+
+MainRow::MainRow( const OuputPage_Environment & i_rEnv )
+    :   // aItems,
+        pEnv(&i_rEnv)
+{
+}
+
+MainRow::~MainRow()
+{
+    csv::erase_container_of_heap_ptrs(aItems);
+}
+
+void
+MainRow::SetupItems_Overview()
+{
+    Create_ItemList_Global( eSelf, eStd, eStd );
+}
+
+void
+MainRow::SetupItems_AllDefs()
+{
+    Create_ItemList_Global( eStd, eStd, eStd );
+}
+
+void
+MainRow::SetupItems_Index()
+{
+    Create_ItemList_Global( eStd, eSelf, eStd );
+}
+
+void
+MainRow::SetupItems_Help()
+{
+    Create_ItemList_Global( eStd, eStd, eSelf );
+}
+
+void
+MainRow::SetupItems_Ce( const ary::cpp::CodeEntity & i_rCe )
+{
+    csv_assert( pEnv->CurNamespace() != 0 );
+    bool bIsNamespace = i_rCe.Id() == pEnv->CurNamespace()->Id();
+    bool bHasClass = pEnv->CurClass() != 0;
+    bool bIsClass = dynamic_cast< const ary::cpp::Class * >(&i_rCe) != 0;
+
+    Create_ItemList_InDirTree_Cpp(
+                ( bIsNamespace ? eSelf : eStd ),
+                ( bIsClass ? eSelf : bHasClass ? eStd : eNo ),
+                eNo, 0 );
+}
+
+void
+MainRow::SetupItems_FunctionGroup()
+{
+    Create_ItemList_InDirTree_Cpp(
+                eStd,
+                (pEnv->CurClass() != 0 ? eStd : eNo),
+                eNo, 0 );
+}
+
+void
+MainRow::SetupItems_DataGroup()
+{
+    SetupItems_FunctionGroup();
+}
+
+void
+MainRow::Write2( csi::xml::Element & o_rOut ) const
+{
+    Table * pTable = new Table;
+    o_rOut
+        >> *pTable
+                << new AnAttribute( "class", "navimain" )
+                << new AnAttribute( "border", "0" )
+                << new AnAttribute( "cellpadding", "1" )
+                << new AnAttribute( "cellspacing", "0" );
+    TableRow & rRow = pTable->AddRow();
+    rRow
+        << new AnAttribute( "align", "center" )
+        << new AnAttribute( "valign", "top" );
+    for ( ItemList::const_iterator it = aItems.begin();
+          it != aItems.end();
+          ++it )
+    {
+        (*it)->Write2( rRow );
+    }
+}
+
+void
+MainRow::Create_ItemList_Global( E_Style             i_eOverview,
+                                 E_Style             i_eIndex,
+                                 E_Style             i_eHelp )
+{
+    if ( i_eOverview == eStd )
+    {
+        String  sLinkOverview = ( i_eIndex == eSelf
+                                        ?   dshelp::PathPerLevelsUp(
+                                                1,
+                                                C_sHFN_Overview )
+                                        :   C_sHFN_Overview );
+        Add_Item( i_eOverview, sOverview, sLinkOverview.c_str(), "" );
+    }
+    else
+    {
+        Add_Item( i_eOverview, sOverview, "", "" );
+    }
+
+    if ( i_eIndex == eSelf )
+        Add_Item( eStd, sNamespace, "../names/index.html", "" );
+    else
+        Add_Item( eStd, sNamespace, "names/index.html", "" );
+
+    Add_Item( eNo, sClass, "", "" );
+
+    if ( i_eIndex == eStd )
+    {
+        Add_Item( i_eIndex, sIndex, C_sPath_Index, "" );
+    }
+    else
+    {
+        Add_Item( i_eIndex, sIndex, "", "" );
+    }
+
+    if ( i_eHelp == eStd )
+    {
+        String  sLinkHelp = ( i_eIndex == eSelf
+                                    ?   PathPerLevelsUp(1,C_sHFN_Help)
+                                    :   C_sHFN_Help );
+        Add_Item( i_eHelp, sHelp, sLinkHelp.c_str(), "" );
+    }
+    else
+    {
+        Add_Item( i_eHelp, sHelp, "", "" );
+    }
+}
+
+void
+MainRow::Create_ItemList_InDirTree_Cpp( E_Style i_eNsp,
+                                        E_Style i_eClass,
+                                        E_Style ,
+                                        const char *  )
+{
+    String
+        sLinkOverview = PathPerRoot(*pEnv, C_sHFN_Overview);
+    Add_Item( eStd, sOverview, sLinkOverview.c_str(), "" );
+
+    if (i_eNsp == eStd)
+    {
+        String  sLinkNamespace = PathPerNamespace(*pEnv, "index.html");
+        Add_Item( i_eNsp, sNamespace, sLinkNamespace.c_str(), "" );
+    }
+    else
+    {
+        Add_Item( i_eNsp, sNamespace, "", "" );
+    }
+
+    if (i_eClass == eStd)
+    {
+        csv_assert( pEnv->CurClass() != 0 );
+
+        StreamLock sLinkClass(300);
+        sLinkClass() << PathPerNamespace(*pEnv, "c-")
+                     << pEnv->CurClass()->LocalName()
+                     << ".html";
+        StreamLock sTipClass(300);
+        sTipClass() << "Class "
+                    << pEnv->CurClass()->LocalName();
+        Add_Item( i_eClass, sClass, sLinkClass().c_str(), sTipClass().c_str() );
+    }
+    else
+    {
+        Add_Item( i_eClass, sClass, "", "" );
+    }
+
+
+    Add_Item( eStd, sIndex, PathPerRoot(*pEnv, C_sPath_Index), "" );
+    String
+        sLinkHelp = PathPerRoot(*pEnv, "help.html");
+    Add_Item( eStd, sHelp, sLinkHelp.c_str(), "" );
+}
+
+void
+MainRow::Add_Item( E_Style             i_eStyle,
+                   const String  &     i_sText,
+                   const char *        i_sLink,
+                   const char *        i_sTip )
+{
+    switch (i_eStyle)
+    {
+         case eStd:      aItems.push_back( new MainRowItem(i_sText, i_sLink, i_sTip) );
+                        break;
+        case eNo:       aItems.push_back( new UnavailableItem(i_sText) );
+                        break;
+        case eSelf:     aItems.push_back( new SelectedItem(i_sText) );
+                        break;
+        default:
+                        csv_assert(false);
+    }
+}
+
+
+
diff --git a/autodoc/source/display/html/nav_main.hxx b/autodoc/source/display/html/nav_main.hxx
new file mode 100644
index 000000000000..f05bebe47969
--- /dev/null
+++ b/autodoc/source/display/html/nav_main.hxx
@@ -0,0 +1,118 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_NAV_MAIN_HXX
+#define ADC_DISPLAY_HTML_NAV_MAIN_HXX
+
+// USED SERVICES
+
+namespace ary
+{
+namespace cpp
+{
+    class CodeEntity;
+}
+namespace loc
+{
+    class File;
+}
+}
+namespace csi
+{
+namespace xml
+{
+    class Element;
+}
+}
+
+class OuputPage_Environment;
+class MainItem;
+
+
+
+
+class MainRow
+{
+  public:
+                        MainRow(
+                            const OuputPage_Environment &
+                                                i_rEnv );
+                        ~MainRow();
+
+    void                SetupItems_Overview();
+    void                SetupItems_AllDefs();
+    void                SetupItems_Index();
+    void                SetupItems_Help();
+
+    void                SetupItems_Ce(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe );
+    void                SetupItems_FunctionGroup(); /// For class member methods.
+    void                SetupItems_DataGroup();     /// For class member data.
+
+    void                Write2(
+                            csi::xml::Element & o_rOut ) const;
+  private:
+    // Local
+    enum E_Style
+    {
+        eSelf,
+        eNo,
+        eStd
+    };
+
+    /** @precond
+        Only combinations of 1 eSelf and 2 eStd are allowed
+        as arguments, here.
+    */
+    void                Create_ItemList_Global(
+                            E_Style             i_eOverview,
+                            E_Style             i_eIndex,
+                            E_Style             i_eHelp );
+    void                Create_ItemList_InDirTree_Cpp(
+                            E_Style             i_eNsp,
+                            E_Style             i_eClass,
+                            E_Style             i_eTree,
+                            const char *        i_sTreeLink );
+    void                Add_Item(
+                            E_Style             i_eStyle,
+                            const String  &     i_sText,
+                            const char *        i_sLink,
+                            const char *        i_sTip );
+    // DATA
+    typedef std::vector< DYN MainItem* > ItemList;
+
+
+    ItemList            aItems;
+    const OuputPage_Environment *
+                        pEnv;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/navibar.cxx b/autodoc/source/display/html/navibar.cxx
new file mode 100644
index 000000000000..06f3e9397b8e
--- /dev/null
+++ b/autodoc/source/display/html/navibar.cxx
@@ -0,0 +1,315 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "navibar.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include "nav_main.hxx"
+#include "opageenv.hxx"
+
+
+using namespace csi::xml;
+using namespace csi::html;
+
+
+namespace
+{
+
+//************************      SubRowItem      ***************************//
+
+class SubRowItem
+{
+  public:
+                        SubRowItem(
+                            const char *        i_sText,
+                            const char *        i_sLink,
+                            bool                i_bActive,
+                            bool                i_bFirstOfRow = false );
+                        ~SubRowItem();
+
+    void                Write2(
+                            Element &           o_rOut ) const;
+  private:
+    String              sText;
+    String              sLink;
+    bool                bIsActive;
+    bool                bFirstOfRow;
+};
+
+SubRowItem::SubRowItem( const char *        i_sText,
+                        const char *        i_sLink,
+                        bool                i_bActive,
+                        bool                i_bFirstOfRow )
+    :   sText(i_sText),
+        sLink(i_sLink),
+        bIsActive(i_bActive),
+        bFirstOfRow(i_bFirstOfRow)
+{
+    csv_assert( NOT csv::no_str(i_sLink) );
+}
+
+SubRowItem::~SubRowItem()
+{
+}
+
+void
+SubRowItem::Write2( Element & o_rOut ) const
+{
+    o_rOut << new Sbr;
+    if ( NOT bFirstOfRow )
+        o_rOut << new XmlCode( "|&nbsp;" );
+    else
+        o_rOut << new XmlCode( "&nbsp;" );
+
+    if ( bIsActive )
+    {
+        o_rOut
+            >> *new Link( sLink.c_str() )
+                >> *new AnElement( "font" )
+                    << new AnAttribute("size","-2")
+                    >> *new Bold
+                        << sText.c_str();
+    }
+    else
+    {
+        o_rOut
+            >> *new AnElement( "font" )
+                << new AnAttribute("size","-2")
+                << sText.c_str();
+    }
+}
+
+
+
+//************************      SubRow      ***************************//
+
+class SubRow
+{
+  public:
+                        SubRow(
+                            const char *        i_sTitle );
+                        ~SubRow();
+
+    void                AddItem(
+                            const char *        i_sText,
+                            const char *        i_sLink,
+                            bool                i_bActive );
+    void                Write2(
+                            Table &             o_rOut ) const;
+  private:
+    typedef std::vector< DYN SubRowItem * >   List_Items;
+
+    List_Items          aItemList;
+    String              sTitle;
+};
+
+SubRow::SubRow( const char * i_sTitle )
+//  :   // aItemList,
+        // sTitle
+{
+    StreamStr sUp(i_sTitle,0);
+    sUp.to_upper();
+    sTitle = sUp.c_str();
+}
+
+SubRow::~SubRow()
+{
+    for ( List_Items::iterator it = aItemList.begin();
+          it != aItemList.end();
+          ++it )
+    {
+         delete (*it);
+    }
+}
+
+inline void
+SubRow::AddItem( const char *        i_sText,
+                 const char *        i_sLink,
+                 bool                i_bActive )
+{
+    aItemList.push_back( new SubRowItem(i_sText, i_sLink, i_bActive, aItemList.empty()) );
+}
+
+void
+SubRow::Write2( Table & o_rOut ) const
+{
+    TableRow * pRow = new TableRow;
+    o_rOut << pRow;
+
+    if (sTitle.length() > 0)
+    {
+        Element & rCell1 = pRow->AddCell();
+        rCell1
+            << new WidthAttr("20%")
+            >> *new AnElement( "font" )
+                    << new AnAttribute("size","-2")
+                       << sTitle
+                       << ":";
+    }
+
+    Element & rCell2 = pRow->AddCell();
+    for ( List_Items::const_iterator it = aItemList.begin();
+          it != aItemList.end();
+          ++it )
+    {
+         (*it)->Write2( rCell2 );
+    }
+}
+
+
+}   // anonymous namespace
+
+
+
+//*************************      CheshireCat     ***********************//
+
+
+typedef std::vector< DYN SubRow * >   List_SubRows;
+
+struct NavigationBar::CheshireCat
+{
+    MainRow             aMainRow;
+    List_SubRows        aSubRows;
+    const OuputPage_Environment *
+                        pEnv;
+
+
+                        CheshireCat(
+                            const OuputPage_Environment &
+                                                i_rEnv );
+                        ~CheshireCat();
+};
+
+NavigationBar::
+CheshireCat::CheshireCat( const OuputPage_Environment & i_rEnv )
+    :   aMainRow( i_rEnv ),
+        pEnv( & i_rEnv )
+{
+}
+
+NavigationBar::
+CheshireCat::~CheshireCat()
+{
+    csv::erase_container_of_heap_ptrs( aSubRows );
+}
+
+
+//************************       NavigationBar       *******************//
+
+NavigationBar::NavigationBar( const OuputPage_Environment & i_rEnv,
+                              E_GlobalLocation              i_eLocation )
+    :   pi( new CheshireCat(i_rEnv) )
+{
+    switch (i_eLocation)
+    {
+         case LOC_Overview:  pi->aMainRow.SetupItems_Overview();  break;
+         case LOC_AllDefs:   pi->aMainRow.SetupItems_AllDefs();   break;
+        case LOC_Index:     pi->aMainRow.SetupItems_Index();     break;
+        case LOC_Help:      pi->aMainRow.SetupItems_Help();      break;
+        default:
+                            csv_assert(false);
+    }
+}
+
+NavigationBar::NavigationBar( const OuputPage_Environment & i_rEnv,
+                              const ary::cpp::CodeEntity &  i_rCe  )
+    :   pi( new CheshireCat(i_rEnv) )
+{
+    pi->aMainRow.SetupItems_Ce( i_rCe );
+}
+
+NavigationBar::NavigationBar( const OuputPage_Environment & i_rEnv,
+                              E_CeGatheringType             i_eCeGatheringType )
+    :   pi( new CheshireCat(i_rEnv) )
+{
+    switch (i_eCeGatheringType)
+    {
+         case CEGT_operations:   pi->aMainRow.SetupItems_FunctionGroup();  break;
+        case CEGT_data:         pi->aMainRow.SetupItems_DataGroup();      break;
+        default:
+                                csv_assert(false);
+    }
+}
+
+NavigationBar::~NavigationBar()
+{
+    csv::erase_container_of_heap_ptrs( pi->aSubRows );
+}
+
+void
+NavigationBar::MakeSubRow( const char * i_sTitle )
+{
+    pi->aSubRows.push_back( new SubRow(i_sTitle) );
+}
+
+void
+NavigationBar::AddItem( const char *        i_sName,
+                        const char *        i_sLink,
+                        bool                i_bValid )
+{
+    csv_assert( pi->aSubRows.size() > 0 );
+    StreamStr sName(i_sName, 0);
+    sName.to_upper();
+
+    StreamLock aSum(100);
+    pi->aSubRows.back()->AddItem( sName.c_str(),
+                                  aSum() << "#" << i_sLink << c_str,
+                                  i_bValid );
+}
+
+void
+NavigationBar::Write( Element &  o_rOut,
+                      bool       i_bWithSubRows ) const
+{
+    pi->aMainRow.Write2( o_rOut );
+
+    const_cast< NavigationBar* >(this)->pSubRowsTable = new Table;
+    o_rOut << pSubRowsTable;
+    *pSubRowsTable
+        << new AnAttribute( "class", "navisub" )
+        << new AnAttribute( "cellpadding", "0" )
+        << new AnAttribute( "cellspacing", "3" );
+
+    if (i_bWithSubRows)
+    {
+        Write_SubRows();
+    }
+}
+
+void
+NavigationBar::Write_SubRows() const
+{
+    for ( List_SubRows::const_iterator it = pi->aSubRows.begin();
+          it != pi->aSubRows.end();
+          ++it )
+    {
+         (*it)->Write2( *pSubRowsTable );
+    }
+}
diff --git a/autodoc/source/display/html/navibar.hxx b/autodoc/source/display/html/navibar.hxx
new file mode 100644
index 000000000000..4b90985d29a4
--- /dev/null
+++ b/autodoc/source/display/html/navibar.hxx
@@ -0,0 +1,118 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_NAVIBAR_HXX
+#define ADC_DISPLAY_HTML_NAVIBAR_HXX
+
+// BASE CLASSES
+#include "hdimpl.hxx"
+
+namespace ary
+{
+namespace cpp
+{
+    class CodeEntity;
+}
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+
+/** Creates a HTML navigation bar wth the following parts:
+
+    A main bar with fixed items.
+    Zero to several subbars with user defined items, depending of
+    the contents of the page.
+
+    The main bar contains those items:
+
+    Overview | Namespace | Class | Tree | Project | File | Index | Help
+*/
+class NavigationBar
+{
+  public:
+    enum E_GlobalLocation
+    {
+        LOC_Overview,
+        LOC_AllDefs,
+        LOC_Index,
+        LOC_Help
+    };
+    enum E_CeGatheringType
+    {
+        CEGT_operations,
+        CEGT_data
+    };
+
+    /// Used for Overview, Index and Help.
+                        NavigationBar(
+                            const OuputPage_Environment &
+                                                i_rEnv,
+                            E_GlobalLocation    i_eLocation );
+    /// Used for all Ces except operations and data.
+                        NavigationBar(
+                            const OuputPage_Environment &
+                                                i_rEnv,
+                            const ary::cpp::CodeEntity &
+                                                i_rCe );
+    /** Used for operations and data.
+    */
+                        NavigationBar(
+                            const OuputPage_Environment &
+                                                i_rEnv,
+                            E_CeGatheringType   i_eCeGatheringType );
+                        ~NavigationBar();
+
+    void                MakeSubRow(
+                            const char *        i_sTitle );
+    void                AddItem(                /// Items are added to last made sub-row.
+                            const char *        i_sName,
+                            const char *        i_sLink,
+                            bool                i_bValid );
+    /** This writes the main bar and the pSubRowTable to o_rOut.
+        The pSubRowsTable stays in memory and can be filled later,
+        when all SubRow items are known.
+    */
+    void                Write(
+                            csi::xml::Element & o_rOut,
+                            bool                i_bWithSubRows = false ) const;
+    void                Write_SubRows() const;
+
+  private:
+    struct CheshireCat;
+    Dyn<CheshireCat>    pi;
+    csi::html::Table *  pSubRowsTable;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/opageenv.cxx b/autodoc/source/display/html/opageenv.cxx
new file mode 100644
index 000000000000..49661f06d15f
--- /dev/null
+++ b/autodoc/source/display/html/opageenv.cxx
@@ -0,0 +1,489 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "opageenv.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <udm/html/htmlitem.hxx>
+#include <estack.hxx>
+#include "hdimpl.hxx"
+#include "strconst.hxx"
+
+
+const String  C_sCppDir( "names" );
+const String  C_sIndexDir( "ix" );
+
+
+//************************         Implementation          ********************//
+
+namespace
+{
+
+void    CreateDirectory( const csv::ploc::Path &    i_rPath );
+
+void
+CreateDirectory( const csv::ploc::Path & i_rPath )
+{
+    csv::ploc::Directory aDirectory(i_rPath);
+    if (NOT aDirectory.Exists())
+        aDirectory.PhysicalCreate();
+}
+
+//************************         CheshireCat          ********************//
+
+struct InNamespaceTree
+{
+    enum E_Type
+    {
+        t_unknown,
+        t_namespace,
+        t_type,
+        t_operations,
+        t_data
+    };
+
+    EStack< const ary::cpp::Namespace * >
+                        aNamespaces; /// never empty.
+    EStack< const ary::cpp::Class * >
+                        aClasses;      /// maybe empty.
+    const ary::cpp::CodeEntity *
+                        pCe;        /// CurFileCe, maybe 0
+    E_Type              eType;
+
+                        InNamespaceTree(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+                        ~InNamespaceTree();
+    void                GoDown(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    void                GoDown(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                GoUp();
+};
+
+InNamespaceTree::InNamespaceTree( const ary::cpp::Namespace & i_rNsp )
+    :   // aNamespaces,
+        // aClasses,
+        pCe(0),
+        eType(t_unknown)
+{
+    aNamespaces.push( &i_rNsp );
+}
+
+InNamespaceTree::~InNamespaceTree()
+{
+}
+
+void
+InNamespaceTree::GoDown( const ary::cpp::Namespace & i_rNsp )
+{
+    aNamespaces.push(&i_rNsp);
+    aClasses.erase_all();
+    pCe = 0;
+    eType = t_unknown;
+}
+
+void
+InNamespaceTree::GoDown( const ary::cpp::Class & i_rClass )
+{
+    aClasses.push(&i_rClass);
+    pCe = 0;
+    eType = t_unknown;
+}
+
+void
+InNamespaceTree::GoUp()
+{
+    if ( NOT aClasses.empty() )
+        aClasses.pop();
+    else
+        aNamespaces.pop();
+    pCe = 0;
+    eType = t_unknown;
+}
+
+struct InIndex
+{
+    char                cLetter;
+
+                        InIndex() : cLetter('A') {}
+};
+
+
+}   // anonymous namespace
+
+
+
+
+
+struct OuputPage_Environment::CheshireCat
+{
+    csv::ploc::Path     aOutputRoot;
+    csv::ploc::Path     aMyPath;
+    csv::StreamStr      aFileName;
+
+    const ary::cpp::Gate *
+                        pGate;
+    const display::CorporateFrame *
+                        pLayout;
+    intt                nDepth;
+
+    Dyn<InNamespaceTree>
+                        pInNamespace;
+    Dyn<InIndex>        pInIndex;
+
+                        CheshireCat(
+                            const csv::ploc::Path &
+                                                io_rOutputDir,
+                            const ary::cpp::Gate &
+                                                i_rGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+                        ~CheshireCat();
+    void                AddQualifiedName2Path(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe,
+                            bool                i_bIncludeLocalName );
+
+    const Dyn<InNamespaceTree> &
+                        NspEnv() const          { return pInNamespace; }
+    Dyn<InNamespaceTree> &
+                        NspEnv()                { return pInNamespace; }
+    const ary::cpp::Namespace *
+                        Namespace() const       { return pInNamespace ? pInNamespace->aNamespaces.top() : 0; }
+    const ary::cpp::Class *
+                        Class() const           { return pInNamespace ? (pInNamespace->aClasses.empty() ? 0 : pInNamespace->aClasses.top()) : 0; }
+};
+
+OuputPage_Environment::
+CheshireCat::CheshireCat( const csv::ploc::Path &         io_rOutputDir,
+                          const ary::cpp::Gate &   i_rGate,
+                          const display::CorporateFrame & i_rLayout )
+    :   aOutputRoot(io_rOutputDir),
+        aMyPath(io_rOutputDir),
+        aFileName(500),
+        pGate(&i_rGate),
+        pLayout(&i_rLayout),
+        nDepth(0),
+        pInNamespace(),
+        pInIndex()
+{
+}
+
+OuputPage_Environment::
+CheshireCat::~CheshireCat()
+{
+}
+
+void
+OuputPage_Environment::
+CheshireCat::AddQualifiedName2Path( const ary::cpp::CodeEntity & i_rCe,
+                                    bool                    i_bIncludeLocalName )
+{
+    if (NOT i_rCe.Owner().IsValid())
+    {
+        aMyPath.DirChain().PushBack( C_sCppDir );
+        return;
+    }
+
+    const ary::cpp::CodeEntity &
+        rParent = pGate->Ces().Find_Ce( i_rCe.Owner() );
+    AddQualifiedName2Path( rParent, true );
+
+    if ( i_bIncludeLocalName )
+        aMyPath.DirChain().PushBack( i_rCe.LocalName() );
+}
+
+
+
+//************************         OuputPage_Environment          ********************//
+
+OuputPage_Environment::OuputPage_Environment( const csv::ploc::Path &           io_rOutputDir,
+                                              const ary::cpp::Gate &            i_rGate,
+                                              const display::CorporateFrame &   i_rLayout )
+    :   pi( new CheshireCat(io_rOutputDir, i_rGate, i_rLayout) )
+{
+}
+
+OuputPage_Environment::~OuputPage_Environment()
+{
+}
+
+void
+OuputPage_Environment::MoveDir_2Root()
+{
+    pi->NspEnv() = 0;
+    pi->pInIndex = 0;
+    pi->nDepth = 0;
+    while ( pi->aMyPath.DirChain().Size() > pi->aOutputRoot.DirChain().Size() )
+        pi->aMyPath.DirChain().PopBack();
+    pi->aMyPath.SetFile(String ::Null_());
+}
+
+void
+OuputPage_Environment::MoveDir_2Names()
+{
+    pi->NspEnv() = new InNamespaceTree( Gate().Ces().GlobalNamespace() );
+    pi->aMyPath.DirChain().PushBack( C_sCppDir );
+    pi->aMyPath.SetFile(String ::Null_());
+    ++pi->nDepth;
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_Down2( const ary::cpp::Namespace & i_rNsp )
+{
+    csv_assert(i_rNsp.Depth() > 0);
+    csv_assert( pi->NspEnv() );
+    csv_assert( pi->Namespace()->CeId() == i_rNsp.Owner() );
+
+    pi->NspEnv()->GoDown( i_rNsp );
+    pi->aMyPath.DirChain().PushBack(i_rNsp.LocalName());
+    ++pi->nDepth;
+    pi->aMyPath.SetFile(String ::Null_());
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_Down2( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( pi->NspEnv() );
+    if ( i_rClass.Protection() == ary::cpp::PROTECT_global )
+    {
+        csv_assert( pi->Namespace()->CeId() == i_rClass.Owner() );
+    }
+    else
+    {
+        csv_assert( pi->Class() != 0 );
+        csv_assert( pi->Class()->CeId() == i_rClass.Owner() );
+    }
+
+    pi->NspEnv()->GoDown(i_rClass);
+    pi->aMyPath.DirChain().PushBack(i_rClass.LocalName());
+    pi->aMyPath.SetFile(String ::Null_());
+    ++pi->nDepth;
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_2Index()
+{
+    MoveDir_2Root();
+    pi->pInIndex = new InIndex;
+    pi->aMyPath.DirChain().PushBack( String (C_sDIR_Index) );
+    pi->aMyPath.SetFile(String ::Null_());
+    pi->nDepth = 1;
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_Up()
+{
+     if ( pi->nDepth == 1 )
+    {
+         MoveDir_2Root();
+        return;
+    }
+    else if ( pi->NspEnv() )
+    {
+        pi->NspEnv()->GoUp();
+        pi->aMyPath.DirChain().PopBack();
+        pi->aMyPath.SetFile(String ::Null_());
+        --pi->nDepth;
+    }
+}
+
+void
+OuputPage_Environment::SetFile_Css()
+{
+    pi->aMyPath.SetFile( C_sHFN_Css );
+}
+
+void
+OuputPage_Environment::SetFile_Overview()
+{
+    pi->aMyPath.SetFile( C_sHFN_Overview );
+}
+
+void
+OuputPage_Environment::SetFile_AllDefs()
+{
+    // Provisorium
+    pi->aMyPath.SetFile("def-all.html");
+}
+
+void
+OuputPage_Environment::SetFile_Index( char i_cLetter )
+{
+    csv_assert( 'A' <= i_cLetter AND i_cLetter <= 'Z' OR i_cLetter == '_' );
+
+    static StreamStr sIndexFileName(40);
+    sIndexFileName.seekp(0);
+    sIndexFileName << "index-";
+    if ( i_cLetter == '_' )
+    {
+        sIndexFileName << "27";
+    }
+    else
+    {
+        sIndexFileName << int(i_cLetter -'A' + 1);
+    }
+    sIndexFileName << ".html";
+
+    pi->aMyPath.SetFile( sIndexFileName.c_str() );
+}
+
+void
+OuputPage_Environment::SetFile_Help()
+{
+    pi->aMyPath.SetFile( C_sHFN_Help );
+}
+
+void
+OuputPage_Environment::SetFile_CurNamespace()
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile("index.html");
+    pi->NspEnv()->pCe = pi->Namespace();
+    pi->NspEnv()->eType = InNamespaceTree::t_namespace;
+}
+
+void
+OuputPage_Environment::SetFile_Class( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile( ClassFileName(i_rClass.LocalName()) );
+    pi->NspEnv()->pCe = &i_rClass;
+    pi->NspEnv()->eType = InNamespaceTree::t_type;
+}
+
+void
+OuputPage_Environment::SetFile_Enum( const ary::cpp::Enum & i_rEnum )
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile( EnumFileName(i_rEnum.LocalName()) );
+    pi->NspEnv()->pCe = &i_rEnum;
+    pi->NspEnv()->eType = InNamespaceTree::t_type;
+}
+
+void
+OuputPage_Environment::SetFile_Typedef( const ary::cpp::Typedef & i_rTypedef )
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile( TypedefFileName(i_rTypedef.LocalName()) );
+    pi->NspEnv()->pCe = &i_rTypedef;
+    pi->NspEnv()->eType = InNamespaceTree::t_type;
+}
+
+void
+OuputPage_Environment::SetFile_Operations( const ary::loc::File * i_pFile )
+{
+    csv_assert( pi->NspEnv() );
+    if ( CurClass() != 0 )
+        pi->aMyPath.SetFile( "o.html" );
+    else
+    {
+        csv_assert( i_pFile != 0 );
+        pi->aMyPath.SetFile( HtmlFileName("o-", i_pFile->LocalName()) );
+    }
+    pi->NspEnv()->pCe = 0;
+    pi->NspEnv()->eType = InNamespaceTree::t_operations;
+}
+
+void
+OuputPage_Environment::SetFile_Data( const ary::loc::File * i_pFile )
+{
+    csv_assert( pi->NspEnv() );
+    if ( CurClass() != 0 )
+        pi->aMyPath.SetFile( "d.html" );
+    else
+    {
+        csv_assert( i_pFile != 0 );
+        pi->aMyPath.SetFile( HtmlFileName("d-", i_pFile->LocalName()) );
+    }
+    pi->NspEnv()->pCe = 0;
+    pi->NspEnv()->eType = InNamespaceTree::t_data;
+}
+
+const ary::cpp::Namespace *
+OuputPage_Environment::CurNamespace() const
+{
+    return pi->Namespace();
+}
+
+const ary::cpp::Class *
+OuputPage_Environment::CurClass() const
+{
+    return pi->Class();
+}
+
+const csv::ploc::Path &
+OuputPage_Environment::CurPath() const
+{
+    return pi->aMyPath;
+}
+
+const ary::cpp::Gate &
+OuputPage_Environment::Gate() const
+{
+    return *pi->pGate;
+}
+
+const display::CorporateFrame &
+OuputPage_Environment::Layout() const
+{
+    return *pi->pLayout;
+}
+
+uintt
+OuputPage_Environment::Depth() const
+{
+    return static_cast<uintt>(pi->nDepth);
+}
+
+const String &
+OuputPage_Environment::RepositoryTitle() const
+{
+    return Gate().RepositoryTitle();
+}
diff --git a/autodoc/source/display/html/opageenv.hxx b/autodoc/source/display/html/opageenv.hxx
new file mode 100644
index 000000000000..953a615d0023
--- /dev/null
+++ b/autodoc/source/display/html/opageenv.hxx
@@ -0,0 +1,128 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_OPAGEENV_HXX
+#define ADC_DISPLAY_HTML_OPAGEENV_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+    // PARAMETERS
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Gate;
+
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+    }
+    namespace loc
+    {
+        class File;
+    }
+}
+namespace display
+{
+    class CorporateFrame;
+}
+
+class OuputPage_Environment
+{
+  public:
+    // LIFECYCLE
+                        OuputPage_Environment(
+                            const csv::ploc::Path &
+                                                io_rOutputDir,
+                            const ary::cpp::Gate &
+                                                i_rGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+                        ~OuputPage_Environment();
+
+    // OPERATIONS
+    void                MoveDir_2Root();
+    void                MoveDir_2Names();
+    void                MoveDir_Down2(             /// Only one level.
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    void                MoveDir_Down2(             /// Only one level.
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                MoveDir_2Index();
+    void                MoveDir_Up();
+
+    void                SetFile_Css();
+    void                SetFile_Overview();
+    void                SetFile_AllDefs();
+    void                SetFile_Index(
+                            char                i_cLetter );
+    void                SetFile_Help();
+    void                SetFile_CurNamespace();
+    void                SetFile_Class(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                SetFile_Enum(
+                            const ary::cpp::Enum &
+                                                i_rEnum );
+    void                SetFile_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_typedef );
+    void                SetFile_Operations(
+                            const ary::loc::File *
+                                                i_pFile = 0 );  /// Only needed for global functions.
+    void                SetFile_Data(
+                            const ary::loc::File *
+                                                i_pFile = 0 );  /// Only needed for global variables.
+    // INQUIRY
+    const ary::cpp::Namespace *
+                        CurNamespace() const;
+    const ary::cpp::Class *
+                        CurClass() const;
+    const csv::ploc::Path &
+                        CurPath() const;
+    const ary::cpp::Gate &
+                        Gate() const;
+    const display::CorporateFrame &
+                        Layout() const;
+    uintt               Depth() const;
+    const String &      RepositoryTitle() const;
+
+  private:
+    struct CheshireCat;
+    Dyn<CheshireCat>    pi;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/outfile.cxx b/autodoc/source/display/html/outfile.cxx
new file mode 100644
index 000000000000..dcf999bf0a1f
--- /dev/null
+++ b/autodoc/source/display/html/outfile.cxx
@@ -0,0 +1,392 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "outfile.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/file.hxx>
+#include <udm/html/htmlitem.hxx>
+#include <toolkit/out_position.hxx>
+#include "strconst.hxx"
+
+
+namespace
+{
+bool            bUse_OOoFrameDiv = true;
+const String    C_sOOoFrameDiv_CppId("adc-cppref");
+}
+
+
+using namespace csi;
+using csi::xml::AnAttribute;
+
+
+
+#define CRLF "\n"
+
+const char * const
+    C_sStdStyle =
+    "body   { background-color:#ffffff; }"CRLF
+    "h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
+    "h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
+    "h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
+    "h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dl     { margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
+    "dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
+    "p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "tr     { font-size:10pt; }"CRLF
+    "td     { font-size:10pt; }"CRLF
+    CRLF
+    "dt.attention   { color:#dd0000; }"CRLF
+    CRLF
+    "div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }"CRLF
+    ".subtitle      { background-color:#ccccff; }"CRLF
+    CRLF
+    "td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "td.flagno      { font-family:Arial; font-size:8pt; }"CRLF
+    "td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    CRLF
+    "td.navimain, td.navimain a"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "td.navimainself"CRLF
+    "               { background-color:#2222ad; color:#ffffff;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "td.navimainnone"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; }"CRLF
+    CRLF
+    "div.define     { font-family:Arial; background-color:#ccccff; }"CRLF
+    CRLF
+    ".nqclass       { color:#008800; }"CRLF
+    CRLF
+    "h3.help        { background-color:#eeeeff; margin-top:12pt; }"CRLF
+    CRLF
+    ".btpubl        { color:#33ff33; }"CRLF
+    ".btprot        { color:#cc9933; }"CRLF
+    ".btpriv        { color:#ff6666; }"CRLF
+    ".btvpubl       { color:#33ff33; font-style:italic; }"CRLF
+    ".btvprot       { color:#cc9933; font-style:italic; }"CRLF
+    ".btvpriv       { color:#ff6666; font-style:italic; }"CRLF
+    ".btself        { font-weight:bold; }"CRLF
+    ;
+
+
+const char * const
+    C_sCssExplanations =
+    "/* Explanation of CSS classes:"CRLF
+    CRLF
+    "dl.member       provides coloured frame for function descriptions."CRLF
+    "dd.member       makes the content of this frame white"CRLF
+    CRLF
+    "dt.attention    special colour for @attention remarks"CRLF
+    CRLF
+    "div.title       HTML page headline"CRLF
+    ".subtitle       headline of lists of members and similar"CRLF
+    CRLF
+    "                These are for the flagtables in classes:"CRLF
+    "td.flagname     Flag name."CRLF
+    "td.flagyes      flag value \"yes\""CRLF
+    "td.flagno       flag value \"no\""CRLF
+    "td.flagtext     other flag value"CRLF
+    CRLF
+    CRLF
+    "                These are for the main navigationbar:"CRLF
+    "td.navimain, td.navimain a"CRLF
+    "                Links in navibar."CRLF
+    "td.navimainself Text in navibar which refers to current page."CRLF
+    "td.navimainnone Text which links to nothing."CRLF
+    CRLF
+    CRLF
+    "div.define      Subtitles on the #define/macro descriptions page"CRLF
+    CRLF
+    ".nqclass        special color for classes in the qualification"CRLF
+    "                on top of type pages like in:"CRLF
+    "                ::nsp1::nsp2::_ClassXY_::"CRLF
+    CRLF
+    "h3.help         Subtitles on the help page"CRLF
+    CRLF
+    "                These are for the base class tree on class pages:"CRLF
+    ".btpubl         public base class"CRLF
+    ".btprot         protected"CRLF
+    ".btpriv         private"CRLF
+    ".btvpubl        virtual public"CRLF
+    ".btvprot        virtual protected"CRLF
+    ".btvpriv        virtual private"CRLF
+    ".btself         placeholder for currently displayed class"CRLF
+    CRLF
+    "*/"CRLF
+    ;
+
+
+const char * const
+    C_sStdStyle_withDivFrame =
+    "body   { background-color:#ffffff; }"CRLF
+    "#adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
+    "#adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
+    "#adc-cppref h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
+    "#adc-cppref h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dl     { margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
+    "#adc-cppref dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
+    "#adc-cppref p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref tr     { font-size:10pt; }"CRLF
+    "#adc-cppref td     { font-size:10pt; }"CRLF
+    CRLF
+    "#adc-cppref dt.attention   { color:#dd0000; }"CRLF
+    CRLF
+    "#adc-cppref div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }"CRLF
+    "#adc-cppref .subtitle      { background-color:#ccccff; }"CRLF
+    CRLF
+    "#adc-cppref td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }"CRLF
+    "#adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    CRLF
+    "#adc-cppref td.navimain, #adc-cppref td.navimain a"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.navimainself"CRLF
+    "               { background-color:#2222ad; color:#ffffff;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.navimainnone"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; }"CRLF
+    CRLF
+    "#adc-cppref div.define     { font-family:Arial; background-color:#ccccff; }"CRLF
+    CRLF
+    "#adc-cppref .nqclass       { color:#008800; }"CRLF
+    CRLF
+    "#adc-cppref h3.help        { background-color:#eeeeff; margin-top:12pt; }"CRLF
+    CRLF
+    "#adc-cppref .btpubl        { color:#33ff33; }"CRLF
+    "#adc-cppref .btprot        { color:#cc9933; }"CRLF
+    "#adc-cppref .btpriv        { color:#ff6666; }"CRLF
+    "#adc-cppref .btvpubl       { color:#33ff33; font-style:italic; }"CRLF
+    "#adc-cppref .btvprot       { color:#cc9933; font-style:italic; }"CRLF
+    "#adc-cppref .btvpriv       { color:#ff6666; font-style:italic; }"CRLF
+    "#adc-cppref .btself        { font-weight:bold; }"CRLF
+    ""CRLF
+    "#adc-cppref table { empty-cells:show; }"CRLF
+    ""CRLF
+    "#adc-cppref .childlist td, "CRLF
+    "#adc-cppref .commentedlinks td, "CRLF
+    "#adc-cppref .memberlist td, "CRLF
+    "#adc-cppref .subtitle td, "CRLF
+    "#adc-cppref .crosstitle td  { border: .1pt solid #000000; }"CRLF
+    ""CRLF
+    "#adc-cppref .flag-table td { border: .1pt solid #cccccc; } "CRLF
+    ""CRLF
+    "#adc-cppref .title-table td, "CRLF
+    "#adc-cppref .table-in-method td, "CRLF
+    "#adc-cppref .table-in-data td, "CRLF
+    "#adc-cppref .navimain td, "CRLF
+    "#adc-cppref .navisub td, "CRLF
+    "#adc-cppref .expl-table td, "CRLF
+    "#adc-cppref .param-table td  { border: none; }"CRLF
+    ;
+
+
+
+HtmlDocuFile::HtmlDocuFile()
+    :   sFilePath(),
+        sTitle(),
+        sLocation(),
+        sCopyright(),
+        nDepthInOutputTree(0),
+        aBodyData(),
+        aBuffer(60000)  // Grows dynamically when necessary.
+{
+}
+
+void
+HtmlDocuFile::SetLocation( const csv::ploc::Path &  i_rFilePath,
+                           uintt                    i_depthInOutputTree )
+{
+    static StreamStr sPath_(1000);
+    sPath_.seekp(0);
+    i_rFilePath.Get( sPath_ );
+
+    sFilePath = sPath_.c_str();
+    nDepthInOutputTree = i_depthInOutputTree;
+}
+
+void
+HtmlDocuFile::SetTitle( const char * i_sTitle )
+{
+    sTitle = i_sTitle;
+}
+
+void
+HtmlDocuFile::SetCopyright( const char * i_sCopyright )
+{
+    sCopyright = i_sCopyright;
+}
+
+void
+HtmlDocuFile::EmptyBody()
+{
+     aBodyData.SetContent(0);
+
+     if (bUse_OOoFrameDiv)
+     {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("<div id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_CppId)
+            << new xml::XmlCode("\">\n\n");
+     }
+
+    aBodyData
+        >> *new html::Label( "_top_" )
+        << " ";
+}
+
+bool
+HtmlDocuFile::CreateFile()
+{
+    csv::File aFile(sFilePath, csv::CFM_CREATE);
+    if (NOT aFile.open())
+    {
+        Cerr() << "Can't create file " << sFilePath << "." << Endl();
+        return false;
+    }
+
+    WriteHeader(aFile);
+    WriteBody(aFile);
+
+    // Write end
+    static const char sCompletion[] = "\n</html>\n";
+    aFile.write( sCompletion );
+
+    aFile.close();
+    Cout() << '.' << Flush();
+    return true;
+}
+
+void
+HtmlDocuFile::WriteCssFile( const csv::ploc::Path & i_rFilePath )
+{
+    Cout() << "\nCreate css file ..." << Endl();
+
+    csv::File
+        aCssFile(i_rFilePath, csv::CFM_CREATE);
+    csv::OpenCloseGuard
+        aOpenGuard(aCssFile);
+    if (NOT aOpenGuard)
+    {
+        Cerr() << "Can't create file " << "cpp.css" << "." << Endl();
+        return;
+    }
+
+    aCssFile.write("/*      Autodoc css file for C++ documentation      */\n\n\n");
+
+    if (bUse_OOoFrameDiv)
+        aCssFile.write(C_sStdStyle_withDivFrame);
+    else
+        aCssFile.write(C_sStdStyle);
+
+    aCssFile.write("\n\n\n");
+    aCssFile.write(C_sCssExplanations);
+}
+
+void
+HtmlDocuFile::WriteHeader( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    static const char s1[] =
+        "<html>\n<head>\n"
+        "<title>";
+    static const char s2[] =
+        "</title>\n"
+        "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
+    static const char s3[] =
+        "\">\n</head>\n";
+
+    aBuffer.write( s1 );
+    aBuffer.write( sTitle );
+    aBuffer.write( s2 );
+    aBuffer.write( output::get_UpLink(nDepthInOutputTree) );
+    aBuffer.write( C_sHFN_Css );
+    aBuffer.write( s3 );
+
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
+
+void
+HtmlDocuFile::WriteBody( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    aBodyData
+        >> *new html::Link( "#_top_" )
+                << new html::ClassAttr( "objchapter" )
+                << "Top of Page";
+
+    if ( sCopyright.length() > 0 )
+    {
+        aBodyData
+#ifndef COMPATIBLE_NETSCAPE_47
+            >> *new html::HorizontalLine
+                    <<  new html::SizeAttr( "3" );
+#else
+            << new xml::XmlCode("<hr size=\"3\">");
+#endif
+
+        aBodyData
+            >> *new html::Paragraph
+                    << new html::ClassAttr( "copyright" )
+                    << new xml::AnAttribute( "align", "center" )
+                    << new xml::XmlCode(sCopyright);
+    }
+
+     if (bUse_OOoFrameDiv)
+    {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("\n</div> <!-- id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_CppId)
+            << new xml::XmlCode("\" -->\n");
+    }
+
+    aBodyData.WriteOut(aBuffer);
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
diff --git a/autodoc/source/display/html/outfile.hxx b/autodoc/source/display/html/outfile.hxx
new file mode 100644
index 000000000000..7302baec7432
--- /dev/null
+++ b/autodoc/source/display/html/outfile.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_OUTFILE_HXX
+#define ADC_DISPLAY_HTML_OUTFILE_HXX
+
+// USED SERVICES
+#include <udm/html/htmlitem.hxx>
+#include <cosv/ploc.hxx>
+
+
+namespace csv
+{
+    class File;
+}
+
+
+
+
+class HtmlDocuFile
+{
+  public:
+    // LIFECYCLE
+                        HtmlDocuFile();
+
+    void                SetLocation(
+                            const csv::ploc::Path &
+                                                i_rFilePath,
+                            uintt               i_depthInOutputTree );
+    void                SetTitle(
+                            const char *        i_sTitle );
+    void                SetCopyright(
+                            const char *        i_sCopyright );
+    void                EmptyBody();
+
+    Html::Body &        Body()                  { return aBodyData; }
+    bool                CreateFile();
+
+    static void         WriteCssFile(
+                            const csv::ploc::Path &
+                                                i_rFilePath );
+  private:
+    void                WriteHeader(
+                            csv::File &         io_aFile );
+    void                WriteBody(
+                            csv::File &         io_aFile );
+
+    // DATA
+    String              sFilePath;
+    String              sTitle;
+    String              sLocation;
+    String              sCopyright;
+    uintt               nDepthInOutputTree;
+
+    Html::Body          aBodyData;
+    StreamStr           aBuffer;                // Output buffer, should be transfered into csv::File.
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/pagemake.cxx b/autodoc/source/display/html/pagemake.cxx
new file mode 100644
index 000000000000..4608fd5b4e0a
--- /dev/null
+++ b/autodoc/source/display/html/pagemake.cxx
@@ -0,0 +1,576 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pagemake.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <display/corframe.hxx>
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "outfile.hxx"
+#include "pm_aldef.hxx"
+#include "pm_class.hxx"
+#include "pm_help.hxx"
+#include "pm_index.hxx"
+#include "pm_namsp.hxx"
+#include "pm_start.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::Link;
+using csi::html::HorizontalLine;
+
+
+const int C_nNrOfIndexLetters = 27;
+
+
+template <class SPECIAL_MAKER>
+inline void
+Make_SpecialPage( DYN SPECIAL_MAKER * let_dpMaker )
+{
+    Dyn< SPECIAL_MAKER > pMaker( let_dpMaker );
+    pMaker->MakePage();
+    pMaker = 0;
+}
+
+
+PageDisplay::PageDisplay( OuputPage_Environment & io_rEnv )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pMyFile( new HtmlDocuFile )
+{
+}
+
+PageDisplay::~PageDisplay()
+{
+
+}
+
+void
+PageDisplay::Create_OverviewFile()
+{
+    Env().SetFile_Overview();
+    File().SetLocation( Env().CurPath(), 0 );
+
+    SetupFileOnCurEnv( C_sHFTitle_Overview );
+    Make_SpecialPage( new PageMaker_Overview(*this) );
+    Create_File();
+}
+
+void
+PageDisplay::Create_AllDefsFile()
+{
+    // This method is a provisorium, because later this will
+    //   be spreaded over the files.
+
+    Env().MoveDir_2Root();
+    Env().SetFile_AllDefs();
+    File().SetLocation( Env().CurPath(), 0 );
+
+    SetupFileOnCurEnv( "Defines and Macros" );
+    Make_SpecialPage( new PageMaker_AllDefs(*this) );
+    Create_File();
+}
+
+void
+PageDisplay::Create_IndexFiles()
+{
+    Env().MoveDir_2Index();
+
+    for ( int i = 0; i < C_nNrOfIndexLetters; ++i )
+        Create_IndexFile(i);
+}
+
+void
+PageDisplay::Create_HelpFile()
+{
+    Env().SetFile_Help();
+    File().SetLocation( Env().CurPath(), 0 );
+
+    SetupFileOnCurEnv( C_sHFTitle_Help );
+    Make_SpecialPage( new PageMaker_Help(*this) );
+    Create_File();
+}
+
+void
+PageDisplay::Create_NamespaceFile()
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_CurNamespace();
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+    if (Env().CurNamespace()->Owner().IsValid())
+    {
+        StreamLock sNsp(100);
+        SetupFileOnCurEnv( sNsp() << C_sHFTypeTitle_Namespace
+                                  << " "
+                                  << Env().CurNamespace()->LocalName()
+                                  << c_str );
+    }
+    else
+    {
+        SetupFileOnCurEnv( C_sHFTitle_GlobalNamespaceCpp );
+    }
+
+    Make_SpecialPage( new PageMaker_Namespace(*this) );
+
+    Create_File();
+}
+
+void
+PageDisplay::Setup_OperationsFile_for( const ary::loc::File & i_rFile )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Operations(&i_rFile);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sOpFile(100);
+    SetupFileOnCurEnv( sOpFile() << "Global Functions in Namespace "
+                                 << Env().CurNamespace()->LocalName()
+                                 << " in Sourcefile "
+                                 << i_rFile.LocalName()
+                                 << c_str );
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_operations );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    csi::xml::Element & rTitle = fTitle( CurOut() );
+    if (Env().CurNamespace()->Owner().IsValid())
+    {
+         rTitle << "Global Functions in Namespace "
+               << Env().CurNamespace()->LocalName();
+    }
+    else
+    {
+        rTitle << "Global Functions in Global Namespace C++";
+    }
+
+    rTitle << new html::LineBreak
+           << "in Sourcefile "
+           << i_rFile.LocalName();
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Setup_OperationsFile_for( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Operations(0);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sOpFile(100);
+    SetupFileOnCurEnv( sOpFile() << "Methods of Class "
+                                 << i_rClass.LocalName()
+                                 << c_str );
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_operations );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Methods of Class", i_rClass.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Setup_DataFile_for( const ary::loc::File & i_rFile )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Data(&i_rFile);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sDataFile(100);
+    SetupFileOnCurEnv( sDataFile() << "Global Data in Namespace "
+                                   << Env().CurNamespace()->LocalName()
+                                   << " in Sourcefile "
+                                   << i_rFile.LocalName()
+                                   << c_str );
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_data );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    csi::xml::Element & rTitle = fTitle( CurOut() );
+    if ( Env().CurNamespace()->Owner().IsValid() )
+    {
+         rTitle << "Global Data in Namespace "
+               << Env().CurNamespace()->LocalName();
+    }
+    else
+    {
+        rTitle << "Global Data in Global Namespace C++";
+    }
+
+    rTitle
+        << new html::LineBreak
+        << "in Sourcefile "
+        << i_rFile.LocalName();
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Setup_DataFile_for( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Data(0);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sDataFile(100);
+    SetupFileOnCurEnv( sDataFile() << "Data of Class "
+                                   << i_rClass.LocalName()
+                                   << c_str );
+
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_data );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Data of Class", i_rClass.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Create_File()
+{
+    Easy().Leave();
+    File().CreateFile();
+}
+
+void
+PageDisplay::do_Process(const ary::cpp::Class & i_rData)
+{
+    Env().SetFile_Class(i_rData);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    const char *
+            sTypeTitle = i_rData.ClassKey() == ary::cpp::CK_class
+                            ?   C_sHFTypeTitle_Class
+                            :   i_rData.ClassKey() == ary::cpp::CK_struct
+                                    ?   C_sHFTypeTitle_Struct
+                                    :   C_sHFTypeTitle_Union;
+    StreamLock sClassFile(60);
+    SetupFileOnCurEnv( sClassFile() << sTypeTitle
+                                    << " "
+                                    << i_rData.LocalName()
+                                    << c_str );
+
+    Make_SpecialPage( new PageMaker_Class(*this, i_rData) );
+
+    Create_File();
+}
+
+void
+PageDisplay::do_Process(const ary::cpp::Enum & i_rData)
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    Env().SetFile_Enum(i_rData);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sEnumFile(100);
+    SetupFileOnCurEnv( sEnumFile() << C_sHFTypeTitle_Enum
+                                   << " "
+                                   << i_rData.LocalName()
+                                   << c_str );
+    Write_NavBar_Enum(i_rData);
+    Write_TopArea_Enum(i_rData);
+    Write_DocuArea_Enum(i_rData);
+    Write_ChildList_Enum(i_rData);
+
+    Create_File();
+}
+
+void
+PageDisplay::do_Process(const ary::cpp::Typedef & i_rData)
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    Env().SetFile_Typedef(i_rData);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sTypedefFile(100);
+    SetupFileOnCurEnv( sTypedefFile() << C_sHFTypeTitle_Typedef
+                                      << " "
+                                      << i_rData.LocalName()
+                                      << c_str );
+    Write_NavBar_Typedef(i_rData);
+    Write_TopArea_Typedef(i_rData);
+    Write_DocuArea_Typedef(i_rData);
+
+
+    Create_File();
+}
+
+void
+PageDisplay::Write_NameChainWithLinks( const ary::cpp::CodeEntity & i_rCe )
+{
+    if ( Env().CurNamespace()->Id() != i_rCe.Id() )
+    {
+        RecursiveWrite_NamespaceLink( Env().CurNamespace() );
+        if ( Env().CurClass() != 0 )
+        {
+            CurOut() << new html::Sbr;
+            RecursiveWrite_ClassLink( Env().CurClass(), 1 );
+        }
+    }
+    else
+    {
+        RecursiveWrite_NamespaceLink( Env().CurNamespace()->Parent() );
+    }
+}
+
+const ary::cpp::Gate *
+PageDisplay::inq_Get_ReFinder() const
+{
+     return &Env().Gate();
+}
+
+void
+PageDisplay::RecursiveWrite_NamespaceLink( const ary::cpp::Namespace * i_pNamespace )
+{
+    if ( i_pNamespace == 0 )
+    {
+        return;
+    }
+    else if (NOT i_pNamespace->Owner().IsValid())
+    {   // Global namespace:
+        StreamLock sNspDir(50);
+        CurOut()
+            >> *new Link( PathPerRoot(Env(),
+                                      sNspDir() << C_sDIR_NamespacesCpp
+                                                << "/"
+                                                << C_sHFN_Namespace
+                                                << c_str) )
+                    << new xml::AnAttribute( "alt", C_sHFTitle_GlobalNamespaceCpp )
+                    >> *new html::Font
+                            << new html::SizeAttr("+1")
+                            >> *new html::Bold
+                                    << "::";
+        CurOut()
+            << " ";
+        return;
+    }
+    else
+    {
+        RecursiveWrite_NamespaceLink( i_pNamespace->Parent() );
+    }
+
+    uintt nLevelDistance = Env().Depth() - ( i_pNamespace->Depth() + 1 );
+    csv_assert( nLevelDistance < 100 );
+    CurOut()
+        >> *new Link( PathPerLevelsUp(nLevelDistance, C_sHFN_Namespace) )
+                << new xml::AnAttribute( "alt", C_sHFTypeTitle_Namespace)
+                >> *new html::Font
+                        << new html::SizeAttr("+1")
+                        >> *new html::Bold
+                                << i_pNamespace->LocalName();
+    CurOut()
+        >> *new html::Font
+                << new html::SizeAttr("+1")
+                << " :: ";
+}
+
+void
+PageDisplay::RecursiveWrite_ClassLink( const ary::cpp::Class * i_pClass,
+                                       uintt                   i_nLevelDistance )
+{
+     if ( i_pClass == 0 )
+        return;
+
+    if ( i_pClass->Protection() != ary::cpp::PROTECT_global )
+    {
+         RecursiveWrite_ClassLink(
+            dynamic_cast< const ary::cpp::Class* >(
+                Env().Gate().Ces().Search_Ce(i_pClass->Owner())),
+            i_nLevelDistance + 1 );
+    }
+
+    CurOut()
+        >> *new Link( Path2Class(i_nLevelDistance, i_pClass->LocalName()) )
+            << new html::ClassAttr("nqclass")
+            << i_pClass->LocalName()
+            << " :: ";
+}
+
+void
+PageDisplay::SetupFileOnCurEnv( const char * i_sTitle )
+{
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+    File().SetTitle( i_sTitle );
+    File().SetCopyright( Env().Layout().CopyrightText() );
+    File().EmptyBody();
+
+    // This sets CurOut() to the contents of <body></body>
+    //   in File() :
+    Easy().Enter( File().Body() );
+}
+
+void
+PageDisplay::Write_NavBar_Enum( const ary::cpp::Enum & i_rData )
+{
+    NavigationBar   aNavi( Env(), i_rData );
+    aNavi.MakeSubRow("List of");
+    aNavi.AddItem( C_sTitle_EnumValues, C_sLabel_EnumValues, true );
+    aNavi.Write( CurOut(), true );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_TopArea_Enum( const ary::cpp::Enum & i_rData )
+{
+    Write_NameChainWithLinks( i_rData );
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), C_sHFTypeTitle_Enum, i_rData.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_DocuArea_Enum( const ary::cpp::Enum & i_rData )
+{
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    aDocuShow.Process(i_rData.Docu());
+    aDocuShow.Unassign_Out();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_ChildList_Enum( const ary::cpp::Enum & i_rData )
+{
+    bool    bChildrenExist = false;
+    ChildList_Display::Area_Result
+            aResult( bChildrenExist, CurOut() );
+
+    ChildList_Display aDisplay(Env(), i_rData);
+    aDisplay.Run_Simple( aResult,
+                         ary::cpp::Enum::SLOT_Values,
+                         C_sLabel_EnumValues,
+                         C_sTitle_EnumValues );
+
+    if (NOT bChildrenExist)
+        CurOut() >> *new html::Headline(4) << "This enum has no values.";
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_NavBar_Typedef( const ary::cpp::Typedef & i_rData )
+{
+    NavigationBar   aNavi( Env(), i_rData );
+    aNavi.Write( CurOut(), true );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_TopArea_Typedef( const ary::cpp::Typedef & i_rData )
+{
+    Write_NameChainWithLinks( i_rData );
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), C_sHFTypeTitle_Typedef, i_rData.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_DocuArea_Typedef( const ary::cpp::Typedef & i_rData )
+{
+    adcdisp::ExplanationList aDef( CurOut() );
+    aDef.AddEntry("Definition:");
+    xml::Element & rDef = aDef.Def();
+
+    ary::cpp::Type_id
+        nDefiningType = i_rData.DescribingType();
+
+    const ary::cpp::CodeEntity *
+        pRelatedCe = Env().Gate().Search_RelatedCe(nDefiningType);
+    if ( pRelatedCe != 0 )
+    {
+        const char * sTypeKey = Get_TypeKey(*pRelatedCe);
+        if ( NOT csv::no_str(sTypeKey) )
+            rDef << sTypeKey << " ";
+    }
+
+    dshelp::Get_LinkedTypeText( rDef, Env(), nDefiningType );
+
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    aDocuShow.Process(i_rData.Docu());
+    aDocuShow.Unassign_Out();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Create_IndexFile( int i_nLetter )
+{
+    static char aLetters[C_nNrOfIndexLetters+1] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
+    csv_assert( 0 <= i_nLetter AND i_nLetter < C_nNrOfIndexLetters );
+
+    char cCurLetter = aLetters[i_nLetter];
+    Env().SetFile_Index( cCurLetter );
+
+    static char sIndexFileTitle[] = "Global Index X";
+    const int nPositionOfLetterInTitle = 13;
+    sIndexFileTitle[nPositionOfLetterInTitle] = cCurLetter;
+    SetupFileOnCurEnv( sIndexFileTitle );
+
+    Make_SpecialPage( new PageMaker_Index(*this, cCurLetter ) );
+
+    Create_File();
+}
+
diff --git a/autodoc/source/display/html/pagemake.hxx b/autodoc/source/display/html/pagemake.hxx
new file mode 100644
index 000000000000..b8cc1c50a6ff
--- /dev/null
+++ b/autodoc/source/display/html/pagemake.hxx
@@ -0,0 +1,164 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PAGEMAKE_HXX
+#define ADC_DISPLAY_HTML_PAGEMAKE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+#include "hdimpl.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_namesp.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+    }
+    namespace loc
+    {
+        class File;
+    }
+}
+
+
+class OuputPage_Environment;
+class HtmlDocuFile;
+
+
+
+class PageDisplay : public ary::Display,
+                    public csv::ConstProcessor<ary::cpp::Class>,
+                    public csv::ConstProcessor<ary::cpp::Enum>,
+                    public csv::ConstProcessor<ary::cpp::Typedef>,
+                    public HtmlDisplay_Impl
+{
+  public:
+                        PageDisplay(
+                            OuputPage_Environment &
+                                                io_rEnv );
+    virtual             ~PageDisplay();
+
+    void                Create_OverviewFile();
+    void                Create_AllDefsFile();
+    void                Create_IndexFiles();
+    void                Create_HelpFile();
+
+    void                Create_NamespaceFile();
+
+    void                Setup_OperationsFile_for(
+                            const ary::loc::File &
+                                                i_rFile );
+    void                Setup_OperationsFile_for(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                Setup_DataFile_for(
+                            const ary::loc::File &
+                                                i_rFile );
+    void                Setup_DataFile_for(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    /// Used with Setup_OperatonsFile_for().
+    void                Create_File();
+
+
+    // Interface for Children of SpecializedPageMaker:
+    void                Write_NameChainWithLinks(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe );
+
+    // Necessary, to call Process() on this class.
+    using csv::ConstProcessor<ary::cpp::Class>::Process;
+    using csv::ConstProcessor<ary::cpp::Enum>::Process;
+    using csv::ConstProcessor<ary::cpp::Typedef>::Process;
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    // Interface ary::cpp::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    HtmlDocuFile &      File()                  { return *pMyFile; }
+    void                RecursiveWrite_NamespaceLink(
+                            const ary::cpp::Namespace *
+                                                i_pNamespace );
+    void                RecursiveWrite_ClassLink(
+                            const ary::cpp::Class *
+                                                i_pClass,
+                            uintt               i_nLevelDistance );
+    void                SetupFileOnCurEnv(
+                            const char *        i_sTitle );
+    void                Write_NavBar_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_TopArea_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_DocuArea_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_ChildList_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_NavBar_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    void                Write_TopArea_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    void                Write_DocuArea_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    void                Create_IndexFile(
+                            int                 i_nLetter );
+
+    // DATA
+    Dyn<HtmlDocuFile>   pMyFile;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/pm_aldef.cxx b/autodoc/source/display/html/pm_aldef.cxx
new file mode 100644
index 000000000000..debe4681b0b8
--- /dev/null
+++ b/autodoc/source/display/html/pm_aldef.cxx
@@ -0,0 +1,245 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_aldef.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/cp_def.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/getncast.hxx>
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::HorizontalLine;
+using csi::html::Link;
+using csi::html::Label;
+using csi::html::AlignAttr;
+
+
+
+PageMaker_AllDefs::PageMaker_AllDefs( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pDocuDisplay( new Docu_Display(io_rPage.Env()) ),
+        pNavi(0)
+{
+}
+
+PageMaker_AllDefs::~PageMaker_AllDefs()
+{
+}
+
+void
+PageMaker_AllDefs::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_AllDefs );
+    Write_NavBar();
+
+    Write_TopArea();
+
+    Write_DefinesList();
+    Write_MacrosList();
+
+    pNavi->Write_SubRows();
+}
+
+void
+PageMaker_AllDefs::Write_NavBar()
+{
+    pNavi->MakeSubRow( "" );
+    pNavi->AddItem( "Defines", "defines", true );
+    pNavi->AddItem( "Macros", "macros", true );
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_TopArea()
+{
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Defines and ", "Macros" );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_DocuArea()
+{
+    // Not needed.
+}
+
+void
+PageMaker_AllDefs::Write_DefinesList()
+{
+    CurOut()
+        << new html::LineBreak
+        << new html::LineBreak
+        >> *new xml::AnElement("div")
+            << new html::ClassAttr("define")
+            >> *new html::Label("defines")
+                >> *new html::Headline(3)
+                    << "Defines";
+
+    ary::cpp::DefsResultList
+        aAllDefines =  Env().Gate().Defs().AllDefines();
+    ary::cpp::DefsConstIterator
+        itEnd = aAllDefines.end();
+
+    if (aAllDefines.begin() != itEnd)
+    {
+        for ( ary::cpp::DefsConstIterator it = aAllDefines.begin();
+              it != itEnd;
+              ++it )
+        {
+            Write_Define(*it);
+        }
+    }
+    else
+    {
+        CurOut() << "None.";
+    }
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_MacrosList()
+
+{
+    CurOut()
+        << new html::LineBreak
+        << new html::LineBreak
+        >> *new xml::AnElement("div")
+            << new html::ClassAttr("define")
+            >> *new html::Label("macros")
+                >> *new html::Headline(3)
+                    << "Macros";
+
+    ary::cpp::DefsResultList
+        aAllMacros =  Env().Gate().Defs().AllMacros();
+    ary::cpp::DefsConstIterator
+        itEnd = aAllMacros.end();
+
+    if (aAllMacros.begin() != itEnd)
+    {
+        for ( ary::cpp::DefsConstIterator it = aAllMacros.begin();
+              it != itEnd;
+              ++it )
+        {
+            Write_Macro(*it);
+        }
+    }
+    else
+    {
+        CurOut() << "None.";
+    }
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_Define(De_id  i_nId)
+{
+    csv_assert( ary::is_type<ary::cpp::Define>( Env().Gate().Defs().Find_Def(i_nId)) );
+    const ary::cpp::Define &
+        rDef = static_cast< const ary::cpp::Define& >( Env().Gate().Defs().Find_Def(i_nId) );
+
+    CurOut() << new html::HorizontalLine;
+
+    adcdisp::ExplanationList aDocu( CurOut(), true );
+    aDocu.AddEntry();
+
+    aDocu.Term()
+        >> *new html::Label( rDef.LocalName() )
+            << " ";
+    aDocu.Term()
+        << rDef.LocalName();
+
+    Write_DefsDocu( aDocu.Def(), rDef );
+}
+
+void
+PageMaker_AllDefs::Write_Macro(De_id  i_nId)
+{
+    csv_assert( Env().Gate().Defs().Find_Def(i_nId).AryClass() == ary::cpp::Macro::class_id );
+    const ary::cpp::Macro &
+        rDef = static_cast< const ary::cpp::Macro& >( Env().Gate().Defs().Find_Def(i_nId) );
+
+    CurOut() << new html::HorizontalLine;
+
+    adcdisp::ExplanationList aDocu( CurOut(), true );
+    aDocu.AddEntry();
+
+    aDocu.Term()
+        >> *new html::Label( rDef.LocalName() )
+            << " ";
+    aDocu.Term()
+        << rDef.LocalName()
+        << "(";
+    WriteOut_TokenList( aDocu.Term(), rDef.Params(), ", " );
+    aDocu.Term()
+        << ")";
+
+    Write_DefsDocu( aDocu.Def(), rDef );
+}
+
+
+void
+PageMaker_AllDefs::Write_DefsDocu( csi::xml::Element &              o_rOut,
+                                   const ary::cpp::DefineEntity &  i_rTextReplacement )
+{
+    if ( i_rTextReplacement.DefinitionText().size() > 0 )
+    {
+        EraseLeadingSpace( *const_cast< String * >(
+                                &(*i_rTextReplacement.DefinitionText().begin())
+                         ) );
+    }
+
+    adcdisp::ExplanationTable rList( o_rOut );
+
+    rList.AddEntry( "Defined As" );
+    WriteOut_TokenList( rList.Def(), i_rTextReplacement.DefinitionText(), " " );
+
+    const ary::loc::File &
+        rFile = Env().Gate().Locations().Find_File( i_rTextReplacement.Location() );
+    rList.AddEntry( "In File" );
+    rList.Def() << rFile.LocalName();
+
+    ShowDocu_On( o_rOut, *pDocuDisplay, i_rTextReplacement );
+}
diff --git a/autodoc/source/display/html/pm_aldef.hxx b/autodoc/source/display/html/pm_aldef.hxx
new file mode 100644
index 000000000000..3971bd0c4a13
--- /dev/null
+++ b/autodoc/source/display/html/pm_aldef.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PM_ALDEF_HXX
+#define ADC_DISPLAY_HTML_PM_ALDEF_HXX
+
+// BASE CLASSES
+#include "pm_base.hxx"
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+using ary::cpp::De_id;
+
+namespace ary
+{
+    namespace cpp
+    {
+        class DefineEntity;
+    }
+}
+
+class Docu_Display;
+class NavigationBar;
+
+
+
+
+
+class PageMaker_AllDefs : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_AllDefs(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_AllDefs();
+
+    virtual void        MakePage();
+
+  private:
+    typedef std::vector<De_id>              List_Ids;
+    typedef List_Ids::const_iterator        ids_iterator;
+
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+    virtual void        Write_DefinesList();
+    virtual void        Write_MacrosList();
+    void                Write_Define(
+                            De_id               i_nId );
+    void                Write_Macro(
+                            De_id               i_nId );
+    void                Write_DefsDocu(
+                            csi::xml::Element & o_rOut,
+                            const ary::cpp::DefineEntity &
+                                                i_rTextReplacement );
+
+    // DATA
+    Dyn<Docu_Display>   pDocuDisplay;
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/pm_base.cxx b/autodoc/source/display/html/pm_base.cxx
new file mode 100644
index 000000000000..16ab7bb97ef8
--- /dev/null
+++ b/autodoc/source/display/html/pm_base.cxx
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_base.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+
+//********************       SpecializedPageMaker        *********************//
+
+SpecializedPageMaker::SpecializedPageMaker( PageDisplay &  io_rPage )
+    :   pEnv( &io_rPage.Env() ),
+        pCurOut( &io_rPage.CurOut() ),
+        pPage( &io_rPage )
+{
+}
+
+void
+SpecializedPageMaker::Write_NavBar()
+{
+     // Dummy
+}
+
+void
+SpecializedPageMaker::Write_TopArea()
+{
+     // Dummy
+}
+
+void
+SpecializedPageMaker::Write_DocuArea()
+{
+     // Dummy
+}
+
+//void
+//SpecializedPageMaker::Write_ChildList( ary::SlotAccessId   ,
+//                                       const char *        ,
+//                                       const char *        )
+//{
+//  // Dummy
+//}
+
+csi::xml::Element &
+SpecializedPageMaker::CurOut()
+{
+    return Page().CurOut();
+}
+
diff --git a/autodoc/source/display/html/pm_base.hxx b/autodoc/source/display/html/pm_base.hxx
new file mode 100644
index 000000000000..9acc2186d5ad
--- /dev/null
+++ b/autodoc/source/display/html/pm_base.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_PM_BASE_HXX
+#define ADC_DISPLAY_PM_BASE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include "hdimpl.hxx"
+
+
+
+class OuputPage_Environment;
+namespace csi
+{
+    namespace xml
+    {
+        class Element;
+    }
+}
+class PageDisplay;
+
+
+/** Interface for making a special kind of HTML-Page
+*/
+class SpecializedPageMaker
+{
+  public:
+    virtual             ~SpecializedPageMaker() {}
+
+    virtual void        MakePage() = 0;
+
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+//    virtual void        Write_ChildList(
+//                            ary::SlotAccessId   i_nSlot,
+//                            const char *        i_nListTitle,
+//                            const char *        i_nLabel );
+
+  protected:
+                        SpecializedPageMaker(
+                            PageDisplay &       io_rPage );
+
+    OuputPage_Environment &
+                        Env() const             { return *pEnv; }
+    csi::xml::Element & CurOut();
+    PageDisplay &       Page()                  { return *pPage; }
+
+  private:
+    OuputPage_Environment *
+                        pEnv;
+    csi::xml::Element * pCurOut;
+    PageDisplay *       pPage;
+};
+
+
+
+#endif
+
diff --git a/autodoc/source/display/html/pm_class.cxx b/autodoc/source/display/html/pm_class.cxx
new file mode 100644
index 000000000000..3e22eb5a91a9
--- /dev/null
+++ b/autodoc/source/display/html/pm_class.cxx
@@ -0,0 +1,811 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_class.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/getncast.hxx>
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+using namespace adcdisp;
+
+using namespace csi;
+using csi::html::HorizontalLine;
+using csi::html::LineBreak;
+using csi::html::Link;
+using csi::html::Table;
+using csi::html::TableRow;
+using csi::html::TableCell;
+
+using ary::cpp::CesConstIterator;
+using ary::doc::OldCppDocu;
+
+const char * const C_sTitle_InnerClasses    = "Classes";
+const char * const C_sTitle_InnerStructs    = "Structs";
+const char * const C_sTitle_InnerUnions     = "Unions";
+const char * const C_sTitle_Methods         = "Methods";
+const char * const C_sTitle_StaticMethods   = "Static Methods";
+const char * const C_sTitle_Data            = "Data";
+const char * const C_sTitle_StaticData      = "Static Data";
+
+const char * const C_sLabel_StaticOperations    = "static_ops";
+const char * const C_sLabel_StaticVariables     = "static_vars";
+
+const char * const   C_sTitlePublic      = "Public Members";
+const char * const   C_sTitleProtected   = "Protected Members";
+const char * const   C_sTitlePrivate     = "Private Members";
+const char * const   C_sMprTitles[3]     = { C_sTitlePublic,
+                                             C_sTitleProtected,
+                                             C_sTitlePrivate
+                                           };
+const char * const   C_sSummaryTitlePublic      = "Public Members";
+const char * const   C_sSummaryTitleProtected   = "Protected Members";
+const char * const   C_sSummaryTitlePrivate     = "Private Members";
+const char *
+        C_sMprSummaryTitles[3] =
+        { C_sSummaryTitlePublic, C_sSummaryTitleProtected, C_sSummaryTitlePrivate };
+const char *
+        C_sMprPrefixes[3] =
+        { "publ_", "prot_", "priv_" };
+const char *
+        C_sSummaryItems_Titles[PageMaker_Class::cl_MAX] =
+        { C_sTitle_InnerClasses, C_sTitle_InnerStructs, C_sTitle_InnerUnions,
+          C_sTitle_Enums, C_sTitle_Typedefs,
+          C_sTitle_Methods, C_sTitle_StaticMethods, C_sTitle_Data, C_sTitle_StaticData };
+const char *
+        C_sSummaryItems_Labels[PageMaker_Class::cl_MAX] =
+        { C_sLabel_Classes, C_sLabel_Structs, C_sLabel_Unions,
+          C_sLabel_Enums, C_sLabel_Typedefs,
+          C_sLabel_Operations, C_sLabel_StaticOperations,
+          C_sLabel_Variables, C_sLabel_StaticVariables };
+
+
+const ary::cpp::E_Protection
+        aProt[3] = { ary::cpp::PROTECT_public,
+                     ary::cpp::PROTECT_protected,
+                     ary::cpp::PROTECT_private };
+
+
+PageMaker_Class::PageMaker_Class( PageDisplay &             io_rPage,
+                                  const ary::cpp::Class &   i_rClass )
+    :   SpecializedPageMaker(io_rPage),
+        pMe( &i_rClass ),
+        pChildDisplay( new ChildList_Display(io_rPage.Env(), i_rClass) ),
+        pNavi(0)
+        // pProtectionArea,
+        // bChildLists_Exist
+{
+    int i_max = 3 * cl_MAX;
+    for (int i = 0; i < i_max; i++)
+    {
+        bChildLists_Exist[i] = false;
+    }  // end for
+}
+
+PageMaker_Class::~PageMaker_Class()
+{
+}
+
+void
+PageMaker_Class::MakePage()
+{
+    pNavi = new NavigationBar( Env(), Me() );
+
+    Write_NavBar();
+    Write_TopArea();
+    Write_DocuArea();
+    Write_ChildLists();
+
+    pNavi->Write_SubRows();
+    pNavi = 0;
+}
+
+void
+PageMaker_Class::Write_NavBar()
+{
+    NavigationBar   aNavi( Env(), Me() );
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+inline bool
+IsInterface(const ary::doc::Documentation & i_doc)
+{
+    const OldCppDocu *
+        doc = Get_CppDocu(i_doc);
+    return doc != 0
+            ?   doc->IsInterface()
+            :   false;
+}
+
+void
+PageMaker_Class::Write_TopArea()
+{
+    TemplateClause fTemplateClause;
+    PageTitle_Std fTitle;
+
+    Page().Write_NameChainWithLinks( Me() );
+
+    fTemplateClause( CurOut(), Me().TemplateParameters() );
+    fTitle( CurOut(), Get_ClassTypeKey(Me()), Me().LocalName() );
+
+    CurOut() << new HorizontalLine;
+
+    Write_BaseHierarchy();
+    Write_DerivedList();
+
+    CurOut() << new LineBreak;
+
+    adcdisp::FlagTable
+        aFlags( CurOut(), 4 );
+    aFlags.SetColumn( 0, "virtual",
+                      Me().Virtuality() != ary::cpp::VIRTUAL_none );
+    aFlags.SetColumn( 1, "abstract",
+                      Me().Virtuality() == ary::cpp::VIRTUAL_abstract );
+    aFlags.SetColumn( 2, "interface",
+                      IsInterface(Me().Docu())
+                      OR  Me().Virtuality() == ary::cpp::VIRTUAL_abstract );
+    aFlags.SetColumn( 3, "template",
+                      Me().TemplateParameters().size() > 0 );
+}
+
+void
+PageMaker_Class::Write_DocuArea()
+{
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    Me().Accept( aDocuShow );
+    aDocuShow.Unassign_Out();
+
+    ary::loc::File &
+        rFile = Env().Gate().Locations().Find_File( Me().Location() );
+
+    adcdisp::ExplanationList
+        aFileText( CurOut() );
+    aFileText.AddEntry("File");
+    aFileText.Def()
+        << rFile.LocalName();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Class::Write_ChildLists()
+{
+    int i_max = 3 * cl_MAX;
+    for (int i = 0; i < i_max; i++)
+    {
+        bChildLists_Exist[i] = false;
+    }  // end for
+
+    csi::html::DefListDefinition &
+            rPublic = Setup_MemberSegment_Out( mp_public );
+    csi::html::DefListDefinition &
+            rProtected = Setup_MemberSegment_Out( mp_protected );
+    csi::html::DefListDefinition &
+            rPrivate = Setup_MemberSegment_Out( mp_private );
+
+    Write_ChildList_forClasses( rPublic,
+                                rProtected,
+                                rPrivate,
+                                C_sLabel_Classes,
+                                C_sTitle_InnerClasses,
+                                ary::cpp::CK_class );
+    Write_ChildList_forClasses( rPublic,
+                                rProtected,
+                                rPrivate,
+                                C_sLabel_Structs,
+                                C_sTitle_InnerStructs,
+                                ary::cpp::CK_struct );
+    Write_ChildList_forClasses( rPublic,
+                                rProtected,
+                                rPrivate,
+                                C_sLabel_Unions,
+                                C_sTitle_InnerUnions,
+                                ary::cpp::CK_union );
+
+    Write_ChildList( ary::cpp::Class::SLOT_Enums,
+                     cl_Enums,
+                     C_sLabel_Enums,
+                     C_sTitle_Enums,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_Typedefs,
+                     cl_Typedefs,
+                     C_sLabel_Typedefs,
+                     C_sTitle_Typedefs,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+
+    Write_ChildList( ary::cpp::Class::SLOT_Operations,
+                     cl_Operations,
+                     C_sLabel_Operations,
+                     C_sTitle_Methods,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_StaticOperations,
+                     cl_StaticOperations,
+                     C_sLabel_StaticOperations,
+                     C_sTitle_StaticMethods,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_Data,
+                     cl_Data,
+                     C_sLabel_Variables,
+                     C_sTitle_Data,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_StaticData,
+                     cl_StaticData,
+                     C_sLabel_StaticVariables,
+                     C_sTitle_StaticData,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+
+    Create_NaviSubRow(mp_public);       // Also puts out or deletes pPublic.
+    Create_NaviSubRow(mp_protected);    // Also puts out or deletes pProtected.
+    Create_NaviSubRow(mp_private);      // Also puts out or deletes pPrivate.
+}
+
+void
+PageMaker_Class::Write_ChildList( ary::SlotAccessId   i_nSlot,
+                                  E_ChidList          i_eChildListIndex,
+                                  const char *        i_sLabel,
+                                  const char *        i_sListTitle,
+                                  csi::xml::Element & o_rPublic,
+                                  csi::xml::Element & o_rProtected,
+                                  csi::xml::Element & o_rPrivate )
+
+{
+    bool    bPublic_ChildrenExist = false;
+    bool    bProtected_ChildrenExist = false;
+    bool    bPrivate_ChildrenExist = false;
+
+    ChildList_Display::Area_Result
+            aPublic_Result( bPublic_ChildrenExist, o_rPublic );
+    ChildList_Display::Area_Result
+            aProtected_Result( bProtected_ChildrenExist, o_rProtected );
+    ChildList_Display::Area_Result
+            aPrivate_Result( bPrivate_ChildrenExist, o_rPrivate );
+
+    String sLabelPublic = ChildListLabel(i_sLabel, mp_public);
+    String sLabelProtected = ChildListLabel(i_sLabel, mp_protected);
+    String sLabelPrivate = ChildListLabel(i_sLabel, mp_private);
+
+    pChildDisplay->Run_Members( aPublic_Result,
+                                aProtected_Result,
+                                aPrivate_Result,
+                                i_nSlot,
+                                sLabelPublic,
+                                sLabelProtected,
+                                sLabelPrivate,
+                                i_sListTitle );
+
+    bChildLists_Exist[i_eChildListIndex]
+                = bPublic_ChildrenExist;
+    bChildLists_Exist[i_eChildListIndex + cl_MAX]
+                = bProtected_ChildrenExist;
+    bChildLists_Exist[i_eChildListIndex + 2*cl_MAX]
+                = bPrivate_ChildrenExist;
+
+    if (bPublic_ChildrenExist)
+        o_rPublic << new HorizontalLine;
+    if (bProtected_ChildrenExist)
+        o_rProtected << new HorizontalLine;
+    if (bPrivate_ChildrenExist)
+        o_rPrivate << new HorizontalLine;
+}
+
+void
+PageMaker_Class::Write_ChildList_forClasses( csi::xml::Element &    o_rPublic,
+                                             csi::xml::Element &    o_rProtected,
+                                             csi::xml::Element &    o_rPrivate,
+                                             const char *           i_sLabel,
+                                             const char *           i_sListTitle,
+                                             ary::cpp::E_ClassKey   i_eFilter )
+{
+    bool    bPublic_ChildrenExist = false;
+    bool    bProtected_ChildrenExist = false;
+    bool    bPrivate_ChildrenExist = false;
+
+    ChildList_Display::Area_Result
+            aPublic_Result( bPublic_ChildrenExist, o_rPublic );
+    ChildList_Display::Area_Result
+            aProtected_Result( bProtected_ChildrenExist, o_rProtected );
+    ChildList_Display::Area_Result
+            aPrivate_Result( bPrivate_ChildrenExist, o_rPrivate );
+
+    String sLabelPublic = ChildListLabel(i_sLabel, mp_public);
+    String sLabelProtected = ChildListLabel(i_sLabel, mp_protected);
+    String sLabelPrivate = ChildListLabel(i_sLabel, mp_private);
+
+    pChildDisplay->Run_MemberClasses( aPublic_Result,
+                                      aProtected_Result,
+                                      aPrivate_Result,
+                                      ary::cpp::Class::SLOT_NestedClasses,
+                                      sLabelPublic,
+                                      sLabelProtected,
+                                      sLabelPrivate,
+                                      i_sListTitle,
+                                      i_eFilter );
+
+    bChildLists_Exist[int(cl_NestedClasses)+int(i_eFilter)]
+                = bPublic_ChildrenExist;
+    bChildLists_Exist[int(cl_NestedClasses)+int(i_eFilter) + cl_MAX]
+                = bProtected_ChildrenExist;
+    bChildLists_Exist[int(cl_NestedClasses)+int(i_eFilter) + 2*cl_MAX]
+                = bPrivate_ChildrenExist;
+
+    if (bPublic_ChildrenExist)
+        o_rPublic << new HorizontalLine;
+    if (bProtected_ChildrenExist)
+        o_rProtected << new HorizontalLine;
+    if (bPrivate_ChildrenExist)
+        o_rPrivate << new HorizontalLine;
+}
+
+const char *
+PageMaker_Class::ChildListLabel( const char * i_sLabel, E_MemberProtection i_eMpr )
+{
+     static char sResult[100];
+    strcpy( sResult, C_sMprPrefixes[i_eMpr] );  // SAFE STRCPY (#100211# - checked)
+    strcat( sResult, i_sLabel );                // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+csi::html::DefListDefinition &
+PageMaker_Class::Setup_MemberSegment_Out( E_MemberProtection i_eMpr )
+{
+    html::DefList * pDefList = new html::DefList;
+    pProtectionArea[i_eMpr] = pDefList;
+
+    pDefList->AddTerm()
+        << new html::ClassAttr("subtitle")
+        >> *new html::Label( C_sMprPrefixes[i_eMpr] )
+                >> *new html::Headline(3)
+                        << C_sMprTitles[i_eMpr];
+    return pDefList->AddDefinition();
+}
+
+void
+PageMaker_Class::Create_NaviSubRow( E_MemberProtection i_eMpr )
+{
+    int nIndexAdd = int(cl_MAX) * int(i_eMpr);
+
+    bool bEmpty = true;
+    for (int e = 0; e < cl_MAX; e++)
+    {
+        if ( bChildLists_Exist[e + nIndexAdd] )
+        {
+            bEmpty = false;
+            break;
+        }
+    }  // end for
+    if (bEmpty)
+    {
+        pProtectionArea[i_eMpr] = 0;
+        return;
+    }
+    else //
+    {
+        CurOut() << pProtectionArea[i_eMpr].Release();
+    }  // endif
+
+    pNavi->MakeSubRow( C_sMprSummaryTitles[i_eMpr] );
+    for (int i = 0; i < cl_MAX; i++)
+    {
+        pNavi->AddItem( C_sSummaryItems_Titles[i],
+                        ChildListLabel( C_sSummaryItems_Labels[i], i_eMpr ),
+                        bChildLists_Exist[i+nIndexAdd] );
+    }  // end for
+}
+
+void
+PageMaker_Class::Write_DerivedList()
+{
+    adcdisp::ExplanationList
+        aDeriveds( CurOut() );
+    aDeriveds.AddEntry( "Known Derived Classes" );
+
+    if ( Me().KnownDerivatives().Size() == 0 )
+    {
+        aDeriveds.Def() << "None.";
+        return;
+    }
+
+    typedef ary::List_Rid  RidList;
+
+    CesConstIterator
+        itEnd = Me().KnownDerivatives().End();
+    for ( CesConstIterator it = Me().KnownDerivatives().Begin();
+          it != itEnd;
+          ++it )
+    {
+        const ary::cpp::CodeEntity &
+            rCe = Env().Gate().Ces().Find_Ce(*it);
+
+        aDeriveds.Def()
+            >> *new html::Link( Link2Ce(Env(),rCe) )
+                << rCe.LocalName();
+        aDeriveds.Def()
+            << new html::LineBreak;
+    }   // end for
+}
+
+
+// ==============  Creating a classes base hierarchy  ====================== //
+
+
+namespace
+{
+
+class Node
+{
+  public:
+                        Node(
+                            const ary::cpp::Class &
+                                                i_rClass,
+                            ary::cpp::Type_id   i_nClassType,
+                            const ary::cpp::Gate &
+                                                i_rGate,
+                            intt                i_nPositionOffset,
+                            Node *              io_pDerived = 0,
+                            ary::cpp::E_Protection
+                                                i_eProtection = ary::cpp::PROTECT_global,
+                            bool                i_bVirtual = false );
+                        ~Node();
+
+    void                FillPositionList(
+                            std::vector< const Node* > &
+                                                o_rPositionList ) const;
+    void                Write2(
+                            csi::xml::Element & o_rOut,
+                            const OuputPage_Environment &
+                                                i_rEnv ) const;
+
+    intt                BaseCount() const       { return nCountBases; }
+    intt                Position() const        { return nPosition; }
+    int                 Xpos() const            { return 3*Position(); }
+    int                 Ypos() const            { return 2*Position(); }
+    const Node *        Derived() const         { return pDerived; }
+
+  private:
+    typedef std::vector< DYN Node* > BaseList;
+
+    void                IncrBaseCount();
+
+    // DATA
+    BaseList            aBases;
+    intt                nCountBases;
+    Node *              pDerived;
+
+    String              sName;
+    const ary::cpp::Class *
+                        pClass;
+    ary::cpp::Type_id   nClassType;
+    ary::cpp::E_Protection
+                        eProtection;
+    bool                bVirtual;
+
+    intt                nPosition;
+};
+
+void                WriteNodeHierarchy(
+                        csi::xml::Element & o_rOut,
+                        const OuputPage_Environment &
+                                            i_rEnv,
+                        const Node &        i_rClass );
+
+const ary::cpp::Class *
+                    HereFind_Class(
+                        const ary::cpp::Gate &
+                                            i_rGate,
+                        ary::cpp::Type_id   i_nReferingTypeId );
+
+}   // anonymous namespace
+
+void
+PageMaker_Class::Write_BaseHierarchy()
+{
+    adcdisp::ExplanationList aBases( CurOut() );
+    aBases.AddEntry( "Base Classes" );
+
+    if (   Me().BaseClasses().size() == 0 )
+    {
+        aBases.Def() << "None.";
+    }
+    else
+    {
+        Dyn< Node >
+            pBaseGraph( new Node(Me(), ary::cpp::Type_id(0), Env().Gate(), 0) );
+        WriteNodeHierarchy( aBases.Def(), Env(), *pBaseGraph );
+    }
+}
+
+
+
+namespace
+{
+
+void
+WriteNodeHierarchy( csi::xml::Element &             o_rOut,
+                    const OuputPage_Environment &   i_rEnv,
+                    const Node &                    i_rClass )
+{
+    typedef const Node *            NodePtr;
+    typedef std::vector<NodePtr>    NodeList;
+
+    NodeList aPositionList;
+    intt nSize = i_rClass.Position()+1;
+    aPositionList.reserve(nSize);
+    i_rClass.FillPositionList( aPositionList );
+
+    xml::Element &
+        rPre = o_rOut
+               >> *new xml::AnElement("pre")
+                   << new html::StyleAttr("font-family:monospace;");
+
+    for ( int line = 0; line < nSize; ++line )
+    {
+        char * sLine1 = new char[2 + line*5];
+        char * sLine2 = new char[1 + line*5];
+        *sLine1 = '\0';
+        *sLine2 = '\0';
+
+        bool bBaseForThisLineReached = false;
+         for ( int col = 0; col < line; ++col )
+        {
+            intt nDerivPos = aPositionList[col]->Derived()->Position();
+
+            if ( nDerivPos >= line )
+                strcat(sLine1, "  |  ");
+            else
+                strcat(sLine1, "     ");
+
+            if ( nDerivPos > line )
+            {
+                strcat(sLine2, "  |  ");
+            }
+            else if ( nDerivPos == line )
+            {
+                if (bBaseForThisLineReached)
+                    strcat(sLine2, "--+--");
+                else
+                {
+                    bBaseForThisLineReached = true;
+                    strcat(sLine2, "  +--");
+                }
+            }
+            else // nDerivPos < line
+            {
+                if (bBaseForThisLineReached)
+                    strcat(sLine2, "-----");
+                else
+                    strcat(sLine2, "     ");
+            }
+        }  // end for (col)
+        strcat(sLine1,"\n");
+        rPre
+            << sLine1
+            << sLine2;
+        delete [] sLine1;
+        delete [] sLine2;
+
+        aPositionList[line]->Write2( rPre, i_rEnv );
+        rPre << "\n";
+    }   // end for (line)
+}
+
+const ary::cpp::Class *
+HereFind_Class( const ary::cpp::Gate & i_rGate,
+                ary::cpp::Type_id      i_nReferingTypeId )
+{
+    const ary::cpp::CodeEntity *
+        pCe = i_rGate.Search_RelatedCe( i_nReferingTypeId );
+
+    if ( pCe != 0 )
+    {
+        if  ( ary::is_type<ary::cpp::Class>(*pCe) )
+        {
+            return ary::ary_cast<ary::cpp::Class>(pCe);
+        }
+        else if ( ary::is_type<ary::cpp::Typedef>(*pCe) )
+        {
+            const ary::cpp::Typedef *
+                pTydef = ary::ary_cast<ary::cpp::Typedef>(pCe);
+            return  HereFind_Class( i_rGate, pTydef->DescribingType() );
+        }
+    }
+
+    static const ary::cpp::Class aClassNull_( "Base class not found",
+                                              ary::cpp::Ce_id(0),
+                                              ary::cpp::PROTECT_global,
+                                              ary::loc::Le_id(0),
+                                              ary::cpp::CK_class );
+    return &aClassNull_;
+}
+
+
+
+//*********************        Node        ***********************//
+
+Node::Node( const ary::cpp::Class &         i_rClass,
+            ary::cpp::Type_id               i_nClassType,
+            const ary::cpp::Gate &          i_rGate,
+            intt                            i_nPositionOffset,
+            Node *                          io_pDerived,
+            ary::cpp::E_Protection          i_eProtection,
+            bool                            i_bVirtual )
+    :   aBases(),
+        nCountBases(0),
+        pDerived(io_pDerived),
+        pClass(&i_rClass),
+        nClassType(i_nClassType),
+        eProtection(i_eProtection),
+        bVirtual(i_bVirtual),
+        nPosition(i_nPositionOffset)
+{
+    typedef ary::cpp::List_Bases  BList;
+
+    for ( BList::const_iterator it = i_rClass.BaseClasses().begin();
+          it != i_rClass.BaseClasses().end();
+          ++it )
+    {
+        const ary::cpp::Class *
+                pBaseClass = HereFind_Class( i_rGate, (*it).nId );
+
+        Dyn<Node>
+            pBase( new Node(*pBaseClass,
+                            (*it).nId,
+                            i_rGate,
+                            nPosition,
+                            this,
+                            (*it).eProtection,
+                            (*it).eVirtuality == ary::cpp::VIRTUAL_virtual)
+                 );
+        IncrBaseCount();
+        nPosition += pBase->BaseCount() + 1;
+        aBases.push_back( pBase.Release() );
+    }   // end for
+}
+
+Node::~Node()
+{
+}
+
+void
+Node::FillPositionList( std::vector< const Node* > & o_rPositionList ) const
+{
+    for ( BaseList::const_iterator it = aBases.begin();
+          it != aBases.end();
+          ++it )
+    {
+        (*it)->FillPositionList(o_rPositionList);
+    }  // end for
+
+    if( o_rPositionList.size() != uintt(Position()) )
+    {
+        csv_assert(false);
+    }
+    o_rPositionList.push_back(this);
+}
+
+void
+Node::Write2( csi::xml::Element &           o_rOut,
+              const OuputPage_Environment & i_rEnv ) const
+{
+    if ( Derived() == 0 )
+    {
+        o_rOut
+            >> *new xml::AnElement("span")
+                << new html::ClassAttr("btself")
+                << pClass->LocalName();
+        return;
+    }
+
+    csi::xml::Element *
+        pOut = & ( o_rOut >> *new xml::AnElement("span") );
+    switch ( eProtection )
+    {
+         case ary::cpp::PROTECT_public:
+                     if (bVirtual)
+                        *pOut << new html::ClassAttr("btvpubl");
+                    else
+                        *pOut << new html::ClassAttr("btpubl");
+                    break;
+        case ary::cpp::PROTECT_protected:
+                     if (bVirtual)
+                        *pOut << new html::ClassAttr("btvprot");
+                    else
+                        *pOut << new html::ClassAttr("btprot");
+                    break;
+        case ary::cpp::PROTECT_private:
+                     if (bVirtual)
+                        *pOut << new html::ClassAttr("btvpriv");
+                    else
+                        *pOut << new html::ClassAttr("btpriv");
+                    break;
+        default:    // do nothing.
+                    ;
+    }   // end switch
+
+    csi::xml::Element & rOut = *pOut;
+
+    Get_LinkedTypeText( rOut, i_rEnv, nClassType, false );
+    rOut << " (";
+    if ( bVirtual )
+        rOut << "virtual ";
+    switch ( eProtection )
+    {
+         case ary::cpp::PROTECT_public:
+                    rOut << "public)";
+                    break;
+         case ary::cpp::PROTECT_protected:
+                    rOut << "protected)";
+                    break;
+         case ary::cpp::PROTECT_private:
+                    rOut << "private)";
+                    break;
+        default:    // do nothing.
+                    ;
+    }   // end switch
+}
+
+void
+Node::IncrBaseCount()
+{
+    ++nCountBases;
+    if (pDerived != 0)
+        pDerived->IncrBaseCount();
+}
+
+
+}   // anonymous namespace
+
+
diff --git a/autodoc/source/display/html/pm_class.hxx b/autodoc/source/display/html/pm_class.hxx
new file mode 100644
index 000000000000..a2a5b89e7205
--- /dev/null
+++ b/autodoc/source/display/html/pm_class.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PM_CLASS_HXX
+#define ADC_DISPLAY_HTML_PM_CLASS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+     namespace cpp
+    {
+         class Class;
+    }
+}
+
+class ChildList_Display;
+class NavigationBar;
+
+
+class PageMaker_Class : public SpecializedPageMaker
+{
+  public:
+    enum E_ChidList
+    {
+        cl_NestedClasses = 0,
+        cl_NestedStructs,
+        cl_NestedUnions,
+        cl_Enums,
+        cl_Typedefs,
+        cl_Operations,
+        cl_StaticOperations,
+        cl_Data,
+        cl_StaticData,
+        cl_MAX
+    };
+                        PageMaker_Class(
+                            PageDisplay &       io_rPage,
+                            const ary::cpp::Class &
+                                                i_rClass );
+
+    virtual             ~PageMaker_Class();
+
+    virtual void        MakePage();
+
+  private:
+    enum E_MemberProtection { mp_public = 0, mp_protected, mp_private, mp_MAX };
+
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+    virtual void        Write_ChildList(
+                            ary::SlotAccessId   i_nSlot,
+                            E_ChidList          i_eChildListIndex,
+                            const char *        i_sLabel,
+                            const char *        i_sListTitle,
+                            csi::xml::Element & o_rPublic,
+                            csi::xml::Element & o_rProtected,
+                            csi::xml::Element & o_rPrivate );
+    void                Write_ChildList_forClasses(
+                            csi::xml::Element & o_rPublic,
+                            csi::xml::Element & o_rProtected,
+                            csi::xml::Element & o_rPrivate,
+                            const char *        i_sLabel,
+                            const char *        i_sListTitle,
+                            ary::cpp::E_ClassKey
+                                                i_eFilter  );
+    void                Write_ChildLists();
+    static const char * ChildListLabel(
+                            const char *        i_sLabel,
+                            E_MemberProtection  i_eMpr );
+    csi::html::DefListDefinition &
+                        Setup_MemberSegment_Out(
+                            E_MemberProtection  i_eMpr );
+    void                Create_NaviSubRow(
+                            E_MemberProtection  i_eMpr );
+    void                Write_BaseHierarchy();
+    void                Write_DerivedList();
+
+    const ary::cpp::Class &
+                        Me() const              { return *pMe; }
+    // DATA
+    const ary::cpp::Class *
+                        pMe;
+    Dyn<ChildList_Display>
+                        pChildDisplay;
+    Dyn<NavigationBar>  pNavi;
+
+    Dyn<csi::xml::Element>
+                        pProtectionArea[mp_MAX];
+
+    bool                bChildLists_Exist[3*cl_MAX];
+};
+
+
+
+
+
+#endif
+
diff --git a/autodoc/source/display/html/pm_help.cxx b/autodoc/source/display/html/pm_help.cxx
new file mode 100644
index 000000000000..2ad3b6fc32e2
--- /dev/null
+++ b/autodoc/source/display/html/pm_help.cxx
@@ -0,0 +1,232 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_help.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "navibar.hxx"
+#include "html_kit.hxx"
+
+using namespace csi;
+using csi::html::Paragraph;
+using csi::html::HorizontalLine;
+using csi::html::Headline;
+using csi::html::AlignAttr;
+using csi::html::Bold;
+using csi::html::Link;
+using csi::html::Sbr;
+using csi::html::LineBreak;
+using csi::xml::Element;
+
+
+
+const String  C_sHelpText(
+"<div style=\"font-size:10pt;\">\n"
+"<h3 class=\"help\">The Main Navigationbar</h3>\n"
+"<p> On top of every page, there is a main navigationbar on a lightly coloured\n"
+"background with the following items:<br>\n"
+"</p>\n"
+"<ul>\n"
+"  <li>Overview - the start page for this document,</li>\n"
+"  <li>Namespace - the lowest/deepest namespace of the language objects, described\n"
+"on the current page,</li>\n"
+"  <li>Class - the class, struct or union, which owns the methods or data,\n"
+"described on the current page,</li>\n"
+"  <li>Index - the global alphabetical index,</li>\n"
+"  <li>Help - this page.</li>\n"
+"</ul>\n"
+" Each item in this&nbsp; bar can be in three different states:<br>\n"
+"<ul>\n"
+"  <li>Link - the item is valid and you can get there,</li>\n"
+"  <li>Simple - the item does not apply (if this page described a namespace,\n"
+"there would be no owning class),</li>\n"
+"  <li>Reversed (white text on dark background) - this is the current page.</li>\n"
+"</ul>\n"
+"<h3 class=\"help\">Lower Navigationbars</h3>\n"
+" Just below the main navigation bar, there may be zero to three lower navigationbars\n"
+"on white background.<br>\n"
+"<br>\n"
+"Their items are dependent of the context, but they always link to paragraphs\n"
+"on the same, current page.<br>\n"
+"Available items appear as links. Unavailable items appear as simple text.<br>\n"
+"\n"
+"\n"
+"<h3 class=\"help\">Namespace Descriptions</h3>\n"
+"\n"
+"<dl>\n"
+"<dt class=\"simple\">Parent namespaces</dt>\n"
+"  </dl>\n"
+"  <dl>\n"
+"  <dd>In front of the namespace title, there is a linked list of the parent\n"
+"namespaces. The global namespace is linked with the first \"::\",</dd>\n"
+"    <dd>the namespaces between the global and the current one are linked\n"
+"by their names.<br>\n"
+"      </dd>\n"
+"      <dd> </dd>\n"
+"        </dl>\n"
+"After the title, the documentation of the namespace follows (which is often\n"
+"missing, because the namespace name may be self-explaining).<br>\n"
+"        <br>\n"
+"Below are the lists of nested namspaces and of the classes, functions and\n"
+"other program objects, that belong within this namespace.<br>\n"
+"Each of this lists is accessible by the lower navigationbar on top of the\n"
+"page.<br>\n"
+"\n"
+"<h3 class=\"help\">Class Descriptions</h3>\n"
+"\n"
+"        <dl>\n"
+"        <dt class=\"simple\">Parent namespaces and classes</dt>\n"
+"          </dl>\n"
+"          <dl>\n"
+"          <dd>In front of the class title, there is a linked list of the\n"
+"parent namespaces or classes. The global namespace is linked with the first\n"
+"\"::\",</dd>\n"
+"            <dd>the namespaces between the global and the current one are\n"
+"linked by their names. Enclosing classes are linked as well, but appear in\n"
+"<span class=\"nqclass\">green</font> color.&nbsp;</dd>\n"
+"              <dd>So you see on the first glance, that this is a parent class,\n"
+"no namespace.<br>\n"
+"               </dd>\n"
+"                <dd><br>\n"
+"                  </dd>\n"
+"                  </dl>\n"
+"After the title, the bases and derivations of the class follow. <br>\n"
+"Base classes are displayed as a graph. The text around base classes can appear\n"
+"in different styles and colours:<br>\n"
+"<ul>\n"
+"  <li><span class=\"btpubl\">Green</span> - public inherited,</li>\n"
+"  <li><span class=\"btprot\">Orange</span> - protected inherited,</li>\n"
+"  <li><span class=\"btpriv\">Red</span> - private inherited,</li>\n"
+"  <li><span class=\"btvpubl\">italic</span> - a (public inherited) virtual base class.</li>\n"
+"  <li><span class=\"btself\">Bold and black</span> without a link - the placeholder\n"
+"for the currently described class.<br>\n"
+"  </li>\n"
+"</ul>\n"
+"There may be many derivations of a class, but only the known ones, which\n"
+"are described within this document also, are listed.<br>\n"
+"<br>\n"
+"Below the derivations is a little table with some properties of the class:<br>\n"
+"<ul>\n"
+"  <li>virtual - the class owns at least one virtual method,</li>\n"
+"  <li>abstract - the class owns at least one abstract method,</li>\n"
+"  <li>interface - the class may or may be not abstract,\n"
+"but it is intended by its author to be used only as an interface and never\n"
+"to be instantiated,</li>\n"
+"  <li>template - the class is a template class.<br>\n"
+"  </li>\n"
+"</ul>\n"
+"Next comes further documentation of the class itself.<br>\n"
+"<br>\n"
+"Lastly, there are listed all members of the class. Public members come first,\n"
+"then protected, at last the private ones.<br>\n"
+"All member lists are accessible by the lower navigationbars on top of the\n"
+"page.<br>\n"
+"\n"
+"<h3 class=\"help\">Macros and Defines</h3>\n"
+"In C++ and C, there are also program constructs, which do not fit into the\n"
+"name tree, because they are #define'd: macros and definitions.<br>\n"
+"These may be documented, too. Those comments you find <a href=\"def-all.html\">\n"
+"here</a>\n"
+" or from the \"Overview\" start page.\n"
+"<h3 class=\"help\">Links to IDL-Documentation</h3>\n"
+"Some types, which appear as links, may refer to classes, enums or other\n"
+"entities, which are direct mappings of UNO-IDL entities.<br>\n"
+"In those cases the link doesn't lead to the C++ class, enum or whatever,\n"
+"but to the description of the IDL entity.\n"
+"<h3 class=\"help\">How to Link From Extern Documents</h3>\n"
+"If you wish to write an extern html document, which links to types within\n"
+"this C++ reference, you can do so, if your links have the following format:<br>\n"
+"<br>\n"
+"&lt;RootDirectory-of-this-Document&gt;/names/&lt;Namespace-A&gt;/&lt;Namespace-XY&gt;/EnclosingClass-nn&gt;/&lt;TypePreFix&gt;-&lt;MyTypeName&gt;.html<br>\n"
+"<br>\n"
+"&lt;TypePreFix&gt; can have the following values:<br>\n"
+"<ul>\n"
+"<li>c - class, struct or union</li>\n"
+"<li>e - enum</li>\n"
+"<li>t - typedef</li>\n"
+"</ul>\n"
+"If this document would be located in directory &nbsp;\"/doc/cpp/ref\", examples\n"
+"would look like this:<br>\n"
+"<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/osl/c-File.html\"&gt;class File&lt;/a&gt;<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/osl/FileBase/e-RC.html\"&gt;enum FileBase::RC&lt;/a&gt;<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/t-oslMutex.html\"&gt;typedef oslMutex&lt;/a&gt;<br>\n"
+"<br>\n"
+"Namespaces are described in the index.html file within their directory:<br>\n"
+"<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/cppu/index.html\"&gt;namespace cppu&lt;/a&gt;<br>\n"
+"</div>" );
+
+
+
+
+PageMaker_Help::PageMaker_Help( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pNavi(0)
+{
+}
+
+PageMaker_Help::~PageMaker_Help()
+{
+}
+
+void
+PageMaker_Help::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_Help );
+    Write_NavBar();
+
+    Write_TopArea();
+    Write_DocuArea();
+}
+
+void
+PageMaker_Help::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Help::Write_TopArea()
+{
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "How to Use", "this Reference Document" );
+
+    CurOut() << new xml::XmlCode(C_sHelpText);
+}
+
+void
+PageMaker_Help::Write_DocuArea()
+{
+    CurOut() << new HorizontalLine;
+}
+
+
+
diff --git a/autodoc/source/display/html/pm_help.hxx b/autodoc/source/display/html/pm_help.hxx
new file mode 100644
index 000000000000..7266c402c991
--- /dev/null
+++ b/autodoc/source/display/html/pm_help.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PM_HELP_HXX
+#define ADC_DISPLAY_HTML_PM_HELP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class NavigationBar;
+
+class PageMaker_Help : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_Help(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_Help();
+
+    virtual void        MakePage();
+
+  private:
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+
+    // DATA
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+#endif
+
diff --git a/autodoc/source/display/html/pm_index.cxx b/autodoc/source/display/html/pm_index.cxx
new file mode 100644
index 000000000000..bb41a8fe8f58
--- /dev/null
+++ b/autodoc/source/display/html/pm_index.cxx
@@ -0,0 +1,317 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_index.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include "aryattrs.hxx"
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+using namespace csi;
+using ary::GlobalId;
+
+
+
+
+namespace
+{
+
+inline const char *
+F_CK_Text( ary::cpp::E_ClassKey i_eCK )
+{
+    switch (i_eCK)
+    {
+         case ary::cpp::CK_class:    return "class";
+         case ary::cpp::CK_struct:   return "struct";
+         case ary::cpp::CK_union:    return "union";
+    }   // end switch
+    return "";
+}
+
+template <class CE>
+inline const char *
+F_OwnerType( const CE & i_rData, const ary::cpp::Gate & i_rGate )
+{
+     if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+        return "namespace ";
+
+    const ary::cpp::Class *
+        pClass = dynamic_cast< const ary::cpp::Class* >(
+                    i_rGate.Ces().Search_Ce(i_rData.Owner()) );
+    if (pClass != 0)
+        return F_CK_Text(pClass->ClassKey());
+    return "";
+}
+
+}   // anonymous namespace
+
+PageMaker_Index::PageMaker_Index( PageDisplay & io_rPage,
+                                  char          i_c )
+    :   SpecializedPageMaker(io_rPage),
+        pNavi(0),
+        c(i_c),
+        pCurIndex(0)
+{
+}
+
+PageMaker_Index::~PageMaker_Index()
+{
+}
+
+void
+PageMaker_Index::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_Index );
+
+    Write_NavBar();
+    Write_TopArea();
+    Write_CompleteAlphabeticalList();
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "namespace", "namespace" );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Class & i_rData )
+{
+    // KORR_FUTURE
+    //  Really throw out all anonymous classes from index?
+
+    if ( strncmp(i_rData.LocalName().c_str()+1,"_Anonymous",10) == 0 )
+        return;
+
+    Write_CeIndexEntry( i_rData,
+                        F_CK_Text(i_rData.ClassKey()),
+                        F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Enum & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "enum", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "typedef", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Function & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "function", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Variable & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "variable", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::EnumValue & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "enum value", "" );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Define & i_rData )
+{
+    String  sFileName;
+
+    pCurIndex->AddEntry();
+    pCurIndex->Term()
+        >> *new html::Link( Link2CppDefinition(Env(), i_rData) )
+            >> *new html::Bold
+                <<  i_rData.LocalName();
+    pCurIndex->Term()
+        << " - define";
+    pCurIndex->Def() << " ";
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Macro & i_rData )
+{
+    String  sFileName;
+
+    pCurIndex->AddEntry();
+    pCurIndex->Term()
+        >> *new html::Link( Link2CppDefinition(Env(), i_rData) )
+            >> *new html::Bold
+                <<  i_rData.LocalName();
+    pCurIndex->Term()
+        << " - macro";
+
+    pCurIndex->Def() << " ";
+}
+
+const ary::cpp::Gate *
+PageMaker_Index::inq_Get_ReFinder() const
+{
+     return &Env().Gate();
+}
+
+void
+PageMaker_Index::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new html::HorizontalLine;
+}
+
+
+const String   C_sAlphabet(
+"<a href=\"index-1.html\"><B>A</B></a> <a href=\"index-2.html\"><B>B</B></a> <a href=\"index-3.html\"><B>C</B></a> <a href=\"index-4.html\"><B>D</B></a> <a href=\"index-5.html\"><B>E</B></a> "
+"<a href=\"index-6.html\"><B>F</B></a> <a href=\"index-7.html\"><B>G</B></a> <a href=\"index-8.html\"><B>H</B></a> <a href=\"index-9.html\"><B>I</B></a> <a href=\"index-10.html\"><B>J</B></a> "
+"<a href=\"index-11.html\"><B>K</B></a> <a href=\"index-12.html\"><B>L</B></a> <a href=\"index-13.html\"><B>M</B></a> <a href=\"index-14.html\"><B>N</B></a> <a href=\"index-15.html\"><B>O</B></a> "
+"<a href=\"index-16.html\"><B>P</B></a> <a href=\"index-17.html\"><B>Q</B></a> <a href=\"index-18.html\"><B>R</B></a> <a href=\"index-19.html\"><B>S</B></a> <a href=\"index-20.html\"><B>T</B></a> "
+"<a href=\"index-21.html\"><B>U</B></a> <a href=\"index-22.html\"><B>V</B></a> <a href=\"index-23.html\"><B>W</B></a> <a href=\"index-24.html\"><B>X</B></a> <a href=\"index-25.html\"><B>Y</B></a> "
+"<a href=\"index-26.html\"><B>Z</B></a> <a href=\"index-27.html\"><B>_</B></a>" );
+
+void
+PageMaker_Index::Write_TopArea()
+{
+    String  sLetter(&c, 1);
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Global Index", sLetter );
+
+    CurOut() >>* new html::Paragraph
+                 << new html::AlignAttr("center")
+                 << new xml::XmlCode(C_sAlphabet);
+
+    CurOut() << new html::HorizontalLine;
+}
+
+void
+PageMaker_Index::Write_CompleteAlphabeticalList()
+{
+    std::vector<GlobalId>
+        aThisPagesItems;
+    const ary::cpp::Gate &
+        rGate = Env().Gate();
+
+    static char sBegin[] = "X";
+    static char sEnd[] = "Y";
+
+    switch ( c )
+    {
+         case 'Z':   sBegin[0] = 'Z';
+                    sEnd[0] = '_';
+                    break;
+        case '_':   sBegin[0] = '_';
+                    sEnd[0] = '0';
+                    break;
+        default:    sBegin[0] = c;
+                    sEnd[0] = char(c + 1);
+                    break;
+    }
+
+    uintt
+        nCount = rGate.Get_AlphabeticalList( aThisPagesItems, sBegin, sEnd );
+    if (nCount > 0 )
+    {
+        adcdisp::IndexList
+            aIndex(CurOut());
+        pCurIndex = &aIndex;
+
+        std::vector<GlobalId>::const_iterator itEnd = aThisPagesItems.end();
+        for ( std::vector<GlobalId>::const_iterator it = aThisPagesItems.begin();
+              it != itEnd;
+              ++it )
+        {
+            const ary::Entity *
+                pRe = rGate.Search_Entity( *it );
+            if ( pRe != 0 )
+                pRe->Accept(*this);
+        }   // end for
+
+        pCurIndex = 0;
+    }   // endif (nCount > 0)
+}
+
+void
+PageMaker_Index::Write_CeIndexEntry( const ary::cpp::CodeEntity &
+                                                            i_rCe,
+                                     const char *           i_sType,
+                                     const char *           i_sOwnerType )
+{
+    if ( Ce_IsInternal(i_rCe) )
+        return;
+
+    static csv::StreamStr aQualification(500);
+
+    const ary::cpp::CodeEntity &
+        rOwner = Env().Gate().Ces().Find_Ce(i_rCe.Owner());
+
+    pCurIndex->AddEntry();
+    pCurIndex->Term()
+        >> *new html::Link( Link2Ce(Env(), i_rCe) )
+            >> *new html::Bold
+                <<  i_rCe.LocalName();
+    pCurIndex->Term()
+        <<  " - "
+        <<  i_sType;
+
+    if ( rOwner.Owner().IsValid() )
+    {
+        aQualification.seekp(0);
+        Env().Gate().Ces().Get_QualifiedName( aQualification,
+                                              rOwner.LocalName(),
+                                              rOwner.Owner() );
+
+        pCurIndex->Term()
+            <<  " in "
+            << i_sOwnerType
+            << " "
+            << aQualification.c_str();
+    }
+
+    pCurIndex->Def() << " ";
+}
diff --git a/autodoc/source/display/html/pm_index.hxx b/autodoc/source/display/html/pm_index.hxx
new file mode 100644
index 000000000000..d2dcf8ed422c
--- /dev/null
+++ b/autodoc/source/display/html/pm_index.hxx
@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PM_INDEX_HXX
+#define ADC_DISPLAY_HTML_PM_INDEX_HXX
+
+// BASE CLASSES
+#include "pm_base.hxx"
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+namespace adcdisp
+{
+     class IndexList;
+}
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+        class EnumValue;
+        class Define;
+        class Macro;
+    }
+}
+
+class NavigationBar;
+
+
+
+
+class PageMaker_Index : public SpecializedPageMaker,
+                        public ary::Display,
+                        public csv::ConstProcessor<ary::cpp::Namespace>,
+                        public csv::ConstProcessor<ary::cpp::Class>,
+                        public csv::ConstProcessor<ary::cpp::Enum>,
+                        public csv::ConstProcessor<ary::cpp::Typedef>,
+                        public csv::ConstProcessor<ary::cpp::Function>,
+                        public csv::ConstProcessor<ary::cpp::Variable>,
+                        public csv::ConstProcessor<ary::cpp::EnumValue>,
+                        public csv::ConstProcessor<ary::cpp::Define>,
+                        public csv::ConstProcessor<ary::cpp::Macro>
+{
+  public:
+                        PageMaker_Index(
+                            PageDisplay &       io_rPage,
+                            char                i_c );
+
+    virtual             ~PageMaker_Index();
+
+    virtual void        MakePage();
+
+  private:
+    // Interface csv::ConstProcessor<>
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::EnumValue &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Define &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Macro &
+                                                i_rData );
+    // Interface ary::cpp::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_CompleteAlphabeticalList();
+
+    void                Write_CeIndexEntry(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe,
+                            const char *        i_sType,
+                            const char *        i_sOwnerType );
+
+    // DATA
+    Dyn<NavigationBar>  pNavi;
+    char                c;
+    adcdisp::IndexList *
+                        pCurIndex;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/html/pm_namsp.cxx b/autodoc/source/display/html/pm_namsp.cxx
new file mode 100644
index 000000000000..ea13c237919f
--- /dev/null
+++ b/autodoc/source/display/html/pm_namsp.cxx
@@ -0,0 +1,173 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_namsp.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::HorizontalLine;
+using csi::html::Link;
+using csi::html::Table;
+using csi::html::TableRow;
+using csi::html::TableCell;
+
+
+
+PageMaker_Namespace::PageMaker_Namespace( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pMe( io_rPage.Env().CurNamespace() ),
+        pChildDisplay( new ChildList_Display(io_rPage.Env()) ),
+        pNavi(0)
+{
+    csv_assert( pMe != 0 );
+}
+
+PageMaker_Namespace::~PageMaker_Namespace()
+{
+}
+
+void
+PageMaker_Namespace::MakePage()
+{
+    pNavi = new NavigationBar( Env(), Me() );
+
+    Write_NavBar();
+    Write_TopArea();
+    Write_DocuArea();
+
+    pNavi->MakeSubRow("");
+    Write_ChildList( ary::cpp::Namespace::SLOT_SubNamespaces, C_sTitle_SubNamespaces, C_sLabel_SubNamespaces );
+
+    Write_ChildLists_forClasses( C_sTitle_Classes,
+                                 C_sLabel_Classes,
+                                 ary::cpp::CK_class );
+    Write_ChildLists_forClasses( C_sTitle_Structs,
+                                 C_sLabel_Structs,
+                                 ary::cpp::CK_struct );
+    Write_ChildLists_forClasses( C_sTitle_Unions,
+                                 C_sLabel_Unions,
+                                 ary::cpp::CK_union );
+
+    Write_ChildList( ary::cpp::Namespace::SLOT_Enums, C_sTitle_Enums, C_sLabel_Enums  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Typedefs, C_sTitle_Typedefs, C_sLabel_Typedefs  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Operations, C_sTitle_Operations, C_sLabel_Operations  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Constants, C_sTitle_Constants, C_sLabel_Constants  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Variables, C_sTitle_Variables, C_sLabel_Variables  );
+
+    pNavi->Write_SubRows();
+}
+
+void
+PageMaker_Namespace::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_TopArea()
+{
+    Page().Write_NameChainWithLinks( Me() );
+
+    adcdisp::PageTitle_Std fTitle;
+    xml::Element & rH3 = fTitle( CurOut() );
+    if ( Env().CurNamespace()->Owner().IsValid() )
+    {
+        rH3 << C_sHFTypeTitle_Namespace
+            << " "
+            << Env().CurNamespace()->LocalName();
+    }
+    else
+    {
+        rH3 << C_sHFTitle_GlobalNamespaceCpp;
+    }
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_DocuArea()
+{
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    aDocuShow.Process(Me().Docu());
+    aDocuShow.Unassign_Out();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_ChildList( ary::SlotAccessId   i_nSlot,
+                                      const char *        i_sListTitle,
+                                      const char *        i_sLabel )
+
+{
+    bool    bChildrenExist = false;
+    ChildList_Display::Area_Result
+            aResult( bChildrenExist, CurOut() );
+
+    pChildDisplay->Run_Simple( aResult,
+                               i_nSlot,
+                               i_sLabel,
+                               i_sListTitle );
+
+    pNavi->AddItem(i_sListTitle, i_sLabel, bChildrenExist);
+    if (bChildrenExist)
+        CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_ChildLists_forClasses( const char *         i_sListTitle,
+                                                  const char *         i_sLabel,
+                                                  ary::cpp::E_ClassKey i_eFilter )
+
+{
+    bool    bChildrenExist = false;
+    ChildList_Display::Area_Result
+            aResult( bChildrenExist, CurOut() );
+
+    pChildDisplay->Run_GlobalClasses( aResult,
+                                      ary::cpp::Namespace::SLOT_Classes,
+                                      i_sLabel,
+                                      i_sListTitle,
+                                      i_eFilter );
+
+    pNavi->AddItem(i_sListTitle, i_sLabel, bChildrenExist);
+    if ( bChildrenExist )
+        CurOut() << new HorizontalLine;
+}
diff --git a/autodoc/source/display/html/pm_namsp.hxx b/autodoc/source/display/html/pm_namsp.hxx
new file mode 100644
index 000000000000..11501e4dc359
--- /dev/null
+++ b/autodoc/source/display/html/pm_namsp.hxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PM_NAMSP_HXX
+#define ADC_DISPLAY_HTML_PM_NAMSP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class ChildList_Display;
+class NavigationBar;
+
+class PageMaker_Namespace : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_Namespace(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_Namespace();
+
+    virtual void        MakePage();
+
+  private:
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+    virtual void        Write_ChildList(
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_nListTitle,
+                            const char *        i_nLabel );
+    void                Write_ChildLists_forClasses(
+                            const char *         i_sListTitle,
+                            const char *         i_sLabel,
+                            ary::cpp::E_ClassKey i_eFilter );
+
+    const ary::cpp::Namespace &
+                        Me() const              { return *pMe; }
+    // DATA
+    const ary::cpp::Namespace *
+                        pMe;
+    Dyn<ChildList_Display>
+                        pChildDisplay;
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+#endif
+
diff --git a/autodoc/source/display/html/pm_start.cxx b/autodoc/source/display/html/pm_start.cxx
new file mode 100644
index 000000000000..c5ff38f32eba
--- /dev/null
+++ b/autodoc/source/display/html/pm_start.cxx
@@ -0,0 +1,137 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_start.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "navibar.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::Paragraph;
+using csi::html::HorizontalLine;
+using csi::html::AlignAttr;
+using csi::html::Bold;
+using csi::html::Link;
+using csi::html::Sbr;
+using csi::html::LineBreak;
+
+
+
+PageMaker_Overview::PageMaker_Overview( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pNavi(0)
+{
+}
+
+PageMaker_Overview::~PageMaker_Overview()
+{
+}
+
+void
+PageMaker_Overview::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_Overview );
+    Write_NavBar();
+
+    Write_TopArea();
+    Write_DocuArea();
+}
+
+void
+PageMaker_Overview::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Overview::Write_TopArea()
+{
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), Env().RepositoryTitle(), "" );
+
+    CurOut()
+        >> *new Paragraph
+            << new html::StyleAttr("font-size:14pt;")
+            << "This is a reference documentation for the C++ source code."
+            << new LineBreak
+            << new LineBreak
+            << "Points to start:";
+
+    html::SimpleList &
+        rList = *new html::SimpleList;
+    CurOut() >> rList;
+
+    html::ListItem & rNamedObjsItem =
+        rList.AddItem();
+
+    StreamLock sNspDir(50);
+    rNamedObjsItem
+            << new html::StyleAttr("font-size:14pt;")
+            >> *new Link( sNspDir() << C_sDIR_NamespacesCpp
+                                    << "/"
+                                    << C_sHFN_Namespace
+                                    << c_str )
+                    >> *new Bold
+                        << "Named Objects";
+    rNamedObjsItem << " (classes, functions, namespaces, etc.)"
+                   << new html::LineBreak;
+    rList.AddItem()
+            << new html::StyleAttr("font-size:14pt;")
+            >> *new Link( "def-all.html" )
+                    >> *new Bold
+                        << "Defines and Macros"
+                        << new html::LineBreak;
+    StreamLock sIndexDir(50);
+    rList.AddItem()
+            << new html::StyleAttr("font-size:14pt;")
+            >> *new Link( sIndexDir() << C_sDIR_Index
+                                      << "/index-1.html"
+                                      << c_str )
+                    >> *new Bold
+                        << "Global Index"
+                        << new html::LineBreak;
+}
+
+void
+PageMaker_Overview::Write_DocuArea()
+{
+    CurOut() << new HorizontalLine;
+}
+
+
+
diff --git a/autodoc/source/display/html/pm_start.hxx b/autodoc/source/display/html/pm_start.hxx
new file mode 100644
index 000000000000..96fe9d815efe
--- /dev/null
+++ b/autodoc/source/display/html/pm_start.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PM_START_HXX
+#define ADC_DISPLAY_HTML_PM_START_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class NavigationBar;
+
+class PageMaker_Overview : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_Overview(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_Overview();
+
+    virtual void        MakePage();
+
+  private:
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+
+    // DATA
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+#endif
+
diff --git a/autodoc/source/display/html/protarea.cxx b/autodoc/source/display/html/protarea.cxx
new file mode 100644
index 000000000000..8c54212c29f4
--- /dev/null
+++ b/autodoc/source/display/html/protarea.cxx
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "protarea.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "hdimpl.hxx"
+
+
+inline UINT8
+ProtectionArea::Index( ary::cpp::E_ClassKey i_eClassKey ) const
+{
+     return i_eClassKey == ary::cpp::CK_class
+                ?   0
+                :   i_eClassKey == ary::cpp::CK_struct
+                        ?   1
+                        :   2;
+}
+
+
+
+ProtectionArea::ProtectionArea( const char *        i_sLabel,
+                                const char *        i_sTitle )
+    :   pSglTable( new S_Slot_Table(i_sTitle) ),
+        aClassesTables(),
+        sLabel(i_sLabel)
+{
+}
+
+ProtectionArea::~ProtectionArea()
+{
+
+}
+
+csi::html::Table &
+ProtectionArea::GetTable()
+{
+    csv_assert(pSglTable);
+
+    return pSglTable->GetTable();
+}
+
+csi::html::Table &
+ProtectionArea::GetTable( ary::cpp::E_ClassKey i_eClassKey )
+{
+    csv_assert(aClassesTables[Index(i_eClassKey)]);
+    return aClassesTables[Index(i_eClassKey)]->GetTable();
+}
+
+DYN csi::html::Table *
+ProtectionArea::ReleaseTable()
+{
+    csv_assert(pSglTable);
+    return pSglTable->ReleaseTable();
+}
+
+DYN csi::html::Table *
+ProtectionArea::ReleaseTable( ary::cpp::E_ClassKey i_eClassKey )
+{
+    csv_assert(aClassesTables[Index(i_eClassKey)]);
+    return aClassesTables[Index(i_eClassKey)]->ReleaseTable();
+}
+
+const char *
+ProtectionArea::Label() const
+{
+    return sLabel;
+}
+
+
+bool
+ProtectionArea::WasUsed_Area() const
+{
+    if ( pSglTable )
+    {
+         return pSglTable->WasUsed();
+    }
+
+    typedef const Dyn<ProtectionArea::S_Slot_Table> cdyntab;
+
+    // Workaround a maybe compiler bug in Solaris5-CC ?
+    //   should normally work without the cast,
+    //   because that is exactly the genuine type, given:
+    return static_cast< cdyntab& >(aClassesTables[0])->WasUsed()
+           OR static_cast< cdyntab& >(aClassesTables[1])->WasUsed()
+           OR static_cast< cdyntab& >(aClassesTables[2])->WasUsed();
+}
+
+//*******************        S_Slot_Table        **********************//
+
+ProtectionArea::
+S_Slot_Table::S_Slot_Table(const char * i_sTitle)
+    :   sTableTitle(i_sTitle)
+{
+}
+
+ProtectionArea::
+S_Slot_Table::~S_Slot_Table()
+{
+}
+
+csi::html::Table &
+ProtectionArea::
+S_Slot_Table::GetTable()
+{
+    return pTable
+                ?   *pTable
+                :   *( pTable = &Create_ChildListTable(sTableTitle) );
+}
+
+
+
diff --git a/autodoc/source/display/html/protarea.hxx b/autodoc/source/display/html/protarea.hxx
new file mode 100644
index 000000000000..e09904fbc85e
--- /dev/null
+++ b/autodoc/source/display/html/protarea.hxx
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_PROTAREA_HXX
+#define ADC_DISPLAY_HTML_PROTAREA_HXX
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace csi
+{
+namespace html
+{
+    class Table;
+}
+}
+
+
+
+
+class ProtectionArea
+{
+  public:
+                            ProtectionArea(
+                                const char *        i_sLabel,
+                                const char *        i_sTitle );
+                            ~ProtectionArea();
+
+    csi::html::Table &      GetTable();
+    csi::html::Table &      GetTable(
+                                ary::cpp::E_ClassKey
+                                                    i_eClassKey );
+    DYN csi::html::Table *  ReleaseTable();
+    DYN csi::html::Table *  ReleaseTable(
+                                ary::cpp::E_ClassKey
+                                                    i_eClassKey );
+    const char *            Label() const;
+
+    int                     Size() const            { return pSglTable ? 1 : 3; }
+
+    bool                    WasUsed_Area() const;
+  private:
+    struct S_Slot_Table
+    {
+        const char *        sTableTitle;
+        Dyn< csi::html::Table >
+                            pTable;
+
+                            S_Slot_Table(
+                                const char *        i_sTitle );
+                            ~S_Slot_Table();
+        csi::html::Table &  GetTable();
+        DYN csi::html::Table *
+                            ReleaseTable()          { return pTable.Release(); }
+        bool                WasUsed() const         { return pTable; }
+    };
+
+    UINT8                   Index(
+                                ary::cpp::E_ClassKey
+                                                    i_eClassKey ) const;
+    // DATA
+    Dyn<S_Slot_Table>       pSglTable;
+    Dyn<S_Slot_Table>       aClassesTables[3];
+    const char *            sLabel;
+};
+
+
+
+#endif
+
diff --git a/autodoc/source/display/html/strconst.hxx b/autodoc/source/display/html/strconst.hxx
new file mode 100644
index 000000000000..a9e5eaad2101
--- /dev/null
+++ b/autodoc/source/display/html/strconst.hxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_STRCONST_HXX
+#define ADC_DISPLAY_HTML_STRCONST_HXX
+
+
+const char * const C_sDIR_NamespacesCpp = "names";
+const char * const C_sDIR_Index = "index-files";   // Convention recognised by Javadoc
+
+const char * const C_sPath_Index = "index-files/index-1.html";   // Convention recognised by Javadoc
+
+const char * const C_sHFN_Css           = "cpp.css";
+const char * const C_sHFN_Overview      = "index.html";
+const char * const C_sHFN_Help          = "help.html";
+
+const char * const C_sHFN_Namespace     = "index.html";
+
+const char * const C_sTitle_SubNamespaces   = "Nested Namespaces";
+const char * const C_sTitle_Classes         = "Classes";
+const char * const C_sTitle_Structs         = "Structs";
+const char * const C_sTitle_Unions          = "Unions";
+const char * const C_sTitle_Enums           = "Enums";
+const char * const C_sTitle_Typedefs        = "Typedefs";
+const char * const C_sTitle_Operations      = "Functions";
+const char * const C_sTitle_Constants       = "Constants";
+const char * const C_sTitle_Variables       = "Variables";
+const char * const C_sTitle_EnumValues      = "Values";
+
+const char * const C_sLabel_SubNamespaces   = "subnsps";
+const char * const C_sLabel_Classes         = "classes";
+const char * const C_sLabel_Structs         = "structs";
+const char * const C_sLabel_Unions          = "unions";
+const char * const C_sLabel_Enums           = "enums";
+const char * const C_sLabel_Typedefs        = "tydefs";
+const char * const C_sLabel_Operations      = "ops";
+const char * const C_sLabel_Constants       = "consts";
+const char * const C_sLabel_Variables       = "vars";
+const char * const C_sLabel_EnumValues      = "envals";
+
+const char * const C_sHFTitle_Overview              = "C++ Reference Documentation Overview";
+const char * const C_sHFTitle_Help                  = "How This Reference Document Is Organized";
+
+const char * const C_sHFTitle_GlobalNamespaceCpp    = "Global Namespace in C++";
+const char * const C_sHFTypeTitle_Namespace         = "namespace";
+const char * const C_sHFTypeTitle_Class             = "class";
+const char * const C_sHFTypeTitle_Struct            = "struct";
+const char * const C_sHFTypeTitle_Union             = "union";
+const char * const C_sHFTypeTitle_Enum              = "enum";
+const char * const C_sHFTypeTitle_Typedef           = "typedef";
+
+
+#endif
+
diff --git a/autodoc/source/display/idl/hfi_constgroup.cxx b/autodoc/source/display/idl/hfi_constgroup.cxx
new file mode 100644
index 000000000000..accf58cf290e
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_constgroup.cxx
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_constgroup.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_constgroup.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Constants("constants group");
+
+
+namespace
+{
+
+const String
+    C_sList_Constants("Constants");
+const String
+    C_sList_Constants_Label("Constants");
+const String
+    C_sList_ConstantDetails("Constants' Details");
+const String
+    C_sList_ConstantDetails_Label("ConstantDetails");
+
+enum E_SubListIndices
+{
+    sli_ConstantsSummary = 0,
+    sli_ConstantDetails = 1
+};
+
+
+}   // anonymous namespace
+
+
+
+HF_IdlConstGroup::HF_IdlConstGroup( Environment &   io_rEnv,
+                                    Xml::Element &  o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlConstGroup::~HF_IdlConstGroup()
+{
+}
+
+void
+HF_IdlConstGroup::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Constants, i_ce);
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list
+        dpConstants;
+    ary::idl::ifc_constgroup::attr::Get_Constants(dpConstants, i_ce);
+
+    if ( (*dpConstants).operator bool() )
+    {
+        produce_Members( *dpConstants,
+                         C_sList_Constants,
+                         C_sList_Constants_Label,
+                         C_sList_ConstantDetails,
+                         C_sList_ConstantDetails_Label );
+        pNaviSubRow->SwitchOn(sli_ConstantsSummary);
+        pNaviSubRow->SwitchOn(sli_ConstantDetails);
+    }
+    pNaviSubRow->Produce_Row();
+}
+
+HF_NaviSubRow &
+HF_IdlConstGroup::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce,true);  // true := avoid link to Use-page.
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Constants, C_sList_Constants_Label, false);
+    ret.AddItem(C_sList_ConstantDetails, C_sList_ConstantDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlConstGroup::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                         const client &      i_ce ) const
+{
+    HF_IdlConstant
+        aElement( Env(), o_table );
+    aElement.Produce_byData(i_ce);
+}
+
diff --git a/autodoc/source/display/idl/hfi_constgroup.hxx b/autodoc/source/display/idl/hfi_constgroup.hxx
new file mode 100644
index 000000000000..9719d6c131cf
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_constgroup.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_CONSTGROUP_HXX
+#define ADC_DISPLAY_HFI_CONSTGROUP_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class HF_IdlConstGroup : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlConstGroup(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlConstGroup();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    HF_NaviSubRow &     make_Navibar(
+                            const client &      ce ) const;
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Constants;
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_doc.cxx b/autodoc/source/display/idl/hfi_doc.cxx
new file mode 100644
index 000000000000..5647ecd753f0
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_doc.cxx
@@ -0,0 +1,191 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_doc.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary_i/d_token.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include "hfi_tag.hxx"
+#include "hi_ary.hxx"
+
+
+
+
+HF_IdlDocu::HF_IdlDocu( Environment &       io_rEnv,
+                        HF_DocEntryList &   o_rOut )
+    :   HtmlFactory_Idl( io_rEnv, &o_rOut.CurOut() ),
+        rOut(o_rOut)
+{
+}
+
+HF_IdlDocu::~HF_IdlDocu()
+{
+}
+
+void
+HF_IdlDocu::Produce_fromCodeEntity( const client & i_ce ) const
+{
+    const ce_info *
+        i_pDocu = Get_IdlDocu(i_ce.Docu());
+    if (i_pDocu != 0)
+        Produce_byDocuAndScope(*i_pDocu, &i_ce, i_ce);
+}
+
+void
+HF_IdlDocu::Produce_fromReference( const ce_info &   i_rDocuForReference,
+                                   const client &    i_rScopeGivingCe ) const
+{
+    Produce_byDocuAndScope(i_rDocuForReference, 0, i_rScopeGivingCe );
+}
+
+void
+HF_IdlDocu::Produce_byDocuAndScope( const ce_info & i_rDocu,
+                                    const client *  i_pClient,
+                                    const client &  i_rScopeGivingCe ) const
+{
+    bool bShort = NOT i_rDocu.Short().IsEmpty();
+    bool bDescr = NOT i_rDocu.Description().IsEmpty();
+
+    if ( i_rDocu.IsDeprecated()
+         OR (
+             (i_pClient != 0 ? i_pClient->SightLevel() == ary::idl::sl_File : false)
+             AND NOT i_rDocu.IsPublished()
+            )
+         OR i_rDocu.IsOptional() )
+    {   // any usage restriction
+        rOut.Produce_Term("Usage Restrictions");
+
+        if ( i_rDocu.IsDeprecated() )
+            rOut.Produce_Definition() >> *new Html::Italic << "deprecated";
+        if ( (i_pClient != 0 ? i_pClient->SightLevel() == ary::idl::sl_File : false)
+             AND NOT i_rDocu.IsPublished() )
+            rOut.Produce_Definition() >> *new Html::Italic << "not published";
+        if ( i_rDocu.IsOptional() )
+            rOut.Produce_Definition() >> *new Html::Italic << "optional";
+
+        if ( i_rDocu.IsDeprecated() AND
+             // KORR_FUTURE
+             // Workaround, because DocuTex2::IsEmpty() does not
+             //   calculate whitespace tokens only as empty.
+             i_rDocu.DeprecatedText().Tokens().size() > 1 )
+        {
+            rOut.Produce_Term("Deprecation Info");
+
+            HF_IdlDocuTextDisplay
+                aDescription( Env(), 0, i_rScopeGivingCe);
+            aDescription.Out().Enter( rOut.Produce_Definition() );
+            i_rDocu.DeprecatedText().DisplayAt( aDescription );
+            aDescription.Out().Leave();
+        }
+    }   // end if (<any usage restriction>)
+
+    if ( bShort OR bDescr )
+    {
+        rOut.Produce_Term("Description");
+        HF_IdlDocuTextDisplay
+                aDescription( Env(), 0, i_rScopeGivingCe);
+        if (bShort)
+        {
+            aDescription.Out().Enter( rOut.Produce_Definition() );
+            i_rDocu.Short().DisplayAt( aDescription );
+            aDescription.Out().Leave();
+        }
+        if (bDescr)
+        {
+            aDescription.Out().Enter( rOut.Produce_Definition() );
+            i_rDocu.Description().DisplayAt( aDescription );
+            aDescription.Out().Leave();
+        }
+    }
+
+    std::vector< csi::dsapi::DT_SeeAlsoAtTag* >
+        aSeeAlsosWithoutText;
+    std::vector< csi::dsapi::DT_SeeAlsoAtTag* >
+        aSeeAlsosWithText;
+
+    for ( std::vector< ary::inf::AtTag2* >::const_iterator
+                iter = i_rDocu.Tags().begin();
+          iter != i_rDocu.Tags().end();
+          ++iter )
+    {
+        csi::dsapi::DT_SeeAlsoAtTag*
+            pSeeAlso = dynamic_cast< csi::dsapi::DT_SeeAlsoAtTag * >(*iter);
+        if (pSeeAlso != 0 )
+        {
+            if ( pSeeAlso->Text().IsEmpty() )
+            {
+                aSeeAlsosWithoutText.push_back(pSeeAlso);
+            }
+            else
+            {
+                aSeeAlsosWithText.push_back(pSeeAlso);
+            }
+            continue;
+        }
+
+        if ( strlen( (*iter)->Title() ) > 0 )
+        {
+            HF_IdlTag
+                    aTag(Env(), i_rScopeGivingCe);
+            Xml::Element &
+                rTerm = rOut.Produce_Term();
+            aTag.Produce_byData( rTerm,
+                                 rOut.Produce_Definition(),
+                                 *(*iter) );
+        }
+    }   // end for
+
+    if (aSeeAlsosWithoutText.size() > 0)
+    {
+        HF_IdlTag
+            aSeeAlsoTag(Env(),  i_rScopeGivingCe);
+        Xml::Element &
+            rTerm = rOut.Produce_Term();
+        aSeeAlsoTag.Produce_byData( rTerm,
+                                    rOut.Produce_Definition(),
+                                    aSeeAlsosWithoutText );
+    }
+
+    for ( std::vector< csi::dsapi::DT_SeeAlsoAtTag* >::const_iterator
+                itSee2 = aSeeAlsosWithText.begin();
+          itSee2 != aSeeAlsosWithText.end();
+          ++itSee2 )
+    {
+        HF_IdlTag
+            aTag(Env(),  i_rScopeGivingCe);
+        Xml::Element &
+            rTerm = rOut.Produce_Term();
+            aTag.Produce_byData( rTerm,
+                                 rOut.Produce_Definition(),
+                                 *(*itSee2) );
+    }   // end for
+}
diff --git a/autodoc/source/display/idl/hfi_doc.hxx b/autodoc/source/display/idl/hfi_doc.hxx
new file mode 100644
index 000000000000..424d01cbc5e2
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_doc.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_DOC_HXX
+#define ADC_DISPLAY_HFI_DOC_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_DocEntryList;
+
+
+class HF_IdlDocu : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlDocu(
+                            Environment &       io_rEnv,
+                            HF_DocEntryList &   o_rOut );
+    virtual             ~HF_IdlDocu();
+
+
+    /** Produces documentation by the CodeInfo accompanying
+        ->i_ce.
+    */
+    void                Produce_fromCodeEntity(
+                            const client &      i_ce ) const;
+
+    /** Produces documentation by the CodeInfo accompanying
+        a link or reference to a CodeEntity.
+
+        @param i_rScopeGivingCe
+        Gives the scope from which links are to be calculated.
+    */
+    void                Produce_fromReference(
+                            const ce_info &     i_rDocuForReference,
+                            const client &      i_rScopeGivingCe ) const;
+
+  private:
+    // Locals
+    /** Produces documentation.
+
+        @param i_rScopeGivingCe
+        Gives the scope from which links are to be calculated.
+    */
+    void                Produce_byDocuAndScope(
+                            const ce_info &     i_rDocu,
+                            const client *      i_pClient,      /// May be 0.
+                            const client &      i_rScopeGivingCe ) const;
+
+    // DATA
+    HF_DocEntryList &   rOut;
+};
+
+
+#endif
diff --git a/autodoc/source/display/idl/hfi_enum.cxx b/autodoc/source/display/idl/hfi_enum.cxx
new file mode 100644
index 000000000000..6532242ebc3c
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_enum.cxx
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_enum.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_enum.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Enum("enum");
+
+namespace
+{
+
+const String
+    C_sList_Values("Values");
+const String
+    C_sList_Values_Label("Values");
+const String
+    C_sList_ValueDetails("Values' Details");
+const String
+    C_sList_ValueDetails_Label("ValueDetails");
+
+enum E_SubListIndices
+{
+    sli_ValuesSummary = 0,
+    sli_ValueDetails = 1
+};
+
+}   // anonymous namespace
+
+HF_IdlEnum::HF_IdlEnum( Environment &       io_rEnv,
+                        Xml::Element &      o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlEnum::~HF_IdlEnum()
+{
+}
+
+void
+HF_IdlEnum::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Enum, i_ce);
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list
+        dpValues;
+    ary::idl::ifc_enum::attr::Get_Values(dpValues, i_ce);
+    if ( (*dpValues).operator bool() )
+    {
+        produce_Members( *dpValues,
+                         C_sList_Values,
+                         C_sList_Values_Label,
+                         C_sList_ValueDetails,
+                         C_sList_ValueDetails_Label );
+        pNaviSubRow->SwitchOn(sli_ValuesSummary);
+        pNaviSubRow->SwitchOn(sli_ValueDetails);
+    }
+    pNaviSubRow->Produce_Row();
+}
+
+HF_NaviSubRow &
+HF_IdlEnum::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Values, C_sList_Values_Label, false);
+    ret.AddItem(C_sList_ValueDetails, C_sList_ValueDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlEnum::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                   const client &      i_ce) const
+{
+    HF_IdlEnumValue
+        aElement( Env(), o_table );
+    aElement.Produce_byData(i_ce);
+}
diff --git a/autodoc/source/display/idl/hfi_enum.hxx b/autodoc/source/display/idl/hfi_enum.hxx
new file mode 100644
index 000000000000..e04827374a9e
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_enum.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_ENUM_HXX
+#define ADC_DISPLAY_HFI_ENUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlEnum : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlEnum(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlEnum();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    HF_NaviSubRow &     make_Navibar(
+                            const client &      ce ) const;
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Enum;
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_globalindex.cxx b/autodoc/source/display/idl/hfi_globalindex.cxx
new file mode 100644
index 000000000000..0e974d61fa42
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_globalindex.cxx
@@ -0,0 +1,275 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_globalindex.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/idl/i_module.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+
+namespace
+{
+
+/**
+*/
+enum E_Types
+{
+        t_service           = 0,
+        t_interface         = 1,
+        t_struct            = 2,
+        t_exception         = 3,
+        t_enum              = 4,
+        t_typedef           = 5,
+        t_constantsgroup    = 6,
+        t_property          = 7,
+        t_function          = 8,
+        t_structelement     = 9,
+        t_enumvalue         = 10,
+        t_constant          = 11,
+        t_module            = 12,
+        t_singleton         = 13,
+        t_attribute         = 14,
+        t_siservice         = 15,
+        t_sisingleton       = 16,
+        t_MAX
+};
+
+String  G_sDummy;
+
+
+/*  RC-Ids for IDL types (see reposy.cxx):
+
+    Module              2000
+    Interface           2001
+    Function            2002
+    Service             2003
+    Property            2004
+
+    Enum                2005
+    EnumValue           2006
+    Typedef             2007
+    Struct              2008
+    StructElement       2009
+
+    Exception           2010
+    ConstantGroup       2011
+    Constant            2012
+    Singleton           2013
+    Attribute           2014
+    SglIfcService       2015
+    SglIfcSingleton     2016
+*/
+const int C_nNumberOfIdlTypes = 17;
+const char *    C_sTypeNames[C_nNumberOfIdlTypes] =
+                    { "module ",    "interface ",   "function ",    "service ",     "property ",
+                      "enum ",      "value ",       "typedef ",     "struct ",      "field ",
+                      "exception ", "constants group ", "constant ","singleton ",   "attribute ",
+                      "service",    "singleton"
+                    };
+const char *    C_sOwnerNames[C_nNumberOfIdlTypes] =
+                    { "module ",    "module ",      "interface ",   "module ",      "service ",
+                      "module ",    "enum ",        "module ",      "module ",      "", // could be struct or exception
+                      "module ",    "module ",      "constants group ", "module ",  "interface ",
+                      "module",     "module"
+                    };
+const intt C_nNamesArrayOffset = intt(ary::idl::Module::class_id);
+const int C_nIxField = 9;
+
+
+
+
+const char C_cAlphabet[] =
+"<a class=\"inverse\" href=\"index-1.html\"><B>A</B></a> <a class=\"inverse\" href=\"index-2.html\"><B>B</B></a> <a class=\"inverse\" href=\"index-3.html\"><B>C</B></a> <a class=\"inverse\" href=\"index-4.html\"><B>D</B></a> <a class=\"inverse\" href=\"index-5.html\"><B>E</B></a> "
+"<a class=\"inverse\" href=\"index-6.html\"><B>F</B></a> <a class=\"inverse\" href=\"index-7.html\"><B>G</B></a> <a class=\"inverse\" href=\"index-8.html\"><B>H</B></a> <a class=\"inverse\" href=\"index-9.html\"><B>I</B></a> <a class=\"inverse\" href=\"index-10.html\"><B>J</B></a> "
+"<a class=\"inverse\" href=\"index-11.html\"><B>K</B></a> <a class=\"inverse\" href=\"index-12.html\"><B>L</B></a> <a class=\"inverse\" href=\"index-13.html\"><B>M</B></a> <a class=\"inverse\" href=\"index-14.html\"><B>N</B></a> <a class=\"inverse\" href=\"index-15.html\"><B>O</B></a> "
+"<a class=\"inverse\" href=\"index-16.html\"><B>P</B></a> <a class=\"inverse\" href=\"index-17.html\"><B>Q</B></a> <a class=\"inverse\" href=\"index-18.html\"><B>R</B></a> <a class=\"inverse\" href=\"index-19.html\"><B>S</B></a> <a class=\"inverse\" href=\"index-20.html\"><B>T</B></a> "
+"<a class=\"inverse\" href=\"index-21.html\"><B>U</B></a> <a class=\"inverse\" href=\"index-22.html\"><B>V</B></a> <a class=\"inverse\" href=\"index-23.html\"><B>W</B></a> <a class=\"inverse\" href=\"index-24.html\"><B>X</B></a> <a class=\"inverse\" href=\"index-25.html\"><B>Y</B></a> "
+"<a class=\"inverse\" href=\"index-26.html\"><B>Z</B></a>";
+
+
+
+HF_IdlGlobalIndex::PageData     G_PageData;
+
+}   // end anonymous namespace
+
+
+inline void
+HF_IdlGlobalIndex::write_EntryItself( Xml::Element &               o_destination,
+                                      const ary::idl::CodeEntity & i_ce,
+                                      const HF_IdlTypeText &       i_typeLinkWriter ) const
+{
+    i_typeLinkWriter.Produce_IndexLink(o_destination, i_ce);
+    o_destination << " - ";
+}
+
+
+HF_IdlGlobalIndex::HF_IdlGlobalIndex( Environment &     io_rEnv,
+                                      Xml::Element &    o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlGlobalIndex::~HF_IdlGlobalIndex()
+{
+}
+
+void
+HF_IdlGlobalIndex::Produce_Page(ary::idl::alphabetical_index::E_Letter i_letter) const
+{
+    make_Navibar();
+
+    HF_TitleTable
+        aTitle(CurOut());
+    StreamLock sl(100);
+    aTitle.Produce_Title( sl()
+                          << "Global Index "
+                          << ( i_letter != ary::idl::alphabetical_index::non_alpha
+                                ?   char(int(i_letter)-'a'+'A')
+                                :   '_' )
+                          << c_str );
+
+    // Letters Index
+    aTitle.Add_Row()
+        << new Xml::XmlCode(
+            "<p align=\"center\"><a href=\"index-1.html\"><b>A</b></a> <a href=\"index-2.html\"><b>B</b></a> <a href=\"index-3.html\"><b>C</b></a> <a href=\"index-4.html\"><b>D</b></a> <a href=\"index-5.html\"><b>E</b></a> <a href=\"index-6.html\"><b>F</b></a> <a href=\"index-7.html\"><b>G</b></a> <a href=\"index-8.html\"><b>H</b></a> <a href=\"index-9.html\"><b>I</b></a> <a href=\"index-10.html\"><b>J</b></a>"
+            " <a href=\"index-11.html\"><b>K</b></a> <a href=\"index-12.html\"><b>L</b></a> <a href=\"index-13.html\"><b>M</b></a> <a href=\"index-14.html\"><b>N</b></a> <a href=\"index-15.html\"><b>O</b></a> <a href=\"index-16.html\"><b>P</b></a> <a href=\"index-17.html\"><b>Q</b></a> <a href=\"index-18.html\"><b>R</b></a> <a href=\"index-19.html\"><b>S</b></a> <a href=\"index-20.html\"><b>T</b></a>"
+            " <a href=\"index-21.html\"><b>U</b></a> <a href=\"index-22.html\"><b>V</b></a> <a href=\"index-23.html\"><b>W</b></a> <a href=\"index-24.html\"><b>X</b></a> <a href=\"index-25.html\"><b>Y</b></a> <a href=\"index-26.html\"><b>Z</b></a> <a href=\"index-27.html\"><b>_</b></a></p>" );
+
+    Out().Enter(CurOut() >> *new Html::DefList);
+
+    csv::erase_container(G_PageData);
+    Env().Data().Get_IndexData(G_PageData, i_letter);
+
+    // Helper object to produce links to the index Entries.
+    HF_IdlTypeText aTypeLinkWriter(Env(),HF_IdlTypeText::use_for_javacompatible_index);
+
+    PageData::const_iterator itEnd = G_PageData.end();
+    for ( PageData::const_iterator iter = G_PageData.begin();
+          iter != itEnd;
+          ++iter )
+    {
+        produce_Line(iter, aTypeLinkWriter);
+    }   // end for
+
+    Out().Leave();
+    CurOut() << new Html::HorizontalLine;
+}
+
+void
+HF_IdlGlobalIndex::make_Navibar() const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_IndexMainRow();
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlGlobalIndex::produce_Line( PageData::const_iterator i_entry,
+                                 const HF_IdlTypeText &   i_typeLinkWriter) const
+{
+    const client &
+        rCe = Env().Data().Find_Ce(*i_entry);
+    if (NOT rCe.Owner().IsValid())
+        return; // Omit global namespace.
+
+    // The destination for the created output:
+    Xml::Element & rDT = CurOut() >> *new Html::DefListTerm;
+
+    /** The following code is intended to produce an output that
+        will be recognized by the context help system of Forte.
+        That is reached by making it similar to the indices, that
+        Javadoc produces.
+        If the link to the Entry contains a hashmark, the Forte-Help
+        requires following a link to the owner.
+        But if there is no hashmark, the following link must go to
+        the same Entry again. Doesn't make really sense :-(, but that's
+        like it is.
+    */
+    write_EntryItself(rDT,rCe,i_typeLinkWriter);
+    if (rCe.SightLevel() == ary::idl::sl_Member)
+        write_OwnerOfEntry(rDT,rCe,i_typeLinkWriter);
+    else
+        write_EntrySecondTime(rDT,rCe,i_typeLinkWriter);
+
+    // This produces an empty "<dd></dd>", which is also needed to reach
+    //   similarity to the Javadoc index:
+    CurOut() << new Html::DefListDefinition;
+}
+
+void
+HF_IdlGlobalIndex::write_OwnerOfEntry( Xml::Element &               o_destination,
+                                       const ary::idl::CodeEntity & i_ce,
+                                       const HF_IdlTypeText &       i_typeLinkWriter ) const
+{
+    const client &
+        rOwner = Env().Data().Find_Ce(i_ce.Owner());
+
+    int nIx = int(i_ce.AryClass() - C_nNamesArrayOffset);
+    csv_assert(csv::in_range(0,nIx,C_nNumberOfIdlTypes));
+
+    o_destination << C_sTypeNames[nIx]
+                  << "in ";
+    if (nIx != C_nIxField)
+    {
+        o_destination << C_sOwnerNames[nIx];
+    }
+    else
+    {
+        uintt
+            nOwnerIx = rOwner.AryClass() - C_nNamesArrayOffset;
+        csv_assert(
+            nOwnerIx < static_cast< unsigned int >(C_nNumberOfIdlTypes));
+        o_destination << C_sTypeNames[nOwnerIx];
+    }
+    i_typeLinkWriter.Produce_IndexOwnerLink(o_destination, rOwner);
+}
+
+void
+HF_IdlGlobalIndex::write_EntrySecondTime( Xml::Element &                o_destination,
+                                          const ary::idl::CodeEntity &  i_ce,
+                                          const HF_IdlTypeText &        i_typeLinkWriter ) const
+{
+    int nIx = int(i_ce.AryClass() - C_nNamesArrayOffset);
+    csv_assert(csv::in_range(0,nIx,C_nNumberOfIdlTypes));
+
+    o_destination << C_sTypeNames[nIx]
+                  << " ";
+    i_typeLinkWriter.Produce_IndexSecondEntryLink(o_destination, i_ce);
+}
diff --git a/autodoc/source/display/idl/hfi_globalindex.hxx b/autodoc/source/display/idl/hfi_globalindex.hxx
new file mode 100644
index 000000000000..45e953baaed5
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_globalindex.hxx
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_GLOBALINDEX_HXX
+#define ADC_DISPLAY_HFI_GLOBALINDEX_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+class HF_IdlTypeText;
+
+class HF_IdlGlobalIndex : public HtmlFactory_Idl
+{
+  public:
+    typedef std::vector<ary::idl::Ce_id> PageData;
+
+                        HF_IdlGlobalIndex(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlGlobalIndex();
+
+    void                Produce_Page(
+                            ary::idl::alphabetical_index::E_Letter
+                                                i_letter ) const;
+  private:
+    void                make_Navibar() const;   /// Called by @->Produce_Page()
+    void                produce_Line(           /// Called by @->Produce_Page()
+                            PageData::const_iterator
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+
+    void                write_EntryItself(      /// Called by @->produceLine()
+                            Xml::Element &      o_destination,
+                            const ary::idl::CodeEntity &
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+
+    void                write_OwnerOfEntry(     /// Called by @->produceLine()
+                            Xml::Element &      o_destination,
+                            const ary::idl::CodeEntity &
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+
+    void                write_EntrySecondTime(  /// Called by @->produceLine()
+                            Xml::Element &      o_destination,
+                            const ary::idl::CodeEntity &
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+};
+
+
+
+#endif
+
diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx
new file mode 100644
index 000000000000..d4db7f9028f1
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_hierarchy.cxx
@@ -0,0 +1,202 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_hierarchy.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <udm/html/htmlitem.hxx>
+#include <ary/stdconstiter.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include "hfi_interface.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_env.hxx"
+
+
+
+HF_IdlBaseNode::HF_IdlBaseNode( const TYPE &            i_rType,
+                                const GATE &            i_rGate,
+                                intt                    i_nPositionOffset,
+                                HF_IdlBaseNode &        io_rDerived )
+    :   nType(i_rType.TypeId()),
+        aBases(),
+        nCountBases(0),
+        nPosition(i_nPositionOffset),
+        pDerived(&io_rDerived)
+{
+    Ce_id nCe = i_rGate.Types().Search_CeRelatedTo(nType);
+    if (nCe.IsValid())
+    {
+        GatherBases(i_rGate.Ces().Find_Ce(nCe), i_rGate);
+    }
+}
+
+HF_IdlBaseNode::~HF_IdlBaseNode()
+{
+}
+
+void
+HF_IdlBaseNode::FillPositionList( std::vector< const HF_IdlBaseNode* > & o_rPositionList ) const
+{
+    for ( BaseList::const_iterator it = aBases.begin();
+          it != aBases.end();
+          ++it )
+    {
+        (*it)->FillPositionList(o_rPositionList);
+    }  // end for
+
+    o_rPositionList.push_back(this);
+}
+
+void
+HF_IdlBaseNode::GatherBases( const CE &       i_rCe,
+                             const GATE &     i_rGate )
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        aHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(aHelp,i_rCe);
+
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *aHelp;
+          it.operator bool();
+          ++it )
+    {
+        const TYPE &
+            rBaseType = i_rGate.Types().Find_Type((*it).Type());
+
+        Dyn<HF_IdlBaseNode>
+            pBaseNode( new HF_IdlBaseNode( rBaseType,
+                                           i_rGate,
+                                           nPosition,
+                                           *this )
+                     );
+
+        intt nAddedBases = pBaseNode->BaseCount() + 1;
+        nCountBases += nAddedBases;
+        nPosition += nAddedBases;
+        aBases.push_back( pBaseNode.Release() );
+    }   // end for
+}
+
+
+void
+Write_BaseHierarchy( csi::xml::Element &            o_rOut,
+                     HtmlEnvironment_Idl &          i_env,
+                     const ary::idl::CodeEntity &   i_ce )
+{
+    csi::xml::Element &
+        rPre = o_rOut
+               >> *new csi::xml::AnElement("pre")
+                   << new csi::html::StyleAttr("font-family:monospace;");
+
+    std::vector<uintt>
+        aSetColumns;
+    rPre
+        >> *new csi::html::Strong
+            << i_ce.LocalName();
+    rPre
+        << "\n";
+    Write_Bases( rPre,
+                 i_env,
+                 i_ce,
+                         aSetColumns );
+    rPre
+        << "\n";
+
+}
+
+
+void
+Write_Bases( csi::xml::Element &            o_out,
+             HtmlEnvironment_Idl &          i_env,
+             const ary::idl::CodeEntity &   i_rCe,
+             std::vector<uintt> &           io_setColumns )
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        aHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(aHelp,i_rCe);
+
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *aHelp;
+          it.operator bool();
+          // NO INCREMENT HERE, see below
+        )
+    {
+        ary::idl::Type_id
+            nType = (*it).Type();
+        ++it;
+        bool
+            bThereComesMore = it.operator bool();
+
+        ary::idl::Ce_id
+            nCe = i_env.Gate().Types().Search_CeRelatedTo(nType);
+        if (nCe.IsValid())
+        {
+            // KORR_FUTURE
+            //   Rather check for id(!) of com::sun::star::uno::XInterface.
+            if (i_env.Gate().Ces().Find_Ce(nCe).LocalName() == "XInterface")
+                continue;
+        }
+
+        for (uintt i = 0; i < io_setColumns.size(); ++i)
+        {
+            if (io_setColumns[i] == 1)
+                o_out << new csi::xml::XmlCode("&#x2503");
+            else
+                o_out << "  ";
+            o_out << " ";
+        }
+
+        if (bThereComesMore)
+            o_out << new csi::xml::XmlCode("&#x2523");
+        else
+            o_out << new csi::xml::XmlCode("&#x2517");
+        o_out << " ";
+
+        HF_IdlTypeText
+            aDisplay( i_env, o_out, true, i_env.CurPageCe());
+        aDisplay.Produce_byData(nType);
+        o_out << "\n";
+
+        if (nCe.IsValid())
+        {
+            io_setColumns.push_back(bThereComesMore ? 1 : 0);
+
+            const ary::idl::CodeEntity &
+                rCe = i_env.Gate().Ces().Find_Ce(nCe);
+            Write_Bases( o_out,
+                         i_env,
+                         rCe,
+                         io_setColumns );
+            io_setColumns.pop_back();
+        }
+    }   // end for
+}
diff --git a/autodoc/source/display/idl/hfi_hierarchy.hxx b/autodoc/source/display/idl/hfi_hierarchy.hxx
new file mode 100644
index 000000000000..e918a3345821
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_hierarchy.hxx
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_HIERARCHY_HXX
+#define ADC_DISPLAY_HFI_HIERARCHY_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+#include <ary/idl/i_types4idl.hxx>
+
+
+namespace csi
+{
+namespace xml
+{
+    class Element;
+}
+}
+
+
+class HF_IdlInterface;
+class HtmlEnvironment_Idl;
+
+
+
+/** Represents a node in an pyramidic inheritance hierarchy which shall be
+    displayed in text mode.
+*/
+class HF_IdlBaseNode
+{
+  public:
+    typedef ary::idl::CodeEntity            CE;
+    typedef ary::idl::Type                  TYPE;
+    typedef ary::idl::Gate                  GATE;
+    typedef ary::idl::Ce_id                 Ce_id;
+    typedef ary::idl::Type_id               Type_id;
+
+    /** @descr
+        The constructor recursively calls further constructors of
+        HF_IdlBaseNode for the bases of ->i_rType, if ->i_rType matches to a
+        ->CE.
+        So it builds up a complete hierarchy tree of all base classes
+        of ->i_pEntity.
+    */
+                        HF_IdlBaseNode(
+                            const TYPE &        i_rType,
+                            const GATE &        i_rGate,
+                            intt                i_nPositionOffset,
+                            HF_IdlBaseNode &    io_rDerived );
+                        ~HF_IdlBaseNode();
+
+    /** Recursively fills ->o_rPositionList with the instances of base
+        classes in the order in which they will be displayed.
+    */
+    void                FillPositionList(
+                            std::vector< const HF_IdlBaseNode* > &
+                                                o_rPositionList ) const;
+
+    Type_id             Type() const            { return nType; }
+    intt                BaseCount() const       { return nCountBases; }
+    intt                Position() const        { return nPosition; }
+    int                 Xpos() const            { return 3*Position(); }
+    int                 Ypos() const            { return 2*Position(); }
+    const HF_IdlBaseNode *        Derived() const         { return pDerived; }
+
+  private:
+    typedef std::vector< DYN HF_IdlBaseNode* > BaseList;
+
+    void                GatherBases(
+                            const CE &          i_rCe,
+                            const GATE &        i_rGate );
+
+    // DATA
+    Type_id             nType;
+    BaseList            aBases;
+    intt                nCountBases;
+    intt                nPosition;
+    HF_IdlBaseNode *    pDerived;
+};
+
+void                Write_BaseHierarchy(
+                        csi::xml::Element & o_rOut,
+                        HtmlEnvironment_Idl &
+                                            i_env,
+                        const ary::idl::CodeEntity &
+                                            i_rCe );
+
+void                Write_Bases(
+                        csi::xml::Element & o_rOut,
+                        HtmlEnvironment_Idl &
+                                            i_env,
+                        const ary::idl::CodeEntity &
+                                            i_rCe,
+                        std::vector<uintt> &
+                                            io_setColumns );
+
+#endif
diff --git a/autodoc/source/display/idl/hfi_interface.cxx b/autodoc/source/display/idl/hfi_interface.cxx
new file mode 100644
index 000000000000..8e7a637f12c8
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_interface.cxx
@@ -0,0 +1,357 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_interface.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ik_function.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_hierarchy.hxx"
+#include "hfi_method.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Interface("interface");
+
+namespace
+{
+
+const String
+    C_sBaseInterface("Base Interfaces");
+const String
+    C_sList_BaseComments("Comments on Base Interfaces");
+const String
+    C_sList_Methods("Methods' Summary");
+const String
+    C_sList_Methods_Label("MethodsSummary");
+const String
+    C_sDetails_Methods("Methods' Details");
+const String
+    C_sDetails_Methods_Label("MethodsDetails");
+
+const String
+    C_sList_Attributes("Attributes' Summary");
+const String
+    C_sList_Attributes_Label("AttributesSummary");
+const String
+    C_sList_AttributesDetails("Attributes' Details");
+const String
+    C_sList_AttributesDetails_Label("AttributesDetails");
+
+
+
+enum E_SubListIndices
+{
+    sli_MethodsSummay = 0,
+    sli_AttributesSummary = 1,
+    sli_MethodDetails = 2,
+    sli_AttributesDetails = 3
+};
+
+} //anonymous namespace
+
+
+
+
+HF_IdlInterface::HF_IdlInterface( Environment &         io_rEnv,
+                                  Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        eCurProducedMembers(mem_none)
+{
+}
+
+HF_IdlInterface::~HF_IdlInterface()
+{
+}
+
+void
+HF_IdlInterface::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+
+    produce_Title(aTitle, C_sCePrefix_Interface, i_ce);
+
+    produce_BaseHierarchy( aTitle.Add_Row(),
+                           i_ce,
+                           C_sBaseInterface );
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list dpFunctions;
+    ary::idl::ifc_interface::attr::Get_Functions(dpFunctions, i_ce);
+    if ( (*dpFunctions).operator bool() )
+    {
+        eCurProducedMembers = mem_Functions;
+
+        produce_Members( *dpFunctions,
+                         C_sList_Methods,
+                         C_sList_Methods_Label,
+                         C_sDetails_Methods,
+                         C_sDetails_Methods_Label,
+                         HtmlFactory_Idl::viewtype_summary );
+        pNaviSubRow->SwitchOn(sli_MethodsSummay);
+    }
+
+    dyn_ce_list
+        dpAttributes;
+    ary::idl::ifc_interface::attr::Get_Attributes(dpAttributes, i_ce);
+    if ( (*dpAttributes).operator bool() )
+    {
+        eCurProducedMembers = mem_Attributes;
+
+        produce_Members( *dpAttributes,
+                         C_sList_Attributes,
+                         C_sList_Attributes_Label,
+                         C_sList_AttributesDetails,
+                         C_sList_AttributesDetails_Label,
+                         HtmlFactory_Idl::viewtype_summary );
+        pNaviSubRow->SwitchOn(sli_AttributesSummary);
+    }
+
+    ary::idl::ifc_interface::attr::Get_Functions(dpFunctions, i_ce);
+    if ( (*dpFunctions).operator bool() )
+    {
+        eCurProducedMembers = mem_Functions;
+
+        produce_Members( *dpFunctions,
+                         C_sList_Methods,
+                         C_sList_Methods_Label,
+                         C_sDetails_Methods,
+                         C_sDetails_Methods_Label,
+                         HtmlFactory_Idl::viewtype_details );
+        pNaviSubRow->SwitchOn(sli_MethodDetails);
+    }
+
+    ary::idl::ifc_interface::attr::Get_Attributes(dpAttributes, i_ce);
+    if ( (*dpAttributes).operator bool() )
+    {
+        eCurProducedMembers = mem_Attributes;
+
+        produce_Members( *dpAttributes,
+                         C_sList_Attributes,
+                         C_sList_Attributes_Label,
+                         C_sList_AttributesDetails,
+                         C_sList_AttributesDetails_Label,
+                         HtmlFactory_Idl::viewtype_details );
+        pNaviSubRow->SwitchOn(sli_AttributesDetails);
+    }
+
+    eCurProducedMembers = mem_none;
+
+    pNaviSubRow->Produce_Row();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlInterface::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Methods, C_sList_Methods_Label, false);
+    ret.AddItem(C_sList_Attributes, C_sList_Attributes_Label, false);
+    ret.AddItem(C_sDetails_Methods, C_sDetails_Methods_Label, false);
+    ret.AddItem(C_sList_AttributesDetails, C_sList_AttributesDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlInterface::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                        const client &      i_ce ) const
+{
+    switch (eCurProducedMembers)
+    {
+        case mem_Functions:
+                    break;
+        case mem_Attributes:
+        {
+                    HF_IdlAttribute
+                        aAttribute( Env(), o_table);
+                    aAttribute.Produce_byData( i_ce );
+                    return;
+        };
+        default:    //Won't happen.
+                    return;
+    }   // end switch
+
+    typedef ary::idl::ifc_function::attr    funcAttr;
+
+    HF_IdlMethod
+        aFunction(  Env(),
+                    o_table.Add_Row()
+                        >> *new Html::TableCell
+                           << new Html::ClassAttr(C_sCellStyle_MDetail) );
+
+    ary::Dyn_StdConstIterator<ary::idl::Parameter>
+        pParameters;
+    funcAttr::Get_Parameters(pParameters, i_ce);
+
+    ary::Dyn_StdConstIterator<ary::idl::Type_id>
+        pExceptions;
+    funcAttr::Get_Exceptions(pExceptions, i_ce);
+
+    aFunction.Produce_byData( i_ce.LocalName(),
+                              funcAttr::ReturnType(i_ce),
+                              *pParameters,
+                              *pExceptions,
+                              funcAttr::IsOneway(i_ce),
+                              funcAttr::HasEllipse(i_ce),
+                              i_ce );
+}
+
+void
+HF_IdlInterface::produce_BaseHierarchy( Xml::Element &      o_screen,
+                                        const client &      i_ce,
+                                        const String &      i_sLabel ) const
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        pHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(pHelp, i_ce);
+    if (NOT (*pHelp).operator bool())
+        return;
+
+    // Check for XInterface as only base:
+    ary::StdConstIterator<ary::idl::CommentedRelation> &
+        itTest = *pHelp;
+    ary::idl::Ce_id
+        nCe = Env().Gate().Types().Search_CeRelatedTo((*itTest).Type());
+    if (nCe.IsValid())
+    {
+        // KORR_FUTURE
+        //   Rather check for id(!) of com::sun::star::uno::XInterface.
+        if (Env().Gate().Ces().Find_Ce(nCe).LocalName() == "XInterface")
+        {
+            ++itTest;
+            if (NOT itTest.operator bool())
+                return;
+        }
+    }
+
+    // Write hierarchy:
+
+    HF_DocEntryList
+        aDocList( o_screen );
+    aDocList.Produce_Term(i_sLabel);
+    Xml::Element &
+        rBaseList = aDocList.Produce_Definition();
+
+// NEW
+    Write_BaseHierarchy(rBaseList, Env(), i_ce);
+
+    // Write comments:
+        // KORR_FUTURE: Make sure, no empty table is constructed when comments list is empty.
+    HF_SubTitleTable
+        aBaseTable( aDocList.Produce_Definition(),
+                "",
+                C_sList_BaseComments,
+                2,
+                HF_SubTitleTable::sublevel_3 );
+
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        pBases;
+    ary::idl::ifc_interface::attr::Get_Bases(pBases, i_ce);
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *pBases;
+          it.operator bool();
+          ++it )
+    {
+        Xml::Element &
+            rRow = aBaseTable.Add_Row();
+
+        Xml::Element &
+            rTerm = rRow
+                        >> *new Html::TableCell
+                            << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
+        HF_IdlTypeText
+            aTypeDisplay( Env(), rTerm, false, 0);
+        aTypeDisplay.Produce_byData((*it).Type());
+
+        Xml::Element &
+            rDocu = rRow
+                        >> *new Html::TableCell
+                            << new Html::ClassAttr(C_sCellStyle_SummaryRight);
+
+        HF_DocEntryList
+            aDocuList(rDocu);
+
+        if ((*it).Info() != 0)
+        {
+//          aDocuList.Produce_Term("Comment on Base Reference");
+
+            HF_IdlDocu
+                aDocuDisplay(Env(), aDocuList);
+            aDocuDisplay.Produce_fromReference(*(*it).Info(), i_ce);
+        }
+        else
+        {
+            const client *
+                pCe = Env().Linker().Search_CeFromType((*it).Type());
+            const ce_info *
+                pShort = pCe != 0
+                            ?   Get_IdlDocu(pCe->Docu())
+                            :   (const ce_info *)(0);
+            if ( pShort != 0 )
+            {
+                aDocuList.Produce_NormalTerm("(referenced interface's summary:)");
+
+                Xml::Element &
+                    rDef = aDocuList.Produce_Definition();
+                HF_IdlDocuTextDisplay
+                    aShortDisplay( Env(), &rDef, *pCe);
+                pShort->Short().DisplayAt(aShortDisplay);
+            }   // end if (pShort != 0)
+        }   // endif ( (*i_commentedRef).Info() != 0 ) else
+    }   // end for
+}
diff --git a/autodoc/source/display/idl/hfi_interface.hxx b/autodoc/source/display/idl/hfi_interface.hxx
new file mode 100644
index 000000000000..9f2c77c64a97
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_interface.hxx
@@ -0,0 +1,90 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_INTERFACE_HXX
+#define ADC_DISPLAY_HFI_INTERFACE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+
+class HF_NaviSubRow;
+class HF_SubTitleTable;
+class HF_IdlBaseNode;
+
+class HF_IdlInterface : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlInterface(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlInterface();
+
+    void                Produce_byData(
+                            const client &      i_ce ) const;
+  private:
+    // Locals
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+    void                produce_BaseHierarchy(
+                            Xml::Element &      o_screen,
+                            const client &      i_ce,
+                            const String &      i_sLabel ) const;
+
+    // Locals
+    enum E_CurProducedMembers
+    {
+        mem_none,
+        mem_Functions,
+        mem_Attributes
+    };
+
+    // DATA
+    mutable E_CurProducedMembers
+                        eCurProducedMembers;
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Interface;
+
+
+
+#endif
diff --git a/autodoc/source/display/idl/hfi_linklist.cxx b/autodoc/source/display/idl/hfi_linklist.cxx
new file mode 100644
index 000000000000..3ab52ab4d722
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_linklist.cxx
@@ -0,0 +1,378 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_linklist.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+
+
+
+
+//*******************           HF_CommentedLink_Table         **********************************//
+
+HF_CommentedLink_Table::HF_CommentedLink_Table( Environment  &          io_rEnv,
+                                                Xml::Element &          o_rOut,
+                                                const String &          i_sTitle,
+                                                const String &          i_sLabel,
+                                                bool                    i_bBorder )
+    :    HtmlFactory_Idl(io_rEnv,&o_rOut),
+         pTable( new Html::Table( (i_bBorder ? "1" : "0"), "100%", "5", "0") ),
+         pCurLinkColumn(0),
+         pCurCommentColumn(0)
+{
+    *pTable
+        << new Html::ClassAttr("commentedlinks");
+
+    CurOut()
+        >> *new Html::Label(i_sLabel)
+           << new Html::LineBreak;
+    CurOut()
+        << pTable;
+//    HF_SubTitle aTitle(*pTable);
+//    aTitle.Produce_it(i_sTitle);
+}
+
+HF_CommentedLink_Table::~HF_CommentedLink_Table()
+{
+}
+
+void
+HF_CommentedLink_Table::Add_Line()
+{
+    Html::TableRow &
+        rRow = pTable->AddRow();
+
+    pCurLinkColumn = & (rRow.AddCell()
+                            << new Html::WidthAttr("30%")
+                            << new Xml::AnAttribute("valign","top") );
+    pCurCommentColumn  = & rRow.AddCell();
+}
+
+Xml::Element &
+HF_CommentedLink_Table::Cur_LinkColumn()
+{
+    csv_assert(pCurLinkColumn != 0);
+    return *pCurLinkColumn;
+}
+
+Xml::Element &
+HF_CommentedLink_Table::Cur_CommentColumn()
+{
+    csv_assert(pCurCommentColumn != 0);
+    return *pCurCommentColumn;
+}
+
+
+//*******************           HF_MemberTable         **********************************//
+
+HF_MemberTable::HF_MemberTable( Environment  &      io_rEnv,
+                                Xml::Element &      o_rOut,
+                                const String &      i_sTitle,
+                                const String &      i_sLabel,
+                                bool                i_bInline )
+    :    HtmlFactory_Idl(io_rEnv,&o_rOut),
+         pTable( new Html::Table("1", "100%", "5", "0") ),
+         pCurDeclaration(0),
+         pCurDescription(0),
+         bInline(i_bInline)
+{
+    *pTable
+        << new Html::ClassAttr("memberlist");
+
+    CurOut()
+        >> *new Html::Label(i_sLabel)
+           << new Html::LineBreak;
+    CurOut()
+        << pTable;
+//    HF_SubTitle aTitle(*pTable);
+//    aTitle.Produce_it(i_sTitle);
+}
+
+HF_MemberTable::~HF_MemberTable()
+{
+}
+
+void
+HF_MemberTable::Add_Line()
+{
+    if (bInline)
+    {
+        Html::TableRow & rRow = pTable->AddRow();
+
+        pCurDeclaration = &( rRow.AddCell()
+                                << new Xml::AnAttribute("valign","top")
+                                << new Html::WidthAttr("30%") );
+        pCurDescription = & rRow.AddCell();
+    }
+    else
+    {
+        Html::DefList *
+            pMemberSpace = new Html::DefList;
+        *pMemberSpace
+            << new Html::ClassAttr("member");
+
+        pTable->AddRow().AddCell() << pMemberSpace;
+
+        pCurDeclaration =
+            & ( *pMemberSpace
+                    >> *new Html::DefListTerm
+                        << new Html::ClassAttr("member") );
+        pCurDescription =
+            & ( *pMemberSpace
+                    >> *new Html::DefListDefinition()
+                        << new Html::ClassAttr("member") );
+    }
+}
+
+Xml::Element &
+HF_MemberTable::Cur_Declaration()
+{
+    csv_assert(pCurDeclaration != 0);
+    return *pCurDeclaration;
+}
+
+Xml::Element &
+HF_MemberTable::Cur_Description()
+{
+    csv_assert(pCurDescription != 0);
+    return *pCurDescription;
+}
+
+
+
+//*******************           HF_IdlLinkList         **********************************//
+
+HF_IdlLinkList::HF_IdlLinkList( Environment  &   io_rEnv,
+                                Xml::Element *   o_pOut )
+    :    HtmlFactory_Idl(io_rEnv,o_pOut)
+{
+}
+
+HF_IdlLinkList::~HF_IdlLinkList()
+{
+}
+
+void
+HF_IdlLinkList::Produce_NamespaceMembers( const String &                        i_sTitle,
+                                          const String &                        i_sLabel,
+                                          const std::vector<ary::idl::Ce_id> &  i_rList,
+                                          bool                                  i_bNestedNamespaces ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+
+    std::vector<ary::idl::Ce_id>::const_iterator itEnd = i_rList.end();
+    for ( std::vector<ary::idl::Ce_id>::const_iterator it = i_rList.begin();
+          it != itEnd;
+          ++it )
+    {
+        static String   sEntryName;
+        static String   sEntryLink;
+        const ce_info *
+                        pDocu = 0;
+        Get_EntryData_NamespaceMembers( sEntryName, sEntryLink, pDocu, *it, i_bNestedNamespaces );
+        aTableMaker.Add_Line();
+
+        aTableMaker.Cur_LinkColumn()
+           >> *new Html::Link(sEntryLink)
+              << sEntryName;
+
+        if ( pDocu != 0 )
+        {
+            HF_IdlShortDocu
+                aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
+            aTextDisplay.Produce_byData( pDocu );
+        }
+    }   // end for
+}
+
+void
+HF_IdlLinkList::Produce_GlobalLinks( const String &      i_sTitle,
+                                     const String &      i_sLabel,
+                                     ce_list &           i_rList ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+
+    for ( ; i_rList; ++i_rList )
+    {
+        aTableMaker.Add_Line();
+        HF_IdlTypeText
+            aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true );
+        aLinkText.Produce_byData(*i_rList);
+
+        const ce_info *
+            pDocu = Get_EntryDocu(*i_rList);
+        if ( pDocu != 0 )
+        {
+            HF_IdlShortDocu
+                aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
+            aTextDisplay.Produce_byData( pDocu, *i_rList );
+        }
+    }
+}
+
+void
+HF_IdlLinkList::Produce_GlobalCommentedLinks( const String &          i_sTitle,
+                                              const String &          i_sLabel,
+                                              comref_list &           i_rList ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+/*
+    for ( ; i_rList; ++i_rList )
+    {
+        aTableMaker.Add_Line();
+        HF_IdlTypeText
+            aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true );
+        aLinkText.Produce_byData( (*i_rList).first );
+
+        HF_DocEntryList
+            aDocList( aTableMaker.Cur_CommentColumn() );
+        if ( (*i_rList).second != 0 )
+        {
+            HF_IdlDocu
+                aDocuDisplay( Env(), aDocList );
+            aDocuDisplay.Produce_byData( (*i_rList).second );
+        }
+        else
+        {
+            const ce_info *
+                pShort = Get_EntryDocu(
+                            Env().Gate().Types().Search_CeRelatedTo(
+                                            (*i_rList).first) );
+            if ( pShort != 0 )
+            {
+                if (pShort->IsDeprecated())
+                {
+                    aDocList.Produce_Term()
+                        << "[ DEPRECATED ]";
+                }
+                if (pShort->IsOptional())
+                {
+                    aDocList.Produce_Term()
+                        << "[ OPTIONAL ]";
+                }
+
+                aDocList.Produce_Term()
+                    << "Description";
+
+                HF_IdlDocuTextDisplay
+                    aShortDisplay( Env(), &aDocList.Produce_Definition() );
+                aShortDisplay.Set_CurScopeTo(
+                        Env().Gate().Types().Search_CeRelatedTo((*i_rList).first) );
+                pShort->Short().DisplayAt(aShortDisplay);
+            }
+        }
+    }
+*/
+}
+
+void
+HF_IdlLinkList::Produce_MemberLinks( const String &     i_sTitle,
+                                     const String &     i_sLabel,
+                                     ce_list &          i_rList ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+
+/*
+    for ( ; i_rList; ++i_rList )
+    {
+        const ary::idl::CodeEntity &
+            rCe = Env().Gate().Ces().Find_Ce(*i_rList);
+
+        aTableMaker.Add_Line();
+        aTableMaker.Cur_LinkColumn()
+            >> *new Html::Link(
+                    StreamLock(200)() << "#" << rCe.LocalName() << c_str)
+               << rCe.LocalName();
+
+        const ce_info *
+            pDocu = rCe.Docu();
+        if ( pDocu != 0 )
+        {
+            HF_IdlShortDocu
+                aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
+            aTextDisplay.Produce_byData( *pDocu );
+        }
+    }   // end for
+*/
+}
+
+void
+HF_IdlLinkList::Get_EntryData_NamespaceMembers(
+                            String &                o_sEntryName,
+                            String &                o_sEntryLink,
+                            const ce_info * &       o_pDocu,
+                            ce_id                   i_nMemberId,
+                            bool                    i_bIsNestedNamespace  ) const
+{
+    const ary::idl::CodeEntity &
+        rCe = Env().Data().Find_Ce(i_nMemberId);
+
+    o_sEntryName = rCe.LocalName();
+    o_sEntryLink = StreamLock(200)() << rCe.LocalName()
+                                     << ( i_bIsNestedNamespace
+                                                ?   "/module-ix"
+                                                :   "" )
+                                     << ".html"
+                                     << c_str;
+    o_pDocu = rCe.Docu();
+}
+
+const ary::doc::OldIdlDocu *
+HF_IdlLinkList::Get_EntryDocu(ce_id i_nMemberId) const
+{
+    if (i_nMemberId.IsValid())
+        return Env().Data().Find_Ce(i_nMemberId).Docu();
+    else
+        return 0;
+}
+
+
diff --git a/autodoc/source/display/idl/hfi_linklist.hxx b/autodoc/source/display/idl/hfi_linklist.hxx
new file mode 100644
index 000000000000..7a7e12679bca
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_linklist.hxx
@@ -0,0 +1,145 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_LINKLIST_HXX
+#define ADC_DISPLAY_HFI_LINKLIST_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+#include <ary_i/ci_text2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+
+
+
+class HF_CommentedLink_Table : public HtmlFactory_Idl
+{
+  public:
+                        HF_CommentedLink_Table(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            bool                i_bBorder = false );
+    virtual             ~HF_CommentedLink_Table();
+
+    void                Add_Line();
+    Xml::Element &      Cur_LinkColumn();
+    Xml::Element &      Cur_CommentColumn();
+
+  private:
+    // DATA
+    Html::Table *       pTable;
+    Xml::Element *      pCurLinkColumn;
+    Xml::Element *      pCurCommentColumn;
+};
+
+class HF_MemberTable : public HtmlFactory_Idl
+{
+  public:
+                        HF_MemberTable(
+                            Environment  &      io_rEnv,
+                            Xml::Element &      o_rOut,
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            bool                i_bInline = false );
+    virtual             ~HF_MemberTable();
+
+    void                Add_Line();
+    Xml::Element &      Cur_Declaration();
+    Xml::Element &      Cur_Description();
+
+  private:
+    // DATA
+    Html::Table *       pTable;
+    Xml::Element *      pCurDeclaration;
+    Xml::Element *      pCurDescription;
+    bool                bInline;
+};
+
+
+
+
+class HF_IdlLinkList : public HtmlFactory_Idl
+{
+  public:
+    typedef ary::StdConstIterator<ary::idl::CommentedRelation>
+                                            comref_list;
+
+                        HF_IdlLinkList(
+                            Environment &       io_rEnv,
+                            Xml::Element *      o_pOut );
+    virtual             ~HF_IdlLinkList();
+
+    void                Produce_NamespaceMembers(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            const std::vector<ary::idl::Ce_id> &
+                                                i_rList,
+                            bool                i_bNestedNamespaces = false ) const;
+    void                Produce_GlobalLinks(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            ce_list &           i_rList ) const;
+    void                Produce_GlobalCommentedLinks(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            comref_list &       i_rList ) const;
+    void                Produce_MemberLinks(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            ce_list &           i_rList ) const;
+  private:
+    void                Get_EntryData_NamespaceMembers(
+                            String &            o_sEntryName,
+                            String &            o_sEntryLink,
+                            const ce_info * &   o_pDocuText,
+                            ce_id               i_nMemberId,
+                            bool                i_bIsNestedNamespace ) const;
+    const ce_info *     Get_EntryDocu(
+                            ce_id               i_nMemberId ) const;
+};
+
+
+
+
+
+
+
+
+// IMPLEMENTATION
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_method.cxx b/autodoc/source/display/idl/hfi_method.cxx
new file mode 100644
index 000000000000..a8c6e3e097ca
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_method.cxx
@@ -0,0 +1,357 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_method.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_param.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_funcdecl.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_globalindex.hxx"
+#include "hfi_typetext.hxx"
+
+
+
+
+
+HF_IdlMethod::HF_IdlMethod( Environment &           io_rEnv,
+                            Xml::Element &          o_cell)
+    :   HtmlFactory_Idl(io_rEnv,&o_cell)
+{
+}
+
+
+HF_IdlMethod::~HF_IdlMethod()
+{
+}
+
+
+void
+HF_IdlMethod::Produce_byData( const String &      i_sName,
+                              type_id             i_nReturnType,
+                              param_list &        i_rParams,
+                              type_list &         i_rExceptions,
+                              bool                i_bOneway,
+                              bool                i_bEllipse,
+                              const client &      i_ce ) const
+{
+    CurOut()
+        >> *new Html::Label(i_sName)
+            << new Html::ClassAttr(C_sMemberTitle)
+            << i_sName;
+    enter_ContentCell();
+    write_Declaration( i_sName,
+                       i_nReturnType,
+                       i_rParams,
+                       i_rExceptions,
+                       i_bOneway,
+                       i_bEllipse );
+    CurOut() << new Html::HorizontalLine;
+    write_Docu(CurOut(), i_ce);
+    leave_ContentCell();
+}
+
+#if 0 // old
+void
+HF_IdlMethod::write_Declaration( const String &      i_sName,
+                                 type_id             i_nReturnType,
+                                 param_list &        i_rParams,
+                                 type_list &         i_rExceptions,
+                                 bool                i_bOneway,
+                                 bool                i_bEllipse ) const
+{
+    HF_FunctionDeclaration
+        aDecl(CurOut()) ;
+    Xml::Element &
+        front = aDecl.Add_ReturnLine();
+
+    // Front:
+    if (i_bOneway)
+        front << "[oneway] ";
+    if (i_nReturnType.IsValid())
+    {   // Normal function, but not constructors:
+        HF_IdlTypeText
+            aReturn(Env(), front, true);
+        aReturn.Produce_byData(i_nReturnType);
+        front
+            << new Html::LineBreak;
+
+    }
+    front
+        >> *new Html::Bold
+            << i_sName;
+
+    //  Main line:
+    Xml::Element &
+        types = aDecl.Types();
+    Xml::Element &
+        names = aDecl.Names();
+    bool bParams = i_rParams.operator bool();
+    if (bParams)
+    {
+        front
+            << "(";
+        HF_IdlTypeText
+            aType( Env(), types, true );
+
+        write_Param( aType, names, (*i_rParams) );
+
+        for (++i_rParams; i_rParams; ++i_rParams)
+        {
+            types
+                << new Html::LineBreak;
+            names
+                << ","
+                << new Html::LineBreak;
+            write_Param( aType, names, (*i_rParams) );
+        }   // end for
+
+        if (i_bEllipse)
+        {
+            names
+                << " ...";
+        }
+        names
+            << " )";
+    }
+    else
+        front
+            << "()";
+
+
+    if ( i_rExceptions.operator bool() )
+    {
+        Xml::Element &
+            rExcOut = aDecl.Add_RaisesLine("raises", NOT bParams);
+        HF_IdlTypeText
+            aExc(Env(), rExcOut, true);
+        aExc.Produce_byData(*i_rExceptions);
+
+        for (++i_rExceptions; i_rExceptions; ++i_rExceptions)
+        {
+            rExcOut
+                << ","
+                << new Html::LineBreak;
+            aExc.Produce_byData(*i_rExceptions);
+        }   // end for
+
+        rExcOut << " );";
+    }
+    else
+    {
+        if (bParams)
+            aDecl.Names() << ";";
+        else
+            aDecl.Front() << ";";
+    }
+}
+#endif   // 0  old
+
+void
+HF_IdlMethod::write_Declaration( const String &      i_sName,
+                                 type_id             i_nReturnType,
+                                 param_list &        i_rParams,
+                                 type_list &         i_rExceptions,
+                                 bool                i_bOneway,
+                                 bool                i_bEllipse ) const
+{
+    HF_FunctionDeclaration
+        aDecl(CurOut(), "raises") ;
+    Xml::Element &
+        rReturnLine = aDecl.ReturnCell();
+
+    // Return line:
+    if (i_bOneway)
+        rReturnLine << "[oneway] ";
+    if (i_nReturnType.IsValid())
+    {   // Normal function, but not constructors:
+        HF_IdlTypeText
+            aReturn(Env(), rReturnLine, true);
+        aReturn.Produce_byData(i_nReturnType);
+    }
+
+    //  Main line:
+    Xml::Element &
+        rNameCell = aDecl.NameCell();
+    rNameCell
+        >> *new Html::Bold
+            << i_sName;
+
+    Xml::Element *
+        pParamEnd  = 0;
+
+    bool bParams = i_rParams.operator bool();
+    if (bParams)
+    {
+        rNameCell
+            << "(";
+
+        pParamEnd  = write_Param( aDecl, *i_rParams );
+        for (++i_rParams; i_rParams; ++i_rParams)
+        {
+            *pParamEnd << ",";
+            pParamEnd  = write_Param( aDecl, *i_rParams );
+        }   // end for
+
+        if (i_bEllipse)
+        {
+            Xml::Element &
+                rParamType = aDecl.NewParamTypeCell();
+            rParamType
+                << " ...";
+            pParamEnd = &rParamType;
+        }
+        *pParamEnd
+            << " )";
+    }
+    else
+    {
+        rNameCell
+            << "()";
+    }
+
+    if ( i_rExceptions.operator bool() )
+    {
+        Xml::Element &
+            rExcOut = aDecl.ExceptionCell();
+        HF_IdlTypeText
+            aExc(Env(), rExcOut, true);
+        aExc.Produce_byData(*i_rExceptions);
+
+        for (++i_rExceptions; i_rExceptions; ++i_rExceptions)
+        {
+            rExcOut
+                << ","
+                << new Html::LineBreak;
+            aExc.Produce_byData(*i_rExceptions);
+        }   // end for
+
+        rExcOut << " );";
+    }
+    else if (bParams)
+    {
+        *pParamEnd << ";";
+    }
+    else
+    {
+        rNameCell << ";";
+    }
+}
+
+#if 0   // old
+void
+HF_IdlMethod::write_Param( HF_IdlTypeText &             o_type,
+                           Xml::Element &               o_names,
+                           const ary::idl::Parameter &  i_param ) const
+{
+    switch ( i_param.Direction() )
+    {
+        case ary::idl::param_in:
+                    o_type.CurOut() << "[in] ";
+                    break;
+        case ary::idl::param_out:
+                    o_type.CurOut() << "[out] ";
+                    break;
+        case ary::idl::param_inout:
+                    o_type.CurOut() << "[inout] ";
+                    break;
+    }   // end switch
+
+    o_type.Produce_byData( i_param.Type() );
+    o_names
+        << i_param.Name();
+}
+#endif  // 0   old
+
+Xml::Element *
+HF_IdlMethod::write_Param( HF_FunctionDeclaration &     o_decl,
+                           const ary::idl::Parameter &  i_param ) const
+{
+    Xml::Element &
+        rTypeCell  = o_decl.NewParamTypeCell();
+    Xml::Element &
+        rNameCell  = o_decl.ParamNameCell();
+
+    switch ( i_param.Direction() )
+    {
+        case ary::idl::param_in:
+                    rTypeCell << "[in] ";
+                    break;
+        case ary::idl::param_out:
+                    rTypeCell << "[out] ";
+                    break;
+        case ary::idl::param_inout:
+                    rTypeCell << "[inout] ";
+                    break;
+    }   // end switch
+
+    HF_IdlTypeText
+        aTypeWriter(Env(), rTypeCell, true);
+    aTypeWriter.Produce_byData( i_param.Type() );
+
+    rNameCell
+        << i_param.Name();
+    return &rNameCell;
+}
+
+const String sContentBorder("0");
+const String sContentWidth("96%");
+const String sContentPadding("5");
+const String sContentSpacing("0");
+
+const String sBgWhite("#ffffff");
+const String sCenter("center");
+
+void
+HF_IdlMethod::enter_ContentCell() const
+{
+
+    Xml::Element &
+        rContentCell = CurOut()
+                        >> *new Html::Table( sContentBorder,
+                                             sContentWidth,
+                                             sContentPadding,
+                                             sContentSpacing )
+                            << new Html::ClassAttr("table-in-method")
+                            << new Html::BgColorAttr(sBgWhite)
+                            << new Html::AlignAttr(sCenter)
+                            >> *new Html::TableRow
+                                >> *new Html::TableCell;
+    Out().Enter(rContentCell);
+}
+
+
+void
+HF_IdlMethod::leave_ContentCell() const
+{
+    Out().Leave();
+}
+
diff --git a/autodoc/source/display/idl/hfi_method.hxx b/autodoc/source/display/idl/hfi_method.hxx
new file mode 100644
index 000000000000..9f81e16c6d42
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_method.hxx
@@ -0,0 +1,104 @@
+        /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_METHOD_HXX
+#define ADC_DISPLAY_HFI_METHOD_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_param.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+typedef ary::doc::OldIdlDocu CodeInfo;
+#include "hfi_linklist.hxx"
+
+
+
+namespace csi
+{
+    namespace idl
+    {
+        class Parameter;
+    }
+}
+
+class HF_FunctionDeclaration;
+
+class HF_IdlMethod : public HtmlFactory_Idl
+{
+  public:
+    typedef ary::StdConstIterator<ary::idl::Parameter>  param_list;
+
+                        HF_IdlMethod(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_cell );
+    virtual             ~HF_IdlMethod();
+
+    void                Produce_byData(
+                            const String &      i_sName,
+                            type_id             i_nReturnType,
+                            param_list &        i_rParams,
+                            type_list &         i_rExceptions,
+                            bool                i_bOneway,
+                            bool                i_bEllipse,
+                            const client &      i_ce ) const;
+  private:
+    void                write_Declaration(
+                            const String &      i_sName,
+                            type_id             i_nReturnType,
+                            param_list &        i_rParams,
+                            type_list &         i_rExceptions,
+                            bool                i_bOneway,
+                            bool                i_bEllipse ) const;
+//    void                write_Param(
+//                            HF_IdlTypeText &    o_type,
+//                            Xml::Element &      o_names,
+//                            const ary::idl::Parameter &
+//                                                i_param ) const;
+
+    Xml::Element *      write_Param(
+                            HF_FunctionDeclaration &
+                                                o_decl,
+                            const ary::idl::Parameter &
+                                                i_param ) const;
+    void                enter_ContentCell() const;
+    void                leave_ContentCell() const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_module.cxx b/autodoc/source/display/idl/hfi_module.cxx
new file mode 100644
index 000000000000..4ab40cfebf89
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_module.cxx
@@ -0,0 +1,299 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_module.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ik_module.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/getncast.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Module("module");
+
+namespace
+{
+
+const String
+    C_sList_NestedModules("Nested Modules");
+const String
+    C_sList_NestedModules_Label("NestedModules");
+const String
+    C_sList_Services("Services");
+const String
+    C_sList_Singletons("Singletons");
+const String
+    C_sList_Interfaces("Interfaces");
+const String
+    C_sList_Structs("Structs");
+const String
+    C_sList_Exceptions("Exceptions");
+const String
+    C_sList_Enums("Enums");
+const String
+    C_sList_Typedefs("Typedefs");
+const String
+    C_sList_ConstGroups("Constant Groups");
+const String
+    C_sList_ConstGroups_Label("ConstantGroups");
+
+
+enum E_SubListIndices
+{   // In case of changes, also adapt make_Navibar() !!
+    sli_NestedModules = 0,
+    sli_Services = 1,
+    sli_Singletons = 2,
+    sli_Interfaces = 3,
+    sli_Structs = 4,
+    sli_Exceptions = 5,
+    sli_Enums = 6,
+    sli_Typedefs = 7,
+    sli_ConstGroups = 8
+};
+
+} //anonymous namespace
+
+
+HF_IdlModule::HF_IdlModule( Environment &         io_rEnv,
+                            Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlModule::~HF_IdlModule()
+{
+}
+
+typedef ary::idl::ifc_module::attr  ModuleAttr;
+
+
+void
+HF_IdlModule::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    if ( Env().CurPosition().Depth() > 0 )
+    {
+        aNameChain.Produce_CompleteChain_forModule(Env().CurPosition(), nameChainLinker);
+
+        StreamLock
+            sl(200);
+        aTitle.Produce_Title( sl()
+                                << C_sCePrefix_Module
+                                  << " "
+                                << i_ce.LocalName()
+                                << c_str );
+    }
+    else
+    {
+        aTitle.Produce_Title( "Global Module" );
+    }
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+
+    // Write children lists:
+    ce_ptr_list aNestedModules;
+    ce_ptr_list aServices;
+    ce_ptr_list aInterfaces;
+    ce_ptr_list aStructs;
+    ce_ptr_list aExceptions;
+    ce_ptr_list aEnums;
+    ce_ptr_list aTypedefs;
+    ce_ptr_list aConstantGroups;
+    ce_ptr_list aSingletons;
+
+    ModuleAttr::Get_AllChildrenSeparated(
+                                aNestedModules,
+                                aServices,
+                                aInterfaces,
+                                aStructs,
+                                aExceptions,
+                                aEnums,
+                                aTypedefs,
+                                aConstantGroups,
+                                aSingletons,
+                                Env().Data().Ces(),
+                                i_ce );
+
+    // Has this to be in the order of enum E_SubListIndices ???
+    if (produce_ChildList(C_sList_NestedModules, C_sList_NestedModules_Label, aNestedModules ))
+        pNaviSubRow->SwitchOn(sli_NestedModules);
+    if (produce_ChildList(C_sList_Services, C_sList_Services, aServices))
+        pNaviSubRow->SwitchOn(sli_Services);
+    if (produce_ChildList(C_sList_Singletons, C_sList_Singletons, aSingletons))
+        pNaviSubRow->SwitchOn(sli_Singletons);
+    if (produce_ChildList(C_sList_Interfaces, C_sList_Interfaces, aInterfaces))
+        pNaviSubRow->SwitchOn(sli_Interfaces);
+    if (produce_ChildList(C_sList_Structs, C_sList_Structs, aStructs))
+        pNaviSubRow->SwitchOn(sli_Structs);
+    if (produce_ChildList(C_sList_Exceptions, C_sList_Exceptions, aExceptions))
+        pNaviSubRow->SwitchOn(sli_Exceptions);
+    if (produce_ChildList(C_sList_Enums, C_sList_Enums, aEnums))
+        pNaviSubRow->SwitchOn(sli_Enums);
+    if (produce_ChildList(C_sList_Typedefs, C_sList_Typedefs, aTypedefs))
+        pNaviSubRow->SwitchOn(sli_Typedefs);
+    if (produce_ChildList(C_sList_ConstGroups, C_sList_ConstGroups_Label, aConstantGroups))
+        pNaviSubRow->SwitchOn(sli_ConstGroups);
+    pNaviSubRow->Produce_Row();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlModule::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_ModuleMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+
+    // Has to be in the order of E_SubListIndices:
+    ret.AddItem(C_sList_NestedModules, C_sList_NestedModules_Label, false);
+    ret.AddItem(C_sList_Services, C_sList_Services, false);
+    ret.AddItem(C_sList_Singletons, C_sList_Singletons, false);
+    ret.AddItem(C_sList_Interfaces, C_sList_Interfaces, false);
+    ret.AddItem(C_sList_Structs, C_sList_Structs, false);
+    ret.AddItem(C_sList_Exceptions, C_sList_Exceptions, false);
+    ret.AddItem(C_sList_Enums, C_sList_Enums, false);
+    ret.AddItem(C_sList_Typedefs, C_sList_Typedefs, false);
+    ret.AddItem(C_sList_ConstGroups, C_sList_ConstGroups_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+bool
+HF_IdlModule::produce_ChildList( const String &      i_sName,
+                                 const String &      i_sLabel,
+                                 const ce_ptr_list & i_list ) const
+{
+    if ( i_list.size() == 0 )
+        return false;
+
+    HF_SubTitleTable
+        aTable( CurOut(),
+                i_sLabel,
+                i_sName,
+                2 );
+
+    ce_ptr_list::const_iterator
+        itEnd = i_list.end();
+    for ( ce_ptr_list::const_iterator it = i_list.begin();
+          it != itEnd;
+          ++it )
+    {
+        Xml::Element &
+            rRow = aTable.Add_Row();
+        produce_Link(rRow, *it);
+        produce_LinkDoc(rRow, *it);
+    }   // end for
+
+    return true;
+}
+
+void
+HF_IdlModule::produce_Link( Xml::Element &      o_row,
+                            const client *      i_ce ) const
+{
+    csv_assert(i_ce != 0);
+    Xml::Element &
+        rCell = o_row
+                >> *new Html::TableCell
+                    << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
+
+    if ( NOT ary::is_type<ary::idl::Module>(*i_ce) )
+    {
+        HF_IdlTypeText
+            aText(Env(), rCell, true);
+        aText.Produce_byData(i_ce->CeId());
+    }
+    else
+    {
+        StreamLock slBuf(100);
+         rCell
+            >> *new Html::Link( slBuf() << i_ce->LocalName()
+                                        << "/module-ix.html"
+                                        << c_str )
+                << i_ce->LocalName();
+    }
+}
+
+void
+HF_IdlModule::produce_LinkDoc( Xml::Element &      o_row,
+                               const client *      i_ce ) const
+{
+    csv_assert(i_ce != 0);
+
+    // We need the cell in any case, because, the rendering may be hurt else.
+    Xml::Element &
+        rCell = o_row
+                    >> *new Html::TableCell
+                        << new Html::ClassAttr(C_sCellStyle_SummaryRight);
+
+    const client &
+        rCe = *i_ce;
+    const ce_info *
+        pShort = Get_IdlDocu(rCe.Docu());
+    if ( pShort == 0 )
+        return;
+
+
+    if (pShort->IsDeprecated())
+    {
+        rCell << "[ DEPRECATED ]" << new Html::LineBreak;
+    }
+    if (pShort->IsOptional())
+    {
+        rCell << "[ OPTIONAL ]" << new Html::LineBreak;
+    }
+
+    HF_IdlDocuTextDisplay
+        aShortDisplay(Env(), &rCell, *i_ce);
+    pShort->Short().DisplayAt(aShortDisplay);
+}
diff --git a/autodoc/source/display/idl/hfi_module.hxx b/autodoc/source/display/idl/hfi_module.hxx
new file mode 100644
index 000000000000..f1eab57050bf
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_module.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_MODULE_HXX
+#define ADC_DISPLAY_HFI_MODULE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_NaviSubRow;
+
+class HF_IdlModule : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlModule(
+                            Environment &       io_rEnv,    // The CurDirectory() is the one of the here displayed Module.
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlModule();
+
+    void                Produce_byData(
+                           const client &       i_ce ) const;
+  private:
+    typedef std::vector< const ary::idl::CodeEntity* >  ce_ptr_list;
+
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+    bool                produce_ChildList(
+                            const String &      i_sName,
+                            const String &      i_sLabel,
+                            const ce_ptr_list & i_list ) const;
+    void                produce_Link(
+                            Xml::Element &      o_row,
+                            const client *      i_ce ) const;
+    void                produce_LinkDoc(
+                            Xml::Element &      o_row,
+                            const client *      i_ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Module;
+
+
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_navibar.cxx b/autodoc/source/display/idl/hfi_navibar.cxx
new file mode 100644
index 000000000000..5a9f32dacb1b
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_navibar.cxx
@@ -0,0 +1,225 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_navibar.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <toolkit/hf_navi_main.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include "hfi_interface.hxx"
+#include "hfi_module.hxx"
+#include "hfi_service.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sLocalManualLinks("#devmanual");
+
+
+const String        C_sTop      = "Overview";
+const String        C_sModule   = "Module";
+const String        C_sUse      = "Use";
+const String        C_sManual   = "Devguide";
+const String        C_sIndex    = "Index";
+
+
+
+
+HF_IdlNavigationBar::HF_IdlNavigationBar( Environment &         io_rEnv,
+                                          Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlNavigationBar::~HF_IdlNavigationBar()
+{
+}
+
+void
+HF_IdlNavigationBar::Produce_CeMainRow( const client & i_ce,
+                                        bool  i_bNoUsePage )
+{
+    HF_NaviMainRow
+                aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_CurModule() );
+    aNaviMain.Add_StdItem( C_sModule, rLink.c_str() );
+
+    if (i_bNoUsePage)
+    {
+        aNaviMain.Add_NoneItem( C_sUse );
+    }
+    else
+    {
+        Env().Get_LinkTo( rLink.reset(),
+                          Env().Linker().PositionOf_CurXRefs(i_ce.LocalName()) );
+        aNaviMain.Add_StdItem( C_sUse, rLink.c_str() );
+    }
+
+    const StringVector &
+        rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if (rManualDescrs.size() == 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, Env().Link2Manual( rManualDescrs.front() ));
+    }
+    else if (rManualDescrs.size() > 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, C_sLocalManualLinks);
+    }
+    else
+    {
+        aNaviMain.Add_NoneItem( C_sManual );
+    }
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_Index() );
+    aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() );
+
+    aNaviMain.Produce_Row();
+}
+
+void
+HF_IdlNavigationBar::Produce_CeXrefsMainRow( const client & i_ce )
+{
+    HF_NaviMainRow
+                aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_CurModule() );
+    aNaviMain.Add_StdItem( C_sModule, rLink.c_str() );
+
+    aNaviMain.Add_SelfItem( C_sUse );
+
+    const StringVector &
+        rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if (rManualDescrs.size() == 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, Env().Link2Manual( rManualDescrs.front() ));
+    }
+    else if (rManualDescrs.size() > 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, C_sLocalManualLinks);
+    }
+    else
+    {
+        aNaviMain.Add_NoneItem( C_sManual );
+    }
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_Index() );
+    aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() );
+
+    aNaviMain.Produce_Row();
+}
+
+void
+HF_IdlNavigationBar::Produce_ModuleMainRow( const client & i_ce )
+{
+    HF_NaviMainRow
+        aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    aNaviMain.Add_SelfItem( C_sModule );
+
+    aNaviMain.Add_NoneItem( C_sUse );
+
+    const StringVector &
+        rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if (rManualDescrs.size() == 1)
+    {
+        aNaviMain.Add_StdItem(C_sManual, Env().Link2Manual( rManualDescrs.front() ));
+    }
+    else if (rManualDescrs.size() > 1)
+    {
+        aNaviMain.Add_StdItem(C_sManual, C_sLocalManualLinks);
+    }
+    else
+    {
+        aNaviMain.Add_NoneItem( C_sManual );
+    }
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_Index() );
+    aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() );
+
+    aNaviMain.Produce_Row();
+}
+
+void
+HF_IdlNavigationBar::Produce_IndexMainRow()
+{
+    HF_NaviMainRow
+                aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    aNaviMain.Add_NoneItem( C_sModule );
+    aNaviMain.Add_NoneItem( C_sUse );
+    aNaviMain.Add_NoneItem( C_sManual );
+
+    aNaviMain.Add_SelfItem( C_sIndex );
+
+    aNaviMain.Produce_Row();
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlNavigationBar::Add_SubRow()
+{
+    return *new HF_NaviSubRow( CurOut() );
+}
+
diff --git a/autodoc/source/display/idl/hfi_navibar.hxx b/autodoc/source/display/idl/hfi_navibar.hxx
new file mode 100644
index 000000000000..b84264d3ac25
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_navibar.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_NAVIBAR_HXX
+#define ADC_DISPLAY_HFI_NAVIBAR_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "hi_factory.hxx"
+    // PARAMETERS
+
+namespace ary
+{
+namespace idl
+{
+class CodeEntity;
+}
+}
+
+
+class HF_NaviSubRow;
+
+/** @resp
+    Creates a navigation bar for an IDL HTML documentation page.
+*/
+class HF_IdlNavigationBar : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlNavigationBar(
+                            HtmlEnvironment_Idl &
+                                                io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlNavigationBar();
+
+    void                Produce_CeMainRow(
+                            const client &      i_ce,
+                            bool                i_bNoUsePage = false );
+    void                Produce_CeXrefsMainRow(
+                            const client &      i_ce );
+    void                Produce_ModuleMainRow(
+                            const client &      i_ce );
+    void                Produce_IndexMainRow();
+
+    /** Adds the subrow to the o_rOut argument of the constructor.
+    */
+    DYN HF_NaviSubRow & Add_SubRow();
+
+  private:
+    const ary::idl::CodeEntity *
+                        pCe;
+};
+
+extern const String
+    C_sLocalManualLinks;
+
+#endif
diff --git a/autodoc/source/display/idl/hfi_property.cxx b/autodoc/source/display/idl/hfi_property.cxx
new file mode 100644
index 000000000000..e92ddc201b25
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_property.cxx
@@ -0,0 +1,451 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_property.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_attribute.hxx>
+#include <ary/idl/ik_constant.hxx>
+#include <ary/idl/ik_enumvalue.hxx>
+#include <ary/idl/ik_property.hxx>
+#include <ary/idl/ik_structelem.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_typetext.hxx"
+#include "hfi_doc.hxx"
+#include "hfi_tag.hxx"
+#include "hi_env.hxx"
+#include "hi_ary.hxx"
+#include "hi_linkhelper.hxx"
+
+void
+HF_IdlDataMember::Produce_byData( const client & ce ) const
+{
+    write_Title(ce);
+    enter_ContentCell();
+    write_Declaration(ce);
+    write_Description(ce);
+    leave_ContentCell();
+}
+
+HF_IdlDataMember::HF_IdlDataMember( Environment &       io_rEnv,
+                                    HF_SubTitleTable &  o_table )
+    :   HtmlFactory_Idl( io_rEnv,
+                         &(o_table.Add_Row()
+                            >> *new Html::TableCell
+                                << new Html::ClassAttr(C_sCellStyle_MDetail))
+                       )
+{
+}
+
+const String sContentBorder("0");
+const String sContentWidth("96%");
+const String sContentPadding("5");
+const String sContentSpacing("0");
+
+const String sBgWhite("#ffffff");
+const String sCenter("center");
+
+void
+HF_IdlDataMember::write_Title( const client & i_ce ) const
+{
+    CurOut()
+        >> *new Html::Label(i_ce.LocalName())
+            << new Html::ClassAttr(C_sMemberTitle)
+            << i_ce.LocalName();
+}
+
+void
+HF_IdlDataMember::write_Description( const client & i_ce ) const
+{
+    CurOut() << new Html::HorizontalLine;
+    write_Docu(CurOut(), i_ce);
+}
+
+void
+HF_IdlDataMember::enter_ContentCell() const
+{
+
+    Xml::Element &
+        rContentCell = CurOut()
+                        >> *new Html::Table( sContentBorder,
+                                             sContentWidth,
+                                             sContentPadding,
+                                             sContentSpacing )
+                            << new Html::ClassAttr("table-in-data")
+                            << new Html::BgColorAttr(sBgWhite)
+                            << new Html::AlignAttr(sCenter)
+                            >> *new Html::TableRow
+                                >> *new Html::TableCell;
+    Out().Enter(rContentCell);
+}
+
+
+void
+HF_IdlDataMember::leave_ContentCell() const
+{
+    Out().Leave();
+}
+
+
+HF_IdlProperty::~HF_IdlProperty()
+{
+}
+
+typedef ary::idl::ifc_property::attr    PropertyAttr;
+
+void
+HF_IdlProperty::write_Declaration( const client & i_ce ) const
+{
+    if (PropertyAttr::HasAnyStereotype(i_ce))
+    {
+        CurOut() << "[ ";
+        if (PropertyAttr::IsReadOnly(i_ce))
+            CurOut() << "readonly ";
+        if (PropertyAttr::IsBound(i_ce))
+            CurOut() << "bound ";
+        if (PropertyAttr::IsConstrained(i_ce))
+            CurOut() << "constrained ";
+        if (PropertyAttr::IsMayBeAmbiguous(i_ce))
+            CurOut() << "maybeambiguous ";
+        if (PropertyAttr::IsMayBeDefault(i_ce))
+            CurOut() << "maybedefault ";
+        if (PropertyAttr::IsMayBeVoid(i_ce))
+            CurOut() << "maybevoid ";
+        if (PropertyAttr::IsRemovable(i_ce))
+            CurOut() << "removable ";
+        if (PropertyAttr::IsTransient(i_ce))
+            CurOut() << "transient ";
+        CurOut() << "] ";
+    }   // end if
+
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData( PropertyAttr::Type(i_ce) );
+
+    CurOut() << " " >> *new Html::Bold << i_ce.LocalName();
+    CurOut() << ";";
+}
+
+
+
+
+HF_IdlAttribute::~HF_IdlAttribute()
+{
+}
+
+typedef ary::idl::ifc_attribute::attr    AttributeAttr;
+
+void
+HF_IdlAttribute::write_Declaration( const client & i_ce ) const
+{
+    if (AttributeAttr::HasAnyStereotype(i_ce))
+    {
+        CurOut() << "[ ";
+        if (AttributeAttr::IsReadOnly(i_ce))
+            CurOut() << "readonly ";
+        if (AttributeAttr::IsBound(i_ce))
+            CurOut() << "bound ";
+        CurOut() << "] ";
+    }
+
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData( AttributeAttr::Type(i_ce) );
+
+    CurOut()
+        << " "
+        >> *new Html::Bold
+            << i_ce.LocalName();
+
+    dyn_type_list pGetExceptions;
+    dyn_type_list pSetExceptions;
+    AttributeAttr::Get_GetExceptions(pGetExceptions, i_ce);
+    AttributeAttr::Get_SetExceptions(pSetExceptions, i_ce);
+
+    bool bGetRaises = (*pGetExceptions).IsValid();
+    bool bSetRaises = (*pSetExceptions).IsValid();
+    bool bRaises = bGetRaises OR bSetRaises;
+    if (bRaises)
+    {
+        HF_DocEntryList aSub(CurOut());
+
+        if (bGetRaises)
+        {
+            Xml::Element &
+                rGet = aSub.Produce_Definition();
+            HF_IdlTypeText
+                aExc(Env(), rGet, true);
+            type_list & itExc = *pGetExceptions;
+
+            rGet << "get raises (";
+            aExc.Produce_byData(*itExc);
+            for (++itExc; itExc.operator bool(); ++itExc)
+            {
+                rGet
+                    << ",";
+                aExc.Produce_byData(*itExc);
+            }   // end for
+            rGet << ")";
+            if (NOT bSetRaises)
+                rGet << ";";
+        }   // end if (bGetRaises)
+
+        if (bSetRaises)
+        {
+            Xml::Element &
+                rSet = aSub.Produce_Definition();
+            HF_IdlTypeText
+                aExc(Env(), rSet, true);
+            type_list & itExc = *pSetExceptions;
+
+            rSet << "set raises (";
+            aExc.Produce_byData(*itExc);
+            for (++itExc; itExc.operator bool(); ++itExc)
+            {
+                rSet
+                    << ",";
+                aExc.Produce_byData(*itExc);
+            }   // end for
+            rSet << ");";
+        }   // end if (bSetRaises)
+    }
+    else
+    {
+        CurOut() << ";";
+    }
+}
+
+
+
+
+HF_IdlEnumValue::~HF_IdlEnumValue()
+{
+}
+
+typedef ary::idl::ifc_enumvalue::attr    EnumValueAttr;
+
+void
+HF_IdlEnumValue::write_Declaration( const client & i_ce ) const
+{
+    CurOut()
+        >> *new Html::Bold
+            << i_ce.LocalName();
+
+    const String &
+        rValue = EnumValueAttr::Value(i_ce);
+    if ( NOT rValue.empty() )
+    {    CurOut() << " " // << " = "    // In the moment this is somehow in the value
+                 << rValue;
+        // CurOut() << ",";             // In the moment this is somehow in the value
+    }
+    else
+        CurOut() << ",";
+}
+
+
+HF_IdlConstant::~HF_IdlConstant()
+{
+}
+
+typedef ary::idl::ifc_constant::attr    ConstantAttr;
+
+void
+HF_IdlConstant::write_Declaration( const client & i_ce ) const
+{
+    CurOut() << "const ";
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData(ConstantAttr::Type(i_ce));
+    CurOut()
+        << " "
+        >> *new Html::Bold
+            << i_ce.LocalName();
+    const String &
+        rValue = ConstantAttr::Value(i_ce);
+    CurOut() << " "     // << " = "    // In the moment this is somehow in the value
+             << rValue;
+    // << ";";  // In the moment this is somehow in the value
+}
+
+
+HF_IdlStructElement::~HF_IdlStructElement()
+{
+}
+
+typedef ary::idl::ifc_structelement::attr    StructElementAttr;
+
+void
+HF_IdlStructElement::write_Declaration( const client & i_ce ) const
+{
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData(StructElementAttr::Type(i_ce));
+    CurOut()
+        << " "
+        >> *new Html::Bold
+            << i_ce.LocalName();
+    CurOut()
+        << ";";
+}
+
+HF_IdlCommentedRelationElement::~HF_IdlCommentedRelationElement()
+{
+}
+
+void
+HF_IdlCommentedRelationElement::produce_Summary( Environment &   io_env,
+                                                 Xml::Element &  io_context,
+                                                 const comref &  i_commentedRef,
+                                                 const client &  i_rScopeGivingCe )
+{
+    csv_assert( i_commentedRef.Info() );
+
+    const ary::idl::Type_id aType = i_commentedRef.Type();
+    const ce_info &         rDocu = *i_commentedRef.Info();
+
+    bool bShort = NOT rDocu.Short().IsEmpty();
+    bool bDescr = NOT rDocu.Description().IsEmpty();
+
+    if ( bShort )
+    {
+        HF_IdlDocuTextDisplay
+                aDescription(io_env, 0, i_rScopeGivingCe);
+
+        Xml::Element& rPara = io_context >> *new Html::Paragraph;
+        aDescription.Out().Enter( rPara );
+        rDocu.Short().DisplayAt( aDescription );
+
+        // if there's more than just the summary - i.e. a description, or usage restrictions, or tags -,
+        // then add a link to the details section
+        if ( bDescr OR rDocu.IsDeprecated() OR rDocu.IsOptional() OR NOT rDocu.Tags().empty() )
+        {
+            StreamLock aLocalLink(100);
+            aLocalLink() << "#" << get_LocalLinkName(io_env, i_commentedRef);
+
+            aDescription.Out().Out() << "(";
+            aDescription.Out().Out()
+                >> *new Html::Link( aLocalLink().c_str() )
+                    << "details";
+            aDescription.Out().Out() << ")";
+        }
+
+        aDescription.Out().Leave();
+    }
+}
+
+void
+HF_IdlCommentedRelationElement::produce_LinkDoc( Environment &   io_env,
+                                                 const client &  i_ce,
+                                                 Xml::Element &  io_context,
+                                                 const comref &  i_commentedRef,
+                                                 const E_DocType i_docType )
+{
+    if ( i_commentedRef.Info() != 0 )
+    {
+        if ( i_docType == doctype_complete )
+        {
+            HF_DocEntryList aDocList(io_context);
+            HF_IdlDocu aDocuDisplay(io_env, aDocList);
+
+            aDocuDisplay.Produce_fromReference(*i_commentedRef.Info(), i_ce);
+        }
+        else
+        {
+            produce_Summary(io_env, io_context, i_commentedRef, i_ce);
+        }
+    }
+    else
+    {
+        HF_DocEntryList aDocList(io_context);
+
+        const client *
+            pCe = io_env.Linker().Search_CeFromType(i_commentedRef.Type());
+        const ce_info *
+            pShort = pCe != 0
+                        ?   Get_IdlDocu(pCe->Docu())
+                        :   (const ce_info *)(0);
+        if ( pShort != 0 )
+        {
+            aDocList.Produce_NormalTerm("(referenced entity's summary:)");
+            Xml::Element &
+                rDef = aDocList.Produce_Definition();
+            HF_IdlDocuTextDisplay
+                aShortDisplay( io_env, &rDef, *pCe);
+            pShort->Short().DisplayAt(aShortDisplay);
+        }   // end if (pShort != 0)
+    }   // endif ( (*i_commentedRef).Info() != 0 ) else
+}
+
+
+String
+HF_IdlCommentedRelationElement::get_LocalLinkName( Environment &  io_env,
+                                                   const comref & i_commentedRef )
+{
+    StringVector        aModules;
+    String              sLocalName;
+    ce_id               nCe;
+    int                 nSequenceCount = 0;
+
+    const ary::idl::Type &
+        rType = io_env.Data().Find_Type(i_commentedRef.Type());
+    io_env.Data().Get_TypeText(aModules, sLocalName, nCe, nSequenceCount, rType);
+
+    // speaking strictly, this is not correct: If we have two interfaces with the same local
+    // name, but in different modules, then the link name will be ambiguous. However, this should
+    // be too seldom a case to really make the link names that ugly by adding the module information.
+    return sLocalName;
+}
+
+void
+HF_IdlCommentedRelationElement::write_Title( const client & /*i_ce*/ ) const
+{
+
+    Xml::Element &
+        rAnchor = CurOut()
+                    >> *new Html::Label(get_LocalLinkName(Env(), m_relation))
+                        << new Html::ClassAttr(C_sMemberTitle);
+
+    HF_IdlTypeText
+        aText(Env(), rAnchor, true);
+    aText.Produce_byData(m_relation.Type());
+}
+
+void
+HF_IdlCommentedRelationElement::write_Declaration( const client & /*i_ce*/ ) const
+{
+    // nothing to do here - an entity which is a commented relation does not have a declaration
+}
+
+void
+HF_IdlCommentedRelationElement::write_Description( const client & i_ce ) const
+{
+    produce_LinkDoc( Env(), i_ce, CurOut(), m_relation, doctype_complete );
+}
diff --git a/autodoc/source/display/idl/hfi_property.hxx b/autodoc/source/display/idl/hfi_property.hxx
new file mode 100644
index 000000000000..2d82e8badb4d
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_property.hxx
@@ -0,0 +1,182 @@
+        /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_PROPERTY_HXX
+#define ADC_DISPLAY_HFI_PROPERTY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+
+class HF_SubTitleTable;
+
+class HF_IdlDataMember : public HtmlFactory_Idl
+{
+  public:
+    void                Produce_byData(
+                            const client &      ce ) const;
+  protected:
+                        HF_IdlDataMember(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table );
+    virtual             ~HF_IdlDataMember() {}
+
+  private:
+    virtual void        write_Title(
+                            const client &      i_ce ) const;
+
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const = 0;
+
+    virtual void        write_Description(
+                            const client &      i_ce ) const;
+
+    void                enter_ContentCell() const;
+    void                leave_ContentCell() const;
+};
+
+
+
+class HF_IdlProperty : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlProperty(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlProperty();
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+class HF_IdlAttribute : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlAttribute(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlAttribute();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+
+class HF_IdlEnumValue : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlEnumValue(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlEnumValue();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+class HF_IdlConstant : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlConstant(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlConstant();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+
+class HF_IdlStructElement : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlStructElement(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlStructElement();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+class HF_IdlCommentedRelationElement : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlCommentedRelationElement(
+                            Environment &                       io_rEnv,
+                            HF_SubTitleTable &                  o_table,
+                            const ary::idl::CommentedRelation&  i_relation )
+                            :   HF_IdlDataMember(io_rEnv, o_table)
+                            ,   m_relation( i_relation )
+                        {
+                        }
+    virtual             ~HF_IdlCommentedRelationElement();
+
+    typedef ::ary::idl::CommentedRelation       comref;
+
+    static void         produce_LinkDoc(
+                            Environment &   io_env,
+                            const client &  i_ce,
+                            Xml::Element &  io_context,
+                            const comref &  i_commentedRef,
+                            const E_DocType i_docType );
+
+  private:
+    virtual void        write_Title(
+                            const client &      i_ce ) const;
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+    virtual void        write_Description(
+                            const client &      i_ce ) const;
+  private:
+    static void         produce_Summary( Environment &  io_env,
+                                         Xml::Element & io_context,
+                                         const comref & i_commentedRef,
+                                         const client & i_rScopeGivingCe );
+
+    static String       get_LocalLinkName( Environment &  io_env,
+                                           const comref & i_commentedRef );
+
+  private:
+    const ary::idl::CommentedRelation&  m_relation;
+};
+
+#endif
diff --git a/autodoc/source/display/idl/hfi_service.cxx b/autodoc/source/display/idl/hfi_service.cxx
new file mode 100644
index 000000000000..a4d105fc0f86
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_service.cxx
@@ -0,0 +1,363 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_service.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_property.hxx>
+#include <ary/idl/ik_service.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+
+extern const String
+    C_sCePrefix_Service("service");
+
+namespace
+{
+
+const String
+    C_sList_IncludedServices("Services' Summary");
+const String
+    C_sList_IncludedServices_Heading("Included Services - Summary");
+const String
+    C_sList_IncludedServices_Label("ServicesSummary");
+const String
+    C_sList_IncludedServicesDetails("Services' Details");
+const String
+    C_sList_IncludedServicesDetails_Heading("Included Services - Details");
+const String
+    C_sList_IncludedServicesDetails_Label("ServicesDetails");
+const String
+    C_sList_ExportedInterfaces("Interfaces' Summary");
+const String
+    C_sList_ExportedInterfaces_Heading("Exported Interfaces - Summary");
+const String
+    C_sList_ExportedInterfaces_Label("InterfacesSummary");
+const String
+    C_sList_ExportedInterfacesDetails("Interfaces' Details");
+const String
+    C_sList_ExportedInterfacesDetails_Heading("Exported Interfaces - Details");
+const String
+    C_sList_ExportedInterfacesDetails_Label("InterfacesDetails");
+const String
+    C_sList_Properties("Properties' Summary");
+const String
+    C_sList_Properties_Label("PropertiesSummary");
+const String
+    C_sList_PropertiesDetails("Properties' Details");
+const String
+    C_sList_PropertiesDetails_Label("PropertiesDetails");
+
+
+enum E_SubListIndices
+{
+    sli_IncludedServicesSummary = 0,
+    sli_InterfacesSummary = 1,
+    sli_PropertiesSummary = 2,
+    sli_IncludedServicesDetails = 3,
+    sli_InterfacesDetails = 4,
+    sli_PropertiesDetails = 5
+};
+
+} //anonymous namespace
+
+
+HF_IdlService::HF_IdlService( Environment &         io_rEnv,
+                              Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlService::~HF_IdlService()
+{
+
+}
+
+typedef ::ary::idl::ifc_service::attr
+    ServiceAttr;
+typedef ::ary::Dyn_StdConstIterator< ::ary::idl::CommentedRelation >
+    dyn_comref_list;
+
+void
+HF_IdlService::produce_CommentedRelations( const client &   i_ce,
+                                           comref_list &    it_list,
+                                           const String &   i_summaryTitle,
+                                           const String &   i_summaryLabel,
+                                           const String &   i_detailsTitle,
+                                           const String &   i_detailsLabel,
+                                           const E_DocType  i_docType ) const
+{
+    csv_assert( it_list );
+
+    bool bSummaryOnly = ( i_docType == doctype_summaryOnly );
+    HF_SubTitleTable aTable(
+                CurOut(),
+                bSummaryOnly ? i_summaryLabel : i_detailsLabel,
+                bSummaryOnly ? i_summaryTitle : i_detailsTitle,
+                2 );
+
+    for ( ; it_list; ++it_list )
+    {
+        Xml::Element &
+            rRow = aTable.Add_Row();
+
+        if ( bSummaryOnly )
+        {
+            produce_Link(rRow, (*it_list).Type());
+            produce_LinkSummary(i_ce, rRow, *it_list);
+        }
+        else
+        {
+            HF_IdlCommentedRelationElement
+                aRelation( Env(), aTable, *it_list );
+            aRelation.Produce_byData( i_ce );
+        }
+    }   // end for
+}
+
+void
+HF_IdlService::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Service, i_ce);
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    // produce ...
+    // - included services: summary
+    dyn_comref_list dpIncludedServices;
+    ServiceAttr::Get_IncludedServices(dpIncludedServices, i_ce);
+    if ( (*dpIncludedServices).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpIncludedServices,
+                         C_sList_IncludedServices_Heading,
+                         C_sList_IncludedServices_Label,
+                         C_sList_IncludedServicesDetails_Heading,
+                         C_sList_IncludedServicesDetails_Label,
+                         doctype_summaryOnly );
+        pNaviSubRow->SwitchOn(sli_IncludedServicesSummary);
+    }
+
+    // - exported interfaces: summary
+    dyn_comref_list dpExportedInterfaces;
+    ServiceAttr::Get_ExportedInterfaces(dpExportedInterfaces, i_ce);
+    if ( (*dpExportedInterfaces).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpExportedInterfaces,
+                         C_sList_ExportedInterfaces_Heading,
+                         C_sList_ExportedInterfaces_Label,
+                         C_sList_ExportedInterfacesDetails_Heading,
+                         C_sList_ExportedInterfacesDetails_Label,
+                         doctype_summaryOnly );
+        pNaviSubRow->SwitchOn(sli_InterfacesSummary);
+    }
+
+    // - supported properties: summary
+    dyn_ce_list dpProperties;
+    ServiceAttr::Get_Properties(dpProperties, i_ce);
+    if ( (*dpProperties).operator bool() )
+    {
+        produce_Members( *dpProperties,
+                         C_sList_Properties,
+                         C_sList_Properties_Label,
+                         C_sList_PropertiesDetails,
+                         C_sList_PropertiesDetails_Label,
+                         viewtype_summary );
+        pNaviSubRow->SwitchOn(sli_PropertiesSummary);
+    }
+
+    // - included services: details
+    ServiceAttr::Get_IncludedServices(dpIncludedServices, i_ce);
+    if ( (*dpIncludedServices).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpIncludedServices,
+                         C_sList_IncludedServices_Heading,
+                         C_sList_IncludedServices_Label,
+                         C_sList_IncludedServicesDetails_Heading,
+                         C_sList_IncludedServicesDetails_Label,
+                         doctype_complete );
+        pNaviSubRow->SwitchOn(sli_IncludedServicesDetails);
+    }
+
+    // - exported interfaces: details
+    ServiceAttr::Get_ExportedInterfaces(dpExportedInterfaces, i_ce);
+    if ( (*dpExportedInterfaces).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpExportedInterfaces,
+                         C_sList_ExportedInterfaces_Heading,
+                         C_sList_ExportedInterfaces_Label,
+                         C_sList_ExportedInterfacesDetails_Heading,
+                         C_sList_ExportedInterfacesDetails_Label,
+                         doctype_complete );
+        pNaviSubRow->SwitchOn(sli_InterfacesDetails);
+    }
+
+    // supported properties: details
+    ServiceAttr::Get_Properties(dpProperties, i_ce);
+    if ( (*dpProperties).operator bool() )
+    {
+        produce_Members( *dpProperties,
+                         C_sList_Properties,
+                         C_sList_Properties_Label,
+                         C_sList_PropertiesDetails,
+                         C_sList_PropertiesDetails_Label,
+                         viewtype_details );
+        pNaviSubRow->SwitchOn(sli_PropertiesDetails);
+    }
+
+    pNaviSubRow->Produce_Row();
+    CurOut() << new Xml::XmlCode("<br>&nbsp;");
+}
+
+typedef ary::idl::ifc_property::attr    PropertyAttr;
+
+void
+HF_IdlService::produce_SummaryDeclaration( Xml::Element &      o_row,
+                                           const client &      i_property ) const
+{
+    // KORR_FUTURE
+    // Put this in to HF_IdlProperty!
+
+    Xml::Element &
+        rCell = o_row
+                    >> *new Html::TableCell
+                        << new Html::ClassAttr( C_sCellStyle_SummaryLeft );
+
+    if (PropertyAttr::HasAnyStereotype(i_property))
+    {
+        rCell << "[ ";
+        if (PropertyAttr::IsReadOnly(i_property))
+            rCell << "readonly ";
+        if (PropertyAttr::IsBound(i_property))
+            rCell << "bound ";
+        if (PropertyAttr::IsConstrained(i_property))
+            rCell << "constrained ";
+        if (PropertyAttr::IsMayBeAmbiguous(i_property))
+            rCell << "maybeambiguous ";
+        if (PropertyAttr::IsMayBeDefault(i_property))
+            rCell << "maybedefault ";
+        if (PropertyAttr::IsMayBeVoid(i_property))
+            rCell << "maybevoid ";
+        if (PropertyAttr::IsRemovable(i_property))
+            rCell << "removable ";
+        if (PropertyAttr::IsTransient(i_property))
+            rCell << "transient ";
+        rCell << "] ";
+    }   // end if
+
+    HF_IdlTypeText
+        aType( Env(), rCell, true );
+    aType.Produce_byData( PropertyAttr::Type(i_property) );
+
+    StreamLock aLocalLink(100);
+    aLocalLink() << "#" << i_property.LocalName();
+    rCell
+        << new Html::LineBreak
+        >> *new Html::Link( aLocalLink().c_str() )
+            << i_property.LocalName();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlService::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_IncludedServices, C_sList_IncludedServices_Label, false);
+    ret.AddItem(C_sList_ExportedInterfaces, C_sList_ExportedInterfaces_Label, false);
+    ret.AddItem(C_sList_Properties, C_sList_Properties_Label, false);
+    ret.AddItem(C_sList_IncludedServicesDetails, C_sList_IncludedServicesDetails_Label, false);
+    ret.AddItem(C_sList_ExportedInterfacesDetails, C_sList_ExportedInterfacesDetails_Label, false);
+    ret.AddItem(C_sList_PropertiesDetails, C_sList_PropertiesDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlService::produce_Link( Xml::Element &     o_row,
+                             type_id            i_type ) const
+{
+    Xml::Element &
+        rCell = o_row
+                >> *new Html::TableCell
+                    << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
+    HF_IdlTypeText
+        aText(Env(), rCell, true);
+    aText.Produce_byData(i_type);
+}
+
+void
+HF_IdlService::produce_LinkSummary( const client &  i_ce,
+                                    Xml::Element &  o_row,
+                                    const comref &  i_commentedRef ) const
+{
+    Xml::Element &
+        rCell = o_row
+                >> *new Html::TableCell
+                    << new Html::ClassAttr(C_sCellStyle_SummaryRight);
+
+    HF_IdlCommentedRelationElement::produce_LinkDoc( Env(), i_ce, rCell, i_commentedRef, doctype_summaryOnly );
+}
+
+void
+HF_IdlService::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                      const client &      i_ce ) const
+{
+    HF_IdlProperty
+        aProperty( Env(), o_table);
+    aProperty.Produce_byData( i_ce );
+}
+
+
+
diff --git a/autodoc/source/display/idl/hfi_service.hxx b/autodoc/source/display/idl/hfi_service.hxx
new file mode 100644
index 000000000000..35e290c67157
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_service.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_SERVICE_HXX
+#define ADC_DISPLAY_HFI_SERVICE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+
+class HF_NaviSubRow;
+class HF_SubTitleTable;
+
+class HF_IdlService : public HtmlFactory_Idl
+{
+  public:
+    typedef ::ary::idl::CommentedRelation       comref;
+    typedef ::ary::StdConstIterator< comref >   comref_list;
+
+                        HF_IdlService(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlService();
+
+    void                Produce_byData(
+                           const client &       i_ce ) const;
+   private:
+    // Overwritten from HtmlFactory_Idl:
+    virtual void        produce_SummaryDeclaration(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+
+    // Locals
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+
+    void                produce_Link(
+                            Xml::Element &      o_row,
+                            type_id             i_type ) const;
+    void                produce_LinkSummary(
+                            const client &      i_ce,
+                            Xml::Element &      o_row,
+                            const comref &  i_commentedRef ) const;
+
+    void                produce_MemberDetails(        /// of property
+                            HF_SubTitleTable &  o_table,
+                            const client &      i_ce ) const;
+
+    void                produce_CommentedRelations(
+                            const client &  i_ce,
+                            comref_list &   it_list,
+                            const String &  i_summaryTitle,
+                            const String &  i_summaryLabel,
+                            const String &  i_detailsTitle,
+                            const String &  i_detailsLabel,
+                            const E_DocType i_docType ) const;
+
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Service;
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_singleton.cxx b/autodoc/source/display/idl/hfi_singleton.cxx
new file mode 100644
index 000000000000..147fda4e2a19
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_singleton.cxx
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_singleton.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_singleton.hxx>
+#include <ary/idl/ik_sisingleton.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+extern const String
+    C_sCePrefix_Singleton("singleton");
+
+const String
+    C_sAssociatedService("Associated Service");
+const String
+    C_sImplementedInterface("Supported Interface");
+
+
+
+HF_IdlSingleton::HF_IdlSingleton( Environment &         io_rEnv,
+                                  Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlSingleton::~HF_IdlSingleton()
+{
+
+}
+
+typedef ::ary::idl::ifc_singleton::attr         SingletonAttr;
+typedef ::ary::idl::ifc_sglifcsingleton::attr   SglIfcSingletonAttr;
+
+void
+HF_IdlSingleton::Produce_byData_ServiceBased( const client & i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Singleton, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term(C_sAssociatedService);
+
+    HF_IdlTypeText
+        aAssociatedService( Env(), aTopList.Produce_Definition(), true );
+    aAssociatedService.Produce_byData( SingletonAttr::AssociatedService(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlSingleton::Produce_byData_InterfaceBased( const client & i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Singleton, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term(C_sImplementedInterface);
+
+    HF_IdlTypeText
+        aImplementedInterface( Env(), aTopList.Produce_Definition(), true );
+    aImplementedInterface.Produce_byData( SglIfcSingletonAttr::BaseInterface(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlSingleton::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce,true);  // true := avoid link to Use-page.
+
+    CurOut() << new Html::HorizontalLine();
+}
diff --git a/autodoc/source/display/idl/hfi_singleton.hxx b/autodoc/source/display/idl/hfi_singleton.hxx
new file mode 100644
index 000000000000..4cbb1dc00cff
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_singleton.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_SINGLETON_HXX
+#define ADC_DISPLAY_HFI_SINGLETON_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class HF_NaviSubRow;
+
+
+class HF_IdlSingleton : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlSingleton(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlSingleton();
+
+    void                Produce_byData_ServiceBased(
+                           const client &       i_ce ) const;
+    void                Produce_byData_InterfaceBased(
+                           const client &       i_ce ) const;
+   private:
+    void                make_Navibar(
+                            const client &      i_ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Singleton;
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_siservice.cxx b/autodoc/source/display/idl/hfi_siservice.cxx
new file mode 100644
index 000000000000..127f609ded9b
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_siservice.cxx
@@ -0,0 +1,175 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_siservice.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_function.hxx>
+#include <ary/idl/ik_siservice.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_method.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_env.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+namespace
+{
+
+const String
+    C_sImplementedInterface("Supported Interface");
+
+const String
+    C_sList_Constructors("Constructors' Summary");
+const String
+    C_sList_Constructors_Label("ConstructorsSummary");
+const String
+    C_sDetails_Constructors("Constructors' Details");
+const String
+    C_sDetails_Constructors_Label("ConstructorsDetails");
+
+
+enum E_SubListIndices
+{
+    sli_ConstructorsSummary = 0,
+    sli_ConstructorsDetails = 1
+};
+
+} //anonymous namespace
+
+
+HF_IdlSglIfcService::HF_IdlSglIfcService( Environment &         io_rEnv,
+                                          Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlSglIfcService::~HF_IdlSglIfcService()
+{
+}
+
+typedef ::ary::idl::ifc_sglifcservice::attr SglIfcServiceAttr;
+
+void
+HF_IdlSglIfcService::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Service, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term(C_sImplementedInterface);
+
+    HF_IdlTypeText
+        aImplementedInterface( Env(), aTopList.Produce_Definition(), true, &i_ce);
+    aImplementedInterface.Produce_byData( SglIfcServiceAttr::BaseInterface(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list
+        dpConstructors;
+    SglIfcServiceAttr::Get_Constructors(dpConstructors, i_ce);
+    if ( (*dpConstructors).operator bool() )
+    {
+        produce_Members( *dpConstructors,
+                         C_sList_Constructors,
+                         C_sList_Constructors_Label,
+                         C_sDetails_Constructors,
+                         C_sDetails_Constructors_Label );
+        pNaviSubRow->SwitchOn(sli_ConstructorsSummary);
+        pNaviSubRow->SwitchOn(sli_ConstructorsDetails);
+    }
+
+    pNaviSubRow->Produce_Row();
+    CurOut() << new Xml::XmlCode("<br>&nbsp;");
+}
+
+DYN HF_NaviSubRow &
+HF_IdlSglIfcService::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce, true);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Constructors, C_sList_Constructors_Label, false);
+    ret.AddItem(C_sDetails_Constructors, C_sDetails_Constructors_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+typedef ary::idl::ifc_function::attr    funcAttr;
+
+void
+HF_IdlSglIfcService::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                            const client &      i_ce ) const
+{
+    HF_IdlMethod
+        aConstructor( Env(),
+                      o_table.Add_Row()
+                            >> *new Html::TableCell
+                                << new Html::ClassAttr(C_sCellStyle_MDetail) );
+
+    ary::Dyn_StdConstIterator<ary::idl::Parameter>
+        pParameters;
+    funcAttr::Get_Parameters(pParameters, i_ce);
+
+    ary::Dyn_StdConstIterator<ary::idl::Type_id>
+        pExceptions;
+    funcAttr::Get_Exceptions(pExceptions, i_ce);
+
+    aConstructor.Produce_byData( i_ce.LocalName(),
+                                 funcAttr::ReturnType(i_ce),
+                                 *pParameters,
+                                 *pExceptions,
+                                 funcAttr::IsOneway(i_ce),
+                                 funcAttr::HasEllipse(i_ce),
+                                 i_ce );
+}
diff --git a/autodoc/source/display/idl/hfi_siservice.hxx b/autodoc/source/display/idl/hfi_siservice.hxx
new file mode 100644
index 000000000000..c7a0b62e1b38
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_siservice.hxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_SISERVICE_HXX
+#define ADC_DISPLAY_HFI_SISERVICE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+
+class HF_NaviSubRow;
+class HF_SubTitleTable;
+
+class HF_IdlSglIfcService : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlSglIfcService(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlSglIfcService();
+
+    void                Produce_byData(
+                           const client &       i_ce ) const;
+   private:
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+
+    void                produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      i_ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Service;
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_struct.cxx b/autodoc/source/display/idl/hfi_struct.cxx
new file mode 100644
index 000000000000..6c98f3a5cef0
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_struct.cxx
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_struct.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/ik_exception.hxx>
+#include <ary/idl/ik_struct.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Struct("struct");
+extern const String
+    C_sCePrefix_Exception("exception");
+
+
+namespace
+{
+
+const String
+    C_sBaseStruct("Base Hierarchy");
+const String
+    C_sBaseException("Base Hierarchy");
+
+const String
+    C_sList_Elements("Elements' Summary");
+const String
+    C_sList_Elements_Label("Elements");
+
+const String
+    C_sList_ElementDetails("Elements' Details");
+const String
+    C_sList_ElementDetails_Label("ElementDetails");
+
+enum E_SubListIndices
+{
+    sli_ElementsSummary = 0,
+    sli_ElementsDetails = 1
+};
+
+}   // anonymous namespace
+
+
+
+HF_IdlStruct::HF_IdlStruct( Environment &         io_rEnv,
+                            Xml::Element &        o_rOut,
+                            bool                  i_bIsException )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        bIsException(i_bIsException)
+{
+}
+
+HF_IdlStruct::~HF_IdlStruct()
+{
+}
+
+void
+HF_IdlStruct::Produce_byData( const client & i_ce ) const
+{
+    const ary::idl::Struct *
+        pStruct =
+            bIsException
+                ?   0
+                :   static_cast< const ary::idl::Struct* >(&i_ce);
+    bool bIsTemplate =
+            pStruct != 0
+                ?   pStruct->TemplateParameterType().IsValid()
+                :   false;
+
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+
+    // Title:
+    StreamLock
+        slAnnotations(200);
+    get_Annotations(slAnnotations(), i_ce);
+
+    StreamLock rTitle(200);
+    if (bIsTemplate)
+        rTitle() << "template ";
+    rTitle()
+        << (bIsException
+            ?   C_sCePrefix_Exception
+            :   C_sCePrefix_Struct)
+        << " "
+        << i_ce.LocalName();
+    if (bIsTemplate)
+    {
+        csv_assert(pStruct != 0);
+        rTitle()
+            << "<"
+            << pStruct->TemplateParameter()
+            << ">";
+    }
+    aTitle.Produce_Title(slAnnotations().c_str(), rTitle().c_str());
+
+    // Bases:
+    produce_Bases( aTitle.Add_Row(),
+                   i_ce,
+                   bIsException
+                    ?   C_sBaseException
+                    :   C_sBaseStruct );
+
+    // Docu:
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    // Elements:
+    dyn_ce_list
+        dpElements;
+    if (bIsException)
+        ary::idl::ifc_exception::attr::Get_Elements(dpElements, i_ce);
+    else
+        ary::idl::ifc_struct::attr::Get_Elements(dpElements, i_ce);
+
+    if ( (*dpElements).operator bool() )
+    {
+        produce_Members( *dpElements,
+                         C_sList_Elements,
+                         C_sList_Elements_Label,
+                         C_sList_ElementDetails,
+                         C_sList_ElementDetails_Label );
+        pNaviSubRow->SwitchOn(sli_ElementsSummary);
+        pNaviSubRow->SwitchOn(sli_ElementsDetails);
+    }
+    pNaviSubRow->Produce_Row();
+}
+
+HtmlFactory_Idl::type_id
+HF_IdlStruct::inq_BaseOf( const client & i_ce ) const
+{
+    return bIsException
+                ?   ary::idl::ifc_exception::attr::Base(i_ce)
+                :   ary::idl::ifc_struct::attr::Base(i_ce);
+}
+
+HF_NaviSubRow &
+HF_IdlStruct::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Elements, C_sList_Elements_Label, false);
+    ret.AddItem(C_sList_ElementDetails, C_sList_ElementDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlStruct::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                     const client &      i_ce) const
+{
+    HF_IdlStructElement
+        aElement( Env(), o_table );
+    aElement.Produce_byData(i_ce);
+}
diff --git a/autodoc/source/display/idl/hfi_struct.hxx b/autodoc/source/display/idl/hfi_struct.hxx
new file mode 100644
index 000000000000..e3a98dddac1e
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_struct.hxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_STRUCT_HXX
+#define ADC_DISPLAY_HFI_STRUCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+/** Is used to display ->ary::idl::Exception s as well as ->ary::idl::Struct s.
+*/
+class HF_IdlStruct : public HtmlFactory_Idl
+{
+  public:
+
+                        HF_IdlStruct(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            bool                i_bIsException );
+    virtual             ~HF_IdlStruct();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    // Interface HtmlFactory_Idl:
+    virtual type_id     inq_BaseOf(
+                            const client &      i_ce ) const;
+    // Locals
+    HF_NaviSubRow &     make_Navibar(
+                            const client &      ce ) const;
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+    // DATA
+    bool                bIsException;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Struct;
+extern const String
+    C_sCePrefix_Exception;
+
+
+#endif
diff --git a/autodoc/source/display/idl/hfi_tag.cxx b/autodoc/source/display/idl/hfi_tag.cxx
new file mode 100644
index 000000000000..78c913db3b99
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_tag.cxx
@@ -0,0 +1,354 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_tag.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary_i/ci_text2.hxx>
+#include <ary_i/d_token.hxx>
+#include <toolkit/out_tree.hxx>
+#include <adc_cl.hxx>
+#include <adc_msg.hxx>
+#include "hfi_typetext.hxx"
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+#include "hi_linkhelper.hxx"
+
+
+using ary::inf::DocuTex2;
+
+
+inline void
+HF_IdlTag::Enter_TextOut( Xml::Element & o_rText ) const
+{
+    aTextOut.Out().Enter(o_rText);
+}
+
+inline void
+HF_IdlTag::Leave_TextOut() const
+{
+    aTextOut.Out().Leave();
+}
+
+inline void
+HF_IdlTag::PutText_Out( const ary::inf::DocuTex2 & i_rText ) const
+{
+    i_rText.DisplayAt( const_cast< HF_IdlDocuTextDisplay& >(aTextOut) );
+}
+
+
+
+HF_IdlTag::HF_IdlTag( Environment &                 io_rEnv,
+                      const ary::idl::CodeEntity &  i_rScopeGivingCe )
+    :   HtmlFactory_Idl( io_rEnv, 0 ),
+        pTitleOut(0),
+        aTextOut(io_rEnv, 0, i_rScopeGivingCe)
+{
+}
+
+HF_IdlTag::~HF_IdlTag()
+{
+}
+
+void
+HF_IdlTag::Produce_byData( Xml::Element &              o_rTitle,
+                           Xml::Element &              o_rText,
+                           const ary::inf::AtTag2 &   i_rTag ) const
+{
+    pTitleOut = &o_rTitle;
+    Enter_TextOut(o_rText);
+    i_rTag.DisplayAt( const_cast< HF_IdlTag& >(*this) );
+    Leave_TextOut();
+}
+
+void
+HF_IdlTag::Produce_byData( Xml::Element &      o_rTitle,
+                           Xml::Element &      o_rText,
+                           const std::vector< csi::dsapi::DT_SeeAlsoAtTag* > &
+                                                i_seeAlsoVector ) const
+{
+    o_rTitle << "See also";
+    for ( std::vector< csi::dsapi::DT_SeeAlsoAtTag* >::const_iterator
+            it = i_seeAlsoVector.begin();
+          it != i_seeAlsoVector.end();
+          ++it )
+    {
+        if (it != i_seeAlsoVector.begin())
+        {
+            o_rText << ", ";
+        }
+        HF_IdlTypeText
+            aLinkText(Env(), o_rText, true, &aTextOut.ScopeGivingCe());
+        aLinkText.Produce_byData( (*it)->LinkText() );
+    }
+}
+
+void
+HF_IdlTag::Display_StdAtTag( const csi::dsapi::DT_StdAtTag & i_rTag )
+{
+    if ( i_rTag.Text().IsEmpty() )
+        return;
+
+    csv_assert( pTitleOut != 0 );
+    *pTitleOut << i_rTag.Title();
+    PutText_Out( i_rTag.Text() );
+}
+
+void
+HF_IdlTag::Display_SeeAlsoAtTag( const csi::dsapi::DT_SeeAlsoAtTag & i_rTag )
+{
+    if ( i_rTag.Text().IsEmpty() )
+        return;
+
+    csv_assert( pTitleOut != 0 );
+    *pTitleOut << "See also";
+
+    HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(),true, &aTextOut.ScopeGivingCe());
+    aLinkText.Produce_byData( i_rTag.LinkText() );
+
+    aTextOut.CurOut() << new Html::LineBreak;
+    PutText_Out( i_rTag.Text() );
+}
+
+void
+HF_IdlTag::Display_ParameterAtTag( const csi::dsapi::DT_ParameterAtTag & i_rTag )
+{
+    csv_assert( pTitleOut != 0 );
+    StreamLock sl(100);
+    *pTitleOut
+        << ( sl() << "Parameter " << i_rTag.Title() << c_str );
+    PutText_Out( i_rTag.Text() );
+}
+
+void
+HF_IdlTag::Display_SinceAtTag( const csi::dsapi::DT_SinceAtTag & i_rTag )
+{
+    csv_assert(pTitleOut != 0);
+
+    if ( i_rTag.Text().IsEmpty() )
+    {
+         return;
+    }
+
+    // Transform the value of the @since tag into the text to be displayed.
+    String sDisplay =
+        autodoc::CommandLine::Get_().DisplayOf_SinceTagValue(
+                                        i_rTag.Text().TextOfFirstToken() );
+    if (sDisplay.empty())
+        return;
+
+    *pTitleOut << "Since ";
+    DocuTex2 aHelp;
+    aHelp.AddToken(* new csi::dsapi::DT_TextToken(sDisplay));
+    PutText_Out(aHelp);
+}
+
+
+//********************      HF_IdlShortDocu     *********************/
+
+HF_IdlShortDocu::HF_IdlShortDocu( Environment &         io_rEnv,
+                                  Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl( io_rEnv, &o_rOut )
+{
+}
+
+HF_IdlShortDocu::~HF_IdlShortDocu()
+{
+}
+
+void
+HF_IdlShortDocu::Produce_byData( const ary::idl::CodeEntity & i_rCe )
+{
+    const ce_info *
+        pDocu = Get_IdlDocu(i_rCe.Docu());
+    if (pDocu == 0)
+        return;
+
+    const ce_info &
+        rDocu = *pDocu;
+    if ( rDocu.IsDeprecated() )
+    {
+        CurOut()
+            >> *new Html::Bold
+                << "[ DEPRECATED ]" << new Html::LineBreak;
+    }
+    if ( rDocu.IsOptional() )
+    {
+        CurOut()
+            >> *new Html::Bold
+                << "[ OPTIONAL ]" << new Html::LineBreak;
+    }
+
+    HF_IdlDocuTextDisplay
+        aText( Env(), &CurOut(), i_rCe);
+    rDocu.Short().DisplayAt(aText);
+}
+
+
+//********************      HF_IdlDocuTextDisplay       *********************/
+
+
+HF_IdlDocuTextDisplay::HF_IdlDocuTextDisplay( Environment &                 io_rEnv,
+                                              Xml::Element *                o_pOut,
+                                              const ary::idl::CodeEntity &  i_rScopeGivingCe )
+    :   HtmlFactory_Idl(io_rEnv, o_pOut),
+        sScope(),
+        sLinkToken(),
+        bGatherLink(false),
+        pScopeGivingCe(&i_rScopeGivingCe)
+{
+}
+
+HF_IdlDocuTextDisplay::~HF_IdlDocuTextDisplay()
+{
+}
+
+void
+HF_IdlDocuTextDisplay::Display_TextToken( const csi::dsapi::DT_TextToken & i_rToken )
+{
+    if (bGatherLink)
+    {
+        if (sLinkToken.length() == 0)
+        {
+            sLinkToken = i_rToken.GetText();
+            return;
+        }
+        else
+        {
+            if ( pScopeGivingCe == 0 )
+            {   // only in original file
+                TheMessages().Out_TypeVsMemberMisuse(sLinkToken, Env().CurPageCe_AsText(), 0);
+            }
+
+            StopLinkGathering();
+        }
+    }   // endif (bGatherLink)
+
+    CurOut() << new Xml::XmlCode( i_rToken.GetText() );
+}
+
+void
+HF_IdlDocuTextDisplay::Display_White()
+{
+    CurOut() << " ";
+}
+
+void
+HF_IdlDocuTextDisplay::Display_MupType( const csi::dsapi::DT_MupType & i_rToken )
+{
+    if (i_rToken.IsBegin())
+    {
+        StartLinkGathering(i_rToken.Scope());
+    }
+    else
+    {
+        if (bGatherLink)
+        {
+            CreateTypeLink();
+            StopLinkGathering();
+        }
+    }
+}
+
+void
+HF_IdlDocuTextDisplay::Display_MupMember( const csi::dsapi::DT_MupMember & i_rToken )
+{
+    if (i_rToken.IsBegin())
+    {
+        StartLinkGathering(i_rToken.Scope());
+    }
+    else
+    {
+        if (bGatherLink)
+        {
+            CreateMemberLink();
+            StopLinkGathering();
+        }
+    }
+}
+
+void
+HF_IdlDocuTextDisplay::Display_MupConst( const csi::dsapi::DT_MupConst & i_rToken )
+{
+    CurOut()
+        >> *new Html::Bold
+           << i_rToken.GetText();
+}
+
+void
+HF_IdlDocuTextDisplay::Display_Style( const csi::dsapi::DT_Style & i_rToken )
+{
+    CurOut() << new Xml::XmlCode( i_rToken.GetText() );
+}
+
+void
+HF_IdlDocuTextDisplay::Display_EOL()
+{
+    CurOut() << "\n";
+}
+
+void
+HF_IdlDocuTextDisplay::CreateTypeLink()
+{
+    if (strchr(sLinkToken,':') != 0)
+    {
+        TheMessages().Out_TypeVsMemberMisuse(sLinkToken, Env().CurPageCe_AsFile(".idl"), 0);
+        CurOut() << sLinkToken;
+        return;
+    }
+    HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe());
+    aLink.Produce_LinkInDocu(sScope, sLinkToken, String::Null_());
+}
+
+void
+HF_IdlDocuTextDisplay::CreateMemberLink()
+{
+
+    HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe());
+
+    const char *
+        sSplit = strchr(sLinkToken,':');
+
+    if (sSplit != 0)
+    {
+        String sCe(sLinkToken.c_str(), sSplit - sLinkToken.c_str());
+        String sMember(sSplit+2);
+
+        if (NOT sScope.empty() OR ScopeGivingCe().LocalName() != sCe )
+            aLink.Produce_LinkInDocu(sScope, sCe, sMember);
+        else
+            aLink.Produce_LocalLinkInDocu(sMember);
+    }
+    else
+    {
+        aLink.Produce_LocalLinkInDocu(sLinkToken);
+    }
+}
diff --git a/autodoc/source/display/idl/hfi_tag.hxx b/autodoc/source/display/idl/hfi_tag.hxx
new file mode 100644
index 000000000000..1d09d21f8c12
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_tag.hxx
@@ -0,0 +1,177 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_TAG_HXX
+#define ADC_DISPLAY_HFI_TAG_HXX
+
+// BASE CLASSES
+#include "hi_factory.hxx"
+#include <ary_i/disdocum.hxx>
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+#include <ary_i/ci_atag2.hxx>
+#include <ary_i/ci_text2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+#include <toolkit/hf_docentry.hxx>
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+}
+}
+
+
+
+
+/** This class is an implementation of ary::inf::DocuText_Display
+    and will be used by that interface.
+*/
+class HF_IdlDocuTextDisplay : public HtmlFactory_Idl,
+                              public ary::inf::DocuText_Display
+{
+  public:
+                        HF_IdlDocuTextDisplay(
+                            Environment  &      io_rEnv,
+                            Xml::Element *      o_pOut,
+                            const ary::idl::CodeEntity &
+                                                i_rScopeGivingCe );
+    virtual             ~HF_IdlDocuTextDisplay();
+
+    const ary::idl::CodeEntity &
+                        ScopeGivingCe() const { return *pScopeGivingCe; }
+  private:
+    virtual void        Display_TextToken(
+                            const csi::dsapi::DT_TextToken &
+                                                i_rToken );
+    virtual void        Display_White();
+
+    virtual void        Display_MupType(
+                            const csi::dsapi::DT_MupType &
+                                                i_rToken );
+    virtual void        Display_MupMember(
+                            const csi::dsapi::DT_MupMember &
+                                                i_rToken );
+    virtual void        Display_MupConst(
+                            const csi::dsapi::DT_MupConst &
+                                                i_rToken );
+    virtual void        Display_Style(
+                            const csi::dsapi::DT_Style &    i_rToken );
+    virtual void        Display_EOL();
+
+    // Local
+    void                StartLinkGathering(
+                            const String &      i_sScope )
+                                                { sLinkToken = ""; sScope = i_sScope; bGatherLink = true; }
+    void                StopLinkGathering()     { bGatherLink = false; }
+    /** @precond
+        The scope is in sScope, the name is in sLinkToken.
+    */
+    void                CreateTypeLink();
+    /** @precond
+        The scope is in sScope, the qualified member-name is in sLinkToken.
+    */
+    void                CreateMemberLink();
+
+    // DATA
+    String              sScope;
+    String              sLinkToken;
+    bool                bGatherLink;
+    const ary::idl::CodeEntity *
+                        pScopeGivingCe;
+};
+
+
+
+class HF_IdlShortDocu : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlShortDocu(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlShortDocu();
+
+    void                Produce_byData(
+                            const ary::idl::CodeEntity &
+                                                i_rCe );
+};
+
+
+
+class HF_IdlTag : public HtmlFactory_Idl,
+                  public ary::inf::DocuTag_Display
+{
+  public:
+                        HF_IdlTag(
+                            Environment &       io_rEnv,
+                            const ary::idl::CodeEntity &
+                                                i_rScopeGivingCe );
+    virtual             ~HF_IdlTag();
+
+    void                Produce_byData(
+                            Xml::Element &      o_rTitle,
+                            Xml::Element &      o_rText,
+                            const ary::inf::AtTag2 &
+                                                i_rTag ) const;
+    void                Produce_byData(
+                            Xml::Element &      o_rTitle,
+                            Xml::Element &      o_rText,
+                            const std::vector< csi::dsapi::DT_SeeAlsoAtTag* > &
+                                                i_seeAlsoVector ) const;
+  private:
+    virtual void        Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag &
+                                                i_rToken );
+    virtual void        Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag &
+                                                i_rToken );
+    virtual void        Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag &
+                                                i_rToken );
+    virtual void        Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag &
+                                                i_rToken );
+
+    void                Enter_TextOut(
+                            Xml::Element &      o_rText ) const;
+    void                Leave_TextOut() const;
+    void                PutText_Out(
+                            const ary::inf::DocuTex2 &
+                                                i_rText ) const;
+    // DATA
+    mutable Xml::Element *
+                        pTitleOut;
+    mutable HF_IdlDocuTextDisplay
+                        aTextOut;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/idl/hfi_typedef.cxx b/autodoc/source/display/idl/hfi_typedef.cxx
new file mode 100644
index 000000000000..3146be05468f
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typedef.cxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_typedef.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_typedef.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+HF_IdlTypedef::HF_IdlTypedef( Environment &         io_rEnv,
+                              Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlTypedef::~HF_IdlTypedef()
+{
+}
+
+typedef ary::idl::ifc_typedef::attr TypedefAttr;
+
+void
+HF_IdlTypedef::Produce_byData( const client & i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Typedef, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term("Defining Type");
+
+    HF_IdlTypeText
+        aDefinition( Env(), aTopList.Produce_Definition(), true );
+    aDefinition.Produce_byData( TypedefAttr::DefiningType(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlTypedef::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    CurOut() << new Html::HorizontalLine();
+}
diff --git a/autodoc/source/display/idl/hfi_typedef.hxx b/autodoc/source/display/idl/hfi_typedef.hxx
new file mode 100644
index 000000000000..59c36baf3bb8
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typedef.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_TYPEDEF_HXX
+#define ADC_DISPLAY_HFI_TYPEDEF_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlTypedef : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlTypedef(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlTypedef();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    void                make_Navibar(
+                            const client &      ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+const String
+    C_sCePrefix_Typedef("typedef");
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx
new file mode 100644
index 000000000000..6927308e677e
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typetext.cxx
@@ -0,0 +1,757 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_typetext.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <string.h>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ik_ce.hxx>
+#include <adc_cl.hxx>
+#include <adc_msg.hxx>
+#include "hi_linkhelper.hxx"
+
+
+
+
+
+
+inline const ary::idl::Module *
+HF_IdlTypeText::referingModule() const
+{
+    if (pReferingCe == 0)
+        return Env().Linker().Search_CurModule();
+    else
+        return &Env().Data().Find_Module(pReferingCe->NameRoom());
+}
+
+inline const HF_IdlTypeText::client *
+HF_IdlTypeText::referingCe() const
+{
+    return pReferingCe;
+}
+
+
+HF_IdlTypeText::HF_IdlTypeText( Environment &       io_rEnv,
+                                Xml::Element &      o_rOut,
+                                bool                i_bWithLink,
+                                const client *      i_pScopeGivingCe )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        pReferingCe( i_pScopeGivingCe ),
+        bWithLink(i_bWithLink)
+{
+}
+
+HF_IdlTypeText::HF_IdlTypeText( Environment &       io_rEnv,
+                                E_Index             )
+    :   HtmlFactory_Idl(io_rEnv, 0),
+        pReferingCe( 0 ),
+        bWithLink(true)
+{
+}
+
+HF_IdlTypeText::~HF_IdlTypeText()
+{
+}
+
+void
+HF_IdlTypeText::Produce_byData(ary::idl::Type_id i_idType) const
+{
+    StringVector        aModule_;
+    String              sName;
+    ce_id               nCe;
+    int                 nSequenceCount = 0;
+    csv::erase_container(aModule_);
+
+    const ary::idl::Type &
+        rType = Env().Data().Find_Type(i_idType);
+    Env().Data().Get_TypeText(aModule_, sName, nCe, nSequenceCount, rType);
+
+    if ( Env().Data().IsBuiltInOrRelated(rType) )
+    {
+        produce_BuiltIn(sName,nSequenceCount);
+    }
+    else
+    {
+        produce_FromStd( aModule_,
+                         sName,
+                         String::Null_(),
+                         nSequenceCount,
+                         (nCe.IsValid() ? exists_yes : exists_no),
+                         rType.FirstEnclosedNonSequenceType(Env().Gate()).TemplateParameters() );
+    }
+}
+
+void
+HF_IdlTypeText::Produce_byData( ary::idl::Ce_id i_idCe ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    const ary::idl::CodeEntity &
+        rCe = Env().Data().Find_Ce(i_idCe);
+    Env().Data().Get_CeText(aModule_, sCe, sMember, rCe);
+    produce_FromStd(aModule_, sCe, sMember, 0, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_byData( const String & i_sFullName ) const
+{
+    if ( strncmp(i_sFullName,"http://", 7) == 0 )
+    {
+        CurOut()
+            >> *new Html::Link(i_sFullName)
+                << i_sFullName;
+        return;
+    }
+
+    StringVector        aModule_;
+    String              sCe,
+                        sMember;
+    int                 nSequence = 0;
+    String              sTypeText;
+    csv::erase_container(aModule_);
+
+    const ary::idl::Module *
+        pScopeModule = referingModule();
+    if (pScopeModule == 0)
+    {
+        // SYNTAX_ERR, but rather logical error: Missing module.
+        CurOut() << i_sFullName;
+        // KORR_FUTURE
+        // How to put a message about this?
+        // errorOut_UnresolvedLink(i_sFullName);
+        return;
+    }
+
+    const char * sTypeStart = strrchr(i_sFullName,'<');
+    if ( sTypeStart != 0 )
+    {
+        const char * sTypeEnd = strchr(i_sFullName,'>');
+        if (sTypeEnd == 0)
+        {   // SYNTAX_ERR
+            CurOut() << i_sFullName;
+            // KORR_FUTURE
+            // How to put a message about this?
+            // errorOut_UnresolvedLink(i_sFullName);
+            return;
+        }
+
+        nSequence = count_Sequences(i_sFullName);
+        sTypeStart++;
+        sTypeText.assign(sTypeStart, sTypeEnd-sTypeStart);
+    }
+    else
+    {
+        sTypeText = i_sFullName;
+    }
+
+    csv::erase_container(aModule_);
+    bool bFound =   // KORR : Check the semantics of this, see if ce really exists, if it is a member?
+        Env().Data().Search_Ce( aModule_,
+                                sCe,sMember,
+                                sTypeText,
+                                *pScopeModule );
+    if (NOT bFound)
+    {
+        if ( strchr(sTypeText,':') == 0
+             AND
+             *sTypeText.c_str() != 'X' )    // This is a HACK, make this correct!
+        {
+            Produce_LocalLinkInDocu(sTypeText);
+            return;
+        }
+        CurOut() << i_sFullName;
+        // KORR
+        // How to put a message about this?
+        // errorOut_UnresolvedLink(i_sFullName);
+        return;
+    }
+
+    produce_FromStd(aModule_, sCe, sMember, nSequence, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_LinkInDocu( const String &      i_scope,
+                                    const String &      i_name,
+                                    const String &      i_member ) const
+{
+    StringVector        aModule_;
+    String              sName;
+    csv::erase_container(aModule_);
+
+    const ary::idl::Module *
+        pScopeModule = referingModule();
+    if (pScopeModule == 0)
+    {
+        // SYNTAX_ERR, but rather logical error: Missing module.
+        CurOut() << i_scope << "::" << i_name;
+        if (NOT i_member.empty())
+            CurOut() << "::" << i_member;
+        return;
+    }
+
+    bool
+        bFound = Env().Data().Search_CesModule( aModule_,
+                                                i_scope,
+                                                i_name,
+                                                *pScopeModule );
+    if (NOT bFound)
+    {
+        CurOut() << i_scope << "::" << i_name;
+        if (NOT i_member.empty())
+            CurOut() << "::" << i_member;
+        return;
+    }
+    produce_FromStd(aModule_, i_name, i_member, 0, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_LocalLinkInDocu( const String & i_member ) const
+{
+    StringVector        aModule_;
+    String              sName;
+    csv::erase_container(aModule_);
+
+    csv_assert(referingCe() != 0);
+    if ( referingModule() == Env().Linker().Search_CurModule() )
+    {
+        StreamLock slLink(200);
+        if (referingCe()->SightLevel() == ary::idl::sl_Member)
+        {
+            slLink() << "#" << i_member;
+        }
+        else
+        {
+            slLink() << referingCe()->LocalName()
+                     << ".html#"
+                     << i_member;
+        }
+        CurOut()
+            >> *new Html::Link(slLink().c_str())
+               << i_member;
+        return;
+    }
+
+    String sDummyMember;
+    Env().Data().Get_CeText(aModule_, sName, sDummyMember, *referingCe());
+    produce_FromStd(aModule_, sName, i_member, 0, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_IndexLink( Xml::Element &   o_out,
+                                   const client &   i_ce ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    Out().Enter(o_out);
+
+    Env().Data().Get_CeText(aModule_, sCe, sMember, i_ce);
+    produce_IndexLink(aModule_, sCe, sMember, false);
+
+    Out().Leave();
+}
+
+void
+HF_IdlTypeText::Produce_IndexOwnerLink( Xml::Element &  o_out,
+                                        const client &  i_owner ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    Out().Enter(o_out);
+
+    if (i_owner.Owner().IsValid())
+    {
+        Env().Data().Get_CeText(aModule_, sCe, sMember, i_owner);
+        produce_IndexLink(aModule_, sCe, sMember, true);
+    }
+    else
+    {   // global namespace:
+
+        CurOut()
+            << "."
+            >> *new Html::Link("../module-ix.html")
+               << "global namespace";
+    }
+
+
+    Out().Leave();
+}
+
+void
+HF_IdlTypeText::Produce_IndexSecondEntryLink( Xml::Element &      o_out,
+                                              const client &      i_ce ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    Out().Enter(o_out);
+
+    Env().Data().Get_CeText(aModule_, sCe, sMember, i_ce);
+    produce_IndexLink(aModule_, sCe, sMember, true);
+    Out().Leave();
+}
+
+
+void
+HF_IdlTypeText::produce_FromStd( const StringVector & i_module,
+                                 const String &       i_ce,
+                                 const String &       i_member,
+                                 int                  i_sequenceCount,
+                                 E_Existence          i_ceExists,
+                                 const std::vector<ary::idl::Type_id> *
+                                                      i_templateParameters ) const
+{
+    if (i_ceExists == exists_no)
+    {
+        if ( is_ExternLink(i_module) )
+        {
+            produce_ExternLink(i_module,i_ce,i_member,i_sequenceCount,i_templateParameters);
+            return;
+        }
+        errorOut_UnresolvedLink(i_module, i_ce, i_member);
+    }
+
+    output::Node &
+        rCeNode = Env().OutputTree().Provide_Node(i_module);
+    output::Position
+        aTargetPos(rCeNode);
+    bool
+        bShowModule = rCeNode != Env().CurPosition().RelatedNode()
+                            ?   i_module.size() > 0
+                            :   false;
+    bool
+        bUseMember = NOT i_member.empty();
+    bool
+        bLink2Module = i_ceExists == exists_yes;
+    bool
+        bLink2Ce = i_ceExists == exists_yes;
+    bool
+        bLink2Member = NOT Env().Is_MemberExistenceCheckRequired()
+                       AND i_ceExists == exists_yes;
+    bool
+        bHasCeOrName = NOT i_ce.empty();
+
+    if (i_sequenceCount > 0)
+        start_Sequence(i_sequenceCount);
+
+    StreamLock  aLink(300);
+    StreamStr & rLink = aLink();
+
+    // Produce output: module
+    if (bShowModule)
+    {
+        int nMax = i_module.size() - 1;
+        int nCount = 0;
+        StringVector::const_iterator
+            itm = i_module.begin();
+        for ( ;
+              nCount < nMax;
+              ++itm, ++nCount )
+        {
+            CurOut() << "::" << *itm;
+        }
+
+        CurOut() << "::";
+        if (bLink2Module)
+        {
+            aTargetPos.Set_File(output::ModuleFileName());
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            CurOut()
+                >> *new Html::Link( rLink.c_str() )
+                    << *itm;
+            rLink.reset();
+        }
+        else
+        {
+            CurOut() << *itm;
+        }
+
+        if (bHasCeOrName)
+            CurOut() << "::";
+    }   // end if (bShowModule)
+
+    // CodeEntity and member:
+    aTargetPos.Set_File( rLink << i_ce << ".html" << c_str );
+    rLink.reset();
+
+    if (bHasCeOrName)
+    {
+        if (bLink2Ce)
+        {
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            CurOut()
+                >> *new Html::Link(rLink.c_str())
+                    << i_ce;
+            rLink.reset();
+        }
+        else
+        {
+            CurOut() << i_ce;
+        }
+
+        if (i_templateParameters != 0)
+            write_TemplateParameterList(*i_templateParameters);
+
+        if (bUseMember)
+        {
+            CurOut() << "::";
+
+            if (bLink2Member)
+            {
+                bool bFunction = strstr(i_member,"()") != 0;
+                String sMember( i_member );
+                if (bFunction)
+                    sMember.assign(i_member.c_str(), sMember.length()-2);
+
+                Env().Linker().Get_Link2Member(rLink, aTargetPos, sMember);
+                CurOut()
+                    >> *new Html::Link(rLink.c_str())
+                        << i_member;
+                rLink.reset();
+            }
+            else
+            {
+                CurOut()
+                    << i_member;
+            }
+        }   // endif (bUseMember)
+    }   // endif (bHasCeOrName)
+
+    if (i_sequenceCount > 0)
+        finish_Sequence(i_sequenceCount);
+}
+
+void
+HF_IdlTypeText::produce_BuiltIn( const String &      i_type,
+                                 int                 i_sequenceCount ) const
+{
+    if (i_sequenceCount > 0)
+        start_Sequence(i_sequenceCount);
+    CurOut() << i_type;
+    if (i_sequenceCount > 0)
+        finish_Sequence(i_sequenceCount);
+}
+
+void
+HF_IdlTypeText::produce_IndexLink( const StringVector & i_module,
+                                   const String &       i_ce,
+                                   const String &       i_member,
+                                   bool                 i_bIsOwner ) const
+{
+    output::Node &
+        rCeNode = Env().OutputTree().Provide_Node(i_module);
+    output::Position
+        aTargetPos(rCeNode);
+    bool
+        bShowModule = i_bIsOwner OR (i_module.size() > 0 AND i_ce.empty());
+    bool
+        bShowNonModule = NOT bShowModule OR (i_bIsOwner AND NOT i_ce.empty());
+    bool
+        bUseMember = NOT i_member.empty();
+
+    StreamLock  aLink(300);
+    StreamStr & rLink = aLink();
+
+    // Produce output: module
+    if (bShowModule)
+    {
+        if (i_bIsOwner)
+        {
+            int nMax = bShowNonModule ? i_module.size() : i_module.size() - 1;
+            int nCount = 0;
+            for ( StringVector::const_iterator itm = i_module.begin();
+                  nCount < nMax;
+                  ++itm, ++nCount )
+            {
+                CurOut() << "::" << *itm;
+            }
+            CurOut() << ":: .";
+        }
+
+        if (NOT bShowNonModule)
+        {
+            aTargetPos.Set_File(output::ModuleFileName());
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            CurOut()
+                >> *new Html::Link( rLink.c_str() )
+                    >> *new Html::Bold
+                        << i_module.back();
+            rLink.reset();
+        }
+    }   // end if (bShowModule)
+
+    if (bShowNonModule)
+    {
+        aTargetPos.Set_File( rLink << i_ce << ".html" << c_str );
+        rLink.reset();
+
+        if (bUseMember)
+        {
+            bool bFunction = strstr(i_member,"()") != 0;
+            String sMember( i_member );
+            if (bFunction)
+                sMember.assign(i_member.c_str(), sMember.length()-2);
+            Env().Linker().Get_Link2Member(rLink, aTargetPos, sMember);
+            CurOut()
+                >> *new Html::Link(rLink.c_str())
+                    >> *new Html::Bold
+                        << i_member;
+            rLink.reset();
+        }
+        else
+        {
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            if (i_bIsOwner)
+            {
+                CurOut()
+                    >> *new Html::Link(rLink.c_str())
+                       << i_ce;
+            }
+            else
+            {
+                CurOut()
+                    >> *new Html::Link(rLink.c_str())
+                           >> *new Html::Bold
+                            << i_ce;
+            }
+            rLink.reset();
+        }
+    }   // endif (bHasCeOrName)
+}
+
+int
+HF_IdlTypeText::count_Sequences( const char * i_sFullType ) const
+{
+    int ret = 0;
+
+    for ( const char * pCount = i_sFullType;
+          *pCount != 0;
+           )
+    {
+        pCount = strstr(pCount,"sequence");
+        if (pCount != 0)
+        {
+            pCount += sizeof("sequence");   // = strlen(sequence) + 1 for '<'.
+            if ( *(pCount-1) == '\0' )
+            {
+                // SYNTAX_ERR
+                return 0;
+            }
+            ++ret;
+        }
+    }   // end for
+
+    return ret;
+}
+
+void
+HF_IdlTypeText::start_Sequence( int i_count ) const
+{
+    csv_assert( i_count > 0 );
+    for (int i = 0; i < i_count; ++i )
+    {
+        CurOut() << "sequence< ";
+    }
+}
+
+void
+HF_IdlTypeText::finish_Sequence( int i_count ) const
+{
+    csv_assert( i_count > 0 );
+    for (int i = 0; i < i_count; ++i )
+    {
+        CurOut() << " >";
+    }
+}
+
+void
+HF_IdlTypeText::errorOut_UnresolvedLink( const char *        i_name ) const
+{
+    StreamLock slFile(1000);
+
+    // KORR
+    // Handle links in cited documentation from other entities.
+    slFile() << Env().CurPageCe_AsText();
+    slFile().pop_back(5);
+    slFile() << ".idl";
+
+    // KORR
+    // Retrieve, correct line number.
+    TheMessages().Out_UnresolvedLink( i_name,
+                                      slFile().c_str(),
+                                      0 );
+}
+
+void
+HF_IdlTypeText::errorOut_UnresolvedLink( const StringVector & i_module,
+                                         const String &       i_ce,
+                                         const String &       i_member ) const
+{
+    StreamLock slName(500);
+
+    if (i_module.size() > 0)
+    {
+        slName().operator_join(i_module.begin(), i_module.end(), "::");
+         if (NOT i_ce.empty())
+            slName() << "::";
+    }
+    if (NOT i_ce.empty())
+    {
+        slName() << i_ce;
+        if (NOT i_member.empty())
+            slName() << "::" << i_member;
+    }
+    errorOut_UnresolvedLink(slName().c_str());
+}
+
+bool
+HF_IdlTypeText::is_ExternLink( const StringVector & i_module ) const
+{
+    const autodoc::CommandLine &
+        rCmdLine = autodoc::CommandLine::Get_();
+    uintt nExtNspLength = rCmdLine.ExternNamespace().length();
+    if (nExtNspLength == 0)
+        return false;
+
+    StreamStr s(1000);
+    s << "::";
+    s.operator_join( i_module.begin(),
+                     i_module.end(),
+                     "::" );
+
+    if (s.length() < nExtNspLength)
+        return false;
+    return ( strncmp( rCmdLine.ExternNamespace().c_str(),
+                      s.c_str(),
+                      nExtNspLength ) == 0 );
+}
+
+void
+HF_IdlTypeText::produce_ExternLink( const StringVector & i_module,
+                                    const String &       i_ce,
+                                    const String &       i_member,
+                                    int                  i_sequenceCount,
+                                    const std::vector<ary::idl::Type_id> *
+                                                         i_templateParameters ) const
+{
+    // KORR
+    // Look again at this code and take some time.
+
+    StreamLock  aLink(1000);
+    StreamStr & rLink = aLink();
+
+    rLink << autodoc::CommandLine::Get_().ExternRoot();
+    rLink.operator_join( i_module.begin(),
+                         i_module.end(),
+                         "/" );
+    rLink << '/'
+          << i_ce
+          << ".html";
+    if (i_member.length() > 0)
+        rLink << "/#" << i_member;
+
+    if (i_sequenceCount > 0)
+        start_Sequence(i_sequenceCount);
+
+    // module
+    int nMax = i_module.size();
+    int nCount = 0;
+    StringVector::const_iterator
+        itm = i_module.begin();
+    for ( ;
+          nCount < nMax;
+          ++itm, ++nCount )
+    {
+        CurOut() << "::" << *itm;
+    }
+    CurOut() << "::";
+
+
+    // CodeEntity
+    if (i_member.length() == 0)
+    {
+        CurOut()
+           >> *new Html::Link(rLink.c_str())
+              << i_ce;
+    }
+    else
+    {
+        CurOut()
+            << i_ce;
+    }
+
+    if (i_templateParameters != 0)
+        write_TemplateParameterList(*i_templateParameters);
+
+    // Member
+    if (i_member.length() > 0)
+    {
+        CurOut()
+            >> *new Html::Link(rLink.c_str())
+                << i_member;
+    }
+
+    if (i_sequenceCount > 0)
+        finish_Sequence(i_sequenceCount);
+}
+
+void
+HF_IdlTypeText::write_TemplateParameterList(
+                    const std::vector<ary::idl::Type_id> & i_templateParameters ) const
+{
+    if (i_templateParameters.size() == 0)
+        return;
+
+    HF_IdlTypeText
+        aTemplateParamWriter(Env(), CurOut(), true, pReferingCe);
+    CurOut() << "< ";
+    std::vector<ary::idl::Type_id>::const_iterator
+        it = i_templateParameters.begin();
+    aTemplateParamWriter.Produce_byData(*it);
+    for ( ++it; it != i_templateParameters.end(); ++it )
+    {
+        CurOut() << ", ";
+        aTemplateParamWriter.Produce_byData(*it);
+    }
+    CurOut() << " >";
+}
diff --git a/autodoc/source/display/idl/hfi_typetext.hxx b/autodoc/source/display/idl/hfi_typetext.hxx
new file mode 100644
index 000000000000..62766ed411e0
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typetext.hxx
@@ -0,0 +1,158 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_TYPETEXT_HXX
+#define ADC_DISPLAY_HFI_TYPETEXT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlTypeText : public HtmlFactory_Idl
+{
+  public:
+    enum E_Index { use_for_javacompatible_index };
+
+                        HF_IdlTypeText(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            bool                i_bWithLink,
+                            const client *      i_pScopeGivingCe = 0 );
+                        HF_IdlTypeText(
+                            Environment &       io_rEnv,
+                            E_Index             e );
+    virtual             ~HF_IdlTypeText();
+
+    void                Produce_byData(
+                            ary::idl::Type_id   i_idType ) const;
+    void                Produce_byData(
+                            ary::idl::Ce_id     i_idCe ) const;
+    void                Produce_byData(
+                            const String &      i_sFullName ) const;
+    void                Produce_LinkInDocu(
+                            const String &      i_scope,
+                            const String &      i_name,
+                            const String &      i_member ) const;
+    void                Produce_LocalLinkInDocu(
+                            const String &      i_member ) const;
+
+    /// Produce the first link for Java-help understood index entries.
+    void                Produce_IndexLink(
+                            Xml::Element &      o_out,
+                            const client &      i_ce ) const;
+    /** Produce the second link for Java-help understood index entries.
+        For members this will be a link to their owner (this function is
+        used), else see @->Produce_IndexSecondEntryLink();
+    */
+    void                Produce_IndexOwnerLink(
+                            Xml::Element &      o_out,
+                            const client &      i_owner ) const;
+    /** Produce the second link for Java-help understood index entries.
+        For non- members this will again be a link to to the entry itself
+        (this function is used), else see @->Produce_IndexOwnerLink();
+    */
+    void                Produce_IndexSecondEntryLink(
+                            Xml::Element &      o_out,
+                            const client &      i_ce ) const;
+  private:
+    // Locals
+    enum E_Existence
+    {
+        exists_dontknow,
+        exists_yes,
+        exists_no
+    };
+
+    void                produce_FromStd(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member,
+                            int                 i_sequenceCount,
+                            E_Existence         i_ceExists,
+                            const std::vector<ary::idl::Type_id> *
+                                                i_templateParameters = 0 ) const;
+    void                produce_BuiltIn(
+                            const String &      i_type,
+                            int                 i_sequenceCount ) const;
+    void                produce_IndexLink(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member,
+                            bool                i_bIsOwner ) const;
+    int                 count_Sequences(
+                            const char *        i_sFullType ) const;
+    void                start_Sequence(
+                            int                 i_count ) const;
+    void                finish_Sequence(
+                            int                 i_count ) const;
+    void                errorOut_UnresolvedLink(
+                            const char *        i_name ) const;
+    void                errorOut_UnresolvedLink(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member ) const;
+    bool                is_ExternLink(
+                            const StringVector &
+                                                i_module ) const;
+    void                produce_ExternLink(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member,
+                            int                 i_sequenceCount,
+                            const std::vector<ary::idl::Type_id> *
+                                                i_templateParameters ) const;
+    void                write_TemplateParameterList(
+                            const std::vector<ary::idl::Type_id> &
+                                                i_templateParameters ) const;
+    const ary::idl::Module *
+                        referingModule() const;
+    const client *      referingCe() const;
+
+    // DATA
+    mutable const client *
+                        pReferingCe;
+    bool                bWithLink;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hfi_xrefpage.cxx b/autodoc/source/display/idl/hfi_xrefpage.cxx
new file mode 100644
index 000000000000..ecf4cb72ff43
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_xrefpage.cxx
@@ -0,0 +1,273 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_xrefpage.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_env.hxx"
+
+
+namespace
+{
+
+const String
+    C_sTitleStart("uses of ");
+const String
+    C_sCRLF("\n");
+const String
+    C_sDevMan("References in Developers Guide");
+
+}   // anonymous namespace
+
+
+
+HF_IdlXrefs::HF_IdlXrefs( Environment &         io_rEnv,
+                          Xml::Element &        o_rOut,
+                          const String &        i_prefix,
+                          const client &        i_ce )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        rContentDirectory(*new Html::Paragraph),
+        pClient(&i_ce)
+{
+    produce_Main(i_prefix, i_ce);
+}
+
+HF_IdlXrefs::~HF_IdlXrefs()
+{
+}
+
+void
+HF_IdlXrefs::Write_ManualLinks( const client &  i_ce ) const
+{
+    const StringVector &
+        rLinks2Refs = i_ce.Secondaries().Links2RefsInManual();
+    if ( rLinks2Refs.size() == 0 )
+    {
+        rContentDirectory
+            << C_sDevMan
+            << new Html::LineBreak
+            << C_sCRLF;
+        return;
+    }
+
+
+    rContentDirectory
+        >> *new Html::Link("#devmanrefs")
+            << C_sDevMan
+            << new Html::LineBreak
+            << C_sCRLF;
+
+    HF_SubTitleTable
+        aList(CurOut(), "devmanrefs", C_sDevMan, 1);
+    Xml::Element &
+        rOutCell = aList.Add_Row() >>* new Html::TableCell;
+
+    csv_assert(rLinks2Refs.size() % 2 == 0);
+    for ( StringVector::const_iterator it = rLinks2Refs.begin();
+          it != rLinks2Refs.end();
+          ++it )
+    {
+        Xml::Element &
+            rLink = rOutCell >> *new Html::Link( Env().Link2Manual(*it));
+        if ( (*(it+1)).empty() )
+
+            // HACK KORR_FUTURE
+            // Research what happens with manual links which contain normal characters
+            // in non-utf-8 texts. And research, why utfF-8 does not work here.
+            rLink << new Xml::XmlCode(*it);
+        else
+            // HACK KORR_FUTURE, see above.
+            rLink << new Xml::XmlCode( *(it+1) );
+        rOutCell
+            << new Html::LineBreak
+            << C_sCRLF;
+        ++it;
+    }   // end for
+}
+
+void
+HF_IdlXrefs::Produce_List( const char *        i_title,
+                           const char *        i_label,
+                           ce_list &           i_iterator ) const
+{
+    if (NOT i_iterator)
+    {
+        rContentDirectory
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+        return;
+    }
+
+    csv_assert(*i_label == '#');
+
+    rContentDirectory
+        >> *new Html::Link(i_label)
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+
+    HF_SubTitleTable
+        aList(CurOut(), i_label+1, i_title, 1);
+    Xml::Element &
+        rOutCell = aList.Add_Row() >>* new Html::TableCell;
+    HF_IdlTypeText
+        aTypeWriter(Env(), rOutCell, true, pClient);
+    for ( ce_list & it = i_iterator; it; ++it )
+    {
+        aTypeWriter.Produce_byData(*it);
+        rOutCell << new Html::LineBreak;
+    }   // end for
+}
+
+void
+HF_IdlXrefs::Produce_Tree(  const char *        i_title,
+                            const char *        i_label,
+                            const client &      i_ce,
+                            F_GET_SUBLIST       i_sublistcreator ) const
+{
+    dyn_ce_list pResult;
+    (*i_sublistcreator)(pResult, i_ce);
+
+    if (NOT (*pResult).operator bool())
+    {
+        rContentDirectory
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+        return;
+    }
+
+    csv_assert(*i_label == '#');
+
+    rContentDirectory
+        >> *new Html::Link(i_label)
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+
+    HF_SubTitleTable
+        aList(CurOut(), i_label+1, i_title, 1);
+    Xml::Element &
+        rOut = aList.Add_Row()
+                    >>* new Html::TableCell
+                        >> *new csi::xml::AnElement("pre")
+                            << new csi::html::StyleAttr("font-family:monospace;");
+
+    recursive_make_ListInTree( rOut,
+                               0,
+                               i_ce,
+                               *pResult,
+                               i_sublistcreator );
+}
+
+void
+HF_IdlXrefs::produce_Main( const String &        i_prefix,
+                           const client &        i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+    StreamLock sl(200);
+    aTitle.Produce_Title( sl()
+                          << C_sTitleStart
+                          << i_prefix
+                          << " "
+                          << i_ce.LocalName()
+                          << c_str );
+
+    aTitle.Add_Row() << &rContentDirectory;
+    sl().reset();
+    rContentDirectory
+        >> *new Html::Link( sl()    << i_ce.LocalName()
+                                    << ".html"
+                                    << c_str )
+            >> *new Html::Bold
+                << "back to "
+                << i_prefix
+                << " "
+                << i_ce.LocalName();
+    rContentDirectory
+        << new Html::LineBreak
+        << new Html::LineBreak
+        << C_sCRLF;
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlXrefs::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeXrefsMainRow(i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlXrefs::recursive_make_ListInTree( Xml::Element &      o_rDisplay,
+                                        uintt               i_level,
+                                        const client &      i_ce,
+                                        ce_list &           i_iterator,
+                                        F_GET_SUBLIST       i_sublistcreator ) const
+{
+    const char * sLevelIndentation = "    ";
+
+    HF_IdlTypeText
+        aTypeWriter(Env(), o_rDisplay, true, &i_ce);
+    for ( ; i_iterator.operator bool(); ++i_iterator )
+    {
+        for (uintt i = 0; i < i_level; ++i)
+        {
+            o_rDisplay << sLevelIndentation;
+        }   // end for
+
+        aTypeWriter.Produce_byData(*i_iterator);
+        o_rDisplay << C_sCRLF;
+
+        dyn_ce_list     pResult;
+        const client &  rCe = Env().Gate().Ces().Find_Ce(*i_iterator);
+        (*i_sublistcreator)(pResult, rCe);
+        if ( (*pResult).operator bool() )
+        {
+            recursive_make_ListInTree( o_rDisplay,
+                                       i_level + 1,
+                                       rCe,
+                                       *pResult,
+                                       i_sublistcreator );
+        }
+    }   // end for
+}
diff --git a/autodoc/source/display/idl/hfi_xrefpage.hxx b/autodoc/source/display/idl/hfi_xrefpage.hxx
new file mode 100644
index 000000000000..2eed092c568e
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_xrefpage.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFI_XREFPAGE_HXX
+#define ADC_DISPLAY_HFI_XREFPAGE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlXrefs : public HtmlFactory_Idl
+{
+  public:
+    typedef void (*F_GET_SUBLIST)(dyn_ce_list&, const client&);
+
+                        HF_IdlXrefs(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            const String &      i_prefix,
+                            const client &      i_ce);
+    virtual             ~HF_IdlXrefs();
+
+    /** @descr
+        Only lists which are tried to be produced by Produce_List() or
+        Produce_Tree(), will occur in the content directory of the page.
+        They will have links, if the list or tree has at least one element,
+        else the list is mentioned in the directory without link.
+
+        @param i_label [*i_label == '#']
+    */
+    void                Produce_List(
+                            const char *        i_title,
+                            const char *        i_label,
+                            ce_list &           i_iterator ) const;
+    void                Write_ManualLinks(
+                            const client &      i_ce ) const;
+    /** @descr
+        Only lists which are tried to be produced by Produce_List() or
+        Produce_Tree(), will occur in the content directory of the page.
+        They will have links, if the list or tree has at least one element,
+        else the list is mentioned in the directory without link.
+
+        @param i_label [*i_label == '#']
+    */
+    void                Produce_Tree(
+                            const char *        i_title,
+                            const char *        i_label,
+                            const client &      i_ce,
+                            F_GET_SUBLIST       i_sublistcreator ) const;
+
+  private:
+    // Locals
+    void                produce_Main(
+                            const String &      i_prefix,
+                            const client &      i_ce ) const;
+    void                make_Navibar(
+                            const client &      i_ce ) const;
+    /// @return true if there are any elements in sub lists.
+    void                recursive_make_ListInTree(
+                            Xml::Element &      o_rDisplay,
+                            uintt               i_level,    /// 0 is highest
+                            const client &      i_ce,
+                            ce_list &           i_iterator,
+                            F_GET_SUBLIST       i_sublistcreator ) const;
+
+    // DATA
+    Xml::Element &      rContentDirectory;
+    const client *      pClient;
+};
+
+
+
+// IMPLEMENTATION
+
+#endif
diff --git a/autodoc/source/display/idl/hi_ary.cxx b/autodoc/source/display/idl/hi_ary.cxx
new file mode 100644
index 000000000000..ce8a4197911f
--- /dev/null
+++ b/autodoc/source/display/idl/hi_ary.cxx
@@ -0,0 +1,283 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hi_ary.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+inline const ary::idl::Gate &
+AryAccess::gate() const
+    { return rGate; }
+
+inline const ary::idl::CePilot &
+AryAccess::ces() const
+    { return rGate.Ces(); }
+
+inline const ary::idl::TypePilot &
+AryAccess::types() const
+    { return rGate.Types(); }
+
+inline const ary::idl::Module *
+AryAccess::find_SubModule( const ary::idl::Module & i_parent,
+                           const String &           i_name ) const
+{
+    ary::idl::Ce_id
+        nModule = i_parent.Search_Name(i_name);
+    return ces().Search_Module(nModule);
+}
+
+bool
+AryAccess::nextName( const char * &      io_TextPtr,
+                     String &            o_name ) const
+{
+    if ( strncmp(io_TextPtr,"::", 2) == 0 )
+        io_TextPtr += 2;
+
+    const char *    pEnd = strchr(io_TextPtr,':');
+    size_t          nLen = pEnd == 0
+                                ?   strlen(io_TextPtr)
+                                :   pEnd - io_TextPtr;
+    o_name.assign(io_TextPtr, nLen);
+    io_TextPtr += nLen;
+
+    return nLen > 0;
+}
+
+
+
+AryAccess::AryAccess( const ary::idl::Gate & i_rGate )
+    :   rGate(i_rGate)
+{
+}
+
+const ary::idl::Module &
+AryAccess::GlobalNamespace() const
+{
+    return ces().GlobalNamespace();
+}
+
+const ary::idl::Module &
+AryAccess::Find_Module( ary::idl::Ce_id i_ce ) const
+{
+    return ces().Find_Module(i_ce);
+}
+
+
+const ary::idl::CodeEntity &
+AryAccess::Find_Ce( ary::idl::Ce_id i_ce ) const
+{
+    return ces().Find_Ce(i_ce);
+}
+
+const ary::idl::Type &
+AryAccess::Find_Type( ary::idl::Type_id i_type ) const
+{
+    return types().Find_Type(i_type);
+}
+
+ary::idl::Ce_id
+AryAccess::CeFromType( ary::idl::Type_id i_type ) const
+{
+    return types().Search_CeRelatedTo(i_type);
+}
+
+bool
+AryAccess::IsBuiltInOrRelated( const ary::idl::Type & i_type ) const
+{
+    return types().IsBuiltInOrRelated(i_type);
+}
+
+bool
+AryAccess::Search_Ce( StringVector &            o_module,
+                      String &                  o_mainEntity,
+                      String &                  o_memberEntity,
+                      const char *              i_sText,
+                      const ary::idl::Module &  i_referingScope ) const
+{
+    o_module.erase(o_module.begin(),o_module.end());
+    o_mainEntity = String::Null_();
+    o_memberEntity = String::Null_();
+
+    const ary::idl::Module *    pModule = 0;
+
+    if ( strncmp(i_sText, "::", 2) == 0
+         OR strncmp(i_sText, "com::sun::star", 14) == 0 )
+        pModule = &GlobalNamespace();
+    else
+    {
+        pModule = &i_referingScope;
+        ces().Get_Text(o_module, o_mainEntity, o_memberEntity, *pModule);
+    }
+
+    const char *    pNext = i_sText;
+    String          sNextName;
+
+    // Find Module:
+    while ( nextName(pNext, sNextName) )
+    {
+        const ary::idl::Module *
+            pSub = find_SubModule(*pModule, sNextName);
+        if (pSub != 0)
+        {
+            pModule = pSub;
+            o_module.push_back(sNextName);
+        }
+        else
+            break;
+    }
+
+    // Find main CodeEntity:
+    if ( sNextName.length() == 0 )
+        return true;
+    const ary::idl::Ce_id
+        nCe = pModule->Search_Name(sNextName);
+    if (NOT nCe.IsValid())
+        return false;
+    o_mainEntity = sNextName;
+
+    // Find member:
+    if ( *pNext == 0 )
+        return true;
+    nextName(pNext, o_memberEntity);
+    if (strchr(o_memberEntity,':') != 0)
+        return false;   // This must not happen in IDL
+
+#if 0
+// The following code avoids false links, but is rather expensive
+//   in runtime time consumation.
+
+    const ary::idl::CodeEntity *
+        pCe = Find_Ce(nCe);
+    if (pCe == 0)
+        return false;
+
+    if ( NOT ary::idl::ifc_ce::attr::Search_Member(*pCe,o_memberEntity) )
+        return false;
+#endif
+
+    return true;
+}
+
+bool
+AryAccess::Search_CesModule( StringVector &             o_module,
+                             const String &             i_scope,
+                             const String &             i_ce,
+                             const ary::idl::Module &   i_referingScope ) const
+{
+    o_module.erase(o_module.begin(),o_module.end());
+
+    const ary::idl::Module *
+        pModule = 0;
+
+    if ( strncmp(i_scope, "::", 2) == 0
+         OR strncmp(i_scope, "com::sun::star", 14) == 0 )
+        pModule = &GlobalNamespace();
+    else
+    {
+        pModule = &i_referingScope;
+        static String Dummy1;
+        static String Dummy2;
+        ces().Get_Text(o_module, Dummy1, Dummy2, *pModule);
+    }
+
+    const char *    pNext = i_scope;
+    String          sNextName;
+
+    // Find Module:
+    while ( nextName(pNext, sNextName) )
+    {
+        const ary::idl::Module *
+            pSub = find_SubModule(*pModule, sNextName);
+        if (pSub != 0)
+        {
+            pModule = pSub;
+            o_module.push_back(sNextName);
+        }
+        else
+            return false;
+    }  // end while
+    return pModule->Search_Name(i_ce).IsValid();
+}
+
+const ary::idl::Module *
+AryAccess::Search_Module( const StringVector & i_nameChain ) const
+{
+    const ary::idl::Module * ret =
+        &GlobalNamespace();
+    for ( StringVector::const_iterator it = i_nameChain.begin();
+          it != i_nameChain.end();
+          ++it )
+    {
+        ret = find_SubModule(*ret, *it);
+        if (ret == 0)
+            break;
+    }   // end for
+    return ret;
+}
+
+void
+AryAccess::Get_CeText( StringVector &               o_module,
+                       String &                     o_ce,
+                       String &                     o_member,
+                       const ary::idl::CodeEntity & i_ce ) const
+{
+    ces().Get_Text(o_module, o_ce, o_member, i_ce);
+}
+
+void
+AryAccess::Get_TypeText( StringVector &         o_module,
+                         String &               o_sCe,
+                         ary::idl::Ce_id &      o_nCe,
+                         int &                  o_sequenceCount,
+                         const ary::idl::Type & i_type ) const
+{
+    i_type.Get_Text(o_module, o_sCe, o_nCe, o_sequenceCount, gate());
+}
+
+void
+AryAccess::Get_IndexData( std::vector<ary::idl::Ce_id> &            o_data,
+                          ary::idl::alphabetical_index::E_Letter    i_letter ) const
+{
+    rGate.Ces().Get_AlphabeticalIndex(o_data, i_letter);
+}
+
+
+const ary::idl::CePilot &
+AryAccess::Ces() const
+{
+    return rGate.Ces();
+}
diff --git a/autodoc/source/display/idl/hi_ary.hxx b/autodoc/source/display/idl/hi_ary.hxx
new file mode 100644
index 000000000000..a85dff4913dd
--- /dev/null
+++ b/autodoc/source/display/idl/hi_ary.hxx
@@ -0,0 +1,162 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HI_ARY_HXX
+#define ADC_DISPLAY_HI_ARY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <ary/idl/i_types4idl.hxx>
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+#include <ary/doc/d_docu.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+    class Gate;
+    class CePilot;
+    class TypePilot;
+}
+}
+namespace output
+{
+    class Position;
+}
+
+
+
+
+inline const ary::doc::OldIdlDocu *
+Get_IdlDocu(const ary::doc::Documentation & i_doc)
+{
+    return dynamic_cast< const ary::doc::OldIdlDocu* >(i_doc.Data());
+}
+
+
+
+
+
+/** A helper class to wrap the access to data in the Autodoc Repository.
+*/
+class AryAccess
+{
+  public:
+    // LIFECYCLE
+                        AryAccess(
+                            const ary::idl::Gate &
+                                                i_rGate );
+    // INQUIRY
+    const ary::idl::Module &
+                        GlobalNamespace() const;
+    const ary::idl::Module &
+                        Find_Module(
+                            ary::idl::Ce_id     i_ce ) const;
+    const ary::idl::CodeEntity &
+                        Find_Ce(
+                            ary::idl::Ce_id     i_ce ) const;
+    const ary::idl::Type &
+                        Find_Type(
+                            ary::idl::Type_id   i_type ) const;
+    ary::idl::Ce_id     CeFromType(
+                            ary::idl::Type_id   i_type ) const;
+    bool                IsBuiltInOrRelated(
+                            const ary::idl::Type &
+                                                i_type ) const;
+    bool                Search_Ce(
+                            StringVector &      o_module,
+                            String &            o_mainEntity,
+                            String &            o_memberEntity,
+                            const char *        i_sText,
+                            const ary::idl::Module &
+                                                i_referingScope ) const;
+    bool                Search_CesModule(
+                            StringVector &      o_module,
+                            const String &      i_scope,
+                            const String &      i_ce,
+                            const ary::idl::Module &
+                                                i_referingScope ) const;
+    const ary::idl::Module *
+                        Search_Module(
+                            const StringVector &
+                                                i_nameChain ) const;
+
+    void                Get_CeText(
+                            StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const ary::idl::CodeEntity &
+                                                i_ce ) const;
+    void                Get_TypeText(
+                            StringVector &      o_module,
+                            String &            o_sCe,
+                            ary::idl::Ce_id  &  o_nCe,
+                            int &               o_sequenceCount,
+                            const ary::idl::Type &
+                                                i_type ) const;
+    void                Get_IndexData(
+                            std::vector<ary::idl::Ce_id> &
+                                                o_data,
+                            ary::idl::alphabetical_index::E_Letter
+                                                i_letter ) const;
+
+    const ary::idl::CePilot &
+                        Ces() const;
+  private:
+    const ary::idl::Module *
+                        find_SubModule(
+                            const ary::idl::Module &
+                                                i_parent,
+                            const String &      i_name ) const;
+
+    /// Gets "::"-separated names out of a string.
+    bool                nextName(
+                            const char * &      io_TextPtr,
+                            String &            o_name ) const;
+
+
+    const ary::idl::Gate &
+                        gate() const;
+    const ary::idl::CePilot &
+                        ces() const;
+    const ary::idl::TypePilot &
+                        types() const;
+    // DATA
+    const ary::idl::Gate &
+                        rGate;
+};
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hi_display.cxx b/autodoc/source/display/idl/hi_display.cxx
new file mode 100644
index 000000000000..f1c2042e9e6d
--- /dev/null
+++ b/autodoc/source/display/idl/hi_display.cxx
@@ -0,0 +1,207 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <idl/hi_display.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/getncast.hxx>
+#include <toolkit/out_tree.hxx>
+#include <cfrstd.hxx>
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+#include "hi_main.hxx"
+
+
+extern const String C_sCssFilename_Idl;
+
+
+inline bool
+HtmlDisplay_Idl::IsModule( const ary::idl::CodeEntity & i_ce ) const
+{
+     return ary::is_type<ary::idl::Module>(i_ce);
+}
+
+inline const ary::idl::Module &
+HtmlDisplay_Idl::Module_Cast( const ary::idl::CodeEntity & i_ce ) const
+{
+     return ary::ary_cast<ary::idl::Module>(i_ce);
+}
+
+
+
+
+HtmlDisplay_Idl::HtmlDisplay_Idl()
+    :   pCurPageEnv(),
+        pMainDisplay()
+{
+}
+
+HtmlDisplay_Idl::~HtmlDisplay_Idl()
+{
+}
+
+void
+HtmlDisplay_Idl::do_Run( const char *                       i_sOutputDirectory,
+                         const ary::idl::Gate &             i_rAryGate,
+                         const display::CorporateFrame &    i_rLayout )
+{
+    SetRunData( i_sOutputDirectory, i_rAryGate, i_rLayout );
+
+    Create_StartFile();
+    Create_CssFile();
+    Create_FilesInNameTree();
+    Create_IndexFiles();
+    Create_FilesInProjectTree();
+    Create_PackageList();
+    Create_HelpFile();
+}
+
+void
+HtmlDisplay_Idl::SetRunData( const char *                       i_sOutputDirectory,
+                             const ary::idl::Gate &             i_rAryGate,
+                             const display::CorporateFrame &    i_rLayout  )
+{
+    csv::ploc::Path aOutputDir( i_sOutputDirectory, true );
+    pCurPageEnv = new HtmlEnvironment_Idl( aOutputDir, i_rAryGate, i_rLayout );
+    pMainDisplay = new MainDisplay_Idl(*pCurPageEnv);
+}
+
+void
+HtmlDisplay_Idl::Create_StartFile()
+{
+}
+
+void
+HtmlDisplay_Idl::Create_FilesInNameTree()
+{
+    Cout() << "\nCreate files in subtree namespaces ..." << Endl();
+
+    const ary::idl::Module &
+        rGlobalNamespace = pCurPageEnv->Data().GlobalNamespace();
+    pCurPageEnv->Goto_Directory( pCurPageEnv->OutputTree().NamesRoot(), true );
+
+    RecursiveDisplay_Module(rGlobalNamespace);
+
+    Cout() << "... done." << Endl();
+}
+
+void
+HtmlDisplay_Idl::Create_IndexFiles()
+{
+    Cout() << "\nCreate files in subtree index ..." << Endl();
+    pCurPageEnv->Goto_Directory( pCurPageEnv->OutputTree().IndexRoot(), true );
+    pMainDisplay->WriteGlobalIndices();
+    Cout() << "... done.\n" << Endl();
+}
+
+typedef ary::Dyn_StdConstIterator<ary::idl::Ce_id>  Dyn_CeIterator;
+typedef ary::StdConstIterator<ary::idl::Ce_id>      CeIterator;
+
+void
+HtmlDisplay_Idl::RecursiveDisplay_Module( const ary::idl::Module & i_module )
+{
+    i_module.Accept(*pMainDisplay);
+
+    Dyn_CeIterator
+        aMembers;
+    i_module.Get_Names(aMembers);
+
+    for ( CeIterator & iter = *aMembers;
+          iter;
+          ++iter )
+    {
+        const ary::idl::CodeEntity &
+            rCe = pCurPageEnv->Data().Find_Ce(*iter);
+
+        if ( NOT IsModule(rCe) )
+            rCe.Accept(*pMainDisplay);
+        else
+        {
+            pCurPageEnv->Goto_DirectoryLevelDown( rCe.LocalName(), true );
+            RecursiveDisplay_Module( Module_Cast(rCe) );
+            pCurPageEnv->Goto_DirectoryLevelUp();
+        }
+    }   // end for
+}
+
+void
+HtmlDisplay_Idl::Create_FilesInProjectTree()
+{
+}
+
+void
+HtmlDisplay_Idl::Create_PackageList()
+{
+#if 0
+    Cout() << "\nCreate package list ..." << std::flush;
+
+    pCurPageEnv->CurPosition() = pCurPageEnv->OutputTree().Root();
+
+    // KORR
+    // ...
+
+    Cout() << " done." << Endl();
+#endif // 0
+}
+
+void
+HtmlDisplay_Idl::Create_HelpFile()
+{
+}
+
+void
+HtmlDisplay_Idl::Create_CssFile()
+{
+    Cout() << "\nCreate css file ..." << Endl();
+
+    pCurPageEnv->Goto_Directory( pCurPageEnv->OutputTree().Root(), true );
+    pCurPageEnv->Set_CurFile( C_sCssFilename_Idl );
+
+    StreamLock
+        slCurFilePath(700);
+    pCurPageEnv->Get_CurFilePath(slCurFilePath());
+
+    csv::File
+        aCssFile(slCurFilePath().c_str(), csv::CFM_CREATE);
+    csv::OpenCloseGuard
+        aOpenGuard(aCssFile);
+    if (NOT aOpenGuard)
+    {
+        Cerr() << "Can't create file " << slCurFilePath().c_str() << "." << Endl();
+        return;
+    }
+
+    aCssFile.write("/*      Autodoc css file for IDL documentation      */\n\n\n");
+    aCssFile.write(pCurPageEnv->Layout().CssStyle());
+    aCssFile.write("\n\n\n");
+    aCssFile.write(pCurPageEnv->Layout().CssStylesExplanation());
+}
diff --git a/autodoc/source/display/idl/hi_env.cxx b/autodoc/source/display/idl/hi_env.cxx
new file mode 100644
index 000000000000..7dc6b8187ab9
--- /dev/null
+++ b/autodoc/source/display/idl/hi_env.cxx
@@ -0,0 +1,199 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hi_env.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+#include <cfrstd.hxx>
+#include <toolkit/out_tree.hxx>
+#include "hi_ary.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+const String C_s_index_files("index-files");
+
+const String C_sUseFileSuffix("-use.html");
+const String C_IndexA_FileName("index-1.html");
+
+
+HtmlEnvironment_Idl::HtmlEnvironment_Idl( const csv::ploc::Path &           i_rOutputDir,
+                                          const ary::idl::Gate &            i_rGate,
+                                          const display::CorporateFrame &   i_rLayout )
+    :   aOutputRoot(i_rOutputDir),
+        pData(new AryAccess(i_rGate)),
+        pGate(&i_rGate),
+        pOutputTree(new output::Tree),
+        aCurPosition(pOutputTree->Root()),
+        pCurPageCe(0),
+        pLayout(&i_rLayout),
+        pLinker()
+{
+    StringVector    aHelp;
+    pOutputTree->Set_NamesRoot(aHelp);
+
+    aHelp.push_back(output::IndexFilesDirName());
+    pOutputTree->Set_IndexRoot(aHelp);
+
+    (*aHelp.begin()) = String("com");
+    aHelp.push_back(String("sun"));
+    aHelp.push_back(String("star"));
+    pOutputTree->Set_Overview(aHelp, output::ModuleFileName() );
+
+    pLinker = new LinkHelper(*this);
+}
+
+HtmlEnvironment_Idl::~HtmlEnvironment_Idl()
+{
+}
+
+namespace
+{
+StringVector    G_aChain;
+}
+
+void
+HtmlEnvironment_Idl::Goto_Directory( output::Position   i_pos,
+                                     bool               i_bCreateDirectoryIfNecessary )
+{
+    aCurPosition = i_pos;
+    aCurPath = aOutputRoot.MyPath();
+
+    aCurPosition.Get_Chain(G_aChain);
+    for ( StringVector::const_iterator it = G_aChain.begin();
+          it != G_aChain.end();
+          ++it )
+    {
+        aCurPath.DirChain() += *it;
+    }
+
+    if (i_bCreateDirectoryIfNecessary)
+        create_Directory(aCurPath);
+}
+
+void
+HtmlEnvironment_Idl::Goto_DirectoryLevelDown( const String & i_subDirName,
+                                              bool           i_bCreateDirectoryIfNecessary )
+{
+    aCurPosition +=(i_subDirName);
+
+    aCurPath.SetFile(String::Null_());
+    aCurPath.DirChain() += i_subDirName;
+
+    if (i_bCreateDirectoryIfNecessary)
+        create_Directory(aCurPath);
+}
+
+void
+HtmlEnvironment_Idl::Goto_DirectoryLevelUp()
+{
+    aCurPosition -= 1;
+
+    aCurPath.SetFile(String::Null_());
+    aCurPath.DirChain() -= 1;
+}
+
+void
+HtmlEnvironment_Idl::Set_CurFile( const String & i_fileName )
+{
+    aCurPath.SetFile(i_fileName);
+}
+
+void
+HtmlEnvironment_Idl::create_Directory( const csv::ploc::Path & i_path )
+
+{
+    csv::ploc::Directory aCurDir(i_path);
+    if (NOT aCurDir.Exists())
+        aCurDir.PhysicalCreate();
+}
+
+inline bool
+IsAbsoluteLink(const char * i_link)
+{
+    const char
+        shttp[] = "http://";
+    const char
+        sfile[] = "file://";
+    const int
+        csize = sizeof shttp - 1;
+    csv_assert(csize == sizeof sfile - 1);
+
+    return      strncmp(i_link,shttp,csize) == 0
+            OR  strncmp(i_link,sfile,csize) == 0;
+}
+
+
+const char *
+HtmlEnvironment_Idl::Link2Manual( const String & i_link ) const
+{
+    if ( IsAbsoluteLink(i_link.c_str()) )
+        return i_link;
+
+    static StreamStr aLink_(200);
+    aLink_.reset();
+    String
+        sDvgRoot(pLayout->DevelopersGuideHtmlRoot());
+    if (sDvgRoot.empty())
+        sDvgRoot = "../DevelopersGuide";
+
+    // KORR_FUTURE
+    // Enhance performance by calculating this only one time:
+    if ( NOT IsAbsoluteLink(sDvgRoot.c_str()) )
+        aCurPosition.Get_LinkToRoot(aLink_);
+    aLink_ << sDvgRoot
+           << "/"
+           << i_link;
+    return aLink_.c_str();
+}
+
+String
+HtmlEnvironment_Idl::CurPageCe_AsText() const
+{
+    return CurPageCe_AsFile(".html");
+}
+
+String
+HtmlEnvironment_Idl::CurPageCe_AsFile(const char * i_sEnding) const
+{
+    if (pCurPageCe == 0)
+        return String::Null_();
+
+    static StringVector aModule_;
+    String sCe;
+    String sDummy;
+    Data().Get_CeText(aModule_, sCe, sDummy, *pCurPageCe);
+    StreamLock slCe(500);
+    if (aModule_.size() > 0)
+        slCe().operator_join(aModule_.begin(), aModule_.end(), "/");
+    if (NOT sCe.empty())
+        slCe() << "/" << sCe << i_sEnding;
+    return String(slCe().c_str());
+}
diff --git a/autodoc/source/display/idl/hi_env.hxx b/autodoc/source/display/idl/hi_env.hxx
new file mode 100644
index 000000000000..f671d6f46ce6
--- /dev/null
+++ b/autodoc/source/display/idl/hi_env.hxx
@@ -0,0 +1,161 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HI_ENV_HXX
+#define ADC_DISPLAY_HI_ENV_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+#include <cosv/ploc_dir.hxx>
+    // PARAMETERS
+#include <toolkit/out_position.hxx>
+
+namespace ary
+{
+namespace idl
+{
+    class Gate;
+    class CodeEntity;
+}
+}
+namespace display
+{
+    class CorporateFrame;
+}
+namespace output
+{
+    class Tree;
+}
+
+class AryAccess;
+class LinkHelper;
+
+/** @resp
+    Provides enviroment information to the HTML factory
+    classes.
+
+    @descr
+    All information that is not included in the data, especially
+    about the layout of the output tree and the access to
+    information from the repository are provided here.
+
+    @see HtmlFactory
+*/
+class HtmlEnvironment_Idl
+{
+  public:
+    // LIFECYCLE
+                        HtmlEnvironment_Idl(
+                            const csv::ploc::Path &
+                                                io_rOutputDir,
+                            const ary::idl::Gate &
+                                                i_rGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+                        ~HtmlEnvironment_Idl();
+
+    // OPERATIONS
+    void                Goto_Directory(
+                            output::Position    i_pos,
+                            bool                i_bCreateDirectoryIfNecessary );
+    void                Goto_DirectoryLevelDown(
+                            const String &      i_subDirName,
+                            bool                i_bCreateDirectoryIfNecessary );
+    void                Goto_DirectoryLevelUp();
+    void                Set_CurFile(
+                            const String &      i_fileName );
+    void                Set_CurPageCe(
+                            const ary::idl::CodeEntity *
+                                                i_ce )
+                                                { pCurPageCe = i_ce; }
+    // INQUIRY
+    const ary::idl::Gate &
+                        Gate() const            { return *pGate; }
+    const AryAccess &   Data() const            { return *pData; }
+    const char *        Link2Manual(
+                            const String &      i_link ) const;
+
+    /// This may be reimplemented for removing dead links to members.
+    bool                Is_MemberExistenceCheckRequired() const
+                                                { return false; }
+
+    /// @return Holds only the current directory, not the current file.
+    output::Position &  CurPosition() const     { return aCurPosition; }
+    void                Get_CurFilePath(
+                            StreamStr &         o_buffer ) const
+                                                { o_buffer << aCurPath; }
+
+    const display::CorporateFrame &
+                        Layout() const          { return *pLayout; }
+    const LinkHelper &  Linker() const          { return *pLinker; }
+
+    void                Get_LinkTo(
+                            StreamStr &         o_result,
+                            output::Position    i_destination )
+                                                { CurPosition().Get_LinkTo(o_result, i_destination); }
+    String              CurPageCe_AsText() const;
+    String              CurPageCe_AsFile(
+                            const char *        i_sEnding) const;
+    const ary::idl::CodeEntity *
+                        CurPageCe() const       { return pCurPageCe; }
+
+    // ACCESS
+    output::Tree &      OutputTree()            { return *pOutputTree; }
+
+  private:
+    // Local
+    void                create_Directory(
+                            const csv::ploc::Path &
+                                                i_path );
+
+    // DATA
+    csv::ploc::Directory
+                        aOutputRoot;
+    csv::ploc::Path     aCurPath;
+
+    Dyn<AryAccess>      pData;          /// @invariant *pData is valid.
+    const ary::idl::Gate *
+                        pGate;          /// @invariant pGate != 0.
+    Dyn<output::Tree>   pOutputTree;    /// @invariant *pOutputTree is valid.
+    mutable output::Position
+                        aCurPosition;
+    const ary::idl::CodeEntity *
+                        pCurPageCe;
+
+    const display::CorporateFrame *
+                        pLayout;
+
+    Dyn<LinkHelper>     pLinker;
+};
+
+
+#endif
+
+
diff --git a/autodoc/source/display/idl/hi_factory.cxx b/autodoc/source/display/idl/hi_factory.cxx
new file mode 100644
index 000000000000..78d71bf83525
--- /dev/null
+++ b/autodoc/source/display/idl/hi_factory.cxx
@@ -0,0 +1,321 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hi_factory.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCellStyle_SummaryLeft("imsum_left");
+extern const String
+    C_sCellStyle_SummaryRight("imsum_right");
+extern const String
+    C_sCellStyle_MDetail("imdetail");
+extern const String
+    C_sMemberTitle("membertitle");
+
+
+namespace
+{
+
+const char C_sSpace[92] = "                              "
+                          "                              "
+                          "                               ";
+}
+
+
+void
+HtmlFactory_Idl::produce_SummaryDeclaration( Xml::Element &      o_row,
+                                             const client &      i_ce ) const
+{
+    produce_InternalLink(o_row, i_ce);
+}
+
+void
+HtmlFactory_Idl::produce_InternalLink( Xml::Element &  o_screen,
+                                       const client &  i_ce ) const
+{
+    StreamLock aLocalLink(100);
+    aLocalLink() << "#" << i_ce.LocalName();
+
+    o_screen
+        >> *new Html::TableCell
+            << new Html::ClassAttr( C_sCellStyle_SummaryLeft )
+            >> *new Html::Link( aLocalLink().c_str() )
+                << i_ce.LocalName();
+}
+
+void
+HtmlFactory_Idl::produce_ShortDoc( Xml::Element &   o_screen,
+                                   const client &   i_ce ) const
+{
+    Xml::Element &
+        rDetailsRowCell = o_screen
+                            >> *new Html::TableCell
+                                << new Html::ClassAttr( C_sCellStyle_SummaryRight );
+    HF_IdlShortDocu
+        aLinkDoc(Env(), rDetailsRowCell);
+    aLinkDoc.Produce_byData( i_ce );
+
+    rDetailsRowCell << new Xml::XmlCode("&nbsp;");
+}
+
+// KORR_FUTURE: Does not belong here (implementation inheritance)!
+void
+HtmlFactory_Idl::produce_Bases( Xml::Element &   o_screen,
+                                const client &   i_ce,
+                                const String &   i_sLabel ) const
+{
+    ary::idl::Type_id nBaseT = baseOf(i_ce);
+    if ( nBaseT.IsValid() )
+    {
+        HF_DocEntryList
+            aDocList( o_screen );
+        aDocList.Produce_Term(i_sLabel);
+
+        int nDepth = 0;
+        Xml::Element &
+            rBaseList = aDocList.Produce_Definition()
+                                >> *new Xml::AnElement("pre")
+                                    << new Xml::AnAttribute("style","font-family:monospace;");
+        rBaseList
+            >> *new Html::Strong
+                << i_ce.LocalName();
+        rBaseList
+            << "\n";
+        recursive_ShowBases( rBaseList,
+                             nBaseT,
+                             nDepth );
+    }
+}
+
+void
+HtmlFactory_Idl::produce_Members( ce_list &               it_list,
+                                  const String &          i_summaryTitle,
+                                  const String &          i_summaryLabel,
+                                  const String &          i_detailsTitle,
+                                  const String &          i_detailsLabel,
+                                  const E_MemberViewType  i_viewType ) const
+{
+    csv_assert( it_list );
+
+    Dyn< HF_SubTitleTable > pSummary;
+    if  (   ( i_viewType == viewtype_summary )
+        ||  ( i_viewType == viewtype_complete )
+        )
+    {
+        pSummary = new HF_SubTitleTable(
+                CurOut(),
+                i_summaryLabel,
+                i_summaryTitle,
+                2 );
+    }
+
+    Dyn< HF_SubTitleTable > pDetails;
+    if  (   ( i_viewType == viewtype_details )
+        ||  ( i_viewType == viewtype_complete )
+        )
+    {
+        pDetails = new HF_SubTitleTable(
+                CurOut(),
+                i_detailsLabel,
+                i_detailsTitle,
+                1 );
+    }
+
+    for ( ; it_list.operator bool(); ++it_list )
+    {
+        const ary::idl::CodeEntity &
+            rCe = Env().Data().Find_Ce(*it_list);
+
+        if ( pSummary )
+        {
+            Xml::Element &
+                rSummaryRow = pSummary->Add_Row();
+            produce_SummaryDeclaration(rSummaryRow, rCe);
+//            produce_InternalLink(rSummaryRow, rCe);
+            produce_ShortDoc(rSummaryRow, rCe);
+        }
+
+        if ( pDetails )
+            produce_MemberDetails(*pDetails, rCe);
+    }
+}
+
+void
+HtmlFactory_Idl::produce_Title( HF_TitleTable &     o_title,
+                                const String &      i_label,
+                                const client &      i_ce ) const
+{
+    StreamLock
+        slAnnotations(200);
+    get_Annotations(slAnnotations(), i_ce);
+    StreamLock
+        slTitle(200);
+    slTitle() << i_label << " " << i_ce.LocalName();
+    o_title.Produce_Title( slAnnotations().c_str(),
+                           slTitle().c_str() );
+}
+
+void
+HtmlFactory_Idl::get_Annotations( StreamStr &         o_out,
+                                  const client &      i_ce ) const
+{
+    const ary::doc::OldIdlDocu *
+        doc = Get_IdlDocu(i_ce.Docu());
+    if (doc != 0)
+    {
+        if (doc->IsDeprecated())
+            o_out << "deprecated ";
+        if (NOT doc->IsPublished())
+            o_out << "unpublished ";
+    }
+
+    // KORR
+    //  Need to display "unpublished", if there is no docu.
+}
+
+void
+HtmlFactory_Idl::write_Docu( Xml::Element &     o_screen,
+                             const client &     i_ce ) const
+{
+    const ary::doc::OldIdlDocu *
+        doc = Get_IdlDocu(i_ce.Docu());
+    if (doc != 0)
+    {
+        HF_DocEntryList
+            aDocuList( o_screen );
+        HF_IdlDocu
+            aDocu( Env(), aDocuList );
+        aDocu.Produce_fromCodeEntity(i_ce);
+    }
+
+    write_ManualLinks(o_screen, i_ce);
+}
+
+void
+HtmlFactory_Idl::write_ManualLinks( Xml::Element &  o_screen,
+                                    const client &  i_ce ) const
+{
+    const StringVector &
+        rLinks2Descrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if ( rLinks2Descrs.size() == 0 )
+        return;
+
+    o_screen
+        >> *new Html::Label(C_sLocalManualLinks.c_str()+1)  // Leave out the leading '#'.
+            << " ";
+    HF_DocEntryList
+        aDocuList( o_screen );
+    aDocuList.Produce_Term("Developers Guide");
+    csv_assert(rLinks2Descrs.size() % 2 == 0);
+    for ( StringVector::const_iterator it = rLinks2Descrs.begin();
+          it != rLinks2Descrs.end();
+          ++it )
+    {
+        Xml::Element &
+            rLink = aDocuList.Produce_Definition() >> *new Html::Link( Env().Link2Manual(*it));
+        if ( (*(it+1)).empty() )
+            // HACK KORR_FUTURE
+            // Research what happens with manual links which contain normal characters
+            // in non-utf-8 texts. And research, why utfF-8 does not work here.
+            rLink << new Xml::XmlCode(*it);
+        else
+            rLink << new Xml::XmlCode( *(it+1) );
+        ++it;
+    }   // end for
+}
+
+void
+HtmlFactory_Idl::produce_MemberDetails(  HF_SubTitleTable &  ,
+                                         const client &      ) const
+{
+    // Dummy, which does not need to do anything.
+}
+
+void
+HtmlFactory_Idl::recursive_ShowBases( Xml::Element &     o_screen,
+                                      type_id            i_baseType,
+                                      int &              io_nDepth ) const
+{
+    // Show this base
+    ++io_nDepth;
+    const ary::idl::CodeEntity *
+        pCe = Env().Linker().Search_CeFromType(i_baseType);
+
+    csv_assert(io_nDepth > 0);
+    if (io_nDepth > 30)
+        io_nDepth = 30;
+    o_screen
+        << (C_sSpace + 93 - 3*io_nDepth)
+        << new csi::xml::XmlCode("&#x2517")
+        << " ";
+
+    if (pCe == 0)
+    {
+        HF_IdlTypeText
+            aText( Env(), o_screen, false );
+        aText.Produce_byData( i_baseType );
+        o_screen
+            << "\n";
+        --io_nDepth;
+        return;
+    }
+
+    HF_IdlTypeText
+        aBaseLink( Env(), o_screen, true );
+    aBaseLink.Produce_byData(pCe->CeId());
+    o_screen
+        << "\n";
+
+    // Bases
+    ary::idl::Type_id
+        nBaseT = baseOf(*pCe);
+    if (nBaseT.IsValid())
+        recursive_ShowBases(o_screen,nBaseT,io_nDepth);
+
+    --io_nDepth;
+    return;
+}
+
+HtmlFactory_Idl::type_id
+HtmlFactory_Idl::inq_BaseOf( const client & ) const
+{
+    // Unused dummy.
+    return type_id(0);
+}
+
diff --git a/autodoc/source/display/idl/hi_factory.hxx b/autodoc/source/display/idl/hi_factory.hxx
new file mode 100644
index 000000000000..d7a649bbfbb2
--- /dev/null
+++ b/autodoc/source/display/idl/hi_factory.hxx
@@ -0,0 +1,169 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HI_FACTORY_HXX
+#define ADC_DISPLAY_HI_FACTORY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <toolkit/htmlfactory.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/stdconstiter.hxx>
+#include <ary/idl/i_types4idl.hxx>
+#include <toolkit/out_position.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+}
+namespace doc
+{
+    class OldIdlDocu;
+}
+}
+
+
+class HtmlEnvironment_Idl;
+class LinkHelper;
+class HF_NaviSubRow;
+class HF_TitleTable;
+class HF_SubTitleTable;
+
+
+class HtmlFactory_Idl : public HtmlFactory<HtmlEnvironment_Idl>
+{
+  public:
+    enum E_MemberViewType
+    {
+        viewtype_summary,   // the summary of the members
+        viewtype_details,   // the details of the members
+        viewtype_complete   // everything
+    };
+
+    enum E_DocType
+    {
+        doctype_summaryOnly,    // only the summary
+        doctype_complete        // the complete documentation
+    };
+
+  public:
+    typedef ary::idl::CodeEntity                client;
+    typedef ary::idl::Ce_id                     ce_id;
+    typedef ary::idl::Type_id                   type_id;
+    typedef ary::doc::OldIdlDocu                ce_info;
+
+    typedef ary::Dyn_StdConstIterator<ce_id>    dyn_ce_list;
+    typedef ary::Dyn_StdConstIterator<type_id>  dyn_type_list;
+    typedef ary::StdConstIterator<ce_id>        ce_list;
+    typedef ary::StdConstIterator<type_id>      type_list;
+
+    typedef HtmlEnvironment_Idl                 Environment;
+    typedef output::Position                    OutPosition;
+
+  protected:
+                        HtmlFactory_Idl(
+                            Environment &       io_rEnv,
+                            Xml::Element *      o_pOut = 0 )
+                            :   HtmlFactory<Environment>(io_rEnv, o_pOut)
+                            { }
+    virtual             ~HtmlFactory_Idl() {}
+
+    /** The default version only calls ->produce_InternalLink().
+        This may be overwritten by derived classes.
+    */
+    virtual void        produce_SummaryDeclaration(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+    void                produce_InternalLink(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+    void                produce_ShortDoc(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+
+    // KORR_FUTURE: Does not belong here (implementation inheritance)!
+    void                produce_Bases(
+                                Xml::Element &   o_screen,
+                                const client &   i_ce,
+                                const String &   i_sLabel ) const;
+    void                produce_Members(
+                            ce_list &               it_list,
+                            const String &          i_summaryTitle,
+                            const String &          i_summaryLabel,
+                            const String &          i_detailsTitle,
+                            const String &          i_detailsLabel,
+                            const E_MemberViewType  i_viewType = viewtype_complete ) const;
+
+    void                produce_Title(
+                            HF_TitleTable &     o_title,
+                            const String &      i_label,
+                            const client &      i_ce ) const;
+    void                get_Annotations(
+                            StreamStr &         o_out,
+                            const client &      i_ce ) const;
+
+    /// Writes complete docu in standard format.
+    void                write_Docu(
+                            Xml::Element &      o_screen,
+                            const client &      i_ce ) const;
+
+    void                write_ManualLinks(
+                            Xml::Element &      o_screen,
+                            const client &      i_ce ) const;
+  private:
+    // Dummy does nothing
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      i_ce ) const;
+    void                recursive_ShowBases(
+                            Xml::Element &      o_screen,
+                            type_id             i_baseType,
+                            int &               io_nDepth ) const;
+    type_id             baseOf(
+                            const client &      i_ce ) const
+                                                { return inq_BaseOf(i_ce); }
+    virtual type_id     inq_BaseOf(
+                            const client &      i_ce ) const;
+};
+
+
+extern const String
+    C_sCellStyle_SummaryLeft;
+extern const String
+    C_sCellStyle_SummaryRight;
+extern const String
+    C_sCellStyle_MDetail;
+extern const String
+    C_sMemberTitle;
+
+
+#endif
diff --git a/autodoc/source/display/idl/hi_linkhelper.cxx b/autodoc/source/display/idl/hi_linkhelper.cxx
new file mode 100644
index 000000000000..1e3bff61b50c
--- /dev/null
+++ b/autodoc/source/display/idl/hi_linkhelper.cxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hi_linkhelper.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_module.hxx>
+
+
+
+
+const ary::idl::Module *
+LinkHelper::Search_CurModule() const
+{
+    return Search_Module( rEnv.CurPosition().RelatedNode() );
+}
+
+const ary::idl::Module *
+LinkHelper::Search_Module( output::Node & i_node ) const
+{
+    static StringVector aNames_;
+
+    output::Node::relative_id
+        nId = i_node.RelatedNameRoom();
+    if (nId == 0)
+    {
+        csv::erase_container(aNames_);
+        i_node.Get_Chain(aNames_);
+        const ary::idl::Module *  pModule =
+            rEnv.Data().Search_Module(aNames_);
+        if ( pModule == 0 )
+            return 0;
+        nId = static_cast<output::Node::relative_id>(pModule->Id());
+        rEnv.CurPosition().RelatedNode().Set_RelatedNameRoom(nId);
+    }
+
+    return & rEnv.Data().Find_Module( ary::idl::Ce_id(nId) );
+}
+
+namespace
+{
+    const String C_sXrefsSuffix("-xref");
+}
+
+
+LinkHelper::OutPosition
+LinkHelper::PositionOf_CurXRefs( const String & i_ceName ) const
+{
+    StreamLock sl(100);
+    return OutPosition( rEnv.CurPosition(),
+                        sl()    << i_ceName
+                                << C_sXrefsSuffix
+                                << ".html"
+                                << c_str );
+}
+
+const String &
+LinkHelper::XrefsSuffix() const
+{
+    return C_sXrefsSuffix;
+}
+
+
+String
+nameChainLinker( const char * )
+{
+    static const String
+        sModuleFileName_( output::ModuleFileName() );
+    return sModuleFileName_;
+}
diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx b/autodoc/source/display/idl/hi_linkhelper.hxx
new file mode 100644
index 000000000000..26f50cca2f87
--- /dev/null
+++ b/autodoc/source/display/idl/hi_linkhelper.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HI_LINKHELPER_HXX
+#define ADC_DISPLAY_HI_LINKHELPER_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+#include <toolkit/out_position.hxx>
+#include <toolkit/out_tree.hxx>
+
+
+class LinkHelper
+{
+  public:
+    typedef ary::idl::CodeEntity                CE;
+    typedef output::Position                    OutPosition;
+
+                        LinkHelper(
+                            HtmlEnvironment_Idl &
+                                                io_rEnv )
+                            :   rEnv(io_rEnv) {}
+
+    OutPosition         PositionOf_CurModule() const
+                        { return OutPosition( rEnv.CurPosition(),
+                                              output::ModuleFileName()); }
+
+    OutPosition         PositionOf_CurXRefs(
+                            const String &      i_ceName) const;
+    OutPosition         PositionOf_Index() const
+                        { OutPosition ret1 = rEnv.OutputTree().IndexRoot();
+                          return OutPosition( ret1, String(output::IndexFile_A()) ); }
+
+
+    const ary::idl::Module *
+                        Search_CurModule() const;
+    const ary::idl::Module *
+                        Search_Module(
+                            output::Node &      i_node ) const;
+
+    const CE *          Search_CeFromType(
+                            ary::idl::Type_id   i_type ) const;
+
+    void                Get_Link2Position(
+                            StreamStr &         o_link,
+                            OutPosition &       i_pos ) const
+                        { rEnv.CurPosition().Get_LinkTo(o_link, i_pos); }
+
+    void                Get_Link2Member(
+                            StreamStr &         o_link,
+                            OutPosition &       i_ownerPos,
+                            const String &      i_memberName ) const
+                        { Get_Link2Position(o_link, i_ownerPos);
+                          o_link << "#" << i_memberName; }
+    const String &      XrefsSuffix() const;
+
+  private:
+    // DATA
+    mutable HtmlEnvironment_Idl &
+                        rEnv;
+};
+
+inline const ary::idl::CodeEntity *
+LinkHelper::Search_CeFromType( ary::idl::Type_id i_type ) const
+{
+    ary::idl::Ce_id nCe = rEnv.Data().CeFromType(i_type);
+    if (nCe.IsValid())
+        return &rEnv.Data().Find_Ce(nCe);
+    return 0;
+}
+
+
+
+String              nameChainLinker(
+                        const char *        i_levelName );
+
+
+#endif
diff --git a/autodoc/source/display/idl/hi_main.cxx b/autodoc/source/display/idl/hi_main.cxx
new file mode 100644
index 000000000000..8a18d4a8564b
--- /dev/null
+++ b/autodoc/source/display/idl/hi_main.cxx
@@ -0,0 +1,764 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hi_main.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <cosv/ploc.hxx>
+#include <cosv/file.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_ce.hxx>
+#include <ary/idl/ik_enum.hxx>
+#include <ary/idl/ik_typedef.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/ik_struct.hxx>
+#include <ary/idl/ik_exception.hxx>
+#include <ary/idl/i_constant.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/i_module.hxx>
+#include <cfrstd.hxx>
+#include <toolkit/htmlfile.hxx>
+#include <toolkit/out_position.hxx>
+#include <toolkit/out_tree.hxx>
+#include "hfi_constgroup.hxx"
+#include "hfi_enum.hxx"
+#include "hfi_globalindex.hxx"
+#include "hfi_interface.hxx"
+#include "hfi_module.hxx"
+#include "hfi_struct.hxx"
+#include "hfi_service.hxx"
+#include "hfi_singleton.hxx"
+#include "hfi_siservice.hxx"
+#include "hfi_typedef.hxx"
+#include "hfi_xrefpage.hxx"
+#include "hi_env.hxx"
+#include "hi_linkhelper.hxx"
+
+
+using       ::ary::idl::Ce_id;
+using       ::ary::idl::Type_id;
+using       ::ary::idl::ifc_ce::Dyn_CeIterator;
+
+
+
+extern const String C_sCssFilename_Idl("idl.css");
+
+/*
+typedef     ::ary::Dyn_StdConstIterator< ::ary::idl::CommentedRelation>
+            Dyn_ComRefIterator;
+namespace   read_module     = ::ary::idl::ifc_module;
+namespace   read_interface  = ::ary::idl::ifc_interface;
+namespace   read_service    = ::ary::idl::ifc_service;
+namespace   read_struct     = ::ary::idl::ifc_struct;
+namespace   read_exception  = ::ary::idl::ifc_exception;
+namespace   read_enum       = ::ary::idl::ifc_enum;
+namespace   read_typedef    = ::ary::idl::ifc_typedef;
+namespace   read_constgroup = ::ary::idl::ifc_constantsgroup;
+*/
+
+namespace
+{
+
+/** @resp
+    Inits (constructor) and creates (destructor) the current
+    html documentation file ( MainDisplay_Idl.pMyFile ).
+*/
+class Guard_CurFile
+{
+  public:
+                        Guard_CurFile(          /// For CodeEntities
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            const ary::idl::CodeEntity &
+                                                i_ce,
+                            const String &      i_titlePrefix );
+                        Guard_CurFile(          /// For Use pages
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            const String &      i_fileName,
+                            const String &      i_titlePrefix );
+                        Guard_CurFile(          /// For Modules
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            const ary::idl::CodeEntity &
+                                                i_ce );
+                        Guard_CurFile(          /// For Indices
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            char                i_letter );
+                        ~Guard_CurFile();
+  private:
+    DocuFile_Html &     rClient;
+    HtmlEnvironment_Idl &
+                        rEnv;
+
+};
+
+/** @resp
+    Sets and releases the current factory pointer
+    ( MainDisplay_Idl.pCurFactory ).
+*/
+class Guard_CurFactoryPtr
+{
+  public:
+                        Guard_CurFactoryPtr(
+                            HtmlFactory_Idl *&  io_client,
+                            HtmlFactory_Idl &   i_factory )
+                            :   rpClient(io_client)
+                        { rpClient = &i_factory; }
+
+                        ~Guard_CurFactoryPtr()
+                        { rpClient = 0; }
+
+  private:
+    HtmlFactory_Idl *&  rpClient;
+
+};
+
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &               io_client,
+                              HtmlEnvironment_Idl &         io_env,
+                              const ary::idl::CodeEntity &  i_ce,
+                              const String &                i_titlePrefix )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Ces
+    StreamLock sl(300);
+    io_env.Set_CurFile( sl()    << i_ce.LocalName()
+                                << ".html"
+                                << c_str );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+
+    rClient.EmptyBody();
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+    rClient.SetLocation(aLocation);
+    sl().reset();
+    rClient.SetTitle( sl()  << i_titlePrefix
+                            << " "
+                            << i_ce.LocalName()
+                            << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << io_env.CurPosition().LinkToRoot()
+                            << C_sCssFilename_Idl
+                            << c_str );
+
+    io_env.Set_CurPageCe(&i_ce);
+}
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &       io_client,
+                              HtmlEnvironment_Idl & io_env,
+                              const String &        i_fileName,
+                              const String &        i_titlePrefix )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Use pages
+    StreamLock sl(300);
+    io_env.Set_CurFile( sl()    << i_fileName
+                                << ".html"
+                                << c_str );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+
+    rClient.EmptyBody();
+    rClient.SetLocation(aLocation);
+    sl().reset();
+    rClient.SetTitle( sl() << i_titlePrefix << " " << i_fileName << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << io_env.CurPosition().LinkToRoot()
+                            << C_sCssFilename_Idl
+                            << c_str );
+
+    io_env.Set_CurPageCe(0);
+}
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &               io_client,
+                              HtmlEnvironment_Idl &         io_env,
+                              const ary::idl::CodeEntity &  i_ce )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Modules
+    io_env.Set_CurFile( output::ModuleFileName() );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+
+    rClient.EmptyBody();
+    rClient.SetLocation(aLocation);
+    StreamLock sl(300);
+    rClient.SetTitle( sl() << "Module " << io_env.CurPosition().Name() << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << io_env.CurPosition().LinkToRoot()
+                            << C_sCssFilename_Idl
+                            << c_str );
+
+    io_env.Set_CurPageCe(&i_ce);
+}
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &       io_client,
+                              HtmlEnvironment_Idl & io_env,
+                              char                  i_letter )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Index pages
+    StreamLock sl(300);
+    io_env.Set_CurFile( sl()    << "index-"
+                                << ( i_letter != '_'
+                                        ?   int(i_letter)-'a'+1
+                                        :   27 )
+                                << ".html"
+                                << c_str );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+
+    rClient.EmptyBody();
+    rClient.SetLocation(aLocation);
+    sl().reset();
+    rClient.SetTitle( sl() << "Global Index "
+                           << ( i_letter != '_'
+                                    ?   char(i_letter-'a'+'A')
+                                    :   '_' )
+                           << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << "../"
+                            << C_sCssFilename_Idl
+                            << c_str );
+}
+
+Guard_CurFile::~Guard_CurFile()
+{
+    rClient.CreateFile();
+    rEnv.Set_CurPageCe(0);
+}
+
+
+}   // anonymous namespace
+
+
+
+
+MainDisplay_Idl::MainDisplay_Idl( HtmlEnvironment_Idl & io_rEnv )
+    :   pEnv(&io_rEnv),
+        pMyFile(new DocuFile_Html),
+        pCurFactory(0)
+{
+//  pMyFile->SetStyle( Env().Layout().CssStyle() );
+    pMyFile->SetCopyright( Env().Layout().CopyrightText() );
+}
+
+MainDisplay_Idl::~MainDisplay_Idl()
+{
+}
+
+
+void
+MainDisplay_Idl::WriteGlobalIndices()
+{
+    for ( const char * pLetter = "abcdefghijklmnopqrstuvwxyz_X"; *pLetter != 'X'; ++pLetter )
+    {
+        Guard_CurFile       gFile( *pMyFile, Env(), *pLetter );
+
+        HF_IdlGlobalIndex   aFactory( *pEnv, pMyFile->Body() );
+        Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+        aFactory.Produce_Page( ary::idl::alphabetical_index::E_Letter(*pLetter) );
+    }   // end for
+}
+
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Module & i_ce )
+{
+    Guard_CurFile    gFile( *pMyFile,
+                            Env(),
+                            i_ce );
+    HF_IdlModule     aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Interface & i_ce )
+{
+    do_InterfaceDescr(i_ce);
+    do_Interface2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Service & i_ce )
+{
+    do_ServiceDescr(i_ce);
+    do_Service2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::SglIfcService & i_ce )
+{
+    do_SglIfcServiceDescr(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Struct & i_ce )
+{
+    do_StructDescr(i_ce);
+    do_Struct2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Exception & i_ce )
+{
+    do_ExceptionDescr(i_ce);
+    do_Exception2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Enum & i_ce )
+{
+    do_EnumDescr(i_ce);
+    do_Enum2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Typedef & i_ce )
+{
+    do_TypedefDescr(i_ce);
+    do_Typedef2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::ConstantsGroup & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Constants' Group" );
+    HF_IdlConstGroup    aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Singleton & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Singleton" );
+    HF_IdlSingleton     aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData_ServiceBased(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::SglIfcSingleton & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Singleton" );
+    HF_IdlSingleton     aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData_InterfaceBased(i_ce);
+}
+
+void
+MainDisplay_Idl::do_InterfaceDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Interface" );
+    HF_IdlInterface     aInterface( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aInterface);
+
+    aInterface.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_ServiceDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Service" );
+    HF_IdlService       aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_SglIfcServiceDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Service" );
+    HF_IdlSglIfcService aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_StructDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Struct" );
+    HF_IdlStruct        aFactory( *pEnv, pMyFile->Body(), false );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_ExceptionDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Exception" );
+    HF_IdlStruct        aFactory( *pEnv, pMyFile->Body(), true );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_EnumDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Enum" );
+    HF_IdlEnum        aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_TypedefDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Typedef" );
+    HF_IdlTypedef       aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Interface2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               sUsesFileName,
+                               "Uses of Interface" );
+    HF_IdlXrefs         aUses( *pEnv,
+                               pMyFile->Body(),
+                               C_sCePrefix_Interface,
+                               i_ce );
+
+
+    aUses.Produce_Tree(
+        "Derived Interfaces",
+        "#Deriveds",
+        i_ce,
+        &ary::idl::ifc_interface::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
+    ary::idl::ifc_interface::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_ExportingServices(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Services which Support this Interface",
+        "#SupportingServices",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_ExportingSingletons(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Singletons which Support this Interface",
+        "#SupportingSingletons",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Service2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Service" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Service,
+                            i_ce );
+    Dyn_CeIterator  pXrefList;
+    ary::idl::ifc_service::xref::Get_IncludingServices(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Services which Include this Service",
+        "#IncludingServices",
+        *pXrefList );
+
+    ary::idl::ifc_service::xref::Get_InstantiatingSingletons(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Singletons which Instantiate this Service",
+        "#Singletons",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Struct2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Struct" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Struct,
+                            i_ce );
+
+    aUses.Produce_Tree(
+        "Derived Structs",
+        "#Deriveds",
+        i_ce,
+        &ary::idl::ifc_struct::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
+    ary::idl::ifc_struct::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_struct::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_struct::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_struct::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Exception2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Exception" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Exception,
+                            i_ce );
+
+    aUses.Produce_Tree(
+        "Derived Exceptions",
+        "#Deriveds",
+        i_ce,
+        &ary::idl::ifc_exception::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
+    ary::idl::ifc_exception::xref::Get_RaisingFunctions(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Raising Functions",
+        "#Raisers",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Enum2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Enum" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Enum,
+                            i_ce );
+    Dyn_CeIterator  pXrefList;
+    ary::idl::ifc_enum::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_enum::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_enum::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_enum::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Typedef2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+               sl() << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Typedef" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Typedef,
+                            i_ce );
+    Dyn_CeIterator  pXrefList;
+    ary::idl::ifc_typedef::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_typedef::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_typedef::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_typedef::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
diff --git a/autodoc/source/display/idl/hi_main.hxx b/autodoc/source/display/idl/hi_main.hxx
new file mode 100644
index 000000000000..57b345a98df7
--- /dev/null
+++ b/autodoc/source/display/idl/hi_main.hxx
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HFIDMAIN_HXX
+#define ADC_DISPLAY_HFIDMAIN_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+#include "hi_factory.hxx"
+    // PARAMETERS
+
+
+class HtmlEnvironment_Idl;
+class HtmlFactory_Idl;
+class DocuFile_Html;
+
+namespace ary
+{
+namespace idl
+{
+
+    class Module;
+    class Service;
+    class SglIfcService;
+    class Interface;
+    class Struct;
+    class Exception;
+    class Enum;
+    class Typedef;
+    class ConstantsGroup;
+    class Singleton;
+    class SglIfcSingleton;
+
+}   // namespace idl
+}   // namespace ary
+
+
+class MainDisplay_Idl : public csv::ProcessorIfc,
+                        public csv::ConstProcessor<ary::idl::Module>,
+                        public csv::ConstProcessor<ary::idl::Service>,
+                        public csv::ConstProcessor<ary::idl::SglIfcService>,
+                        public csv::ConstProcessor<ary::idl::Interface>,
+                        public csv::ConstProcessor<ary::idl::Struct>,
+                        public csv::ConstProcessor<ary::idl::Exception>,
+                        public csv::ConstProcessor<ary::idl::Enum>,
+                        public csv::ConstProcessor<ary::idl::Typedef>,
+                        public csv::ConstProcessor<ary::idl::ConstantsGroup>,
+                        public csv::ConstProcessor<ary::idl::Singleton>,
+                        public csv::ConstProcessor<ary::idl::SglIfcSingleton>
+{
+  public:
+                        MainDisplay_Idl(
+                            HtmlEnvironment_Idl &
+                                                io_rEnv );
+    virtual             ~MainDisplay_Idl();
+
+    void                WriteGlobalIndices();
+
+    void                Display_NamedEntityHierarchy();
+
+  private:
+    // Interface csv::ProcessorIfc:
+    virtual void        do_Process(
+                            const ary::idl::Module  &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::Service &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::SglIfcService &
+                                                          i_client );
+    virtual void        do_Process(
+                            const ary::idl::Interface &   i_client );
+    virtual void        do_Process(
+                            const ary::idl::Struct  &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::Exception &   i_client );
+    virtual void        do_Process(
+                            const ary::idl::Enum &        i_client );
+    virtual void        do_Process(
+                            const ary::idl::Typedef &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::ConstantsGroup &
+                                                i_client );
+    virtual void        do_Process(
+                            const ary::idl::Singleton &   i_client );
+    virtual void        do_Process(
+                            const ary::idl::SglIfcSingleton &
+                                                i_client );
+    // Locals
+    void                do_ServiceDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_SglIfcServiceDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_InterfaceDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_StructDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_ExceptionDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_EnumDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_TypedefDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_SingletonDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Service2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Interface2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Struct2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Exception2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Enum2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Typedef2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Singleton2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+
+    const HtmlEnvironment_Idl &
+                        Env() const             { return *pEnv; }
+    HtmlEnvironment_Idl &
+                        Env()                   { return *pEnv; }
+    Xml::Element &      CurHtmlOut()            { return pCurFactory->CurOut(); }
+
+    // DATA
+    HtmlEnvironment_Idl *
+                        pEnv;
+    Dyn<DocuFile_Html>  pMyFile;
+    HtmlFactory_Idl *   pCurFactory;
+};
+
+
+
+#endif
diff --git a/autodoc/source/display/idl/makefile.mk b/autodoc/source/display/idl/makefile.mk
new file mode 100644
index 000000000000..383983a1fb22
--- /dev/null
+++ b/autodoc/source/display/idl/makefile.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_idl
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/hfi_constgroup.obj  \
+    $(OBJ)$/hfi_doc.obj         \
+    $(OBJ)$/hfi_enum.obj        \
+    $(OBJ)$/hfi_globalindex.obj \
+    $(OBJ)$/hfi_hierarchy.obj   \
+    $(OBJ)$/hfi_interface.obj   \
+    $(OBJ)$/hfi_method.obj      \
+    $(OBJ)$/hfi_module.obj      \
+    $(OBJ)$/hfi_navibar.obj     \
+    $(OBJ)$/hfi_property.obj    \
+    $(OBJ)$/hfi_service.obj     \
+    $(OBJ)$/hfi_singleton.obj   \
+    $(OBJ)$/hfi_siservice.obj   \
+    $(OBJ)$/hfi_struct.obj      \
+    $(OBJ)$/hfi_tag.obj         \
+    $(OBJ)$/hfi_typedef.obj     \
+    $(OBJ)$/hfi_typetext.obj    \
+    $(OBJ)$/hfi_xrefpage.obj    \
+    $(OBJ)$/hi_ary.obj        	\
+    $(OBJ)$/hi_display.obj      \
+    $(OBJ)$/hi_env.obj          \
+    $(OBJ)$/hi_factory.obj      \
+    $(OBJ)$/hi_linkhelper.obj   \
+    $(OBJ)$/hi_main.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/inc/cfrstd.hxx b/autodoc/source/display/inc/cfrstd.hxx
new file mode 100644
index 000000000000..5545fe854596
--- /dev/null
+++ b/autodoc/source/display/inc/cfrstd.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CFRSTD_HXX
+#define ADC_CFRSTD_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <display/corframe.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+class StdFrame : public display::CorporateFrame
+{
+  public:
+    // LIFECYCLE
+                        StdFrame();
+
+    // INQUIRY
+    virtual DYN Html_Image *
+                        LogoSrc() const;
+    virtual const char *
+                        LogoLink() const;
+    virtual const char *
+                        CopyrightText() const;
+    virtual const char *
+                        CssStyle() const;
+    virtual const char *
+                        CssStylesExplanation() const;
+    virtual const char *
+                        DevelopersGuideHtmlRoot() const;
+    virtual bool        SimpleLinks() const;
+
+    // ACCESS
+    virtual void        Set_DevelopersGuideHtmlRoot(
+                            const String &      i_directory );
+    virtual void        Set_SimpleLinks();
+
+  private:
+    String              sDevelopersGuideHtmlRoot;
+    bool                bSimpleLinks;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
diff --git a/autodoc/source/display/inc/html/chd_udk2.hxx b/autodoc/source/display/inc/html/chd_udk2.hxx
new file mode 100644
index 000000000000..2177f22a90b6
--- /dev/null
+++ b/autodoc/source/display/inc/html/chd_udk2.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTML_CHD_UDK2_HXX
+#define ADC_DISPLAY_HTML_CHD_UDK2_HXX
+
+// BASE CLASSES
+#include <autodoc/dsp_html_std.hxx>
+// USED SERVICES
+#include <cosv/ploc.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Namespace;
+    class Gate;
+}
+}
+
+class OuputPage_Environment;
+
+
+
+
+class CppHtmlDisplay_Udk2 : public autodoc::HtmlDisplay_UdkStd
+{
+  public:
+                        CppHtmlDisplay_Udk2();
+                        ~CppHtmlDisplay_Udk2();
+  private:
+    // Interface CppHtmlDisplay_UdkStd:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+
+    // Local
+    void                SetRunData(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+
+    void                Create_Css_File();
+    void                Create_Overview_File();
+    void                Create_Help_File();
+    void                Create_AllDefs_File();
+    void                CreateFiles_InSubTree_Namespaces();
+    void                CreateFiles_InSubTree_Index();
+
+    void                RecursiveDisplay_Namespace(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    void                DisplayFiles_InNamespace(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    const ary::cpp::Gate &
+                        Gate() const;
+    // DATA
+    Dyn<OuputPage_Environment>
+                        pCurPageEnv;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/inc/idl/hi_display.hxx b/autodoc/source/display/inc/idl/hi_display.hxx
new file mode 100644
index 000000000000..53650a8ce5a8
--- /dev/null
+++ b/autodoc/source/display/inc/idl/hi_display.hxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HI_DISPLAY_HXX
+#define ADC_DISPLAY_HI_DISPLAY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <autodoc/dsp_html_std.hxx>
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+    // PARAMETERS
+
+
+
+namespace ary
+{
+    namespace idl
+    {
+        class Module;
+        class CodeEntity;
+    }   // namspace idl
+}   // namspace csi
+
+
+class MainDisplay_Idl;
+class HtmlEnvironment_Idl;
+
+class HtmlDisplay_Idl : public autodoc::HtmlDisplay_Idl_Ifc
+{
+  public:
+                        HtmlDisplay_Idl();
+                        ~HtmlDisplay_Idl();
+  private:
+    // Interface HtmlDisplay_Idl_Ifc:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+    void                SetRunData(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+    void                Create_StartFile();
+    void                Create_FilesInNameTree();
+    void                Create_IndexFiles();
+    void                Create_FilesInProjectTree();
+    void                Create_PackageList();
+    void                Create_HelpFile();
+    void                Create_CssFile();
+
+    /** @descr
+        - makes sure, the module's directory exists
+        - creates the module's docu file
+        - creates docu files for all members of the module
+        - does the same recursive for all sub-modules.
+    */
+    void                RecursiveDisplay_Module(
+                            const ary::idl::Module &
+                                                i_rNamespace );
+    bool                IsModule(
+                            const ary::idl::CodeEntity &
+                                                i_ce ) const;
+    const ary::idl::Module &
+                        Module_Cast(            /// @precond Cast must be valid.
+                            const ary::idl::CodeEntity &
+                                                i_ce ) const;
+    // DATA
+    Dyn<HtmlEnvironment_Idl>
+                        pCurPageEnv;
+    Dyn<MainDisplay_Idl>
+                        pMainDisplay;
+};
+
+
+
+// IMPLEMENTATION
+
+
+#endif
+
diff --git a/autodoc/source/display/inc/toolkit/hf_docentry.hxx b/autodoc/source/display/inc/toolkit/hf_docentry.hxx
new file mode 100644
index 000000000000..83e447c615fa
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_docentry.hxx
@@ -0,0 +1,59 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HF_DOCENTRY_HXX
+#define ADC_DISPLAY_HF_DOCENTRY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "htmlfactory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+/** @resp
+    Produces a list of <DT>..</DT> and <DD>.
+*/
+class HF_DocEntryList : public HtmlMaker
+{
+  public:
+
+                        HF_DocEntryList(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_DocEntryList();
+
+    Xml::Element &      Produce_Term(
+                            const char *        i_sTerm = 0 );
+    Xml::Element &      Produce_NormalTerm(     /// Font will not be bold.
+                            const char *        i_sTerm = 0 );
+    Xml::Element &      Produce_Definition();
+};
+
+
+
+#endif
diff --git a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx
new file mode 100644
index 000000000000..1b943dde3e19
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HF_FUNCDECL_HXX
+#define ADC_DISPLAY_HF_FUNCDECL_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <toolkit/htmlfactory.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+#if 0   // old
+/** @resp
+    Provides three cells to put in a function declaration.
+*/
+class HF_FunctionDeclaration : public HtmlMaker
+{
+  public:
+                        HF_FunctionDeclaration(
+                            Xml::Element &      o_rParent );
+    virtual             ~HF_FunctionDeclaration();
+
+    /// Inserts empty line in 2nd and 3rd cell and returns first.
+    Xml::Element &      Add_ReturnLine();
+
+    /** Inserts empty line in 1st cell, "raises (" in 2nd
+        and returns 3rd.
+    */
+    Xml::Element &      Add_RaisesLine(
+                            const char *        i_sRaisesText,
+                            bool                i_bSuppressExtraLine = false );
+
+    Xml::Element &      Front()                 { return *pFront; }
+    Xml::Element &      Types()                 { return *pTypes; }
+    Xml::Element &      Names()                 { return *pNames; }
+
+  private:
+    Xml::Element *      pFront;
+    Xml::Element *      pTypes;
+    Xml::Element *      pNames;
+};
+#endif // 0  old
+
+class HF_FunctionDeclaration : public HtmlMaker
+{
+  public:
+                        HF_FunctionDeclaration(
+                            Xml::Element &      o_rParent,
+                            const String &      i_sRaisesText );
+    virtual             ~HF_FunctionDeclaration();
+
+    // OPERATIONS
+    Xml::Element &      ReturnCell();
+    Xml::Element &      NameCell();
+    Xml::Element &      NewParamTypeCell();
+    Xml::Element &      ParamNameCell();
+    Xml::Element &      ExceptionCell();
+
+  private:
+    Html::TableRow &    ParameterLine();
+
+    // DATA
+    String              sRaisesText;
+    Html::Table *       pTable;
+    Xml::Element *      pReturnCell;
+    Xml::Element *      pNameCell;
+    Html::TableRow *    pParameterLine;
+    Xml::Element *      pLastParameterCell;
+    Xml::Element *      pExceptionCell;
+};
+
+
+// IMPLEMENTATION
+
+
+
+#endif
diff --git a/autodoc/source/display/inc/toolkit/hf_linachain.hxx b/autodoc/source/display/inc/toolkit/hf_linachain.hxx
new file mode 100644
index 000000000000..fa780dbc778c
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_linachain.hxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HF_LINACHAIN_HXX
+#define ADC_DISPLAY_HF_LINACHAIN_HXX
+
+// BASE CLASSES
+#include "htmlfactory.hxx"
+#include "out_position.hxx"
+
+
+
+
+class HF_LinkedNameChain : public HtmlMaker
+{
+  public:
+    /** F_LinkMaker makes a link out of the name of the
+        parent position.
+
+        Returns true, if there is a link, false if not.
+    */
+    typedef String (*F_LinkMaker)(const char *);
+
+
+                        HF_LinkedNameChain(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_LinkedNameChain();
+
+    void                Produce_CompleteChain(
+                            const output::Position &
+                                                i_curPosition,
+                            F_LinkMaker         i_linkMaker ) const;
+    void                Produce_CompleteChain_forModule(
+                            const output::Position &
+                                                i_curPosition,  /// current Module's node
+                            F_LinkMaker         i_linkMaker ) const;
+  private:
+    void                produce_Level(
+                            output::Node &      i_levelNode,
+                            const output::Position &
+                                                i_startPosition,
+                            F_LinkMaker         i_linkMaker ) const;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/display/inc/toolkit/hf_navi_main.hxx b/autodoc/source/display/inc/toolkit/hf_navi_main.hxx
new file mode 100644
index 000000000000..da4167d64dbe
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_navi_main.hxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HF_NAVI_MAIN_HXX
+#define ADC_DISPLAY_HF_NAVI_MAIN_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "htmlfactory.hxx"
+    // PARAMETERS
+
+
+class HF_MainItem;
+
+
+/** @task
+    Create a HTML navigation bar with lightly coloured background.
+
+    @descr
+    There are three kinds of items:
+    Item with link:             Add_StdItem(),
+    Item without link:          Add_NoneItem(),
+    Item that is current page:  Add_SelfItem().
+*/
+class HF_NaviMainRow : public HtmlMaker
+{
+  public:
+    enum E_Style
+    {
+        eStd,
+        eSelf,
+        eNo
+    };
+                        HF_NaviMainRow(
+                            Xml::Element &      o_out );
+                        ~HF_NaviMainRow();
+
+    void                Add_StdItem(
+                            const char *        i_sText,
+                            const char *        i_sLink );
+    void                Add_SelfItem(
+                            const char *        i_sText );
+    void                Add_NoneItem(
+                            const char *        i_sText );
+
+    void                Produce_Row();
+
+  private:
+    // DATA
+    typedef std::vector< DYN HF_MainItem* > ItemList;
+
+    ItemList            aItems;
+    Xml::Element *      pRow;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx
new file mode 100644
index 000000000000..6d24a40eb530
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HF_NAVI_SUB_HXX
+#define ADC_DISPLAY_HFI_NAVI_SUB_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "htmlfactory.hxx"
+    // PARAMETERS
+
+
+class HF_NaviSubRow : public HtmlMaker
+{
+  public:
+                        HF_NaviSubRow(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_NaviSubRow();
+
+    void                AddItem(
+                            const String &      i_sText,
+                            const String &      i_sLink,
+                            bool                i_bSwitchOn );
+    void                SwitchOn(
+                            int                 i_nIndex );
+    void                Produce_Row();
+
+  private:
+    typedef std::pair<String,String>    SubRow_Data;
+    typedef std::pair<SubRow_Data,bool> SubRow_Item;
+    typedef std::vector<SubRow_Item>    SubRow;
+
+    /** Puts the row's table into the parent XML-element, but
+        doesn't write the items, because the actvity-status of
+        the subitems isn't known yet.
+    */
+    void                Setup_Row();
+
+    // DATA
+    SubRow              aRow;
+    Xml::Element *      pMyRow;
+};
+
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/inc/toolkit/hf_title.hxx b/autodoc/source/display/inc/toolkit/hf_title.hxx
new file mode 100644
index 000000000000..b4c80a54cc13
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_title.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HF_TITLE_HXX
+#define ADC_DISPLAY_HF_TITLE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <toolkit/htmlfactory.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_TitleTable : public HtmlMaker
+{
+  public:
+                        HF_TitleTable(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_TitleTable();
+
+    void                Produce_Title(
+                            const char *        i_title );
+    void                Produce_Title(
+                            const char *        i_annotations,
+//                            const char *        i_label,
+                            const char *        i_title );
+
+    /// @return a Html::TableCell reference.
+    Xml::Element &      Add_Row();
+};
+
+
+class HF_SubTitleTable : public HtmlMaker
+{
+  public:
+    enum E_SubLevel
+    {
+        sublevel_1,     /// Big title.
+        sublevel_2,     /// Small title.
+        sublevel_3      /// No title.
+    };
+
+    /** @param i_nColumns [1 .. n]
+        @param i_nSubTitleLevel [1 .. 2]
+        1 is a bit bigger than 2.
+    */
+
+                        HF_SubTitleTable(
+                            Xml::Element &      o_rOut,
+                            const String &      i_label,
+                            const String &      i_title,
+                            int                 i_nColumns,
+                            E_SubLevel          i_eSubTitleLevel = sublevel_1 );
+    virtual             ~HF_SubTitleTable();
+
+    /// @return an Html::TableRow reference.
+    Xml::Element &      Add_Row();
+};
+
+
+// IMPLEMENTATION
+
+
+
+#endif
diff --git a/autodoc/source/display/inc/toolkit/htmlfactory.hxx b/autodoc/source/display/inc/toolkit/htmlfactory.hxx
new file mode 100644
index 000000000000..1e46ac7d94db
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/htmlfactory.hxx
@@ -0,0 +1,102 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTMLFACTORY_HXX
+#define ADC_DISPLAY_HTMLFACTORY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "outputstack.hxx"
+    // PARAMETERS
+#include <udm/xml/xmlitem.hxx>
+#include <udm/html/htmlitem.hxx>
+
+namespace Xml = ::csi::xml;
+namespace Html = ::csi::html;
+
+/** @resp
+    Base class for HTML page creators (factories) for code entites or
+    similar items.
+*/
+template <class ENV>
+class HtmlFactory
+{
+  public:
+    // INQUIRY
+    ENV &               Env() const             { return *pEnv; }
+    Xml::Element &      CurOut() const          { return aDestination.Out(); }
+
+    // ACCESS
+    OutputStack &       Out() const             { return aDestination; }
+
+  protected:
+                        HtmlFactory(
+                            ENV &               io_rEnv,
+                            Xml::Element *      o_pOut = 0 )
+                            :   pEnv(&io_rEnv)  { if (o_pOut != 0) aDestination.Enter(*o_pOut); }
+                        ~HtmlFactory() {}
+  private:
+    // DATA
+    ENV *               pEnv;
+    mutable OutputStack aDestination;
+};
+
+
+/** @resp
+    Base class for HTML paragraph creators, which are to be put into
+    a parent HTML element.
+*/
+class HtmlMaker
+{
+  public:
+
+    // INQUIRY
+    Xml::Element &      CurOut() const          { return *pOut; }
+
+  protected:
+                        HtmlMaker(
+                            Xml::Element &      o_rOut )
+                            :   pOut(&o_rOut)   {}
+  private:
+    // DATA
+    Xml::Element *      pOut;
+};
+
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/inc/toolkit/htmlfile.hxx b/autodoc/source/display/inc/toolkit/htmlfile.hxx
new file mode 100644
index 000000000000..771855ea7a31
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/htmlfile.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HTMLFILE_HXX
+#define ADC_DISPLAY_HTMLFILE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <udm/html/htmlitem.hxx>
+    // PARAMETERS
+#include <cosv/ploc.hxx>
+
+namespace csv
+{
+     class File;
+}
+
+/** Represents an HTML output file.
+*/
+class DocuFile_Html
+{
+  public:
+    // LIFECYCLE
+                        DocuFile_Html();
+
+    void                SetLocation(
+                            const csv::ploc::Path &
+                                                i_rFilePath );
+    void                SetTitle(
+                            const char *        i_sTitle );
+    void                SetRelativeCssPath(
+                            const char *        i_sCssFile_relativePath );
+    void                SetCopyright(
+                            const char *        i_sCopyright );
+    void                EmptyBody();
+
+    Html::Body &        Body()                  { return aBodyData; }
+    bool                CreateFile();
+
+  private:
+    void                WriteHeader(
+                            csv::File &         io_aFile );
+    void                WriteBody(
+                            csv::File &         io_aFile );
+    // DATA
+    String              sFilePath;
+    String              sTitle;
+    String              sLocation;
+    String              sStyle;
+    String              sCssFile;
+    String              sCopyright;
+
+    Html::Body          aBodyData;
+    StreamStr           aBuffer;
+};
+
+
+
+#endif
+
+
diff --git a/autodoc/source/display/inc/toolkit/out_node.hxx b/autodoc/source/display/inc/toolkit/out_node.hxx
new file mode 100644
index 000000000000..4f6385cf54fb
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/out_node.hxx
@@ -0,0 +1,129 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_OUT_NODE_HXX
+#define ADC_DISPLAY_OUT_NODE_HXX
+
+
+
+
+namespace output
+{
+
+
+/** @resp
+    Represents a tree of names where each node can have only one parent,
+    but a list of children.
+
+    @see    Position
+    @see    Tree
+*/
+class Node
+{
+  public:
+    typedef std::vector< Node* >    List;
+    typedef UINT32                  relative_id;
+
+      // LIFECYCLE
+      enum E_NullObject { null_object };
+
+                          Node();
+      explicit            Node(
+                              E_NullObject        );
+                          ~Node();
+
+      // OPERATORS
+      bool                operator==(
+                              const Node &        i_node ) const
+                                                  { return pParent == i_node.pParent AND sName == i_node.sName; }
+      bool                operator!=(
+                              const Node &        i_node ) const
+                                                  { return NOT operator==(i_node); }
+
+      // OPERATIONS
+      /// Seek, and if not existent, create.
+      Node &              Provide_Child(
+                              const String &      i_name );
+      /// Seek, and if not existent, create.
+      Node &              Provide_Child(
+                              const StringVector &
+                                                  i_path )
+                                                  { return provide_Child(i_path.begin(), i_path.end()); }
+      // INQUIRY
+      intt                Depth() const           { return nDepth; }
+
+    const String &      Name() const            { return sName; }
+    /// @return Id of a namespace or class etc. this directory represents.
+    relative_id         RelatedNameRoom() const { return nNameRoomId; }
+    /// @return No delimiter at start, with delimiter at end.
+    void                Get_Path(
+                            StreamStr &         o_result,
+                            intt                i_maxDepth = -1 ) const;
+    void                Get_Chain(
+                            StringVector &      o_result,
+                            intt                i_maxDepth = -1 ) const;
+    // ACCESS
+    void                Set_RelatedNameRoom(
+                            relative_id         i_nNameRoomId )
+                                                { nNameRoomId = i_nNameRoomId; }
+      Node *              Parent()                { return pParent; }
+      Node *              Child(
+                              const String &      i_name )
+                                                  { return find_Child(i_name); }
+    List &              Children()              { return aChildren; }
+
+    /// @return a reference to a Node with Depth() == -1.
+    static Node &       Null_();
+
+  private:
+      // Local
+                          Node(
+                              const String &      i_name,
+                              Node &              i_parent );
+
+      Node *              find_Child(
+                              const String &      i_name );
+      Node &              add_Child(
+                              const String &      i_name );
+      Node &              provide_Child(
+                              StringVector::const_iterator
+                                                  i_next,
+                              StringVector::const_iterator
+                                                  i_end );
+      // Data
+      String              sName;
+      Node *              pParent;
+      List                aChildren;
+      intt                nDepth;
+    relative_id         nNameRoomId;
+};
+
+
+
+
+}   // namespace output
+#endif
diff --git a/autodoc/source/display/inc/toolkit/out_position.hxx b/autodoc/source/display/inc/toolkit/out_position.hxx
new file mode 100644
index 000000000000..214b91c15bab
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/out_position.hxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_OUT_POSITION_HXX
+#define ADC_DISPLAY_OUT_POSITION_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <toolkit/out_node.hxx>
+    // PARAMETERS
+
+
+
+namespace output
+{
+
+
+
+class Position
+{
+  public:
+    // LIFECYCLE
+                        Position();
+    explicit            Position(
+                            Node &              i_directory,
+                            const String &      i_file = String::Null_() );
+                        Position(
+                            const Position &    i_directory,
+                            const String &      i_rDifferentFile );
+                        ~Position();
+
+    // OPERATIONS
+    Position &          operator=(
+                            Node &              i_node );
+    Position &          operator+=(
+                            const String &      i_nodeName );
+    Position &          operator-=(
+                            intt                i_levels );
+
+    // INQUIRY
+    bool                IsValid() const         { return pDirectory->Depth() >= 0; }
+    const String &      Name() const            { return pDirectory->Name(); }
+    const String &      File() const            { return sFile; }
+    intt                Depth() const           { return pDirectory->Depth(); }
+
+    void                Get_Chain(
+                            StringVector &      o_result ) const
+                                                { pDirectory->Get_Chain(o_result); }
+    String              LinkToRoot(
+                            const String &      i_localLabel = String::Null_() ) const;
+
+    void                Get_LinkTo(
+                            StreamStr &         o_result,
+                            const Position &    i_destination,
+                            const String &      i_localLabel = String::Null_() ) const;
+    void                Get_LinkToRoot(
+                            StreamStr &         o_result,
+                            const String &      i_localLabel = String::Null_() ) const;
+
+    static char         Delimiter()             { return '/'; }
+
+    // ACCESS
+    Node &              RelatedNode() const     { return *pDirectory; }
+
+    void                Set(
+                            Node &              i_node,
+                            const String &      i_file = String::Null_() );
+    void                Set_File(
+                            const String &      i_file );
+
+  private:
+    // DATA
+    String              sFile;
+    Node *              pDirectory;
+};
+
+
+/// @return No delimiter at start, with delimiter at end.
+const char *        get_UpLink(
+                        uintt                   i_depth );
+
+
+// IMPLEMENTATION
+
+inline void
+Position::Set_File( const String & i_file )
+    { sFile = i_file; }
+
+}   // namespace output
+
+#endif
diff --git a/autodoc/source/display/inc/toolkit/out_tree.hxx b/autodoc/source/display/inc/toolkit/out_tree.hxx
new file mode 100644
index 000000000000..eaf1edffdf30
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/out_tree.hxx
@@ -0,0 +1,136 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_OUT_TREE_HXX
+#define ADC_DISPLAY_OUT_TREE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "out_position.hxx"
+    // PARAMETERS
+
+
+namespace output
+{
+
+inline const char *
+ModuleFileName()
+{ return "module-ix.html"; }
+inline const char *
+IndexFilesDirName()
+{ return "index-files"; }
+inline const char *
+IndexFile_A()
+{ return "index-1.html"; }
+
+
+class Tree
+{
+  public:
+    // LIFECYCLE
+                        Tree();
+                        ~Tree();
+
+    // OPERATIONS
+    void                Set_Overview(
+                            const StringVector &
+                                                i_path,
+                            const String &      i_sFileName );
+    Node &              Set_NamesRoot(
+                            const StringVector &
+                                                i_path );
+    Node &              Set_IndexRoot(
+                            const StringVector &
+                                                i_path );
+    Node &              Set_ProjectsRoot(
+                            const StringVector &
+                                                i_path );
+    Node &              Provide_Node(
+                            const StringVector &
+                                                i_path );
+
+    // ACCESS
+    Node &              RootNode()              { return *pRoot; }
+    Node &              NamesRootNode()         { return *pNamesRoot; }
+    Node &              IndexRootNode()         { return *pIndexRoot; }
+    Node &              ProjectsRootNode()      { return *pProjectsRoot; }
+
+    Position            Root()                  { return Position(*pRoot); }
+    Position            Overview()              { return aOverview; }
+    Position            NamesRoot()             { return Position(*pNamesRoot); }
+    Position            IndexRoot()             { return Position(*pIndexRoot); }
+    Position            ProjectsRoot()          { return Position(*pProjectsRoot); }
+
+  private:
+    // forbidden:
+                        Tree(const Tree&);
+    Tree &              operator=(const Tree&);
+
+    // DATA
+    Dyn<Node>           pRoot;
+    Node *              pNamesRoot;
+    Node *              pIndexRoot;
+    Node *              pProjectsRoot;
+    Position            aOverview;
+};
+
+
+// IMPLEMENTATION
+
+inline Node &
+Tree::Provide_Node( const StringVector & i_path )
+    { return pRoot->Provide_Child(i_path); }
+
+
+inline void
+Tree::Set_Overview( const StringVector & i_path,
+                    const String &       i_sFileName )
+    { aOverview.Set(Provide_Node(i_path), i_sFileName); }
+
+inline Node &
+Tree::Set_NamesRoot( const StringVector & i_path )
+    { pNamesRoot = &Provide_Node(i_path);
+      return *pNamesRoot; }
+
+inline Node &
+Tree::Set_IndexRoot( const StringVector & i_path )
+    { pIndexRoot = &Provide_Node(i_path);
+      return *pIndexRoot; }
+
+inline Node &
+Tree::Set_ProjectsRoot( const StringVector & i_path )
+    { pProjectsRoot = &Provide_Node(i_path);
+      return *pProjectsRoot; }
+
+
+
+}   // namespace output
+
+
+#endif
diff --git a/autodoc/source/display/inc/toolkit/outputstack.hxx b/autodoc/source/display/inc/toolkit/outputstack.hxx
new file mode 100644
index 000000000000..4c02065bd1e6
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/outputstack.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_OUTPUTSTACK_HXX
+#define ADC_DISPLAY_OUTPUTSTACK_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <estack.hxx>
+    // PARAMETERS
+#include <udm/xml/xmlitem.hxx>
+
+
+class OutputStack
+{
+  public:
+    // LIFECYCLE
+                        OutputStack();
+                        ~OutputStack();
+
+    // OPERATIONS
+    void                Enter(
+                            csi::xml::Element & io_rDestination );
+    void                Leave();
+
+    // ACCESS
+    csi::xml::Element & Out() const;                  // CurOutputNode
+
+  private:
+    EStack< csi::xml::Element * >
+                        aCurDestination;        // The front element is the currently used.
+                                                //   The later ones are the parents.
+};
+
+inline csi::xml::Element &
+OutputStack::Out() const
+{
+    csv_assert( aCurDestination.size() > 0 );
+    return *aCurDestination.top();
+}
+
+// IMPLEMENTATION
+
+
+#endif
+
+
diff --git a/autodoc/source/display/kernel/displfct.cxx b/autodoc/source/display/kernel/displfct.cxx
new file mode 100644
index 000000000000..149dbb375b68
--- /dev/null
+++ b/autodoc/source/display/kernel/displfct.cxx
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "displfct.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <html/chd_udk2.hxx>
+#include <idl/hi_display.hxx>
+#include <cfrstd.hxx>
+
+
+DYN DisplayToolsFactory * DisplayToolsFactory::dpTheInstance_ = 0;
+
+
+namespace autodoc
+{
+
+DisplayToolsFactory_Ifc &
+DisplayToolsFactory_Ifc::GetIt_()
+{
+    if ( DisplayToolsFactory::dpTheInstance_ == 0 )
+        DisplayToolsFactory::dpTheInstance_ = new DisplayToolsFactory;
+    return *DisplayToolsFactory::dpTheInstance_;
+}
+
+}   // namespace autodoc
+
+
+DisplayToolsFactory::DisplayToolsFactory()
+{
+}
+
+DisplayToolsFactory::~DisplayToolsFactory()
+{
+}
+
+// DYN autodoc::TextDisplay_FunctionList_Ifc *
+// DisplayToolsFactory::Create_TextDisplay_FunctionList() const
+// {
+//      return new CppTextDisplay_FunctionList;
+// }
+
+
+DYN autodoc::HtmlDisplay_UdkStd *
+DisplayToolsFactory::Create_HtmlDisplay_UdkStd() const
+{
+    return new CppHtmlDisplay_Udk2;
+}
+
+DYN autodoc::HtmlDisplay_Idl_Ifc *
+DisplayToolsFactory::Create_HtmlDisplay_Idl() const
+{
+    return new HtmlDisplay_Idl;
+}
+
+const display::CorporateFrame &
+DisplayToolsFactory::Create_StdFrame() const
+{
+    static StdFrame aFrame;
+    return aFrame;
+}
+
+
diff --git a/autodoc/source/display/kernel/displfct.hxx b/autodoc/source/display/kernel/displfct.hxx
new file mode 100644
index 000000000000..a6de4b44e447
--- /dev/null
+++ b/autodoc/source/display/kernel/displfct.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_DISPLFCT_HXX
+#define ADC_DISPLAY_DISPLFCT_HXX
+
+
+#include <autodoc/displaying.hxx>
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class DisplayToolsFactory : public autodoc::DisplayToolsFactory_Ifc
+{
+  public:
+                        DisplayToolsFactory();
+    virtual             ~DisplayToolsFactory();
+
+//    virtual DYN autodoc::TextDisplay_FunctionList_Ifc *
+//                        Create_TextDisplay_FunctionList() const;
+
+    virtual DYN autodoc::HtmlDisplay_UdkStd *
+                        Create_HtmlDisplay_UdkStd() const;
+    virtual DYN autodoc::HtmlDisplay_Idl_Ifc *
+                        Create_HtmlDisplay_Idl() const;
+
+    virtual const display::CorporateFrame &
+                        Create_StdFrame() const;
+  private:
+    static DYN DisplayToolsFactory *
+                        dpTheInstance_;
+
+    friend class autodoc::DisplayToolsFactory_Ifc;
+};
+
+
+#endif
+
diff --git a/autodoc/source/display/kernel/makefile.mk b/autodoc/source/display/kernel/makefile.mk
new file mode 100644
index 000000000000..992456dcd667
--- /dev/null
+++ b/autodoc/source/display/kernel/makefile.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_kernel
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/displfct.obj	
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/toolkit/hf_docentry.cxx b/autodoc/source/display/toolkit/hf_docentry.cxx
new file mode 100644
index 000000000000..5d6f415a5223
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_docentry.cxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_docentry.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+HF_DocEntryList::HF_DocEntryList( Xml::Element & o_out )
+    :   HtmlMaker( o_out >>* new Html::DefList )
+{
+}
+
+HF_DocEntryList::~HF_DocEntryList()
+{
+}
+
+Xml::Element &
+HF_DocEntryList::Produce_Term(const char * i_sTerm )
+{
+    Xml::Element &
+        ret = CurOut()
+           >> *new Html::DefListTerm
+              >> *new Html::Bold;
+    if ( NOT csv::no_str(i_sTerm))
+        ret
+            << i_sTerm;
+    return ret;
+}
+
+Xml::Element &
+HF_DocEntryList::Produce_NormalTerm(const char * i_sTerm)
+{
+    Xml::Element &
+        ret = CurOut()
+           >> *new Html::DefListTerm;
+    if ( NOT csv::no_str(i_sTerm))
+        ret
+            << i_sTerm;
+    return ret;
+}
+
+Xml::Element &
+HF_DocEntryList::Produce_Definition()
+{
+    return CurOut()
+           >> *new Html::DefListDefinition;
+}
diff --git a/autodoc/source/display/toolkit/hf_funcdecl.cxx b/autodoc/source/display/toolkit/hf_funcdecl.cxx
new file mode 100644
index 000000000000..1c015b539cf2
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_funcdecl.cxx
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_funcdecl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+const String C_sValignTop("top");
+const String C_sValignBottom("bottom");
+
+
+
+HF_FunctionDeclaration::HF_FunctionDeclaration( Xml::Element & o_rParent,
+                                                const String & i_sRaisesText )
+    :   HtmlMaker(o_rParent),
+        sRaisesText(i_sRaisesText),
+        pTable(0),
+        pReturnCell(0),
+        pNameCell(0),
+        pParameterLine(0),
+        pLastParameterCell(0),
+        pExceptionCell(0)
+{
+    pTable = new Html::Table;
+    CurOut()
+        >> *pTable
+            << new Html::ClassAttr("table-in-method")
+            << new Xml::AnAttribute("border","0");
+}
+
+HF_FunctionDeclaration::~HF_FunctionDeclaration()
+{
+}
+
+Xml::Element &
+HF_FunctionDeclaration::ReturnCell()
+{
+    if (pReturnCell != 0)
+        return *pReturnCell;
+
+    pReturnCell = &( *pTable
+                        >> *new Html::TableRow
+                            >> *new Html::TableCell
+                                << new Html::VAlignAttr(C_sValignTop)
+                                << new Xml::AnAttribute("colspan", "3")
+                    );
+    return *pReturnCell;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::NameCell()
+{
+    if (pNameCell != 0)
+        return *pNameCell;
+
+    pNameCell = &( ParameterLine()
+                    >> *new Html::TableCell
+                        << new Html::VAlignAttr(C_sValignTop)
+                 );
+    pLastParameterCell = pNameCell;
+
+    return *pNameCell;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::NewParamTypeCell()
+{
+    if (pLastParameterCell != pNameCell)
+    {
+        pParameterLine = 0;
+        ParameterLine()
+            >> *new Html::TableCell;
+    }
+
+    Xml::Element &
+        rParamType = ParameterLine()
+                        >> *new Html::TableCell
+                            << new Html::VAlignAttr(C_sValignTop);
+    pLastParameterCell
+                   = &( ParameterLine()
+                            >> *new Html::TableCell
+                                << new Html::VAlignAttr(C_sValignBottom)
+                                << new Xml::XmlCode("&nbsp;")
+                      );
+    return rParamType;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::ParamNameCell()
+{
+    csv_assert(pLastParameterCell != pNameCell);
+    return *pLastParameterCell;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::ExceptionCell()
+{
+    if (pExceptionCell != 0)
+        return *pExceptionCell;
+
+    Xml::Element &
+        rExceptionRow = *pTable
+                            >> *new Html::TableRow;
+    rExceptionRow
+        >> *new Html::TableCell
+            << new Html::VAlignAttr(C_sValignTop)
+            << new Xml::AnAttribute("align", "right")
+            << sRaisesText
+            << "( ";
+
+    pExceptionCell = &( rExceptionRow
+                            >> *new Html::TableCell
+                                << new Html::VAlignAttr(C_sValignTop)
+                                << new Xml::AnAttribute("colspan", "2")
+                      );
+    return *pExceptionCell;
+}
+
+Html::TableRow &
+HF_FunctionDeclaration::ParameterLine()
+{
+    if (pParameterLine != 0)
+        return *pParameterLine;
+
+    pParameterLine = new Html::TableRow;
+    *pTable
+        >> *pParameterLine;
+
+    return *pParameterLine;
+}
+
+
+#if 0   // old
+HF_FunctionDeclaration::HF_FunctionDeclaration( Xml::Element & o_rParent )
+    :   HtmlMaker(o_rParent),
+        pFront(0),
+        pTypes(0),
+        pNames(0)
+{
+    Xml::Element &
+        rRow = CurOut()
+                >> *new Html::Table
+                    << new Xml::AnAttribute("border","0")
+                    >> *new Html::TableRow;
+    pFront = &(rRow >> *new Html::TableCell << new Html::VAlignAttr(C_sValignTop));
+    pTypes = &(rRow >> *new Html::TableCell << new Html::VAlignAttr(C_sValignTop));
+    pNames = &(rRow >> *new Html::TableCell << new Html::VAlignAttr(C_sValignTop));
+}
+
+HF_FunctionDeclaration::~HF_FunctionDeclaration()
+{
+}
+
+Xml::Element &
+HF_FunctionDeclaration::Add_ReturnLine()
+{
+    (*pTypes) << new Xml::XmlCode("&nbsp;<br>\n");
+    (*pNames) << new Xml::XmlCode("&nbsp;<br>\n");
+    return *pFront;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::Add_RaisesLine( const char * i_sRaisesText,
+                                        bool         i_bSuppressExtraLine )
+{
+    if (NOT i_bSuppressExtraLine)
+    {
+        (*pTypes) << new Xml::XmlCode("&nbsp;<br>");
+        (*pNames) << new Xml::XmlCode("&nbsp;<br>\n");
+    }
+    (*pTypes)
+        << new Xml::XmlCode("<p class=\"raise\">")
+        << i_sRaisesText
+        << new Xml::XmlCode("( </p>\n");
+    return *pNames;
+}
+#endif // 0    old
diff --git a/autodoc/source/display/toolkit/hf_linachain.cxx b/autodoc/source/display/toolkit/hf_linachain.cxx
new file mode 100644
index 000000000000..fd83242e5247
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_linachain.cxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_linachain.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <toolkit/out_position.hxx>
+
+
+
+HF_LinkedNameChain::HF_LinkedNameChain( Xml::Element & o_rOut )
+    :   HtmlMaker( o_rOut
+                        >> *new Html::Paragraph
+                            << new Html::ClassAttr("namechain") )
+{
+}
+
+HF_LinkedNameChain::~HF_LinkedNameChain()
+{
+}
+
+void
+HF_LinkedNameChain::Produce_CompleteChain( const output::Position & i_curPosition,
+                                           F_LinkMaker              i_linkMaker ) const
+{
+    produce_Level(i_curPosition.RelatedNode(), i_curPosition, i_linkMaker);
+}
+
+void
+HF_LinkedNameChain::Produce_CompleteChain_forModule( const output::Position &  i_curPosition,
+                                                     F_LinkMaker               i_linkMaker ) const
+{
+    if (i_curPosition.Depth() == 0)
+        return;
+    produce_Level(*i_curPosition.RelatedNode().Parent(), i_curPosition, i_linkMaker);
+}
+
+
+
+namespace
+{
+
+StreamStr aLinkBuf(200);
+
+}
+
+void
+HF_LinkedNameChain::produce_Level( output::Node &           i_levelNode,
+                                   const output::Position & i_startPosition,
+                                   F_LinkMaker              i_linkMaker ) const
+{
+    if ( i_levelNode.Depth() > 0 )
+    {
+        produce_Level( *i_levelNode.Parent(),
+                       i_startPosition,
+                       i_linkMaker );
+    }
+
+    aLinkBuf.reset();
+
+    String
+        sFileName = (*i_linkMaker)(i_levelNode.Name());
+    output::Position
+        aLevelPos(i_levelNode, sFileName);
+
+    i_startPosition.Get_LinkTo(aLinkBuf, aLevelPos);
+
+    if ( i_levelNode.Depth() > 0 )
+    {
+        CurOut()
+        >> *new Html::Link(aLinkBuf.c_str())
+            << new Html::ClassAttr("namechain")
+            << i_levelNode.Name();
+        CurOut() << " :: ";
+    }
+    else
+    {
+        CurOut()
+        >> *new Html::Link(aLinkBuf.c_str())
+            << new Html::ClassAttr("namechain")
+            << "::";
+        CurOut() << " ";
+    }
+}
diff --git a/autodoc/source/display/toolkit/hf_navi_main.cxx b/autodoc/source/display/toolkit/hf_navi_main.cxx
new file mode 100644
index 000000000000..69cfdf0ec746
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_navi_main.cxx
@@ -0,0 +1,238 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_navi_main.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+
+
+
+//********************    MainItem and derived ones      ***************//
+class HF_MainItem : public HtmlMaker
+{
+  public:
+    virtual             ~HF_MainItem() {}
+    void                Produce_Item() const    { do_ProduceItem(); }
+  protected:
+                        HF_MainItem(
+                            Xml::Element &      o_out )
+                                                :   HtmlMaker(o_out) {}
+  private:
+    virtual void        do_ProduceItem() const = 0;
+};
+
+
+namespace
+{
+
+class StdItem : public HF_MainItem
+{
+  public:
+                        StdItem(
+                            Xml::Element &      o_out,
+                            const char *        i_sText,
+                            const char *        i_sLink );
+
+                        ~StdItem();
+  private:
+    virtual void        do_ProduceItem() const;
+
+    // DATA
+    String              sText;
+    String              sLink;
+};
+
+class SelfItem : public HF_MainItem
+{
+  public:
+                        SelfItem(
+                            Xml::Element &      o_out,
+                            const char *        i_sText );
+                        ~SelfItem();
+  private:
+    virtual void        do_ProduceItem() const;
+
+    // DATA
+    String              sText;
+};
+
+class NoneItem : public HF_MainItem
+{
+  public:
+                        NoneItem(
+                            Xml::Element &      o_out,
+                            const char *        i_sText );
+                        ~NoneItem();
+  private:
+    virtual void        do_ProduceItem() const;
+
+    // DATA
+    String              sText;
+};
+
+}   // anonymous namespace
+
+
+
+//********************    HF_NaviMainRow      ***************//
+
+
+
+HF_NaviMainRow::HF_NaviMainRow( Xml::Element & o_out )
+    :   HtmlMaker(o_out),
+        aItems(),
+        pRow(0)
+{
+    aItems.reserve(5);
+
+    pRow =
+    &(  CurOut()
+        >> *new Html::Table
+           << new Html::ClassAttr("navimain")
+           << new Xml::AnAttribute( "border", "0" )
+           << new Xml::AnAttribute( "cellpadding", "3" )
+           >> *new Html::TableRow
+     );
+}
+
+HF_NaviMainRow::~HF_NaviMainRow()
+{
+    csv::erase_container_of_heap_ptrs(aItems);
+}
+
+void
+HF_NaviMainRow::Add_StdItem( const char * i_sText,
+                             const char * i_sLink )
+{
+    aItems.push_back(new StdItem( *pRow,i_sText,i_sLink ));
+}
+
+void
+HF_NaviMainRow::Add_SelfItem( const char * i_sText )
+{
+    aItems.push_back(new SelfItem( *pRow,i_sText ));
+}
+
+void
+HF_NaviMainRow::Add_NoneItem( const char * i_sText )
+{
+    aItems.push_back(new NoneItem( *pRow,i_sText ));
+}
+
+void
+HF_NaviMainRow::Produce_Row()
+{
+    ItemList::iterator itEnd = aItems.end();
+    for ( ItemList::iterator iter = aItems.begin();
+          iter != itEnd;
+          ++iter )
+    {
+         (*iter)->Produce_Item();
+    }
+}
+
+
+
+
+//********************    MainItem and derived ones      ***************//
+
+namespace
+{
+
+StdItem::StdItem( Xml::Element &      o_out,
+                  const char *        i_sText,
+                  const char *        i_sLink )
+    :   HF_MainItem(o_out),
+        sText(i_sText),
+        sLink(i_sLink)
+{
+}
+
+StdItem::~StdItem()
+{
+}
+
+void
+StdItem::do_ProduceItem() const
+{
+    Xml::Element &
+                rCell = CurOut() >>* new Html::TableCell;
+    rCell
+        << new Html::ClassAttr( "navimain" )
+        >> *new Html::Link(sLink.c_str())
+            << new Html::ClassAttr( "navimain" )
+            << sText.c_str();
+}
+
+SelfItem::SelfItem( Xml::Element &      o_out,
+                    const char *        i_sText )
+    :   HF_MainItem(o_out),
+        sText(i_sText)
+{
+}
+
+SelfItem::~SelfItem()
+{
+}
+
+void
+SelfItem::do_ProduceItem() const
+{
+    Xml::Element &
+                rCell = CurOut() >>* new Html::TableCell;
+    rCell
+        << new Html::ClassAttr( "navimainself" )
+        << sText.c_str();
+}
+
+NoneItem::NoneItem( Xml::Element &      o_out,
+                    const char *        i_sText )
+    :   HF_MainItem(o_out),
+        sText(i_sText)
+{
+}
+
+NoneItem::~NoneItem()
+{
+}
+
+void
+NoneItem::do_ProduceItem() const
+{
+    Xml::Element &
+                rCell = CurOut() >>* new Html::TableCell;
+    rCell
+        << new Html::ClassAttr( "navimainnone" )
+        << sText.c_str();
+}
+
+}   // anonymous namespace
+
+
diff --git a/autodoc/source/display/toolkit/hf_navi_sub.cxx b/autodoc/source/display/toolkit/hf_navi_sub.cxx
new file mode 100644
index 000000000000..4c11e0e7e6df
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_navi_sub.cxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_navi_sub.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+HF_NaviSubRow::HF_NaviSubRow( Xml::Element & o_rOut )
+    :   HtmlMaker(o_rOut),
+        aRow(),
+        pMyRow(0)
+{
+    Setup_Row();
+}
+
+HF_NaviSubRow::~HF_NaviSubRow()
+{
+}
+
+void
+HF_NaviSubRow::AddItem( const String &      i_sText,
+                        const String &      i_sLink,
+                        bool                i_bSwitchOn )
+{
+    aRow.push_back( SubRow_Item( SubRow_Data(i_sText,i_sLink),
+                                 i_bSwitchOn ));
+}
+
+void
+HF_NaviSubRow::SwitchOn( int i_nIndex )
+{
+    if ( i_nIndex < int(aRow.size()) )
+        aRow[i_nIndex].second = true;
+}
+
+void
+HF_NaviSubRow::Setup_Row()
+{
+    Html::Table *
+                pTable = new Html::Table;
+    CurOut()
+        >> *pTable
+           << new Html::ClassAttr("navisub")
+           << new Xml::AnAttribute( "border", "0" )
+           << new Xml::AnAttribute( "cellpadding", "0" );
+    pMyRow = &pTable->AddRow();
+}
+
+void
+HF_NaviSubRow::Produce_Row()
+{
+    for ( SubRow::const_iterator it = aRow.begin();
+          it != aRow.end();
+          ++it )
+    {
+        Xml::Element &
+            rCell = *pMyRow
+                     >> *new Html::TableCell
+                         << new Html::ClassAttr("navisub");
+        StreamLock sl(100);
+        Xml::Element &
+            rGoon = (*it).second
+                            ?   ( rCell
+                                  >> *new Html::Link( sl()
+                                                      << "#"
+                                                      << (*it).first.second
+                                                      << c_str )
+                                     << new Html::ClassAttr("navisub")
+                                )
+                            :   rCell;
+        rGoon
+            << (*it).first.first;
+    }
+}
+
+
diff --git a/autodoc/source/display/toolkit/hf_title.cxx b/autodoc/source/display/toolkit/hf_title.cxx
new file mode 100644
index 000000000000..bd6bbd2d5f89
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_title.cxx
@@ -0,0 +1,169 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_title.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <stdlib.h>
+
+
+const String C_sTitleBorder("0");
+const String C_sTitleWidth("100%");
+const String C_sTitlePadding("5");
+const String C_sTitleSpacing("3");
+
+const String C_sSubTitleBorder("1");
+const String C_sSubTitleWidth("100%");
+const String C_sSubTitlePadding("5");
+const String C_sSubTitleSpacing("0");
+const String C_sColSpan("colspan");
+
+
+HF_TitleTable::HF_TitleTable( Xml::Element & o_rOut )
+    :   HtmlMaker(o_rOut >> *new Html::Table( C_sTitleBorder,
+                                              C_sTitleWidth,
+                                              C_sTitlePadding,
+                                              C_sTitleSpacing )
+                            << new Html::ClassAttr("title-table")
+                            << new Html::StyleAttr("margin-bottom:6pt;") )
+{
+}
+
+HF_TitleTable::~HF_TitleTable()
+{
+}
+
+void
+HF_TitleTable::Produce_Title( const char * i_title )
+{
+    Add_Row()
+        << new Html::ClassAttr("title")
+        << i_title;
+}
+
+void
+HF_TitleTable::Produce_Title( const char *        i_annotations,
+                              const char *        i_title )
+{
+    if (csv::no_str(i_annotations))
+    {
+        Produce_Title(i_title);
+        return;
+    }
+
+    Xml::Element &
+        rRow = Add_Row();
+    rRow
+        << new Html::ClassAttr("title");
+
+    Xml::Element &
+        rTable = rRow
+                    >> *new Html::Table()
+                        << new Html::ClassAttr("title-table")
+                        << new Html::WidthAttr("99%");
+    Xml::Element &
+        rInnerRow = rTable
+                        >> *new Html::TableRow;
+    rInnerRow
+        >> *new Html::TableCell
+            << new Html::WidthAttr("25%")
+            << new Html::ClassAttr("title2")
+            << i_annotations;
+    rInnerRow
+        >> *new Html::TableCell
+            << new Html::WidthAttr("50%")
+            << new Html::ClassAttr("title")
+            << i_title;
+    rInnerRow
+        >> *new Html::TableCell
+            << new Html::WidthAttr("*");
+}
+
+Xml::Element &
+HF_TitleTable::Add_Row()
+{
+    return CurOut()
+            >> *new Html::TableRow
+                >> *new Html::TableCell;
+}
+
+
+inline const char *
+get_SubTitleCssClass(HF_SubTitleTable::E_SubLevel i_eSubTitleLevel)
+{
+    return i_eSubTitleLevel == HF_SubTitleTable::sublevel_1
+            ?   "subtitle"
+            :   "crosstitle";
+}
+
+
+HF_SubTitleTable::HF_SubTitleTable( Xml::Element &      o_rOut,
+                                    const String &      i_label,
+                                    const String &      i_title,
+                                    int                 i_nColumns,
+                                    E_SubLevel          i_eSubTitleLevel )
+    :   HtmlMaker( o_rOut
+                    << new Html::Label(i_label)
+                    >> *new Html::Table( C_sSubTitleBorder,
+                                         C_sSubTitleWidth,
+                                         C_sSubTitlePadding,
+                                         C_sSubTitleSpacing )
+                        << new Html::ClassAttr(get_SubTitleCssClass(i_eSubTitleLevel)) )
+{
+    csv_assert(i_nColumns > 0);
+
+    if (i_eSubTitleLevel == sublevel_3)
+        return;
+
+    Xml::Element &
+        rCell = CurOut()
+                    >> *new Html::TableRow
+                        >> *new Html::TableCell
+                        << new Html::ClassAttr(get_SubTitleCssClass(i_eSubTitleLevel)) ;
+
+    if (i_nColumns > 1)
+    {
+        StreamLock sl(20);
+        String sColumns = sl() << i_nColumns << c_str;
+        rCell
+            << new Xml::AnAttribute(C_sColSpan, sColumns);
+    }
+    rCell
+        << i_title;
+}
+
+HF_SubTitleTable::~HF_SubTitleTable()
+{
+}
+
+Xml::Element &
+HF_SubTitleTable::Add_Row()
+{
+    return CurOut() >> *new Html::TableRow;
+}
diff --git a/autodoc/source/display/toolkit/htmlfile.cxx b/autodoc/source/display/toolkit/htmlfile.cxx
new file mode 100644
index 000000000000..bb2bb35f0360
--- /dev/null
+++ b/autodoc/source/display/toolkit/htmlfile.cxx
@@ -0,0 +1,211 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/htmlfile.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/file.hxx>
+#include <udm/html/htmlitem.hxx>
+
+namespace
+{
+bool            bUse_OOoFrameDiv = true;
+const String    C_sOOoFrameDiv_IdlId("adc-idlref");
+}
+
+using namespace csi;
+using csi::xml::AnAttribute;
+
+DocuFile_Html::DocuFile_Html()
+    :   sFilePath(),
+        sTitle(),
+        sLocation(),
+        sStyle(),
+        sCssFile(),
+        sCopyright(),
+        aBodyData(),
+        aBuffer(60000) // Grows dynamically, when necessary.
+{
+}
+
+void
+DocuFile_Html::SetLocation( const csv::ploc::Path & i_rFilePath )
+{
+    StreamLock sPath(1000);
+    i_rFilePath.Get( sPath() );
+
+    sFilePath = sPath().c_str();
+}
+
+void
+DocuFile_Html::SetTitle( const char * i_sTitle )
+{
+    sTitle = i_sTitle;
+}
+
+void
+DocuFile_Html::SetRelativeCssPath( const char * i_sCssFile_relativePath )
+{
+    sCssFile = i_sCssFile_relativePath;
+}
+
+void
+DocuFile_Html::SetCopyright( const char * i_sCopyright )
+{
+    sCopyright = i_sCopyright;
+}
+
+void
+DocuFile_Html::EmptyBody()
+{
+    aBodyData.SetContent(0);
+
+     if (bUse_OOoFrameDiv)
+     {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("<div id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_IdlId)
+            << new xml::XmlCode("\">\n\n");
+     }
+
+    aBodyData
+        >> *new html::Label( "_top_" )
+        << " ";
+}
+
+bool
+DocuFile_Html::CreateFile()
+{
+    csv::File aFile(sFilePath, csv::CFM_CREATE);
+    if (NOT aFile.open())
+    {
+        Cerr() << "Can't create file " << sFilePath << "." << Endl();
+        return false;
+    }
+
+    WriteHeader(aFile);
+    WriteBody(aFile);
+
+    // Write end
+    static const char sCompletion[] = "\n</html>\n";
+    aFile.write( sCompletion );
+
+    aFile.close();
+    Cout() << '.' << Flush();
+    return true;
+}
+
+
+void
+DocuFile_Html::WriteHeader( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    static const char s1[] =
+        "<html>\n<head>\n<title>";
+    static const char s2[] =
+        "</title>\n"
+        "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n";
+
+    aBuffer.write( s1 );
+    aBuffer.write( sTitle );
+    aBuffer.write( s2 );
+
+
+    if (NOT sCssFile.empty())
+    {
+        static const char s3[] =
+            "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
+        static const char s4[] =
+            "\">\n";
+
+        aBuffer.write(s3);
+        aBuffer.write(sCssFile);
+        aBuffer.write(s4);
+    }
+
+    if (NOT sStyle.empty())
+    {
+        static const char s5[] =
+            "<style>";
+        static const char s6[] =
+            "</style>\n";
+
+        aBuffer.write(s5);
+        aBuffer.write(sStyle);
+        aBuffer.write(s6);
+    }
+
+    static const char s7[] =
+        "</head>\n";
+    aBuffer.write(s7);
+
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
+
+void
+DocuFile_Html::WriteBody( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    aBodyData
+        >> *new html::Link( "#_top_" )
+                << "Top of Page";
+
+    if ( sCopyright.length() > 0 )
+    {
+        aBodyData
+            << new xml::XmlCode("<hr size=\"3\">");
+
+        aBodyData
+            >> *new html::Paragraph
+                    << new html::ClassAttr( "copyright" )
+                    << new xml::AnAttribute( "align", "center" )
+                    << new xml::XmlCode(sCopyright);
+    }
+
+     if (bUse_OOoFrameDiv)
+    {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("\n</div> <!-- id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_IdlId)
+            << new xml::XmlCode("\" -->\n");
+    }
+
+    aBodyData.WriteOut(aBuffer);
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
+
+
+
+
+
+
+
diff --git a/autodoc/source/display/toolkit/makefile.mk b/autodoc/source/display/toolkit/makefile.mk
new file mode 100644
index 000000000000..ab374990eb7a
--- /dev/null
+++ b/autodoc/source/display/toolkit/makefile.mk
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_toolkit
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/hf_docentry.obj     \
+    $(OBJ)$/hf_funcdecl.obj     \
+    $(OBJ)$/hf_linachain.obj    \
+    $(OBJ)$/hf_navi_main.obj    \
+    $(OBJ)$/hf_navi_sub.obj     \
+    $(OBJ)$/hf_title.obj     	\
+    $(OBJ)$/htmlfile.obj        \
+    $(OBJ)$/out_node.obj        \
+    $(OBJ)$/out_position.obj    \
+    $(OBJ)$/out_tree.obj        \
+    $(OBJ)$/outputstack.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/toolkit/out_node.cxx b/autodoc/source/display/toolkit/out_node.cxx
new file mode 100644
index 000000000000..ac402e2a123b
--- /dev/null
+++ b/autodoc/source/display/toolkit/out_node.cxx
@@ -0,0 +1,189 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/out_node.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+
+
+namespace output
+{
+
+
+namespace
+{
+
+struct Less_NodePtr
+{
+    bool                operator()(
+                            Node *              p1,
+                            Node *              p2 ) const
+                        { return p1->Name() < p2->Name(); }
+};
+
+struct Less_NodePtr     C_Less_NodePtr;
+
+
+Node  C_aNullNode(Node::null_object);
+
+
+}   // namepace anonymous
+
+
+//**********************        Node        ***************************//
+
+
+Node::Node()
+    :   sName(),
+          pParent(0),
+          aChildren(),
+          nDepth(0),
+          nNameRoomId(0)
+{
+}
+
+Node::Node( E_NullObject )
+    :   sName(),
+          pParent(0),
+          aChildren(),
+          nDepth(-1),
+          nNameRoomId(0)
+{
+}
+
+Node::Node( const String &  i_name,
+            Node &          i_parent )
+    :   sName(i_name),
+        pParent(&i_parent),
+        aChildren(),
+        nDepth(i_parent.Depth()+1),
+          nNameRoomId(0)
+{
+}
+
+Node::~Node()
+{
+    for ( List::iterator it = aChildren.begin();
+          it != aChildren.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+Node &
+Node::Provide_Child( const String & i_name )
+{
+    Node *
+        ret = find_Child(i_name);
+    if (ret != 0)
+        return *ret;
+    return add_Child(i_name);
+}
+
+void
+Node::Get_Path( StreamStr &         o_result,
+                intt                i_maxDepth ) const
+{
+    // Intentionally 'i_maxDepth != 0', so max_Depth == -1 sets no limit:
+    if (i_maxDepth != 0)
+    {
+        if (pParent != 0)
+            pParent->Get_Path(o_result, i_maxDepth-1);
+        o_result << sName << '/';
+    }
+}
+
+void
+Node::Get_Chain( StringVector & o_result,
+                 intt           i_maxDepth ) const
+{
+    if (i_maxDepth != 0)
+    {
+        // This is called also for the toplevel Node,
+        //   but there happens nothing:
+        if (pParent != 0)
+        {
+            pParent->Get_Chain(o_result, i_maxDepth-1);
+            o_result.push_back(sName);
+        }
+    }
+}
+
+Node *
+Node::find_Child( const String & i_name )
+{
+    Node aSearch;
+    aSearch.sName = i_name;
+
+    List::const_iterator
+        ret = std::lower_bound( aChildren.begin(),
+                                aChildren.end(),
+                                &aSearch,
+                                C_Less_NodePtr );
+    if ( ret != aChildren.end() ? (*ret)->Name() == i_name : false )
+        return *ret;
+
+    return 0;
+}
+
+Node &
+Node::add_Child( const String & i_name )
+{
+    DYN Node *
+        pNew = new Node(i_name,*this);
+    aChildren.insert( std::lower_bound( aChildren.begin(),
+                                        aChildren.end(),
+                                        pNew,
+                                        C_Less_NodePtr ),
+                      pNew );
+    return *pNew;
+}
+
+Node &
+Node::provide_Child( StringVector::const_iterator i_next,
+                       StringVector::const_iterator i_end )
+{
+    if (i_next == i_end)
+        return *this;
+    return Provide_Child(*i_next).provide_Child(i_next+1,i_end);
+}
+
+
+
+
+Node &
+Node::Null_()
+{
+    return C_aNullNode;
+}
+
+
+}   // namespace output
diff --git a/autodoc/source/display/toolkit/out_position.cxx b/autodoc/source/display/toolkit/out_position.cxx
new file mode 100644
index 000000000000..735732014b80
--- /dev/null
+++ b/autodoc/source/display/toolkit/out_position.cxx
@@ -0,0 +1,239 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/out_position.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace output
+{
+
+
+
+namespace
+{
+
+const int       C_nAssumedMaxLinkLength = 500;
+
+void                move_ToParent(
+                        Node * &            io_node,
+                        intt                i_levels = 1 );
+
+void
+move_ToParent( Node * &   io_node,
+               intt       i_levels )
+{
+    for ( intt n = 0; n < i_levels; ++n )
+    {
+        csv_assert(io_node != 0);
+        io_node = io_node->Parent();
+    }
+}
+
+
+
+}   // namepace anonymous
+
+
+
+Position::Position()
+    :   sFile(),
+        pDirectory(&Node::Null_())
+{
+}
+
+
+Position::Position( Node &              i_directory,
+                    const String &      i_file )
+    :   sFile(i_file),
+        pDirectory(&i_directory)
+{
+}
+
+Position::Position( const Position &    i_directory,
+                    const String &      i_sDifferentFile )
+    :   sFile(i_sDifferentFile),
+        pDirectory(i_directory.pDirectory)
+{
+}
+
+
+Position::~Position()
+{
+}
+
+
+Position &
+Position::operator=( Node & i_node )
+{
+    pDirectory = &i_node;
+    sFile.clear();
+    return *this;
+}
+
+Position &
+Position::operator+=( const String & i_nodeName )
+{
+    csv_assert(pDirectory != 0);
+
+    pDirectory = &pDirectory->Provide_Child(i_nodeName);
+    sFile.clear();
+
+    return *this;
+}
+
+Position &
+Position::operator-=( intt i_levels )
+{
+    csv_assert(pDirectory != 0);
+
+    for ( intt i = i_levels; i > 0; --i )
+    {
+        pDirectory = pDirectory->Parent();
+        if (pDirectory == 0)
+        {
+            pDirectory = &Node::Null_();
+            i = 0;
+        }
+    }
+    sFile.clear();
+
+    return *this;
+}
+
+String
+Position::LinkToRoot( const String & ) const
+{
+    StreamLock sl(C_nAssumedMaxLinkLength);
+    return sl() << get_UpLink(Depth()) << c_str;
+}
+
+void
+Position::Get_LinkTo( StreamStr &         o_result,
+                      const Position &    i_destination,
+                      const String &      i_localLabel ) const
+{
+    Node * p1 = pDirectory;
+    Node * p2 = i_destination.pDirectory;
+
+    intt diff = Depth() - i_destination.Depth();
+    intt pathLength1 = 0;
+    intt pathLength2 = 0;
+
+    if ( diff > 0 )
+    {
+        pathLength1 = diff;
+        move_ToParent(p1,pathLength1);
+    }
+    else if ( diff < 0 )
+    {
+        pathLength2 = -diff;
+        move_ToParent(p2,pathLength2);
+    }
+
+    while ( p1 != p2 )
+    {
+        move_ToParent(p1);
+        move_ToParent(p2);
+        ++pathLength1;
+        ++pathLength2;
+    }
+
+    o_result << get_UpLink(pathLength1);
+    i_destination.pDirectory->Get_Path(o_result, pathLength2);
+    o_result << i_destination.sFile;
+    if (i_localLabel.length())
+        o_result << "#" << i_localLabel;
+}
+
+void
+Position::Get_LinkToRoot( StreamStr &         o_result,
+                          const String &      ) const
+{
+    o_result << get_UpLink(Depth());
+}
+
+void
+Position::Set( Node &           i_node,
+               const String &   i_file )
+{
+    sFile = i_file;
+    pDirectory = &i_node;
+}
+
+
+
+
+const char *
+get_UpLink(uintt i_depth)
+{
+    static const uintt
+        C_nMaxDepth = 30;
+    static const char
+        C_sUpLinkArray[3*C_nMaxDepth+1] =
+                        "../../../../../../../../../../"
+                        "../../../../../../../../../../"
+                        "../../../../../../../../../../";
+    static const char *
+        C_sUpLink = &C_sUpLinkArray[0];
+
+    if ( i_depth <= C_nMaxDepth )
+    {
+        return C_sUpLink + 3*(C_nMaxDepth - i_depth);
+    }
+    else
+    {   // not THREAD fast
+        static std::vector<char>
+            aRet;
+        uintt nNeededSize = i_depth * 3 + 1;
+
+        if (aRet.size() < nNeededSize)
+        {
+            aRet.resize(nNeededSize);
+            char * pEnd = &aRet[nNeededSize-1];
+            *pEnd = '\0';
+
+            for ( char * pFill = &(*aRet.begin());
+                  pFill != pEnd;
+                  pFill += 3 )
+            {
+                memcpy(pFill, C_sUpLink, 3);
+            }
+        }   // end if
+
+        return &aRet[aRet.size() - 1 - 3*i_depth];
+    }
+}
+
+
+
+
+}   // namespace output
diff --git a/autodoc/source/display/toolkit/out_tree.cxx b/autodoc/source/display/toolkit/out_tree.cxx
new file mode 100644
index 000000000000..73c7d2192e76
--- /dev/null
+++ b/autodoc/source/display/toolkit/out_tree.cxx
@@ -0,0 +1,53 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/out_tree.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace output
+{
+
+Tree::Tree()
+    :   pRoot(new Node),
+        pNamesRoot(pRoot.Ptr()),
+        pIndexRoot(pRoot.Ptr()),
+        pProjectsRoot(pRoot.Ptr()),
+        aOverview()
+{
+}
+
+Tree::~Tree()
+{
+}
+
+
+
+}   // namespace output
diff --git a/autodoc/source/display/toolkit/outputstack.cxx b/autodoc/source/display/toolkit/outputstack.cxx
new file mode 100644
index 000000000000..19573dc4fe75
--- /dev/null
+++ b/autodoc/source/display/toolkit/outputstack.cxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/outputstack.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+OutputStack::OutputStack()
+{
+}
+
+OutputStack::~OutputStack()
+{
+}
+
+void
+OutputStack::Enter( csi::xml::Element & io_rDestination )
+{
+    aCurDestination.push(&io_rDestination);
+}
+
+void
+OutputStack::Leave()
+{
+    csv_assert( NOT aCurDestination.empty() );
+    aCurDestination.pop();
+}
+
+
+
diff --git a/autodoc/source/exes/adc_uni/adc_cl.cxx b/autodoc/source/exes/adc_uni/adc_cl.cxx
new file mode 100644
index 000000000000..ff5ecf6ad923
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cl.cxx
@@ -0,0 +1,568 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adc_cl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <cosv/x.hxx>
+#include <cosv/file.hxx>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/ary.hxx>
+#include <tools/tkpchars.hxx>
+#include <adc_msg.hxx>
+#include "adc_cmds.hxx"
+#include "adc_cmd_parse.hxx"
+#include "cmd_sincedata.hxx"
+
+
+namespace autodoc
+{
+
+CommandLine * CommandLine::pTheInstance_ = 0;
+
+const char * const C_sUserGuide =
+"\n\n\n"
+"               General Use of Autodoc\n"
+"               ----------------------\n"
+"\n"
+"   Example for C++:\n"
+"\n"
+"   -html <OutputDirectory> -name \"UDK 3.x anything\" -lg c++\n"
+"        -p <ProjName> <ProjectRootDirectory>\n"
+"            -t <SourceDir_relativeToProjectRoot>\n"
+"\n"
+"   There may be several projects specified by -p.\n"
+"\n"
+"\n"
+"   Example for IDL:\n"
+"\n"
+"   -html <OutputDirectory> -name \"UDK 3.x anything\" -lg idl\n"
+"         -t <SourceDir1> <SourceDir2>\n"
+"\n"
+"   For both languages, instead of or in addition to -t may be\n"
+"   used -d (no subdirectories) or -f (just one file). There can\n"
+"   be multiple arguments after each of these options (-t -d -f).\n"
+"\n"
+"\n"
+"           Replacing @since Tag Content\n"
+"           ----------------------------\n"
+"\n"
+"   In both languages you can give a transformation file to replace\n"
+"   entries in @since tags by different entries.\n"
+"   This file is given by the option\n"
+"       -sincefile <TransformationFilePath>\n"
+"   This option has to appear between the -html and the -lg option.\n"
+"   Example:\n"
+"   -html <OutputDirectory> -sincefile replacesince.txt\n"
+"       -name \"UDK 3.x anything\" -lg idl -t <SourceDir>\n"
+"\n"
+"\n";
+
+
+#if 0   // FUTURE
+"\n\n\n"
+"               Use of Autodoc\n"
+"               --------------\n"
+"\n"
+"   Basics:\n"
+"\n"
+"   Autodoc may perform different tasks.\n"
+"\n"
+"   Possible tasks are\n"
+"       - parsing source code\n"
+"       - creating HTML-output.\n"
+"   On the command line each task starts with a specific\n"
+"   option:\n"
+"       '-parse' for parsing source code,\n"
+"       '-html' for creating HTML.\n"
+"   All command line options, related to one task, have to follow before\n"
+"   the starting option of the next task.\n"
+"\n"
+"   Within the task '-parse', there may be defined different projects.\n"
+"   A project definition is started with '-p'.\n"
+"   All not project specific options within the task '-parse' have to\n"
+"   appear in front of the first '-p'.\n"
+"   There can be no project at all. Then all options, available for\n"
+"   projects, can be used like for one nameless default project, without using\n"
+"   '-p', but these options still have to appear behind all other\n"
+"   options of the task '-parse'.\n"
+"\n"
+"\n"
+"   Legend:\n"
+"\n"
+"       <SomeText>      Describes an argument.\n"
+"       'SomeText'      Within '...' is the literal value of an argument.\n"
+"       +               There can be multiple arguments.\n"
+"       |               Separator for alternative literal values of an argument.\n"
+"\n"
+"\n"
+"   Syntax:\n"
+"\n"
+"   -parse\n"
+"       -name <RepositoryName>]\n"
+"       -lg 'c++'|'idl'\n"
+"       -extg <AdditonalExtensions>+\n"
+"       -docg 'usehtml'\n"
+"       -p <ProjectName> <ProjectRootDir>\n"
+"           -l 'c++'|'idl'\n"
+"           -ext <AdditonalExtensions>+\n"
+"           -doc 'usehtml'\n"
+"           -d <SourceDir_relative2ProjectRootDir_nosubdirs>+\n"
+"           -t <SourceTree_relative2ProjectRootDir>+\n"
+"           -f <SourceFile_relative2ProjectRootDir>+\n"
+"   -html <OutputDir>\n"
+"       -xlinks <Namespace> <ExternLinksRootDir>\n"
+"   -i <CommandFilePath>\n"
+"   -v <VerboseNr>\n"
+"\n"
+"\n"
+"   Detailed Options Description:\n"
+"\n"
+"   Option      Arguments\n"
+"   ----------------------------------------------------------\n"
+"\n"
+"   -parse      \n\n"
+"               Starts the task \"Parse source code\".\n"
+"               May be omitted, if it would be the first option on the\n"
+"               command line.\n"
+"\n"
+"   -name       <RepositoryName>\n\n"
+"               This name is used for naming the repository in\n"
+"               human readable output. In future it may be used also for\n"
+"               identifiing a repository in searches.\n"
+"\n"
+"   -lg         'c++|'idl'\n\n"
+"               Identifies the programming language to be parsed.\n"
+"                   'c++':  C++\n"
+"                           Files with extensions '.h', '.hxx' are parsed.\n"
+"                   'idl':  UNO-IDL\n"
+"                           Files with extensions '.idl' are parsed.\n"
+"               Here the language is set globally for all projects.\n"
+"               A project can override this by using '-l'.\n"
+"\n"
+"   -extg       <.AdditionalExtension>+\n\n"
+"               Has to follow immediately behind '-lg'.\n"
+"               Specifies additional extensions, that will be recognised as\n"
+"               source code files of the previously specified programming\n"
+"               language.  Each extension has to start with '.'.\n"
+"               It is possible to include extensionless files, too,\n"
+"               by the argument '.'\n"
+"               Here these extensions are set globally for all projects.\n"
+"               A project can override this by using '-l' and '-ext'.\n"
+"\n"
+"   -docg       'html'|'nohtml'\n\n"
+"               Specifies the default for all comments in source code, so \n"
+"               that HTML-tags are interpreted as such or else treated as\n"
+"               regular text.\n"
+"               Without this option, the default is 'nohtml'.\n"
+"               Here the default is set globally for all projects.\n"
+"               A project can override this by using '-doc'.\n"
+"\n"
+"   -p          <ProjectName> <ProjectRootDirectory>\n\n"
+"               ProjectName is used in output as human readable identifier\n"
+"               for the project. ProjectRootDirectory is the path,\n"
+"               where the arguments of '-d', '-t' and '-f' are relative to.\n"
+"               This option can be omitted, then there is no project name\n"
+"               and all paths are relative to the current working directory.\n"
+"\n"
+"   -l          'c++|'idl'\n\n"
+"               Overrides -lg and -extg for the current project, which is\n"
+"               specified by the last previous '-p'.\n"
+"               For details see at option '-lg'.\n"
+"\n"
+"   -ext        <.AdditionalExtension>+\n\n"
+"               Can be used only immediately behind '-l'.\n"
+"               Overrides -extg for the current project, which is\n"
+"               specified by the last previous '-p'.\n"
+"               For details see at option '-extg'.\n"
+"\n"
+"   -doc        'html'|'nohtml'\n\n"
+"               Overrides -docg for the current project, which is\n"
+"               specified by the last previous '-p'.\n"
+"               For details see at option '-docg'.\n"
+"\n"
+"   -d          <SourceDir_relative2ProjectRootDir_nosubdirs>+\n\n"
+"               For the current project all files in the given\n"
+"               directories are parsed, which have valid extensions.\n"
+"               Subdirectories are NOT parsed.\n"
+"\n"
+"   -t          <SourceTree_relative2ProjectRootDir>+\n\n"
+"               For the current project all files in the given\n"
+"               directories AND its subdirectories are parsed, which\n"
+"               have valid extensions.\n"
+"\n"
+"   -f          <SourceFile_relative2ProjectRootDir>+\n\n"
+"               For the current project and language the given files\n"
+"               are parsed. It doesn't matter, if their extensions match\n"
+"               the valid extensions.\n"
+"\n"
+"   -html       <OutputRootDir>\n\n"
+"               Starts the task \"Create HTML output\".\n"
+"\n"
+"   -xlinks     <Namespace> <ExternLinksRootDir>\n\n"
+"               This option allows, to create links to external\n"
+"               HTML-documents.\n"
+"               For all source code objects (like classes or functions)\n"
+"               which belong in the given namespace, the given root\n"
+"               directory is used as a base for links to them.\n"
+"               Presently, this works only for C++-mappings of IDL-items.\n"
+"               The given namespace has to be absolute.\n"
+"\n"
+"   -i          <CommandFilePath>\n\n"
+"               This option is replaced by the contents of the given\n"
+"               file. The file has to be ASCII and each option\n"
+"               has to start in the first column of a new line.\n"
+"               So each valid line starts with a '-'.\n"
+"               Empty lines are allowed.\n"
+"               Comment lines have to start with '#'\n"
+"\n"
+"   -v          <VerboseNumber>\n\n"
+"               Show details during parsing:\n"
+"                   2    shows each parsed letter,\n"
+"                   4    shows stored objects.\n"
+"                   1    shows recognised tokens.\n"
+"               These bit-values can be combined.\n"
+"               This option suppresses errors, because of\n"
+"               missing output options (no '-html').\n";
+#endif // 0, FUTURE
+
+
+CommandLine::CommandLine()
+    :   nDebugStyle(0),
+        pSinceTransformator(new command::SinceTagTransformationData),
+        aCommands(),
+        bInitOk(false),
+        pCommand_CreateHtml(0),
+        pReposy( & ary::Repository::Create_() ),
+        bCpp(false),
+        bIdl(false)
+{
+    csv_assert(pTheInstance_ == 0);
+    pTheInstance_ = this;
+}
+
+CommandLine::~CommandLine()
+{
+    csv::erase_container_of_heap_ptrs(aCommands);
+    pTheInstance_ = 0;
+}
+
+int
+CommandLine::Run() const
+{
+    Cout() << "\nAutodoc version 2.2.5"
+           << "\n---------------------"
+           << "\n" << Endl();
+
+    bool
+        ok = true;
+    for ( CommandList::const_iterator it = aCommands.begin();
+          ok AND it != aCommands.end();
+          ++it )
+    {
+        ok = (*it)->Run();
+    }
+
+    if (pCommand_CreateHtml != 0)
+    {
+        StreamStr aDiagnosticMessagesFile(700);
+        aDiagnosticMessagesFile
+            << pCommand_CreateHtml->OutputDir()
+            << csv::ploc::Delimiter()
+            << "Autodoc_DiagnosticMessages.txt";
+        TheMessages().WriteFile(aDiagnosticMessagesFile.c_str());
+    }
+
+    return ok ? 0 : 1;
+}
+
+CommandLine &
+CommandLine::Get_()
+{
+    csv_assert(pTheInstance_ != 0);
+    return *pTheInstance_;
+}
+
+bool
+CommandLine::DoesTransform_SinceTag() const
+{
+    return pSinceTransformator->DoesTransform();
+}
+
+//bool
+//CommandLine::Strip_SinceTagText( String & io_sSinceTagValue ) const
+//{
+//    return pSinceTransformator->StripSinceTagText(io_sSinceTagValue);
+//}
+
+const String &
+CommandLine::DisplayOf_SinceTagValue( const String & i_sVersionNumber ) const
+{
+    return pSinceTransformator->DisplayOf(i_sVersionNumber);
+}
+
+void
+CommandLine::do_Init( int                 argc,
+                      char *              argv[] )
+{
+  try
+  {
+    bInitOk = false;
+    StringVector    aParameters;
+
+    char * * itpEnd = &argv[0] + argc;
+    for ( char * * itp = &argv[1]; itp != itpEnd; ++itp )
+    {
+         if ( strncmp(*itp, "-I:", 3) != 0 )
+            aParameters.push_back(String(*itp));
+        else
+            load_IncludedCommands(aParameters, (*itp)+3);
+    }
+
+    StringVector::const_iterator itEnd = aParameters.end();
+    for ( StringVector::const_iterator it = aParameters.begin();
+          it != itEnd;
+        )
+    {
+        if ( *it == command::C_opt_Verbose )
+            do_clVerbose(it,itEnd);
+        else if ( *it == command::C_opt_LangAll
+                  OR *it == command::C_opt_Name
+                  OR *it == command::C_opt_DevmanFile )
+            do_clParse(it,itEnd);
+        else if (*it == command::C_opt_CreateHtml)
+            do_clCreateHtml(it,itEnd);
+        else if (*it == command::C_opt_SinceFile)
+            do_clSinceFile(it,itEnd);
+        else if (*it == command::C_opt_ExternNamespace)
+        {
+            sExternNamespace = *(++it);
+            ++it;
+            if ( strncmp(sExternNamespace.c_str(), "::", 2) != 0)
+            {
+                 throw command::X_CommandLine(
+                        "-extnsp needs an absolute qualified namespace, starting with \"::\"."
+                        );
+            }
+        }
+        else if (*it == command::C_opt_ExternRoot)
+        {
+            ++it;
+            StreamLock sl(1000);
+            if ( csv::compare(*it, 0, "http://", 7) != 0 )
+            {
+                sl() << "http://" << *it;
+            }
+            if ( *(sl().end()-1) != '/')
+                sl() << '/';
+            sExternRoot = sl().c_str();
+
+            ++it;
+        }
+//        else if (*it == command::C_opt_CreateXml)
+//            do_clCreateXml(it,itEnd);
+//        else if (command::C_opt_Load)
+//            do_clLoad(it,itEnd);
+//        else if (*it == command::C_opt_Save)
+//            do_clSave(it,itEnd);
+        else if (*it == "-h" OR *it == "-?" OR *it == "?")
+            // Leads to displaying help, because bInitOk stays on false.
+             return;
+        else if ( *it == command::C_opt_Parse )
+            // Only for backwards compatibility.
+            //   Just ignore "-parse".
+            ++it;
+        else
+        {
+            StreamLock sl(200);
+             throw command::X_CommandLine(
+                            sl() << "Unknown commandline option \""
+                                 << *it
+                                 << "\"."
+                                 << c_str );
+        }
+    }   // end for
+    sort_Commands();
+
+    bInitOk = true;
+
+  }   // end try
+  catch ( command::X_CommandLine & xxx )
+  {
+    xxx.Report( Cerr() );
+  }
+  catch ( csv::Exception & xxx )
+  {
+    xxx.GetInfo( Cerr() );
+  }
+}
+
+void
+CommandLine::do_PrintUse() const
+{
+    Cout() << C_sUserGuide << Endl();
+}
+
+bool
+CommandLine::inq_CheckParameters() const
+{
+    if (NOT bInitOk OR aCommands.size() == 0)
+        return false;
+    return true;
+}
+
+void
+CommandLine::load_IncludedCommands( StringVector &      out,
+                                    const char *        i_filePath )
+{
+    CharacterSource
+        aIncludedCommands;
+    csv::File
+        aFile(i_filePath, csv::CFM_READ);
+    if (NOT aFile.open())
+    {
+         Cerr() << "Command include file \""
+               << i_filePath
+               << "\" not found."
+               << Endl();
+        throw command::X_CommandLine("Invalid file in option -I:<command-file>.");
+    }
+    aIncludedCommands.LoadText(aFile);
+    aFile.close();
+
+    bool bInToken = false;
+    StreamLock aTransmit(200);
+    for ( ; NOT aIncludedCommands.IsFinished(); aIncludedCommands.MoveOn() )
+    {
+        if (bInToken)
+        {
+            if (aIncludedCommands.CurChar() <= 32)
+            {
+                const char *
+                    pToken = aIncludedCommands.CutToken();
+                bInToken = false;
+
+                 if ( strncmp(pToken, "-I:", 3) != 0 )
+                 {
+                     aTransmit().seekp(0);
+                     aTransmit() << pToken;
+                     aTransmit().replace_all('\\', *csv::ploc::Delimiter());
+                     aTransmit().replace_all('/', *csv::ploc::Delimiter());
+                    out.push_back(String(aTransmit().c_str()));
+                 }
+                else
+                    load_IncludedCommands(out, pToken+3);
+            }
+        }
+        else
+        {
+            if (aIncludedCommands.CurChar() > 32)
+            {
+                aIncludedCommands.CutToken();
+                bInToken = true;
+            }
+        }   // endif (bInToken) else
+
+    }   // end while()
+}
+
+namespace
+{
+inline int
+v_nr(StringVector::const_iterator it)
+{
+     return int( *(*it).c_str() ) - int('0');
+}
+}   // anonymous namespace
+
+void
+CommandLine::do_clVerbose(  opt_iter &          it,
+                            opt_iter            itEnd )
+{
+    ++it;
+    if ( it == itEnd ? true : v_nr(it) < 0 OR v_nr(it) > 7 )
+        throw command::X_CommandLine( "Missing or invalid number in -v option." );
+    nDebugStyle = v_nr(it);
+    ++it;
+}
+
+void
+CommandLine::do_clParse( opt_iter &          it,
+                         opt_iter            itEnd )
+{
+    command::Command *
+        pCmd_Parse = new command::Parse;
+    pCmd_Parse->Init(it, itEnd);
+    aCommands.push_back(pCmd_Parse);
+}
+
+void
+CommandLine::do_clCreateHtml( opt_iter &          it,
+                              opt_iter            itEnd )
+{
+    pCommand_CreateHtml = new command::CreateHtml;
+    pCommand_CreateHtml->Init(it, itEnd);
+    aCommands.push_back(pCommand_CreateHtml);
+}
+
+void
+CommandLine::do_clSinceFile( opt_iter &          it,
+                             opt_iter            itEnd )
+{
+    pSinceTransformator->Init(it, itEnd);
+}
+
+
+namespace
+{
+
+struct Less_RunningRank
+{
+    bool                operator()(
+                            const command::Command * const &
+                                                i1,
+                            const command::Command * const &
+                                                i2 ) const
+                        { return i1->RunningRank() < i2->RunningRank(); }
+};
+
+}   // anonymous namespace
+
+
+
+void
+CommandLine::sort_Commands()
+{
+    std::sort( aCommands.begin(),
+               aCommands.end(),
+               Less_RunningRank() );
+}
+
+}   // namespace autodoc
diff --git a/autodoc/source/exes/adc_uni/adc_cmd.hxx b/autodoc/source/exes/adc_uni/adc_cmd.hxx
new file mode 100644
index 000000000000..d045da77ee84
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmd.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADC_CMD_HXX
+#define ADC_ADC_CMD_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/comdline.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace autodoc
+{
+namespace command
+{
+
+/** Context for a command, which can be read from the command line.
+*/
+class Context
+{
+  public:
+    typedef StringVector::const_iterator opt_iter;
+
+    virtual             ~Context() {}
+
+    void                Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+  private:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd ) = 0;
+};
+
+// IMPLEMENTATION
+inline void
+Context::Init( opt_iter &          i_nCurArgsBegin,
+               opt_iter            i_nEndOfAllArgs )
+
+{ do_Init(i_nCurArgsBegin, i_nEndOfAllArgs); }
+
+
+
+/** Interface for commands, autodoc is able to perform.
+*/
+class Command : public Context
+{
+  public:
+    /** Running ranks of the commands are to be maintained at one location:
+        Here!
+    */
+    enum E_Ranks
+    {
+        rank_Load       = 10,
+        rank_Parse      = 20,
+        rank_Save       = 30,
+        rank_CreateHtml = 40,
+        rank_CreateXml  = 50
+    };
+
+
+    bool                Run() const;
+    int                 RunningRank() const;
+
+  private:
+    virtual bool        do_Run() const = 0;
+    virtual int         inq_RunningRank() const = 0;
+};
+
+// IMPLEMENTATION
+inline bool
+Command::Run() const
+{ return do_Run(); }
+inline int
+Command::RunningRank() const
+{ return inq_RunningRank(); }
+
+
+
+
+/** The exception thrown, if the command line is invalid.
+*/
+class X_CommandLine
+{
+  public:
+                        X_CommandLine(
+                            const char *        i_sExplanation )
+                            :   sExplanation(i_sExplanation) {}
+
+    void                Report(
+                            std::ostream &      o_rOut )
+                            { o_rOut << "Error in command line: "
+                                     << sExplanation << Endl(); }
+  private:
+    String              sExplanation;
+};
+
+
+
+
+}   // namespace command
+}   // namespace autodoc
+#endif
diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx
new file mode 100644
index 000000000000..f3668d625ab8
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx
@@ -0,0 +1,343 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "adc_cmd_parse.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <adc_cl.hxx>
+#include "adc_cmds.hxx"
+#include "cmd_run.hxx"
+
+
+
+namespace autodoc
+{
+namespace command
+{
+
+namespace
+{
+
+const String C_FileEnding_hxx("*.hxx");
+const String C_FileEnding_h("*.h");
+const String C_FileEnding_idl("*.idl");
+const String C_FileEnding_java("*.java");
+
+inline void
+CHECK( bool b, const String & text )
+{
+    if (NOT b)
+        throw X_CommandLine( text );
+}
+
+}   // anonymous namespace
+
+
+
+//**************************     S_LanguageInfo     ***********************//
+
+S_LanguageInfo::~S_LanguageInfo()
+{
+}
+
+void
+S_LanguageInfo::do_Init( opt_iter &          it,
+                         opt_iter            itEnd )
+{
+    ++it;   // Cur is language.
+    CHECKOPT(   it != itEnd AND
+              ( *it == C_arg_Cplusplus OR
+                *it == C_arg_Idl OR
+                *it == C_arg_Java ),
+              "language",
+              C_opt_LangAll );
+
+    if ( *it == C_arg_Cplusplus ) {
+        eLanguage = cpp;
+    }
+    else if ( *it == C_arg_Idl ) {
+        eLanguage = idl;
+    }
+    else if ( *it == C_arg_Java ) {
+        eLanguage = java;
+    }
+    else {
+         csv_assert(false);
+    }
+
+    switch (eLanguage)
+    {
+        case cpp:   aExtensions.push_back( C_FileEnding_hxx );
+                    aExtensions.push_back( C_FileEnding_h );
+                    CommandLine::Get_().Set_CppUsed();
+                    break;
+        case idl:   aExtensions.push_back( C_FileEnding_idl );
+                    CommandLine::Get_().Set_IdlUsed();
+                    break;
+        case java:  aExtensions.push_back( C_FileEnding_java );
+                    break;
+        default:    //  do nothing.
+                    ;
+    }
+
+    ++it;   // Cur is next option.
+}
+
+void
+S_LanguageInfo::InitExtensions( opt_iter &          it,
+                                opt_iter            itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd AND (*it).char_at(0) == '.',
+              "extensions",
+              C_opt_ExtensionsAll );
+
+    StreamLock slCheck(150);
+    slCheck() << C_opt_ExtensionsAll
+              << " used without previous "
+              << C_opt_LangAll;
+
+    CHECK( eLanguage != none,
+           slCheck().c_str() );
+
+    do {
+        aExtensions.push_back(*it);
+        ++it;
+    }   while (it != itEnd AND (*it).char_at(0) == '.');
+}
+
+
+
+//**************************     Parse     ***********************//
+
+Parse::Parse()
+    :   sRepositoryName(),
+        aGlobalLanguage(),
+        aProjects(),
+        sDevelopersManual_RefFilePath()
+{
+}
+
+Parse::~Parse()
+{
+    csv::erase_container_of_heap_ptrs(aProjects);
+}
+
+void
+Parse::do_Init( opt_iter &          it,
+                opt_iter            itEnd )
+{
+    for ( ; it != itEnd;  )
+    {
+        if (*it == C_opt_Name)
+            do_clName(it, itEnd);
+        else if (*it == C_opt_LangAll)
+            aGlobalLanguage.Init(it, itEnd);
+        else if (*it == C_opt_ExtensionsAll)
+            aGlobalLanguage.InitExtensions(it, itEnd);
+        else if (*it == C_opt_DevmanFile)
+            do_clDevManual(it, itEnd);
+        else if (*it == C_opt_Project)
+            do_clProject(it, itEnd);
+        else if (    *it == C_opt_SourceTree
+                  OR *it == C_opt_SourceDir
+                  OR *it == C_opt_SourceFile )
+            do_clDefaultProject(it, itEnd);
+        else
+            break;
+    }   // for
+}
+
+void
+Parse::do_clName( opt_iter &    it,
+                  opt_iter      itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+              "name",
+              C_opt_Name );
+    sRepositoryName = *it;
+    ++it;
+}
+
+void
+Parse::do_clDevManual( opt_iter &    it,
+                       opt_iter      itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+              "link file path",
+              C_opt_DevmanFile );
+    sDevelopersManual_RefFilePath = *it;
+    ++it;
+}
+
+void
+Parse::do_clProject( opt_iter &    it,
+                     opt_iter      itEnd )
+{
+    if ( aProjects.size() == 1 )
+    {
+         if ( aProjects.front()->IsDefault() )
+            throw X_CommandLine( "Both, named projects and a default project, cannot be used together." );
+    }
+
+    S_ProjectData * dpProject = new S_ProjectData(aGlobalLanguage);
+    ++it;
+    dpProject->Init(it, itEnd);
+    aProjects.push_back(dpProject);
+}
+
+void
+Parse::do_clDefaultProject( opt_iter &    it,
+                            opt_iter      itEnd )
+{
+    if ( aProjects.size() > 0 )
+    {
+        throw X_CommandLine( "Both, named projects and a default project, cannot be used together." );
+    }
+
+    S_ProjectData * dpProject = new S_ProjectData( aGlobalLanguage,
+                                                   S_ProjectData::default_prj );
+    dpProject->Init(it, itEnd);
+    aProjects.push_back(dpProject);
+}
+
+bool
+Parse::do_Run() const
+{
+    run::Parser
+        aParser(*this);
+    return aParser.Perform();
+}
+
+int
+Parse::inq_RunningRank() const
+{
+    return static_cast<int>(rank_Parse);
+}
+
+
+
+//**************************     S_Sources      ***********************//
+
+void
+S_Sources::do_Init( opt_iter &          it,
+                    opt_iter            itEnd )
+{
+    StringVector *
+        pList = 0;
+    csv_assert((*it)[0] == '-');
+
+    for ( ; it != itEnd; ++it)
+    {
+        if ((*it)[0] == '-')
+        {
+            if (*it == C_opt_SourceTree)
+                pList = &aTrees;
+            else if (*it == C_opt_SourceDir)
+                pList = &aDirectories;
+            else if (*it == C_opt_SourceFile)
+                pList = &aFiles;
+            else
+                return;
+        }
+        else
+            pList->push_back(*it);
+    }   // end for
+}
+
+
+
+//**************************     S_ProjectData     ***********************//
+
+
+S_ProjectData::S_ProjectData( const S_LanguageInfo & i_globalLanguage )
+    :   sName(),
+        aRootDirectory(),
+        aLanguage(i_globalLanguage),
+        aFiles(),
+        bIsDefault(false)
+{
+}
+
+S_ProjectData::S_ProjectData( const S_LanguageInfo & i_globalLanguage,
+                              E_Default              )
+    :   sName(),
+        aRootDirectory("."),
+        aLanguage(i_globalLanguage),
+        aFiles(),
+        bIsDefault(true)
+{
+}
+
+S_ProjectData::~S_ProjectData()
+{
+}
+
+void
+S_ProjectData::do_Init( opt_iter &          it,
+                        opt_iter            itEnd )
+{
+    if (NOT IsDefault())
+    {
+        CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+                  "name",
+                  C_opt_Project );
+        sName = *it;
+        ++it;
+
+        CHECKOPT( it != itEnd AND  (*it).char_at(0) != '-',
+                  "root directory",
+                  C_opt_Project );
+        aRootDirectory.Set((*it).c_str(), true);
+        ++it;
+    }
+
+    for ( ; it != itEnd; )
+    {
+        if (    *it == C_opt_SourceTree
+             OR *it == C_opt_SourceDir
+             OR *it == C_opt_SourceFile )
+            aFiles.Init(it, itEnd);
+//        else if (*it == C_opt_Lang)
+//            aLanguage.Init(it, itEnd);
+//        else if (*it == C_opt_Extensions)
+//            aLanguage.InitExtensions(it, itEnd);
+        else
+            break;
+    }   // for
+}
+
+}   // namespace command
+}   // namespace autodoc
+
+
+
diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx
new file mode 100644
index 000000000000..90799c3da286
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx
@@ -0,0 +1,208 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADC_CMD_PARSE_HXX
+#define ADC_ADC_CMD_PARSE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "adc_cmd.hxx"
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+    // PARAMETERS
+
+namespace autodoc
+{
+namespace command
+{
+
+/** A command context which holds the currently parsed programing language
+    and its valid file extensions.
+*/
+struct S_LanguageInfo : public Context
+{
+    enum E_ProgrammingLanguage
+    {
+        none,
+        cpp,
+        idl,
+        java
+    };
+                        S_LanguageInfo()
+                            :   eLanguage(none),
+                                aExtensions() {}
+                        ~S_LanguageInfo();
+
+    void                InitExtensions(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    // DATA
+    E_ProgrammingLanguage
+                        eLanguage;
+    StringVector        aExtensions;        // An empty string is possible and means exactly that: files without extension.
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+};
+
+
+class S_ProjectData;
+
+
+/** A command that parses source code into the Autodoc Repository.
+*/
+class Parse : public Command
+{
+  public:
+    typedef std::vector< DYN S_ProjectData * >  ProjectList;
+    typedef ProjectList::const_iterator         ProjectIterator;
+
+                        Parse();
+                        ~Parse();
+
+    // INQUIRY
+    const String &      ReposyName() const;
+    const S_LanguageInfo &
+                        GlobalLanguage() const;
+    ProjectIterator     ProjectsBegin() const;
+    ProjectIterator     ProjectsEnd() const;
+    const String &      DevelopersManual_RefFilePath() const
+                                                { return sDevelopersManual_RefFilePath; }
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          i_nCurArgsBegin,
+                            opt_iter            i_nEndOfAllArgs );
+    // Interface Command:
+    virtual bool        do_Run() const;
+    virtual int         inq_RunningRank() const;
+
+    // Locals
+    void                do_clName(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clDevManual(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clProject(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clDefaultProject(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+
+    // DATA
+    String              sRepositoryName;
+    S_LanguageInfo      aGlobalLanguage;
+
+    ProjectList         aProjects;
+
+    String              sDevelopersManual_RefFilePath;
+};
+
+inline const String &
+Parse::ReposyName() const
+    { return sRepositoryName; }
+inline const S_LanguageInfo &
+Parse::GlobalLanguage() const
+    { return aGlobalLanguage; }
+inline Parse::ProjectIterator
+Parse::ProjectsBegin() const
+    { return aProjects.begin(); }
+inline Parse::ProjectIterator
+Parse::ProjectsEnd() const
+    { return aProjects.end(); }
+//inline const String &
+//Parse::DevelopersManual_RefFilePath() const
+//    { return sDevelopersManual_RefFilePath; }
+//inline const String &
+//Parse::DevelopersManual_HtmlRoot() const
+//    { return sDevelopersManual_HtmlRoot; }
+
+
+struct S_Sources : public Context
+{
+    StringVector        aTrees;
+    StringVector        aDirectories;
+    StringVector        aFiles;
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+};
+
+class S_ProjectData : public Context
+{
+  public:
+    enum E_Default { default_prj };
+
+                        S_ProjectData(
+                            const S_LanguageInfo &
+                                                i_globalLanguage );
+                        S_ProjectData(
+                            const S_LanguageInfo &
+                                                i_globalLanguage,
+                            E_Default           unused );
+                        ~S_ProjectData();
+
+    bool                IsDefault() const       { return bIsDefault; }
+    const String &      Name() const            { return sName; }
+    const csv::ploc::Path &
+                        RootDirectory() const   { return aRootDirectory; }
+    const S_LanguageInfo &
+                        Language() const        { return aLanguage; }
+    const S_Sources     Sources() const         { return aFiles; }
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    // Locals
+
+    // DATA
+    String              sName;
+    csv::ploc::Path     aRootDirectory;
+    S_LanguageInfo      aLanguage;
+    S_Sources           aFiles;
+    bool                bIsDefault;
+};
+
+
+}   // namespace command
+}   // namespace autodoc
+
+
+#endif
diff --git a/autodoc/source/exes/adc_uni/adc_cmds.cxx b/autodoc/source/exes/adc_uni/adc_cmds.cxx
new file mode 100644
index 000000000000..bae3aeec19f9
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmds.cxx
@@ -0,0 +1,177 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "adc_cmds.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <autodoc/displaying.hxx>
+#include <autodoc/dsp_html_std.hxx>
+#include <display/corframe.hxx>
+#include <adc_cl.hxx>
+
+
+namespace autodoc
+{
+namespace command
+{
+
+extern const String C_opt_Include("-I:");
+
+extern const String C_opt_Verbose("-v");
+
+extern const String C_opt_Parse("-parse");
+extern const String C_opt_Name("-name");
+extern const String C_opt_LangAll("-lg");
+extern const String C_opt_ExtensionsAll("-extg");
+extern const String C_opt_DevmanFile("-dvgfile");
+extern const String C_opt_SinceFile("-sincefile");
+
+extern const String C_arg_Cplusplus("c++");
+extern const String C_arg_Idl("idl");
+extern const String C_arg_Java("java");
+
+extern const String C_opt_Project("-p");
+//extern const String C_opt_Lang;
+//extern const String C_opt_Extensions;
+extern const String C_opt_SourceDir("-d");
+extern const String C_opt_SourceTree("-t");
+extern const String C_opt_SourceFile("-f");
+
+extern const String C_opt_CreateHtml("-html");
+extern const String C_opt_DevmanRoot("-dvgroot");
+
+//extern const String C_opt_CreateXml("-xml");
+//extern const String C_opt_Load("-load");
+//extern const String C_opt_Save("-save");
+
+extern const String C_opt_ExternNamespace("-extnsp");
+extern const String C_opt_ExternRoot("-extroot");
+
+
+
+//**************************        CreateHTML    ***********************//
+
+CreateHtml::CreateHtml()
+    :   sOutputRootDirectory(),
+        sDevelopersManual_HtmlRoot()
+{
+}
+
+CreateHtml::~CreateHtml()
+{
+}
+
+void
+CreateHtml::do_Init( opt_iter &          it,
+                     opt_iter            itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd && (*it).char_at(0) != '-',
+              "output directory", C_opt_CreateHtml );
+    sOutputRootDirectory = *it;
+
+    for ( ++it;
+          it != itEnd AND (*it == C_opt_DevmanRoot);
+          ++it )
+    {
+        if (*it == C_opt_DevmanRoot)
+        {
+            ++it;
+            CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+                      "HTML root directory of Developers Guide",
+                      C_opt_DevmanRoot );
+            sDevelopersManual_HtmlRoot = *it;
+        }
+    }   // end for
+}
+
+bool
+CreateHtml::do_Run() const
+{
+    if ( CommandLine::Get_().IdlUsed() )
+        run_Idl();
+    if ( CommandLine::Get_().CppUsed() )
+        run_Cpp();
+    return true;
+}
+
+int
+CreateHtml::inq_RunningRank() const
+{
+    return static_cast<int>(rank_CreateHtml);
+}
+
+void
+CreateHtml::run_Idl() const
+{
+    const ary::idl::Gate &
+        rGate = CommandLine::Get_().TheRepository().Gate_Idl();
+
+    Cout() << "Creating HTML-output into the directory "
+              << sOutputRootDirectory
+              << "."
+              << Endl();
+
+    const DisplayToolsFactory_Ifc &
+        rToolsFactory = DisplayToolsFactory_Ifc::GetIt_();
+    Dyn<autodoc::HtmlDisplay_Idl_Ifc>
+        pDisplay( rToolsFactory.Create_HtmlDisplay_Idl() );
+
+    DYN display::CorporateFrame &   // KORR_FUTURE: Remove the need for const_cast
+        drFrame = const_cast< display::CorporateFrame& >(rToolsFactory.Create_StdFrame());
+    if (NOT DevelopersManual_HtmlRoot().empty())
+        drFrame.Set_DevelopersGuideHtmlRoot( DevelopersManual_HtmlRoot() );
+
+    pDisplay->Run( sOutputRootDirectory,
+                   rGate,
+                   drFrame );
+}
+
+void
+CreateHtml::run_Cpp() const
+{
+    const ary::Repository &
+        rReposy = CommandLine::Get_().TheRepository();
+    const ary::cpp::Gate &
+        rGate = rReposy.Gate_Cpp();
+
+    const DisplayToolsFactory_Ifc &
+        rToolsFactory = DisplayToolsFactory_Ifc::GetIt_();
+    Dyn< autodoc::HtmlDisplay_UdkStd >
+        pDisplay( rToolsFactory.Create_HtmlDisplay_UdkStd() );
+
+    pDisplay->Run( sOutputRootDirectory,
+                   rGate,
+                   rToolsFactory.Create_StdFrame() );
+}
+
+
+}   // namespace command
+}   // namespace autodoc
diff --git a/autodoc/source/exes/adc_uni/adc_cmds.hxx b/autodoc/source/exes/adc_uni/adc_cmds.hxx
new file mode 100644
index 000000000000..fb90babc2853
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmds.hxx
@@ -0,0 +1,125 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADC_CMDS_HXX
+#define ADC_ADC_CMDS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "adc_cmd.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace autodoc
+{
+namespace command
+{
+
+
+/** A command that produces HTML output from the Autodoc Repository.
+*/
+class CreateHtml : public Command
+{
+  public:
+                        CreateHtml();
+                        ~CreateHtml();
+
+    const String &      OutputDir() const;
+    const String &      DevelopersManual_HtmlRoot() const
+                                                { return sDevelopersManual_HtmlRoot; }
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          i_nCurArgsBegin,
+                            opt_iter            i_nEndOfAllArgs );
+    // Interface Command:
+    virtual bool        do_Run() const;
+    virtual int         inq_RunningRank() const;
+
+    // Locals
+    void                run_Cpp() const;
+    void                run_Idl() const;
+
+    // DATA
+    String              sOutputRootDirectory;
+    String              sDevelopersManual_HtmlRoot;
+};
+
+inline const String &
+CreateHtml::OutputDir() const
+    { return sOutputRootDirectory; }
+
+
+extern const String C_opt_Verbose;
+
+extern const String C_opt_Parse;
+extern const String C_opt_Name;
+extern const String C_opt_LangAll;
+extern const String C_opt_ExtensionsAll;
+extern const String C_opt_DevmanFile;
+extern const String C_opt_SinceFile;
+
+extern const String C_arg_Cplusplus;
+extern const String C_arg_Idl;
+extern const String C_arg_Java;
+
+extern const String C_opt_Project;
+//extern const String C_opt_Lang;
+//extern const String C_opt_Extensions;
+extern const String C_opt_SourceTree;
+extern const String C_opt_SourceDir;
+extern const String C_opt_SourceFile;
+
+extern const String C_opt_CreateHtml;
+extern const String C_opt_DevmanRoot;
+
+//extern const String C_opt_CreateXml;
+//extern const String C_opt_Load;
+//extern const String C_opt_Save;
+
+extern const String C_opt_ExternNamespace;
+extern const String C_opt_ExternRoot;
+
+
+inline void
+CHECKOPT( bool b, const char * miss, const String & opt )
+{
+    if ( NOT b )
+    {
+        StreamLock slMsg(100);
+        throw X_CommandLine( slMsg() << "Missing " << miss <<" after " << opt << "." << c_str );
+    }
+}
+
+}   // namespace command
+}   // namespace autodoc
+
+
+#endif
diff --git a/autodoc/source/exes/adc_uni/adc_msg.cxx b/autodoc/source/exes/adc_uni/adc_msg.cxx
new file mode 100644
index 000000000000..23c15c99790b
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_msg.cxx
@@ -0,0 +1,208 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adc_msg.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <cosv/tpl/tpltools.hxx>
+
+
+namespace autodoc
+{
+
+
+Messages::Messages()
+    :   aMissingDocs(),
+        aParseErrors(),
+        aInvalidConstSymbols(),
+        aUnresolvedLinks(),
+        aTypeVsMemberMisuses()
+{
+}
+
+Messages::~Messages()
+{
+}
+
+void
+Messages::WriteFile(const String & i_sOutputFilePath)
+{
+    csv::File
+        aOut(i_sOutputFilePath, csv::CFM_CREATE);
+    aOut.open();
+
+    // KORR_FUTURE Enable this when appropriate:
+    WriteParagraph( aOut,
+                    aParseErrors,
+                    "Incompletely Parsed Files",
+                    "Stopped parsing at " );
+
+    WriteParagraph( aOut,
+                    aMissingDocs,
+                    "Entities Without Documentation",
+                    " in " );
+
+    WriteParagraph( aOut,
+                    aInvalidConstSymbols,
+                    "Incorrectly Written Const Symbols",
+                    " in " );
+
+    WriteParagraph( aOut,
+                    aUnresolvedLinks,
+                    "Unresolved Links",
+                    " in\n        " );
+
+    WriteParagraph( aOut,
+                    aTypeVsMemberMisuses,
+                    "Confusion or Misuse of <Type> vs. <Member>",
+                    " in " );
+    aOut.close();
+}
+
+void
+Messages::Out_MissingDoc(   const String &      i_sEntity,
+                            const String &      i_sFile,
+                            uintt               i_nLine)
+{
+    AddValue( aMissingDocs,
+              i_sEntity,
+              i_sFile,
+              i_nLine );
+}
+
+void
+Messages::Out_ParseError(   const String &      i_sFile,
+                            uintt               i_nLine)
+{
+    aParseErrors[Location(i_sFile,i_nLine)] = String::Null_();
+}
+
+void
+Messages::Out_InvalidConstSymbol( const String &      i_sText,
+                                  const String &      i_sFile,
+                                  uintt               i_nLine)
+{
+    AddValue( aInvalidConstSymbols,
+              i_sText,
+              i_sFile,
+              i_nLine );
+}
+
+void
+Messages::Out_UnresolvedLink( const String &      i_sLinkText,
+                              const String &      i_sFile,
+                              uintt               i_nLine)
+{
+    AddValue( aUnresolvedLinks,
+              i_sLinkText,
+              i_sFile,
+              i_nLine );
+}
+
+void
+Messages::Out_TypeVsMemberMisuse( const String &      i_sLinkText,
+                                  const String &      i_sFile,
+                                  uintt               i_nLine)
+{
+    AddValue( aTypeVsMemberMisuses,
+              i_sLinkText,
+              i_sFile,
+              i_nLine );
+}
+
+Messages &
+Messages::The_()
+{
+    static Messages TheMessages_;
+    return TheMessages_;
+}
+
+void
+Messages::AddValue( MessageMap &        o_dest,
+                    const String &      i_sText,
+                    const String &      i_sFile,
+                    uintt               i_nLine )
+{
+    String &
+        rDest = o_dest[Location(i_sFile,i_nLine)];
+    StreamLock
+        slDest(2000);
+    if (NOT rDest.empty())
+        slDest() << rDest;
+    slDest() << "\n    " << i_sText;
+    rDest = slDest().c_str();
+}
+
+void
+Messages::WriteParagraph( csv::File &         o_out,
+                          const MessageMap &  i_source,
+                          const String &      i_title,
+                          const String &      )
+{
+    StreamStr   aLine(2000);
+
+    // Write title of paragraph:
+    aLine << i_title
+          << "\n";
+    o_out.write(aLine.c_str());
+
+    aLine.seekp(0);
+    for (uintt i = i_title.size(); i > 0; --i)
+    {
+        aLine << '-';
+    }
+    aLine << "\n\n";
+    o_out.write(aLine.c_str());
+
+    // Write Content
+    MessageMap::const_iterator it = i_source.begin();
+    MessageMap::const_iterator itEnd = i_source.end();
+    for ( ; it != itEnd; ++it )
+    {
+        aLine.seekp(0);
+        aLine << (*it).first.sFile;
+        // Nobody wants to see this, if we don't know the line:
+        if ((*it).first.nLine != 0)
+        {
+            aLine << ", line "
+                  << (*it).first.nLine;
+        }
+        if (NOT (*it).second.empty())
+        {
+            aLine << ':'
+                  << (*it).second
+                  << "\n";
+        }
+        o_out.write(aLine.c_str());
+    }
+    o_out.write("\n\n\n");
+}
+
+}   // namespace autodoc
diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx
new file mode 100644
index 000000000000..d20d9646d3d3
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_run.cxx
@@ -0,0 +1,613 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cmd_run.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <cosv/x.hxx>
+#include <ary/ary.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <autodoc/filecoli.hxx>
+#include <autodoc/parsing.hxx>
+#include <autodoc/prs_code.hxx>
+#include <autodoc/prs_docu.hxx>
+#include <parser/unoidl.hxx>
+#include <adc_cl.hxx>
+#include "adc_cmd_parse.hxx"
+#include "adc_cmds.hxx"
+
+namespace autodoc
+{
+namespace command
+{
+namespace run
+{
+
+Parser::Parser( const Parse & i_command )
+    :   rCommand(i_command),
+        pCppParser(),
+        pCppDocuInterpreter(),
+        pIdlParser()
+{
+}
+
+Parser::~Parser()
+{
+}
+
+bool
+Parser::Perform()
+{
+    Cout() << "Parsing the repository "
+              << rCommand.ReposyName()
+              << " ..."
+              << Endl();
+  try
+  {
+    ::ary::Repository &
+        rAry = CommandLine::Get_().TheRepository();
+    rAry.Set_Title(rCommand.ReposyName());
+
+    Dyn< FileCollector_Ifc >
+        pFiles( ParseToolsFactory().Create_FileCollector(6000) );
+
+    bool bIDL = false;
+    bool bCpp = false;
+
+    command::Parse::ProjectIterator
+        itEnd = rCommand.ProjectsEnd();
+    for ( command::Parse::ProjectIterator it = rCommand.ProjectsBegin();
+          it != itEnd;
+          ++it )
+    {
+        uintt nCount = GatherFiles( *pFiles, *(*it) );
+        Cout() << nCount
+             << " files found to parse in project "
+             << (*it)->Name()
+             << "."
+             << Endl();
+
+        switch ( (*it)->Language().eLanguage )
+        {
+            case command::S_LanguageInfo::idl:
+            {
+                Get_IdlParser().Run(*pFiles);
+                bIDL = true;
+            }   break;
+            case command::S_LanguageInfo::cpp:
+            {
+                Get_CppParser().Run( *pFiles );
+                bCpp = true;
+            }   break;
+            default:
+                Cerr() << "Project in yet unimplemented language skipped."
+                       << Endl();
+        }
+    }   // end for
+
+    if (bCpp)
+    {
+        rAry.Gate_Cpp().Calculate_AllSecondaryInformation();
+    }
+    if (bIDL)
+    {
+        rAry.Gate_Idl().Calculate_AllSecondaryInformation(
+                            rCommand.DevelopersManual_RefFilePath() );
+
+//        ::ary::idl::SecondariesPilot &
+//            rIdl2sPilot = rAry.Gate_Idl().Secondaries();
+//
+//        rIdl2sPilot.CheckAllInterfaceBases( rAry.Gate_Idl() );
+//        rIdl2sPilot.Connect_Types2Ces();
+//        rIdl2sPilot.Gather_CrossReferences();
+//
+//        if (NOT rCommand.DevelopersManual_RefFilePath().empty())
+//        {
+//            csv::File
+//                aFile(rCommand.DevelopersManual_RefFilePath(), csv::CFM_READ);
+//            if ( aFile.open() )
+//            {
+//                rIdl2sPilot.Read_Links2DevManual(aFile);
+//              aFile.close();
+//            }
+//        }
+    }   // endif (bIDL)
+
+    return true;
+
+  }   // end try
+  catch (csv::Exception & xx)
+  {
+    xx.GetInfo(Cerr());
+    Cerr() << " program will exit." << Endl();
+
+    return false;
+  }
+}
+
+CodeParser_Ifc &
+Parser::Get_CppParser()
+{
+    if ( NOT pCppParser )
+        Create_CppParser();
+    return *pCppParser;
+}
+
+IdlParser &
+Parser::Get_IdlParser()
+{
+    if ( NOT pIdlParser )
+        Create_IdlParser();
+    return *pIdlParser;
+}
+
+void
+Parser::Create_CppParser()
+{
+    pCppParser          = ParseToolsFactory().Create_Parser_Cplusplus();
+    pCppDocuInterpreter = ParseToolsFactory().Create_DocuParser_AutodocStyle();
+
+    pCppParser->Setup( CommandLine::Get_().TheRepository(),
+                       *pCppDocuInterpreter );
+}
+
+void
+Parser::Create_IdlParser()
+{
+    pIdlParser = new IdlParser(CommandLine::Get_().TheRepository());
+}
+
+const ParseToolsFactory_Ifc &
+Parser::ParseToolsFactory()
+{
+    return ParseToolsFactory_Ifc::GetIt_();
+}
+
+uintt
+Parser::GatherFiles( FileCollector_Ifc &    o_rFiles,
+                     const S_ProjectData &  i_rProject )
+{
+    uintt ret = 0;
+    o_rFiles.EraseAll();
+
+    typedef StringVector                StrVector;
+    typedef StrVector::const_iterator   StrIterator;
+    const S_Sources &
+        rSources = i_rProject.Sources();
+    const StrVector &
+        rExtensions = i_rProject.Language().aExtensions;
+
+    StrIterator     it;
+    StrIterator     itTreesEnd  = rSources.aTrees.end();
+    StrIterator     itDirsEnd   = rSources.aDirectories.end();
+    StrIterator     itFilesEnd  = rSources.aFiles.end();
+    StrIterator     itExt;
+    StrIterator     itExtEnd    = rExtensions.end();
+
+    csv::StreamStr aDir(500);
+    i_rProject.RootDirectory().Get( aDir );
+
+    uintt nProjectDir_AddPosition =
+            ( strcmp(aDir.c_str(),".\\") == 0 OR strcmp(aDir.c_str(),"./") == 0 )
+                ?   0
+                :   uintt( aDir.tellp() );
+
+    for ( it = rSources.aDirectories.begin();
+          it != itDirsEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        for ( itExt = rExtensions.begin();
+              itExt != itExtEnd;
+              ++itExt )
+        {
+            ret += o_rFiles.AddFilesFrom( aDir.c_str(),
+                                          *itExt,
+                                          FileCollector_Ifc::flat );
+        }   // end for itExt
+    }   // end for it
+    for ( it = rSources.aTrees.begin();
+          it != itTreesEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        for ( itExt = rExtensions.begin();
+              itExt != itExtEnd;
+              ++itExt )
+        {
+            ret += o_rFiles.AddFilesFrom( aDir.c_str(),
+                                          *itExt,
+                                          FileCollector_Ifc::recursive );
+        }   // end for itExt
+    }   // end for it
+    for ( it = rSources.aFiles.begin();
+          it != itFilesEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        o_rFiles.AddFile( aDir.c_str() );
+    }   // end for it
+    ret += rSources.aFiles.size();
+
+    return ret;
+}
+
+
+}   // namespace run
+}   // namespace command
+
+
+#if 0
+inline const ParseToolsFactory_Ifc &
+CommandRunner::ParseToolsFactory()
+    { return ParseToolsFactory_Ifc::GetIt_(); }
+
+
+inline const command::S_LanguageInfo &
+CommandRunner::Get_ProjectLanguage( const command::Parse &          i_rCommand,
+                                    const command::S_ProjectData &  i_rProject )
+{
+    if ( i_rProject.pLanguage )
+        return *i_rProject.pLanguage;
+    return *i_rCommand.GlobalLanguageInfo();
+}
+
+inline bool
+CommandRunner::HasParsedCpp() const
+    { return pCppParser; }
+inline bool
+CommandRunner::HasParsedIdl() const
+    { return pIdlParser; }
+
+
+
+
+
+CommandRunner::CommandRunner()
+    :   pCommandLine(0),
+        pReposy(0),
+        pNewReposy(0),
+        nResultCode(0)
+{
+    Cout() << "\nAutodoc version 2.2.1"
+           << "\n-------------------"
+           << "\n" << Endl();
+}
+
+CommandRunner::~CommandRunner()
+{
+    ary::Repository::Destroy_();
+    Cout() << "\n" << Endl();
+}
+
+void
+CommandRunner::Run( const CommandLine & i_rCL )
+{
+    ary::Repository::Destroy_();
+//  ary::Repository::Destroy_();
+    pReposy = 0;
+    pNewReposy = 0;
+    nResultCode = 0;
+    pCommandLine = &i_rCL;
+
+    pCommandLine->Run();
+}
+
+void
+CommandRunner::Parse()
+{
+    try
+    {
+
+    csv_assert( pCommandLine->Cmd_Parse() != 0 );
+    const command::Parse &
+        rCmd = *pCommandLine->Cmd_Parse();
+
+    Cout() << "Parsing the repository "
+              << rCmd.ReposyName()
+              << " ..."
+              << Endl();
+
+    if ( pReposy == 0 )
+        pReposy = & ary::Repository::Create_( rCmd.ReposyName(), 0 );
+    if ( pNewReposy == 0 )
+        pNewReposy = & ary::Repository::Create_( rCmd.ReposyName() );
+
+    Dyn< FileCollector_Ifc > pFiles;
+    pFiles      = ParseToolsFactory().Create_FileCollector(6000);
+
+    bool bCpp = false;
+    bool bIDL = false;
+
+    command::Parse::ProjectIterator itEnd = rCmd.ProjectsEnd();
+    for ( command::Parse::ProjectIterator it = rCmd.ProjectsBegin();
+          it != itEnd;
+          ++it )
+    {
+
+        uintt nCount = GatherFiles( *pFiles, rCmd, *(*it) );
+        Cout() << nCount
+             << " files found to parse in project "
+             << (*it)->Name()
+             << "."
+             << Endl();
+
+
+        switch ( Get_ProjectLanguage(rCmd, *(*it)).eLanguage )
+        {
+            case command::S_LanguageInfo::cpp:
+            {
+                Get_CppParser().Run( (*it)->Name(),
+                                     (*it)->RootDirectory(),
+                                     *pFiles );
+                bCpp = true;
+            }   break;
+            case command::S_LanguageInfo::idl:
+            {
+                Get_IdlParser().Run(*pFiles);
+                bIDL = true;
+            }   break;
+            default:
+                Cerr() << "Project in yet unimplemented language skipped."
+                       << Endl();
+        }
+    }   // end for
+
+    if (bCpp)
+        pReposy->RwGate_Cpp().Connect_AllTypes_2_TheirRelated_CodeEntites();
+    if (bIDL)
+    {
+        pNewReposy->Gate_Idl().Secondaries().Connect_Types2Ces();
+        pNewReposy->Gate_Idl().Secondaries().Gather_CrossReferences();
+    }
+
+    }   // end try
+    catch (csv::Exception & xx)
+    {
+        xx.GetInfo(Cerr());
+        Cerr() << " program will exit." << Endl();
+        nResultCode = 1;
+    }
+    catch (...)
+    {
+        Cerr() << "Unknown exception -   program will exit." << Endl();
+        nResultCode = 1;
+    }
+}
+
+void
+CommandRunner::Load()
+{
+    Cout() << "This would load the repository from the directory "
+              << pCommandLine->Cmd_Load()->ReposyDir()
+              << "."
+              << Endl();
+}
+
+
+void
+CommandRunner::Save()
+{
+    Cout() << "This would save the repository into the directory "
+              << pCommandLine->Cmd_Save()->ReposyDir()
+              << "."
+              << Endl();
+}
+
+
+void
+CommandRunner::CreateHtml()
+{
+    Cout() << "Creating HTML-output into the directory "
+              << pCommandLine->Cmd_CreateHtml()->OutputDir()
+              << "."
+              << Endl();
+
+    if ( HasParsedCpp() )
+        CreateHtml_NewStyle();
+    if ( HasParsedIdl() )
+        CreateHtml_OldIdlStyle();
+}
+
+
+
+void
+CommandRunner::CreateXml()
+{
+    Cout() << "This would create the XML-output into the directory "
+              << pCommandLine->Cmd_CreateXml()->OutputDir()
+              << "."
+              << Endl();
+}
+
+CodeParser_Ifc &
+CommandRunner::Get_CppParser()
+{
+    if ( NOT pCppParser )
+        Create_CppParser();
+    return *pCppParser;
+}
+
+IdlParser &
+CommandRunner::Get_IdlParser()
+{
+    if ( NOT pIdlParser )
+        Create_IdlParser();
+    return *pIdlParser;
+}
+
+void
+CommandRunner::Create_CppParser()
+{
+    pCppParser          = ParseToolsFactory().Create_Parser_Cplusplus();
+    pCppDocuInterpreter = ParseToolsFactory().Create_DocuParser_AutodocStyle();
+
+    pCppParser->Setup( *pReposy,
+                       *pCppDocuInterpreter );
+}
+
+void
+CommandRunner::Create_IdlParser()
+{
+    pIdlParser = new IdlParser(*pNewReposy);
+}
+
+uintt
+CommandRunner::GatherFiles( FileCollector_Ifc &            o_rFiles,
+                            const command::Parse &         i_rCommand,
+                            const command::S_ProjectData & i_rProject )
+{
+    uintt ret = 0;
+    o_rFiles.EraseAll();
+
+    typedef StringVector                StrVector;
+    typedef StrVector::const_iterator   StrIterator;
+    const command::S_Sources &
+        rSources = i_rProject.aFiles;
+    const StrVector &
+        rExtensions = Get_ProjectLanguage(i_rCommand,i_rProject).aExtensions;
+
+    StrIterator     it;
+    StrIterator     itDirsEnd   = rSources.aDirectories.end();
+    StrIterator     itTreesEnd  = i_rProject.aFiles.aTrees.end();
+    StrIterator     itFilesEnd  = i_rProject.aFiles.aFiles.end();
+    StrIterator     itExt;
+    StrIterator     itExtEnd    = rExtensions.end();
+
+    csv::StreamStr aDir(500);
+    i_rProject.aRootDirectory.Get( aDir );
+
+    uintt nProjectDir_AddPosition =
+            ( strcmp(aDir.c_str(),".\\") == 0 OR strcmp(aDir.c_str(),"./") == 0 )
+                ?   0
+                :   uintt( aDir.tellp() );
+
+    for ( it = rSources.aDirectories.begin();
+          it != itDirsEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        for ( itExt = rExtensions.begin();
+              itExt != itExtEnd;
+              ++itExt )
+        {
+            ret += o_rFiles.AddFilesFrom( aDir.c_str(),
+                                          *itExt,
+                                          FileCollector_Ifc::flat );
+        }   // end for itExt
+    }   // end for it
+    for ( it = rSources.aTrees.begin();
+          it != itTreesEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        for ( itExt = rExtensions.begin();
+              itExt != itExtEnd;
+              ++itExt )
+        {
+            ret += o_rFiles.AddFilesFrom( aDir.c_str(),
+                                          *itExt,
+                                          FileCollector_Ifc::recursive );
+        }   // end for itExt
+    }   // end for it
+    for ( it = rSources.aFiles.begin();
+          it != itFilesEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        o_rFiles.AddFile( aDir.c_str() );
+    }   // end for it
+    ret += rSources.aFiles.size();
+
+    return ret;
+}
+
+void
+CommandRunner::CreateHtml_NewStyle()
+{
+    const ary::cpp::DisplayGate &
+            rGate = pReposy->DisplayGate_Cpp();
+
+    Dyn< autodoc::HtmlDisplay_UdkStd > pHtmlDisplay;
+            pHtmlDisplay = DisplayToolsFactory_Ifc::GetIt_()
+                                .Create_HtmlDisplay_UdkStd();
+
+    pHtmlDisplay->Run( pCommandLine->Cmd_CreateHtml()->OutputDir(),
+                       rGate,
+                       DisplayToolsFactory_Ifc::GetIt_().Create_StdFrame() );
+}
+
+void
+CommandRunner::CreateHtml_OldIdlStyle()
+{
+    ary::idl::Gate &
+        rAryGate            = pNewReposy->Gate_Idl();
+
+    // Read DevManualLinkFile:
+    // KORR_FUTURE
+    csv::File
+        aFile("devmanref.txt", csv::CFM_READ);
+    if ( aFile.open() )
+    {
+        rAryGate.Secondaries().Read_Links2DevManual(aFile);
+         aFile.close();
+    }
+
+    // New Style Output
+    Dyn<autodoc::HtmlDisplay_Idl_Ifc> pNewDisplay;
+        pNewDisplay         = DisplayToolsFactory_Ifc::GetIt_()
+                                .Create_HtmlDisplay_Idl();
+    pNewDisplay->Run( pCommandLine->Cmd_CreateHtml()->OutputDir(),
+                      rAryGate,
+                      DisplayToolsFactory_Ifc::GetIt_().Create_StdFrame() );
+}
+#endif // 0
+
+}   // namespace autodoc
+
+
+
+
diff --git a/autodoc/source/exes/adc_uni/cmd_run.hxx b/autodoc/source/exes/adc_uni/cmd_run.hxx
new file mode 100644
index 000000000000..8216f77e4029
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_run.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CMD_RUN_HXX
+#define ADC_CMD_RUN_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/comdline.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+     class Repository;
+}
+
+namespace autodoc
+{
+    class FileCollector_Ifc;
+    class ParseToolsFactory_Ifc;
+    class CodeParser_Ifc;
+    class DocumentationParser_Ifc;
+    class IdlParser;
+
+
+namespace command
+{
+    class Parse;
+     class S_ProjectData;
+     struct S_LanguageInfo;
+
+namespace run
+{
+
+/** Performs an ::autodoc::command::Parse .
+*/
+class Parser
+{
+  public:
+                        Parser(
+                            const Parse &       i_command );
+                        ~Parser();
+
+    bool                Perform();
+
+  private:
+    // Locals
+    CodeParser_Ifc &    Get_CppParser();
+    IdlParser &         Get_IdlParser();
+    void                Create_CppParser();
+    void                Create_IdlParser();
+    const ParseToolsFactory_Ifc &
+                        ParseToolsFactory();
+    uintt               GatherFiles(
+                            FileCollector_Ifc & o_rFiles,
+                            const S_ProjectData &
+                                                i_rProject );
+    // DATA
+    const Parse &       rCommand;
+
+    Dyn<CodeParser_Ifc> pCppParser;
+    Dyn<DocumentationParser_Ifc>
+                        pCppDocuInterpreter;
+    Dyn<IdlParser>      pIdlParser;
+};
+
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace run
+}   // namespace command
+}   // namespace autodoc
+
+#endif
diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx
new file mode 100644
index 000000000000..1f61d11b9ba5
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx
@@ -0,0 +1,129 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cmd_sincedata.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <cosv/tpl/tpltools.hxx>
+#include "adc_cmds.hxx"
+
+
+
+namespace autodoc
+{
+namespace command
+{
+
+SinceTagTransformationData::SinceTagTransformationData()
+    :   aTransformationTable()
+{
+}
+
+SinceTagTransformationData::~SinceTagTransformationData()
+{
+}
+
+bool
+SinceTagTransformationData::DoesTransform() const
+{
+    return NOT aTransformationTable.empty();
+}
+
+const String &
+SinceTagTransformationData::DisplayOf( const String & i_versionNumber ) const
+{
+    if (DoesTransform())
+    {
+        StreamLock
+            sl(200);
+        sl() << i_versionNumber;
+        sl().strip_frontback_whitespace();
+        String
+            sVersionNumber(sl().c_str());
+
+        const String *
+            ret = csv::find_in_map(aTransformationTable, sVersionNumber);
+        return ret != 0
+                ?   *ret
+                :   String::Null_();
+    }
+    else
+    {
+        return i_versionNumber;
+    }
+}
+
+void
+SinceTagTransformationData::do_Init( opt_iter &  it,
+                                     opt_iter    itEnd )
+{
+    ++it;   // Cur is since-file path.
+
+    CHECKOPT(   it != itEnd ,
+              "file path",
+              C_opt_SinceFile );
+
+    csv::File           aSinceFile(*it);
+    csv::OpenCloseGuard aSinceFileGuard(aSinceFile);
+    StreamStr           sLine(200);
+
+    if (aSinceFileGuard)
+    {
+        for ( sLine.operator_read_line(aSinceFile);
+              NOT sLine.empty();
+              sLine.operator_read_line(aSinceFile) )
+        {
+
+            if (*sLine.begin() != '"')
+                continue;
+
+            const char * pVersion = sLine.c_str() + 1;
+            const char * pVersionEnd = strchr(pVersion, '"');
+            if (pVersionEnd == 0)
+                continue;
+            const char * pDisplay = strchr(pVersionEnd+1, '"');
+            if (pDisplay == 0)
+                continue;
+            ++pDisplay;
+            const char * pDisplayEnd = strchr(pDisplay, '"');
+            if (pDisplayEnd == 0)
+                continue;
+
+            aTransformationTable[ String(pVersion,pVersionEnd) ]
+                                        = String(pDisplay,pDisplayEnd);
+            sLine.clear();
+        }   // end for
+    }   // end if
+
+    ++it;   // Cur is next option.
+}
+
+}   // namespace command
+}   // namespace autodoc
diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.hxx b/autodoc/source/exes/adc_uni/cmd_sincedata.hxx
new file mode 100644
index 000000000000..355c64c2d314
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_sincedata.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CMD_SINCEDATA_HXX
+#define ADC_CMD_SINCEDATA_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "adc_cmd.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace autodoc
+{
+namespace command
+{
+
+
+/** Provides replacements for the contents of the @@since documentation tag.
+
+    Because the @@since tag is part of the source code, it allows only one kind
+    of version information there. If this is to be mapped for different products
+    (example: from OpenOffice.org versions in the @@since tag to StarOffice or
+    StarSuite products), the value of @@since needs a replacement, which is provided
+    by this class.
+
+*/
+class SinceTagTransformationData : public Context
+{
+  public:
+    /** The key of this map are the version numbers within @since.
+        The value is the string to display for each version number.
+    */
+    typedef std::map<String,String>     Map_Version2Display;
+
+    // LIFECYCLE
+                        SinceTagTransformationData();
+    virtual             ~SinceTagTransformationData();
+
+    // INQUIRY
+    /// False, if no transformation table exists.
+    bool                DoesTransform() const;
+
+    /** Gets the string to display for a version number.
+
+        @param i_sVersionNumber
+        Usually should be the result of ->StripSinceTagValue().
+    */
+    const String &      DisplayOf(
+                            const String &      i_sVersionNumber ) const;
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          i_nCurArgsBegin,
+                            opt_iter            i_nEndOfAllArgs );
+    // DATA
+    Map_Version2Display aTransformationTable;
+};
+
+
+}   // namespace command
+}   // namespace autodoc
+
+
+#endif
diff --git a/autodoc/source/exes/adc_uni/main.cxx b/autodoc/source/exes/adc_uni/main.cxx
new file mode 100644
index 000000000000..ff5523a9a137
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/main.cxx
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+
+
+// NOT FULLY DECLARED SERVICES
+
+#include <adc_cl.hxx>
+#include "cmd_run.hxx"
+
+
+int
+#ifdef WNT
+    _cdecl
+#endif
+main( int        argc,
+      char *     argv[] )
+{
+    autodoc::CommandLine    aCL;
+    aCL.Init(argc, argv);
+    if (NOT aCL.CheckParameters() )
+        return 1;
+
+    int ret = aCL.Run();
+    return ret;
+}
+
+
+
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
new file mode 100644
index 000000000000..8baea0830233
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -0,0 +1,104 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=autodoc
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+UWINAPILIB=$(0)
+LIBSALCPPRT=$(0)
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/adc_cl.obj	        \
+    $(OBJ)$/adc_cmd_parse.obj	\
+    $(OBJ)$/adc_cmds.obj        \
+    $(OBJ)$/adc_msg.obj	        \
+    $(OBJ)$/cmd_run.obj         \
+    $(OBJ)$/cmd_sincedata.obj
+
+
+# --- Targets ------------------------------------------------------
+
+LIB1TARGET=$(LB)$/atdoc.lib
+LIB1FILES= \
+            $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
+            $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
+            $(LB)$/ary_info.lib $(LB)$/ary_loc.lib \
+            $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \
+            $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
+            $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
+            $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
+            $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
+            $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
+
+
+
+APP1TARGET=	$(TARGET)
+APP1STACK=	1000000
+APP1OBJS=   $(OBJ)$/main.obj
+
+APP1RPATH=SDK
+
+.IF "$(GUI)"=="WNT"
+APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB)
+.ELSE
+.IF "$(OS)"=="MACOSX"
+# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
+APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv
+.ELSE
+APP1STDLIBS= -lcosv -ludm
+.ENDIF
+.ENDIF
+
+APP1LIBS=$(LB)$/atdoc.lib
+
+DEPOBJFILES += $(APP1OBJS)
+
+APP1DEPN=   $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
+            $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
+            $(LB)$/ary_info.lib $(LB)$/ary_loc.lib \
+            $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \
+            $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
+            $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
+            $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
+            $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
+            $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
+
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/exes/adc_uni/spec-CommandLine.txt b/autodoc/source/exes/adc_uni/spec-CommandLine.txt
new file mode 100644
index 000000000000..756b3184a2e4
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/spec-CommandLine.txt
@@ -0,0 +1,181 @@
+        Command Line Options
+        --------------------
+
+autodoc [-v <level>]
+        -html <out>
+        [-extroot <externroot> -extnsp <externnamespace>]
+        -lg <proglang>
+        [-t <sourcetree>[ <sourcetree> ...]
+        [-d <sourcedir>[ <sourcedir> ...]
+        [-f <sourcefile>[ <sourcefile> ...]
+
+
+    -html <OutputDirectory>
+        Directory where the output will be created.
+
+    -lg <ProgrammingLanguage>
+        Allowed values: "c++" or "idl"
+
+    -extroot <externroot>
+        Only together with "-lg idl" and -extnsp.
+        Links to code entities not found within the current parsed
+        code, will be linked there, but only if -extnsp is given and
+        the linked entity is in the given namespace.
+        <externroot> is a http link, it needs no "http://" at the
+        beginning nor slash at the end.
+
+    -extnsp <externnamespace>
+        Only together with "-lg idl" and -extroot.
+        If a code entity is not found in the current parsed code, but
+        dwells in the namespace (or its children) given here, it is
+        linked into the loc�tion given by -extroot.
+        <externnamespace> is an absolute qualified namespace,
+        starting with "::".
+
+    -t <SourceTree>*
+        Directory with all subdirectories.
+
+    -d <SourceDirectory>*
+        Directory without subdirectories.
+
+    -f <SourceFile>*
+        Any file. Here also files with extensions not matching the
+        language are accepted.
+
+    -I:<ResponseFile>
+        Each line in the response file has to have one command line
+        option. No whitespace at start of line.
+
+    -C:<ConfigurationFile>
+        Format see below.
+
+    -v <VerboseLevel>
+        Only for debugging. Bits 1, 2 and 4 in any combination give
+        different output.
+
+    -h
+        Displays help.
+    -?
+        Displays help.
+
+
+
+
+
+        Command Line Options especially for the OpenOffice.org SDK
+        ----------------------------------------------------------
+
+    -dvgroot <DevelopersGuide>
+        Root directory of the SDK Developers Guide.
+
+    -dvgfile <ReferenceFile>
+        File with references to the SDK Developers Guide.
+
+    -sincefile <@since-AssociationFile>
+        File that maps OpenOffice versions to the wished displayed version names.
+
+    -idlref <IdlDocumentationRoot> <Namespace[,Namespace ...]>
+        Gives the outputdirectory of an IDL documentation, where
+        symbols not found in the currently parsed namespaces of C++
+        or Java can be found.
+
+
+
+        Configure File Format
+        ---------------------
+
+<AutodocConfiguration>
+    <RepositoryName></RepositoryName>
+        // Base name of the binary repository files.
+        // Has to be a valid file name.
+
+    <HtmlOutputTitle></HtmlOutputTitle>
+        // Title on the "welcome page" of the created HTML documentation.
+        // Can be any text.
+
+    <CppExtensions></CppExtensions>
+        // Overwrites the default. Default is: .hxx .h .hpp
+        // Format: File extensions with a dot in front, like ".hcc".
+
+    <IdlExtensions></IdlExtensions>
+        // Overwrites the default. Default is: .idl
+        // Format: File extensions with a dot in front, like ".txt".
+
+    <CppDocu html="(on|off) off"/>
+
+    <IdlDocu html="(on|off) on"/>
+
+</AutodocConfiguration>
+
+
+
+
+
+
+        Historical Command Line Options
+        -------------------------------
+
+autodoc.exe
+    [ -v <VerboseNr> ]
+    -html <OutputDirectory>
+    {
+        [ -parse ]
+	[ -name <RepositoryName> ]
+        -lg <ProgrammingLanguage>
+        {
+            [ -p <ProjectName> <ProjectRootDirectory> ]
+            {
+                -t <SourceDirectory>*
+                -d <SourceDirectory>*
+                -f <SourceFile>*
+            }+
+        }+
+    }
+
+Legend:
+    <Text>
+    	command line parameter
+    [ ]
+    	optional
+    { }
+    	Block of connected options.
+    The sequence of not connected options does not matter. So the -html or -v options can be used before or after all the parsing options.
+    +
+    	once or more times
+    *
+    	none or more times
+
+
+Explanation of the Options
+    -v <VerboseNr> 	Only for debugging. Bits 1, 2 and 4 in any combination give different output.
+    -html <OutputDirectory>
+    	Gives the directory, where a HTML version of the docu shall be generated.
+    -parse 	Starts the block, where all the parse options are given. This can be omitted, because the parse options are identifiable without it, but it may make a commandline more readable.
+    -name <RepositoryName> 	This name appears as title of the documentation (currently only in the in the C++ version).
+    -lg <ProgrammingLanguage>
+
+
+    Possible values are:
+
+    c++
+        This parses all files with the endings .hxx and .h .
+    idl
+        This parses all files with the ending .idl .
+
+    -p with -t/-d/-f: 	If there are more than one project, the -p option is required for each one.
+
+    The directory given wit the -p option is the root directory of the project.
+    If there is no -p option, the working directory is seen as root.
+
+    All paths given with -t/-d/-f are relative to that root directory. It is possible to use "." as argument for -t or -d.
+
+    Each of -t/-d/-f can have several arguments:
+    One could write "-f file1.hxx file2.hxx file_xyz.hxx"
+    After each -p (or after -lg, if there is no -p option), there has to be at least one of the following three:
+    -t 	Tree, which means: include subdirectories
+    -d 	Directory, which means: no subdirectories
+    -f 	File", which means: single file name with ending.
+    This option also allows to parse some files with an ending different from those, the -lg option implies.
+
+
+
diff --git a/autodoc/source/exes/adc_uni/spec-DevGuideReferenceFile.txt b/autodoc/source/exes/adc_uni/spec-DevGuideReferenceFile.txt
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/spec-DevGuideReferenceFile.txt
diff --git a/autodoc/source/exes/adc_uni/spec-SinceTag_Handling.txt b/autodoc/source/exes/adc_uni/spec-SinceTag_Handling.txt
new file mode 100644
index 000000000000..7cf264e76be3
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/spec-SinceTag_Handling.txt
@@ -0,0 +1,49 @@
+		General Handling
+		----------------
+
+- The developer inserts the OpenOffice.org version into the @since tag.
+
+- @since-Tag may contain any string which needs to end with a Version number.
+  The first cipher following immediately on a white space is interpreted as start of the version number.
+
+- The @since Tag must stay completely within one line to allow tool support for retargeting.
+
+- To replace @since entries in the generated documentation, one needs to use
+  the command line option
+
+  -sincefile <TransformationFile-path>
+
+  This option has to occur immediately after the -html option.
+  If this option is not given, the original text of the @since tag is
+  displayed.
+
+  If the TransformationFile does not contain a specific entry,
+  nothing is displayed for this entry.
+
+
+
+		Format of the @since Tag Transformation File
+		--------------------------------------------
+
+Example
+-------
+
+***** BEGIN OF FILE ******
+"1.1" "StarOffice 7.0"
+"2.0" "StarOffice 8.0"
+"2.1" "StarOffice 9.0"
+***** END OF FILE ******
+
+
+
+Rules and Restrictions
+----------------------
+
+*	Each line contains two strings within "".
+	The first string is the OpenOffice.org version number which is found in the @since tag.
+	The second string is the string to display for this version.
+*	No specific order among product versions is needed.
+*	Empty lines and whitespaces are allowed, except:
+	- Non empty lines must not start with white space.
+	- Within OpenOffice.org version strings, no whitespace is allowed.
+*	Whitespace within display strings is displayed as it is.
diff --git a/autodoc/source/inc/adc_cl.hxx b/autodoc/source/inc/adc_cl.hxx
new file mode 100644
index 000000000000..8bcec7df50ce
--- /dev/null
+++ b/autodoc/source/inc/adc_cl.hxx
@@ -0,0 +1,193 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADC_CL_HXX
+#define ADC_ADC_CL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/comdline.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+    class Repository;
+}
+
+namespace autodoc
+{
+namespace command
+{
+    class Command;
+    class CreateHtml;
+    class SinceTagTransformationData;
+}
+
+
+/** Reads and runs an Autodoc command line.
+*/
+class CommandLine : public csv::CommandLine_Ifc
+{
+  public:
+    // LIFECYCLE
+                        CommandLine();
+                        ~CommandLine();
+    // OPERATIONS
+    int                 Run() const;
+
+    // INQUIRY
+        // debugging
+    bool                DebugStyle_ShowText() const;
+    bool                DebugStyle_ShowStoredObjects() const;
+    bool                DebugStyle_ShowTokens() const;
+
+        // @since tags
+    bool                DoesTransform_SinceTag() const;
+
+//    /// @see command::SinceTagTransformationData::StripSinceTagValue()
+//    bool                Strip_SinceTagText(
+//                            String &            io_sSinceTagValue ) const;
+
+    /// @see command::SinceTagTransformationData::DisplayOf()
+    const String &      DisplayOf_SinceTagValue(
+                            const String &      i_sVersionNumber ) const;
+
+        // extern IDL links
+    const String &      ExternRoot() const      { return sExternRoot; }
+    const String &      ExternNamespace() const { return sExternNamespace; }
+
+    bool                CppUsed() const         { return bCpp; }
+    bool                IdlUsed() const         { return bIdl; }
+
+    // ACCESS
+    static CommandLine &
+                        Get_();
+    void                Set_ExternRoot(
+                            const String &      i_s )
+                                                { sExternRoot = i_s; }
+    void                Set_ExternNamespace(
+                            const String &      i_s )
+                                                { sExternNamespace = i_s; }
+    ary::Repository &   TheRepository() const   { csv_assert(pReposy != 0);
+                                                  return *pReposy; }
+    void                Set_CppUsed()           { bCpp = true; }
+    void                Set_IdlUsed()           { bIdl = true; }
+
+  private:
+    // Interface cosv::CommandLine_Ifc:
+    virtual void        do_Init(
+                            int                 argc,
+                            char *              argv[] );
+    virtual void        do_PrintUse() const;
+    virtual bool        inq_CheckParameters() const;
+
+    // Locals
+    typedef StringVector::const_iterator            opt_iter;
+    typedef std::vector< DYN command::Command* >    CommandList;
+
+    void                load_IncludedCommands(
+                            StringVector &      out,
+                            const char *        i_filePath );
+
+    void                do_clVerbose(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clParse(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clCreateHtml(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clSinceFile(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+
+//    void                do_clCreateXml(
+//                            opt_iter &          it,
+//                            opt_iter            itEnd );
+//    void                do_clLoad(
+//                            opt_iter &          it,
+//                            opt_iter            itEnd );
+//    void                do_clSave(
+//                            opt_iter &          it,
+//                            opt_iter            itEnd );
+
+    void                sort_Commands();
+
+    // DATA
+    uintt               nDebugStyle;
+    Dyn<command::SinceTagTransformationData>
+                        pSinceTransformator;
+
+    CommandList         aCommands;
+    bool                bInitOk;
+    command::CreateHtml *
+                        pCommand_CreateHtml;
+
+    String              sExternRoot;
+    String              sExternNamespace;
+
+    mutable Dyn<ary::Repository>
+                        pReposy;
+    bool                bCpp;
+    bool                bIdl;
+
+    static CommandLine *
+                        pTheInstance_;
+};
+
+
+
+// IMPLEMENTATION
+inline bool
+CommandLine::DebugStyle_ShowText() const
+    { return (nDebugStyle & 2) != 0; }
+inline bool
+CommandLine::DebugStyle_ShowStoredObjects() const
+    { return (nDebugStyle & 4) != 0; }
+inline bool
+CommandLine::DebugStyle_ShowTokens() const
+    { return (nDebugStyle & 1) != 0; }
+
+}   // namespace autodoc
+
+
+inline bool
+DEBUG_ShowText()
+    { return autodoc::CommandLine::Get_().DebugStyle_ShowText(); }
+inline bool
+DEBUG_ShowStoring()
+    { return autodoc::CommandLine::Get_().DebugStyle_ShowStoredObjects(); }
+inline bool
+DEBUG_ShowTokens()
+    { return autodoc::CommandLine::Get_().DebugStyle_ShowTokens(); }
+
+#endif
+
diff --git a/autodoc/source/inc/adc_msg.hxx b/autodoc/source/inc/adc_msg.hxx
new file mode 100644
index 000000000000..320b8bd96ebc
--- /dev/null
+++ b/autodoc/source/inc/adc_msg.hxx
@@ -0,0 +1,141 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADC_MSG_HXX
+#define ADC_ADC_MSG_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+namespace csv
+{
+    class File;
+}
+
+
+namespace autodoc
+{
+
+
+/** Gathers, sorts and displays (mainly diagnostic) messages to the
+    user of Autodoc.
+*/
+class Messages
+{
+  public:
+    // LIFECYCLE
+                        Messages();
+                        ~Messages();
+    // OPERATIONS
+    void                WriteFile(
+                            const String &      i_sOutputFilePath);
+    // INQUIRY
+
+    // ACCESS
+    void                Out_MissingDoc(
+                            const String &      i_sEntity,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_ParseError(
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_InvalidConstSymbol(
+                            const String &      i_sText,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_UnresolvedLink(
+                            const String &      i_sLinkText,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_TypeVsMemberMisuse(
+                            const String &      i_sLinkText,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+
+    static Messages &   The_();
+
+  private:
+    struct Location
+    {
+        String              sFile;
+        uintt               nLine;
+
+                            Location(
+                                const String &      i_file,
+                                uintt               i_line)
+                                :   sFile(i_file),
+                                    nLine(i_line)   {}
+        bool                operator<(
+                                const Location &    i_other) const
+                                { int cmp = csv::compare(sFile,i_other.sFile);
+                                  return cmp < 0
+                                            ?   true
+                                            :   cmp > 0
+                                                    ?   false
+                                                    :   nLine < i_other.nLine;
+                                }
+    };
+
+    typedef std::map<Location,String>   MessageMap;
+
+    // Locals
+    void                AddValue(
+                            MessageMap &        o_dest,
+                            const String &      i_sText,
+                            const String &      i_sFile,
+                            uintt               i_nLine );
+    void                WriteParagraph(
+                            csv::File &         o_out,
+                            const MessageMap &  i_source,
+                            const String &      i_title,
+                            const String &      i_firstIntermediateText );
+
+    // DATA
+    MessageMap          aMissingDocs;
+    MessageMap          aParseErrors;
+    MessageMap          aInvalidConstSymbols;
+    MessageMap          aUnresolvedLinks;
+    MessageMap          aTypeVsMemberMisuses;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace autodoc
+
+inline autodoc::Messages &
+TheMessages()
+{
+    return autodoc::Messages::The_();
+}
+
+#endif
diff --git a/autodoc/source/inc/docu_node_ids.hxx b/autodoc/source/inc/docu_node_ids.hxx
new file mode 100644
index 000000000000..b06997755c2b
--- /dev/null
+++ b/autodoc/source/inc/docu_node_ids.hxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DOCU_NODE_IDS_HXX
+#define ADC_DOCU_NODE_IDS_HXX
+
+
+
+namespace ary
+{
+namespace doc
+{
+namespace nodetype
+{
+enum E_Ids
+{
+
+    nt_none,
+    nt_OldCppDocu,
+    nt_OldIdlDocu
+
+
+
+
+
+
+
+
+
+};
+}   // namespace nodetype
+}   // namespace doc
+}   // namespace ary
+
+namespace docnt = ::ary::doc::nodetype;
+
+
+
+
+#endif
diff --git a/autodoc/source/inc/estack.hxx b/autodoc/source/inc/estack.hxx
new file mode 100644
index 000000000000..a3972da9739b
--- /dev/null
+++ b/autodoc/source/inc/estack.hxx
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_ESTACK_HXX
+#define ARY_ESTACK_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <slist>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+template <class ELEM>
+class EStack : private std::slist<ELEM>
+{
+  private:
+    typedef std::slist<ELEM>    base;
+    const base &        Base() const            { return *this; }
+    base &              Base()                  { return *this; }
+
+  public:
+    typedef ELEM                                    value_type;
+    typedef typename std::slist<ELEM>::size_type    size_type;
+
+    // LIFECYCLE
+                        EStack()                {}
+                        EStack(
+                            const EStack &      i_rStack )
+                                                :   base( (const base &)(i_rStack) ) {}
+                        ~EStack()               {}
+    // OPERATORS
+    EStack &            operator=(
+                            const EStack &      i_rStack )
+                                                { base::operator=( i_rStack.Base() );
+                                                  return *this; }
+    bool                operator==(
+                            const EStack<ELEM> &
+                                                i_r2 ) const
+                                                { return std::operator==( Base(), this->i_rStack.Base() ); }
+    bool                operator<(
+                            const EStack<ELEM> &
+                                                i_r2 ) const
+                                                { return std::operator<( Base(), this->i_rStack.Base() ); }
+    // OPERATIONS
+    void                push(
+                            const value_type &  i_rElem )
+                                                { base::push_front(i_rElem); }
+    void                pop()                   { base::pop_front(); }
+    void                erase_all()             { while (NOT empty()) pop(); }
+
+    // INQUIRY
+    const value_type &  top() const             { return base::front(); }
+    size_type           size() const            { return base::size(); }
+    bool                empty() const           { return base::empty(); }
+
+    // ACCESS
+    value_type &        top()                   { return base::front(); }
+};
+
+
+
+// IMPLEMENTATION
+
+
+#endif
+
diff --git a/autodoc/source/inc/luxenum.hxx b/autodoc/source/inc/luxenum.hxx
new file mode 100644
index 000000000000..42eb2953dabe
--- /dev/null
+++ b/autodoc/source/inc/luxenum.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef UDM_LUXENUM_HXX
+#define UDM_LUXENUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <map>
+#include <algorithm>
+
+
+namespace lux
+{
+
+typedef std::map< intt, String  > EnumValueMap;
+
+
+template <class DIFF>
+class Enum // : public Template_Base
+{
+  public:
+    // TYPES
+    typedef Enum< DIFF >    self;
+
+    // LIFECYCLE
+                        Enum(
+                            DIFF                i_nValue,
+                            const char *        i_sText )
+                                                :   nValue(i_nValue) { Values_()[nValue] = i_sText;
+                                                                       // Sequence_().insert(
+                                                                       //       std::lower_bound( Sequence_().begin(), Sequence_().end(), i_nValue ),
+                                                                       //       i_nValue );
+                                                                     }
+                        Enum(
+                            DIFF                i_nValue )
+                                                :   nValue(i_nValue) { ; }
+                        Enum(
+                            intt                i_nValue = 0 )
+                                                :   nValue(i_nValue) { if ( NOT CheckIntt(i_nValue) ) { csv_assert(false); } }
+                        Enum(
+                            const self &        i_rEnum )
+                                                :   nValue(i_rEnum.nValue) {;}
+
+    self &              operator=(
+                            DIFF                i_nValue )
+                                                { nValue = i_nValue; return *this; }
+    self &              operator=(
+                            intt                i_nValue )
+                                                { if ( CheckIntt(i_nValue) ) {nValue = DIFF(i_nValue);}
+                                                  else {csv_assert(false);} return *this; }
+    self &              operator=(
+                            const self &        i_rEnum )
+                                                { nValue = i_rEnum.nValue; return *this; }
+                        operator DIFF() const   { return DIFF(nValue); }
+
+    DIFF                operator()() const      { return nValue; }
+    const String  &     Text() const            { return Values_()[nValue]; }
+
+  private:
+    static EnumValueMap &
+                        Values_();
+    bool                CheckIntt(
+                            intt                i_nNumber )
+                                                { return Values_().find(i_nNumber) != Values_().end(); }
+    // DATA
+    intt                nValue;
+};
+
+
+
+
+}   // namespace lux
+#endif
+
diff --git a/autodoc/source/inc/manip.hxx b/autodoc/source/inc/manip.hxx
new file mode 100644
index 000000000000..9b7ae9fc07c6
--- /dev/null
+++ b/autodoc/source/inc/manip.hxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_MANIP_HXX
+#define ARY_MANIP_HXX
+
+template <class XY >
+class Manipulator
+{
+  public:
+    virtual             ~Manipulator() {}
+
+    void                operator()(
+                            XY &                io_r ) const
+                            { op_fcall(io_r); }
+  private:
+    virtual void        op_fcall(
+                            XY &                io_r ) const = 0;
+};
+
+template <class XY >
+class Const_Manipulator
+{
+  public:
+    virtual             ~Const_Manipulator() {}
+
+    void                operator()(
+                            const XY &          io_r ) const
+                            { op_fcall(io_r); }
+  private:
+    virtual void        op_fcall(
+                            const XY &          io_r ) const = 0;
+};
+
+
+#endif
+
diff --git a/autodoc/source/inc/precomp.h b/autodoc/source/inc/precomp.h
new file mode 100644
index 000000000000..8ff526108f60
--- /dev/null
+++ b/autodoc/source/inc/precomp.h
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef ADC_PRECOMP_H_06071998
+#define ADC_PRECOMP_H_06071998
+
+
+// For en/disabling csv_assertions:
+#ifndef DEBUG
+#define CSV_NO_ASSERTIONS
+#endif
+
+#include <cosv/csv_precomp.h>
+
+#include <vector>
+#include <map>
+#include <set>
+
+
+
+// Shortcuts to access csv::-types:
+using csv::String;
+using csv::StringVector;
+using csv::StreamStr;
+using csv::c_str;
+typedef csv::StreamStrLock  StreamLock;
+
+
+
+inline std::ostream &
+Cout() { return std::cout; }
+inline std::ostream &
+Cerr() { return std::cerr; }
+
+inline csv::F_FLUSHING_FUNC
+Endl()  { return csv::Endl; }
+inline csv::F_FLUSHING_FUNC
+Flush() { return csv::Flush; }
+
+
+
+
+#endif
diff --git a/autodoc/source/inc/prprpr.hxx b/autodoc/source/inc/prprpr.hxx
new file mode 100644
index 000000000000..842900bb5950
--- /dev/null
+++ b/autodoc/source/inc/prprpr.hxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ARY_CPP_PRPRPR_HXX  // PRePRocessorPRocessing
+#define ARY_CPP_PRPRPR_HXX
+
+
+
+// Implemented in autodoc/source/parser/cpp/defdescr.cxx .
+
+bool                CheckForOperator(
+                        bool &              o_bStringify,
+                        bool &              o_bConcatenate,
+                        const String &     i_sTextItem );
+void                Do_bConcatenate(
+                        csv::StreamStr &    o_rText,
+                        bool &              io_bConcatenate );
+void                Do_bStringify_begin(
+                        csv::StreamStr &    o_rText,
+                        bool                i_bStringify );
+void                Do_bStringify_end(
+                        csv::StreamStr &    o_rText,
+                        bool &              io_bStringify );
+bool                HandleOperatorsBeforeTextItem(  /// @return true, if text item is done here
+                        csv::StreamStr &    o_rText,
+                        bool &              io_bStringify,
+                        bool &              io_bConcatenate,
+                        const String &     i_sTextItem );
+
+
+
+
+#endif
diff --git a/autodoc/source/inc/tools/filecoll.hxx b/autodoc/source/inc/tools/filecoll.hxx
new file mode 100644
index 000000000000..75818d1b40eb
--- /dev/null
+++ b/autodoc/source/inc/tools/filecoll.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_FILECOLL_HXX
+#define ADC_FILECOLL_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <autodoc/filecoli.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+class FileCollector : public autodoc::FileCollector_Ifc
+{
+  public:
+    // LIFECYCLE
+                        FileCollector(
+                            uintt               i_nRoughNrOfFiles = 0 );
+
+    // OPERATIONS
+    virtual uintt       AddFilesFrom(
+                            const char *        i_sRootDir,
+                            const char *        i_sFilter,
+                            E_SearchMode        i_eSearchMode );
+    virtual uintt       AddFile(
+                            const char *        i_sFilePath );
+    virtual void        EraseAll();
+
+    // INQUIRY
+    virtual const_iterator
+                        Begin() const;
+    virtual const_iterator
+                        End() const;
+    virtual uintt       Size() const;
+
+  private:
+    // DATA
+    StringVector        aFoundFiles;
+};
+
+
+#endif
+
diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx
new file mode 100644
index 000000000000..2ebe0d000e84
--- /dev/null
+++ b/autodoc/source/inc/tools/tkpchars.hxx
@@ -0,0 +1,170 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKPCHARS_HXX
+#define ADC_TKPCHARS_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETRS
+#include <adc_cl.hxx>
+#include <stack>
+
+
+
+/** @descr
+
+    dpSource:
+
+    1||||||||||||||||||||||a||||||||||||b|||c||||||||||||||||||||...
+
+
+    1 := first character of Sourcecode.
+    a := nLastTokenStart, there starts the last cut token.
+    b := nLastCut, there is a '\0'-char which marks the end of
+         the last cut token. The original character at b is stored
+         in cCharAtLastCut and will replace the '\0'-char, when the
+         next token is cut.
+    c := The current cursor position.
+
+
+    @needs  cosv.lib
+
+    @use    This class can be used by any parser to get the chars of a
+            text one by one and separate them to tokens.
+**/
+
+class CharacterSource
+{
+    public:
+        // LIFECYCLE
+                        CharacterSource();
+                        ~CharacterSource();
+
+        // OPERATIONS
+        /** Loads the complete contents of in_rSource into the classes private memory.
+            If in_rSource is a file, it has to be open of course.
+            After loading the text, the CurChar() is set on the begin of the text.
+        **/
+        void            LoadText(
+                            csv::bstream &      io_rSource);
+
+        void            InsertTextAtCurPos(
+                            const char *        i_sText2Insert );
+
+        /// @return CurChar() after moving forward one char.
+            char            MoveOn();
+        /** @return
+            The token which starts at the char which was CurChar(), when
+            CutToken() was called the last time - or at the beginning of the text.
+            The token ends by the CurChar() being replaced by a '\0'.
+
+            Value is valid until the next call of CutToken() or ~CharacterSource().
+        **/
+        const char *    CutToken();
+
+        // INQUIRY
+        char            CurChar() const;
+        /// @return The result of the last CutToken(). Or NULL, if there was none yet.
+        const char *    CurToken() const;
+
+    // INQUIRY
+        /// @return true, if
+        bool            IsFinished() const;
+
+    private:
+        struct S_SourceState
+        {
+            DYN char *      dpSource;
+            intt            nSourceSize;
+
+            intt            nCurPos;
+            intt            nLastCut;
+            intt            nLastTokenStart;
+            char            cCharAtLastCut;
+
+                            S_SourceState(
+                                DYN char *      dpSource,
+                                intt            nSourceSize,
+                                intt            nCurPos,
+                                intt            nLastCut,
+                                intt            nLastTokenStart,
+                                char            cCharAtLastCut );
+        };
+
+        void            BeginSource();
+        intt            CurPos() const;
+        char            MoveOn_OverStack();
+
+        // DATA
+        std::stack< S_SourceState >
+                        aSourcesStack;
+
+        DYN char *      dpSource;
+        intt            nSourceSize;
+
+        intt            nCurPos;
+        intt            nLastCut;
+        intt            nLastTokenStart;
+        char            cCharAtLastCut;
+};
+
+
+inline char
+CharacterSource::MoveOn()
+    {
+if (DEBUG_ShowText())
+{
+        Cerr() << char(dpSource[nCurPos+1]) << Flush();
+}
+        if ( nCurPos < nSourceSize-1 )
+            return dpSource[++nCurPos];
+        else if ( aSourcesStack.size() > 0 )
+            return MoveOn_OverStack();
+        else
+            return dpSource[nCurPos = nSourceSize];
+    }
+inline char
+CharacterSource::CurChar() const
+    { return nCurPos != nLastCut ? dpSource[nCurPos] : cCharAtLastCut; }
+inline const char *
+CharacterSource::CurToken() const
+    { return &dpSource[nLastTokenStart]; }
+inline bool
+CharacterSource::IsFinished() const
+    { return nCurPos >= nSourceSize; }
+inline intt
+CharacterSource::CurPos() const
+    { return nCurPos; }
+
+
+
+
+#endif
+
+
diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk
new file mode 100644
index 000000000000..75b251643180
--- /dev/null
+++ b/autodoc/source/mkinc/fullcpp.mk
@@ -0,0 +1,54 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+
+
+# --- Settings -----------------------------------------------------
+# Has to be included AFTER settings.mk !
+
+
+# RTTI
+.IF "$(GUI)"=="WNT"
+CFLAGS+= -GR
+.ENDIF
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || $(COM) == "GCC"
+CFLAGSCXX+= -frtti
+.ENDIF
+
+
+
+# Precompiled Headers
+.IF "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
+
+PCH_NAME=autodoc
+.IF "$(debug)"==""
+CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
+.ELSE
+CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd
+.ENDIF
+
+.ENDIF  # "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
diff --git a/autodoc/source/parser/adoc/a_rdocu.cxx b/autodoc/source/parser/adoc/a_rdocu.cxx
new file mode 100644
index 000000000000..9d225bb0ec15
--- /dev/null
+++ b/autodoc/source/parser/adoc/a_rdocu.cxx
@@ -0,0 +1,90 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/a_rdocu.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <adoc/docu_pe.hxx>
+#include <adoc/adoc_tok.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <doc_deal.hxx>
+
+
+
+namespace adoc
+{
+
+
+DocuExplorer::DocuExplorer()
+    :   pDocuDistributor(0),
+        pPE(new Adoc_PE),
+        bIsPassedFirstDocu(false)
+{
+}
+
+DocuExplorer::~DocuExplorer()
+{
+}
+
+void
+DocuExplorer::StartNewFile( DocuDealer & o_rDocuDistributor )
+{
+    pDocuDistributor = &o_rDocuDistributor;
+    bIsPassedFirstDocu = false;
+}
+
+
+void
+DocuExplorer::Process_Token( DYN adoc::Token & let_drToken )
+{
+    csv_assert(pDocuDistributor != 0);
+
+    let_drToken.Trigger(*pPE);
+    if ( pPE->IsComplete() )
+    {
+        ary::doc::OldCppDocu *
+            pDocu = pPE->ReleaseJustParsedDocu();
+        if ( pDocu != 0 )
+        {
+            if (bIsPassedFirstDocu)
+                pDocuDistributor->TakeDocu( *pDocu );
+            else
+            {
+                delete pDocu;
+                bIsPassedFirstDocu = true;
+            }
+        }
+    }
+
+    delete &let_drToken;
+}
+
+
+}   // namespace adoc
+
diff --git a/autodoc/source/parser/adoc/adoc_tok.cxx b/autodoc/source/parser/adoc/adoc_tok.cxx
new file mode 100644
index 000000000000..37b3e9241fa4
--- /dev/null
+++ b/autodoc/source/parser/adoc/adoc_tok.cxx
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/adoc_tok.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/atokdeal.hxx>
+#include <../cpp/c_dealer.hxx>
+
+
+namespace adoc {
+
+void
+Token::DealOut( ::TokenDealer & o_rDealer )
+{
+    o_rDealer.AsDistributor()->Deal_AdcDocu(*this);
+}
+
+
+}   // namespace adoc
+
diff --git a/autodoc/source/parser/adoc/cx_a_std.cxx b/autodoc/source/parser/adoc/cx_a_std.cxx
new file mode 100644
index 000000000000..9bdb10be5f04
--- /dev/null
+++ b/autodoc/source/parser/adoc/cx_a_std.cxx
@@ -0,0 +1,516 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/cx_a_std.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/cx_a_sub.hxx>
+#include <x_parse.hxx>
+#include <tools/tkpchars.hxx>
+#include <adoc/tk_attag.hxx>
+#include <adoc/tk_docw.hxx>
+#include <tokens/tokdeal.hxx>
+
+
+
+namespace adoc {
+
+
+const intt C_nStatusSize = 128;
+const intt C_nCppInitialNrOfStati = 400;
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_Ignore = 2;
+const uintt nF_fin_LineStart = 3;
+const uintt nF_fin_Eol = 4;
+const uintt nF_fin_Eof = 5;
+const uintt nF_fin_AnyWord = 6;
+const uintt nF_fin_Whitespace = 7;
+
+const uintt nF_goto_AtTag = 20;
+const uintt nF_goto_CheckStar = 21;
+
+DYN TextToken * TCF_DocWord(const char * text) { return new Tok_DocWord(text); }
+
+DYN TextToken * TCF_atstd_ATT(const char * ) { return new Tok_at_std(ary::info::atid_ATT); }
+DYN TextToken * TCF_atstd_author(const char * ) { return new Tok_at_std(ary::info::atid_author); }
+DYN TextToken * TCF_atstd_change(const char * ) { return new Tok_at_std(ary::info::atid_change); }
+DYN TextToken * TCF_atstd_collab(const char * ) { return new Tok_at_std(ary::info::atid_collab); }
+DYN TextToken * TCF_atstd_contact(const char * ) { return new Tok_at_std(ary::info::atid_contact); }
+DYN TextToken * TCF_atstd_copyright(const char * ) { return new Tok_at_std(ary::info::atid_copyright); }
+DYN TextToken * TCF_atstd_descr(const char * ) { return new Tok_at_std(ary::info::atid_descr); }
+DYN TextToken * TCF_atstd_docdate(const char * ) { return new Tok_at_std(ary::info::atid_docdate); }
+DYN TextToken * TCF_atstd_derive(const char * ) { return new Tok_at_std(ary::info::atid_derive); }
+DYN TextToken * TCF_atstd_instance(const char * ) { return new Tok_at_std(ary::info::atid_instance); }
+DYN TextToken * TCF_atstd_life(const char * ) { return new Tok_at_std(ary::info::atid_life); }
+DYN TextToken * TCF_atstd_multi(const char * ) { return new Tok_at_std(ary::info::atid_multi); }
+DYN TextToken * TCF_atstd_onerror(const char * ) { return new Tok_at_std(ary::info::atid_onerror); }
+DYN TextToken * TCF_atstd_persist(const char * ) { return new Tok_at_std(ary::info::atid_persist); }
+DYN TextToken * TCF_atstd_postcond(const char * ) { return new Tok_at_std(ary::info::atid_postcond); }
+DYN TextToken * TCF_atstd_precond(const char * ) { return new Tok_at_std(ary::info::atid_precond); }
+DYN TextToken * TCF_atstd_responsibility(const char * ) { return new Tok_at_std(ary::info::atid_resp); }
+DYN TextToken * TCF_atstd_return(const char * ) { return new Tok_at_std(ary::info::atid_return); }
+DYN TextToken * TCF_atstd_short(const char * ) { return new Tok_at_std(ary::info::atid_short); }
+DYN TextToken * TCF_atstd_todo(const char * ) { return new Tok_at_std(ary::info::atid_todo); }
+DYN TextToken * TCF_atstd_version(const char * ) { return new Tok_at_std(ary::info::atid_version); }
+
+DYN TextToken * TCF_at_base(const char *) { return new Tok_at_base; }
+DYN TextToken * TCF_at_exception(const char *) { return new Tok_at_exception; }
+DYN TextToken * TCF_at_impl(const char *) { return new Tok_at_impl; }
+DYN TextToken * TCF_at_interface(const char *) { return new Tok_at_interface; }
+DYN TextToken * TCF_at_key(const char *) { return new Tok_at_key; }
+DYN TextToken * TCF_at_param(const char *) { return new Tok_at_param; }
+DYN TextToken * TCF_at_see(const char *) { return new Tok_at_see; }
+DYN TextToken * TCF_at_template(const char *) { return new Tok_at_template; }
+DYN TextToken * TCF_at_internal(const char *) { return new Tok_at_internal; }
+DYN TextToken * TCF_at_obsolete(const char *) { return new Tok_at_obsolete; }
+DYN TextToken * TCF_at_module(const char *) { return new Tok_at_module; }
+DYN TextToken * TCF_at_file(const char *) { return new Tok_at_file; }
+DYN TextToken * TCF_at_gloss(const char *) { return new Tok_at_gloss; }
+DYN TextToken * TCF_at_global(const char *) { return new Tok_at_global; }
+DYN TextToken * TCF_at_include(const char *) { return new Tok_at_include; }
+DYN TextToken * TCF_at_label(const char *) { return new Tok_at_label; }
+DYN TextToken * TCF_at_since(const char *) { return new Tok_at_since; }
+DYN TextToken * TCF_at_HTML(const char *) { return new Tok_at_HTML; }
+DYN TextToken * TCF_at_NOHTML(const char *) { return new Tok_at_NOHTML; }
+DYN TextToken * TCF_Whitespace(const char * i_sText);
+DYN TextToken * TCF_EoDocu(const char *) { return new Tok_EoDocu; }
+DYN TextToken * TCF_EoLine(const char *) { return new Tok_Eol; }
+DYN TextToken * TCF_Eof(const char *) { return new Tok_Eof; }
+
+
+
+
+Context_AdocStd::Context_AdocStd()
+    :   aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati),
+        pDealer(0),
+        pParentContext(0),
+        pFollowUpContext(0),
+        pCx_LineStart(0),
+        pCx_CheckStar(0),
+        pCx_AtTagCompletion(0),
+        pNewToken(0),
+        bIsMultiline(false)
+{
+    pCx_LineStart = new Cx_LineStart(*this);
+    pCx_CheckStar = new Cx_CheckStar(*this);
+    pCx_AtTagCompletion = new Cx_AtTagCompletion(*this);
+
+    SetupStateMachine();
+}
+
+void
+Context_AdocStd::SetParentContext( TkpContext & io_rParentContext,
+                                   const char * )
+{
+    pFollowUpContext = pParentContext = &io_rParentContext;
+    pCx_CheckStar->Set_End_FollowUpContext(io_rParentContext);
+}
+
+Context_AdocStd::~Context_AdocStd()
+{
+}
+
+void
+Context_AdocStd::AssignDealer( TokenDealer & o_rDealer )
+{
+    pDealer = &o_rDealer;
+    pCx_LineStart->AssignDealer(o_rDealer);
+    pCx_CheckStar->AssignDealer(o_rDealer);
+    pCx_AtTagCompletion->AssignDealer(o_rDealer);
+}
+
+void
+Context_AdocStd::ReadCharChain( CharacterSource & io_rText )
+{
+    csv_assert(pParentContext != 0);
+    pNewToken = 0;
+
+    TextToken::F_CRTOK  fTokenCreateFunction = 0;
+    StmBoundsStatus & rBound = aStateMachine.GetCharChain(fTokenCreateFunction, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    pFollowUpContext = rBound.FollowUpContext();
+    PerformStatusFunction(rBound.StatusFunctionNr(), fTokenCreateFunction, io_rText);
+}
+
+bool
+Context_AdocStd::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Context_AdocStd::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_AdocStd::PerformStatusFunction( uintt               i_nStatusSignal,
+                                        F_CRTOK             i_fTokenCreateFunction,
+                                        CharacterSource &   io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_Error:
+        {
+            char cCC = io_rText.CurChar();
+            String sChar( &cCC, 1 );
+            throw X_Parser(X_Parser::x_InvalidChar, sChar, String ::Null_(), 0);
+        }   // no break, because of throw
+        case nF_fin_Ignore:
+            io_rText.CutToken();
+            pNewToken = 0;
+            break;
+        case nF_fin_LineStart:
+            csv_assert(i_fTokenCreateFunction != 0);
+            pNewToken = (*i_fTokenCreateFunction)(io_rText.CutToken());
+            break;
+        case nF_fin_Eol:
+            io_rText.CutToken();
+            pDealer->Deal_Eol();
+            if ( bIsMultiline )
+            {
+                pNewToken = TCF_EoLine(0);
+                pFollowUpContext = pCx_LineStart.Ptr();
+            }
+            else
+            {
+                pNewToken = TCF_EoDocu(0);
+                pFollowUpContext = pParentContext;
+            }
+            break;
+        case nF_fin_Eof:
+            pNewToken = TCF_Eof(0);
+            break;
+        case nF_fin_AnyWord:
+            if (i_fTokenCreateFunction != 0)
+                pNewToken = (*i_fTokenCreateFunction)(io_rText.CutToken());
+            else
+                pNewToken = TCF_DocWord(io_rText.CutToken());
+            break;
+        case nF_fin_Whitespace:
+            pNewToken = TCF_Whitespace(io_rText.CutToken());
+            break;
+        case nF_goto_AtTag:
+            pNewToken = 0;
+            pCx_AtTagCompletion->SetCurToken(i_fTokenCreateFunction);
+            break;
+        case nF_goto_CheckStar:
+            pNewToken = 0;
+            pCx_CheckStar->SetCanBeEnd( bIsMultiline );
+            break;
+        default:
+        {
+            char cCC = io_rText.CurChar();
+            String  sChar( &cCC, 1 );
+            throw X_Parser(X_Parser::x_InvalidChar, sChar, String::Null_(), 0);
+        }
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_AdocStd::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 bas = 0;        // Base-Status
+    const INT16 wht = 1;        // Whitespace-Status
+    const INT16 awd = 2;        // Any-Word-Read-Status
+
+    // Kontextwechsel-Stati:
+    const INT16 goto_CheckStar = 3;
+    const INT16 goto_AtTag = 4;
+
+    // Tokenfinish-Stati:
+    const INT16 finError = 5;
+//  const INT16 finIgnore = 6;
+    const INT16 finEol = 7;
+    const INT16 finEof = 8;
+    const INT16 finAnyWord = 9;
+    const INT16 finWhitespace = 10;
+
+    // Konstanten zur Benutzung in der Tabelle:
+    const INT16 fof = finEof;
+    const INT16 err = finError;
+    const INT16 faw = finAnyWord;
+//  const INT16 fig = finIgnore;
+    const INT16 fwh = finWhitespace;
+
+    /// The '0's  will be replaced by calls of AddToken().
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,awd,awd,awd,awd,awd,awd,awd,awd,awd,  0,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 63
+       0,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fwh,wht,wht,fwh,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 63
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 95
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh  // ... 127
+    };
+
+    const INT16 A_nWordStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 63
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nAtTagDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 63
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nPunctDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err  // 112 ...
+    };
+
+    DYN StmArrayStatus * dpStatusTop
+            = new StmArrayStatus( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatus * dpStatusWhite
+            = new StmArrayStatus( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatus * dpStatusWord
+            = new StmArrayStatus( C_nStatusSize, A_nWordStatus, TCF_DocWord, true);
+
+    DYN StmBoundsStatus *   dpBst_goto_CheckStar
+            = new StmBoundsStatus( *this, *pCx_CheckStar, nF_goto_CheckStar, true );
+    DYN StmBoundsStatus *   dpBst_goto_AtTag
+            = new StmBoundsStatus( *this, *pCx_AtTagCompletion, nF_goto_AtTag, true );
+
+    DYN StmBoundsStatus *   dpBst_finError
+            = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Error, true );
+    DYN StmBoundsStatus *   dpBst_finIgnore
+            = new StmBoundsStatus( *this, *this, nF_fin_Ignore, true);
+    DYN StmBoundsStatus *   dpBst_finEol
+            = new StmBoundsStatus( *this, *pCx_LineStart, nF_fin_Eol, false);
+    DYN StmBoundsStatus *   dpBst_finEof
+            = new StmBoundsStatus(  *this, TkpContext::Null_(), nF_fin_Eof, false);
+    DYN StmBoundsStatus *   dpBst_finAnyWord
+            = new StmBoundsStatus( *this, *this, nF_fin_AnyWord, true);
+    DYN StmBoundsStatus *   dpBst_finWhitespace
+            = new StmBoundsStatus( *this, *this, nF_fin_Whitespace, true);
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusWord);
+
+    aStateMachine.AddStatus(dpBst_goto_CheckStar);
+    aStateMachine.AddStatus(dpBst_goto_AtTag);
+
+    aStateMachine.AddStatus(dpBst_finError);
+    aStateMachine.AddStatus(dpBst_finIgnore);
+    aStateMachine.AddStatus(dpBst_finEol);
+    aStateMachine.AddStatus(dpBst_finEof);
+    aStateMachine.AddStatus(dpBst_finAnyWord);
+    aStateMachine.AddStatus(dpBst_finWhitespace);
+
+    aStateMachine.AddToken( "*",        0,                  A_nPunctDefStatus, goto_CheckStar );
+    aStateMachine.AddToken( "@ATT",     TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@att",     TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@ATTENTION",
+                                        TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@attention",
+                                        TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@author",  TCF_atstd_author,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@change",  TCF_atstd_change,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@collab",  TCF_atstd_collab,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@collaborator",
+                                        TCF_atstd_collab,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@contact", TCF_atstd_contact,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@copyright",TCF_atstd_copyright, A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@descr",   TCF_atstd_descr,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@docdate", TCF_atstd_docdate,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@derive",  TCF_atstd_derive,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@instance",TCF_atstd_instance, A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@life",    TCF_atstd_life,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@lifecycle",
+                                        TCF_atstd_life,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@multi",   TCF_atstd_multi,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@multiplicity",
+                                        TCF_atstd_multi,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@onerror", TCF_atstd_onerror,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@persist", TCF_atstd_persist,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@postcond",TCF_atstd_postcond,A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@precond", TCF_atstd_precond,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@resp",    TCF_atstd_responsibility,
+                                                            A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@responsibility",
+                                        TCF_atstd_return,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@return",  TCF_atstd_return,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@short",   TCF_atstd_short,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@todo",    TCF_atstd_todo,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@version", TCF_atstd_version,  A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@base",    TCF_at_base,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@exception",TCF_at_exception,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@impl",    TCF_at_impl,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@key",     TCF_at_key,         A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@param",   TCF_at_param,       A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@see",     TCF_at_see,         A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@seealso", TCF_at_see,         A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@since",   TCF_at_since,       A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@tpl",     TCF_at_template,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@tplparam",
+                                        TCF_at_template,    A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@interface",TCF_at_interface,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@internal",TCF_at_internal,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@obsolete",TCF_at_obsolete,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@deprecated",TCF_at_obsolete,  A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@module",  TCF_at_module,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@file",    TCF_at_file,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@gloss",   TCF_at_gloss,       A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@global#", TCF_at_global,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@include#",TCF_at_include,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@#",       TCF_at_label,       A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@HTML",    TCF_at_HTML,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@NOHTML",  TCF_at_NOHTML,      A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "\r\n",     0,                  A_nPunctDefStatus, finEol );
+    aStateMachine.AddToken( "\n",       0,                  A_nPunctDefStatus, finEol );
+    aStateMachine.AddToken( "\r",       0,                  A_nPunctDefStatus, finEol );
+};
+
+void
+Context_AdocStd::SetMode_IsMultiLine( bool  i_bTrue )
+{
+    bIsMultiline = i_bTrue;
+}
+
+DYN TextToken *
+TCF_Whitespace(const char * i_sText)
+{
+    UINT8 nSize = static_cast<UINT8>(strlen(i_sText));
+    for ( const char * pTab = strchr(i_sText,'\t');
+          pTab != 0;
+          pTab = strchr(pTab+1,'\t') )
+    {
+         nSize += 3;
+    }
+
+    return new Tok_Whitespace(nSize);
+}
+
+
+}   // namespace adoc
+
+
+/*
+@ATT[ENTION]
+@author
+@change[s]
+@collab[orators]
+@contact
+@copyright
+@descr
+@devstat[e]
+@docdate
+@derive
+@instance
+@life[cycle]
+@multi[plicity]
+@onerror
+@persist[ence]
+@postcond
+@precond
+@return
+@short
+@todo
+
+@module
+@file
+@gloss[ary]
+
+
+@base <BasisklassenName>
+@exception <ExceptionName>
+@impl[ements] <IDL-Construct>
+@key[words]|[s]
+@param <FunctionParameterName> [<Range of valid values>]
+@see[also]
+@templ[ate] <FormalTemplateParameterName>
+
+@internal
+@obsolete
+
+@#<Label>
+
+@global#<Label> Global comment.
+@include#<Label>
+
+
+*/
+
diff --git a/autodoc/source/parser/adoc/cx_a_sub.cxx b/autodoc/source/parser/adoc/cx_a_sub.cxx
new file mode 100644
index 000000000000..0fdec622b294
--- /dev/null
+++ b/autodoc/source/parser/adoc/cx_a_sub.cxx
@@ -0,0 +1,182 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/cx_a_sub.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <tokens/parseinc.hxx>
+#include <x_parse.hxx>
+#include <adoc/tk_docw.hxx>
+
+
+namespace adoc {
+
+//************************    Cx_LineStart      ************************//
+
+Cx_LineStart::Cx_LineStart( TkpContext &    i_rFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(&i_rFollowUpContext)
+{
+}
+
+void
+Cx_LineStart::ReadCharChain( CharacterSource & io_rText )
+{
+    uintt nCount = 0;
+    for ( char cNext = io_rText.CurChar(); cNext == 32 OR cNext == 9; cNext = io_rText.MoveOn() )
+    {
+        if (cNext == 32)
+            nCount++;
+        else if (cNext == 9)
+            nCount += 4;
+    }
+    io_rText.CutToken();
+
+    if (nCount < 50)
+        pNewToken = new Tok_LineStart(UINT8(nCount));
+    else
+        pNewToken = new Tok_LineStart(0);
+}
+
+bool
+Cx_LineStart::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_LineStart::FollowUpContext()
+{
+    return *pFollowUpContext;
+}
+
+
+//************************    Cx_CheckStar      ************************//
+
+Cx_CheckStar::Cx_CheckStar( TkpContext &        i_rFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(&i_rFollowUpContext),
+        pEnd_FollowUpContext(0),
+        bCanBeEnd(false),
+        bEndTokenFound(false)
+{
+}
+
+
+void
+Cx_CheckStar::ReadCharChain( CharacterSource & io_rText )
+{
+    bEndTokenFound = false;
+    if (bCanBeEnd)
+    {
+        char cNext = jumpOver(io_rText,'*');
+        if ( NULCH == cNext )
+            throw X_Parser(X_Parser::x_UnexpectedEOF, "", String::Null_(), 0);
+        if (cNext == '/')
+        {
+            io_rText.MoveOn();
+            pNewToken = new Tok_EoDocu;
+            bEndTokenFound = true;
+        }
+        else
+        {
+            pNewToken = new Tok_DocWord(io_rText.CutToken());
+        }
+    }
+    else
+    {
+        jumpToWhite(io_rText);
+        pNewToken = new Tok_DocWord(io_rText.CutToken());
+    }
+}
+
+bool
+Cx_CheckStar::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_CheckStar::FollowUpContext()
+{
+    if (bEndTokenFound)
+        return *pEnd_FollowUpContext;
+    else
+        return *pFollowUpContext;
+}
+
+
+//************************    Cx_AtTagCompletion        ************************//
+
+Cx_AtTagCompletion::Cx_AtTagCompletion( TkpContext &    i_rFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(&i_rFollowUpContext)
+{
+}
+
+void
+Cx_AtTagCompletion::ReadCharChain( CharacterSource & io_rText )
+{
+    jumpToWhite(io_rText);
+    csv_assert(fCur_TokenCreateFunction != 0);
+    pNewToken = (*fCur_TokenCreateFunction)(io_rText.CutToken());
+}
+
+bool
+Cx_AtTagCompletion::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_AtTagCompletion::FollowUpContext()
+{
+    return *pFollowUpContext;
+}
+
+
+
+
+}   // namespace adoc
+
diff --git a/autodoc/source/parser/adoc/docu_pe.cxx b/autodoc/source/parser/adoc/docu_pe.cxx
new file mode 100644
index 000000000000..963a36cd6b14
--- /dev/null
+++ b/autodoc/source/parser/adoc/docu_pe.cxx
@@ -0,0 +1,403 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/docu_pe.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/ci_attag.hxx>
+#include <ary/info/ci_text.hxx>
+#include <adoc/adoc_tok.hxx>
+#include <adoc/tk_attag.hxx>
+#include <adoc/tk_docw.hxx>
+
+
+namespace adoc
+{
+
+
+inline bool
+Adoc_PE::UsesHtmlInDocuText()
+{
+    return bUsesHtmlInDocuText;
+}
+
+
+
+
+Adoc_PE::Adoc_PE()
+    :   pCurDocu(0),
+        pCurAtTag(0),
+        nLineCountInDocu(0),
+        nCurSpecialMeaningTokens(0),
+        nCurSubtractFromLineStart(0),
+        eCurTagState(ts_new),
+        eDocuState(ds_wait_for_short),
+        bIsComplete(false),
+        bUsesHtmlInDocuText(false)
+{
+}
+
+Adoc_PE::~Adoc_PE()
+{
+}
+
+void
+Adoc_PE::Hdl_at_std( const Tok_at_std & i_rTok )
+{
+    InstallAtTag(
+        CurDocu().Create_StdTag(i_rTok.Id()) );
+}
+
+void
+Adoc_PE::Hdl_at_base( const Tok_at_base & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_BaseTag() );
+}
+
+void
+Adoc_PE::Hdl_at_exception( const Tok_at_exception & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_ExceptionTag() );
+}
+
+void
+Adoc_PE::Hdl_at_impl( const Tok_at_impl & )
+{
+    InstallAtTag(
+        CurDocu().Create_ImplementsTag() );
+}
+
+void
+Adoc_PE::Hdl_at_key( const Tok_at_key & )
+{
+    InstallAtTag(
+        CurDocu().Create_KeywordTag() );
+}
+
+void
+Adoc_PE::Hdl_at_param( const Tok_at_param & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_ParameterTag() );
+}
+
+void
+Adoc_PE::Hdl_at_see( const Tok_at_see & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_SeeTag() );
+}
+
+void
+Adoc_PE::Hdl_at_template( const Tok_at_template & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_TemplateTag() );
+}
+
+void
+Adoc_PE::Hdl_at_interface( const Tok_at_interface & )
+{
+    CurDocu().Set_Interface();
+}
+
+void
+Adoc_PE::Hdl_at_internal( const Tok_at_internal & )
+{
+    CurDocu().Set_Internal();
+}
+
+void
+Adoc_PE::Hdl_at_obsolete( const Tok_at_obsolete & )
+{
+    CurDocu().Set_Obsolete();
+}
+
+void
+Adoc_PE::Hdl_at_module( const Tok_at_module & )
+{
+    // KORR_FUTURE
+
+//  pCurAtTag = CurDocu().Assign2_ModuleTag();
+//  nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens();
+}
+
+void
+Adoc_PE::Hdl_at_file( const Tok_at_file & )
+{
+    // KORR_FUTURE
+
+//  pCurAtTag = CurDocu().Assign2_FileTag();
+//  nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens();
+}
+
+void
+Adoc_PE::Hdl_at_gloss( const Tok_at_gloss & )
+{
+    // KORR_FUTURE
+
+//  Create_GlossaryEntry();
+}
+
+void
+Adoc_PE::Hdl_at_global( const Tok_at_global & )
+{
+    // KORR_FUTURE
+//  Create_GlobalTextComponent();
+}
+
+void
+Adoc_PE::Hdl_at_include( const Tok_at_include & )
+{
+    // KORR_FUTURE
+}
+
+void
+Adoc_PE::Hdl_at_label( const Tok_at_label & )
+{
+    InstallAtTag(
+        CurDocu().Create_LabelTag() );
+}
+
+void
+Adoc_PE::Hdl_at_since( const Tok_at_since & )
+{
+    InstallAtTag(
+        CurDocu().Create_SinceTag() );
+}
+
+void
+Adoc_PE::Hdl_at_HTML( const Tok_at_HTML &  )
+{
+    bUsesHtmlInDocuText = true;
+}
+
+void
+Adoc_PE::Hdl_at_NOHTML( const Tok_at_NOHTML & )
+{
+    bUsesHtmlInDocuText = false;
+}
+
+void
+Adoc_PE::Hdl_DocWord( const Tok_DocWord & i_rTok )
+{
+    bool bIsSpecial = false;
+    if ( nCurSpecialMeaningTokens > 0 )
+    {
+        bIsSpecial = CurAtTag().Add_SpecialMeaningToken(
+                                    i_rTok.Text(),
+                                    CurAtTag().NrOfSpecialMeaningTokens()
+                                        - (--nCurSpecialMeaningTokens) );
+    }
+
+    if ( NOT bIsSpecial )
+    {
+        if ( eDocuState == ds_wait_for_short OR eDocuState == ds_1newline_after_short )
+            eDocuState = ds_in_short;
+        if (nLineCountInDocu == 0)
+            nLineCountInDocu = 1;
+
+        uintt nLength = i_rTok.Length();
+        if ( nLength > 2 )
+        {
+            bool bMaybeGlobalLink = strncmp( "::", i_rTok.Text(), 2 ) == 0;
+            bool bMayBeFunction = *(i_rTok.Text() + nLength - 2) == '('
+                                  AND *(i_rTok.Text() + nLength - 1) == ')';
+            if ( bMaybeGlobalLink OR bMayBeFunction )
+            {
+                CurAtTag().Add_PotentialLink( i_rTok.Text(),
+                                              bMaybeGlobalLink,
+                                              bMayBeFunction );
+                return;
+            }
+        }
+
+        CurAtTag().Add_Token( i_rTok.Text() );
+        eCurTagState = ts_std;
+    }
+}
+
+void
+Adoc_PE::Hdl_Whitespace( const Tok_Whitespace & i_rTok )
+{
+    if ( eCurTagState == ts_std )
+    {
+
+        CurAtTag().Add_Whitespace(i_rTok.Size());
+    }
+}
+
+void
+Adoc_PE::Hdl_LineStart( const Tok_LineStart & i_rTok )
+{
+    if ( pCurAtTag == 0 )
+        return;
+
+    if ( nLineCountInDocu == 2 )
+    {
+        nCurSubtractFromLineStart = i_rTok.Size();
+        eCurTagState = ts_std;
+    }
+    else if ( nLineCountInDocu > 2 )
+    {
+        if ( i_rTok.Size() > nCurSubtractFromLineStart )
+        {
+            CurAtTag().Add_Whitespace( i_rTok.Size()
+                                       - nCurSubtractFromLineStart );
+        }
+        // else do nothing, because there is no whitespace.
+    }
+}
+
+void
+Adoc_PE::Hdl_Eol( const Tok_Eol & )
+{
+    if ( pCurAtTag == 0 )
+        return;
+
+    nLineCountInDocu++;
+
+    if ( nCurSpecialMeaningTokens == 0 )
+    {
+        CurAtTag().Add_Eol();
+
+        switch ( eDocuState )
+        {
+            case ds_wait_for_short:         break;
+             case ds_in_short:               if ( nLineCountInDocu < 4 )
+                                                eDocuState = ds_1newline_after_short;
+                                            else
+                                            {
+                                                RenameCurShortTag();
+                                                eDocuState = ds_in_descr;
+                                            }
+                                            break;
+            case ds_1newline_after_short:   FinishCurShortTag();
+                                            eDocuState = ds_in_descr;
+                                            break;
+            default:
+                                            ;   // Do noting.
+        }
+    }
+    else
+    {
+        nCurSpecialMeaningTokens = 0;
+    }
+
+
+}
+
+void
+Adoc_PE::Hdl_EoDocu( const Tok_EoDocu & )
+{
+    bIsComplete = true;
+}
+
+DYN ary::doc::OldCppDocu *
+Adoc_PE::ReleaseJustParsedDocu()
+{
+    pCurAtTag = 0;
+    nLineCountInDocu = 0;
+    nCurSpecialMeaningTokens = 0;
+    nCurSubtractFromLineStart = 0;
+    eCurTagState = ts_new;
+    eDocuState = ds_wait_for_short;
+    bIsComplete = false;
+    return pCurDocu.Release();
+}
+
+void
+Adoc_PE::InstallAtTag( DYN ary::info::AtTag * let_dpTag,
+                       bool                   i_bImplicit )
+{
+    pCurAtTag = let_dpTag;
+    if ( pCurAtTag != 0 )
+    {
+        nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens();
+        pCurAtTag->Set_HtmlUseInDocuText( bUsesHtmlInDocuText );
+    }
+
+    eCurTagState = ts_new;
+    if ( NOT i_bImplicit )
+        eDocuState = ds_std;
+}
+
+ary::doc::OldCppDocu &
+Adoc_PE::CurDocu()
+{
+    if (NOT pCurDocu)
+        pCurDocu = new ary::doc::OldCppDocu;
+    return *pCurDocu;
+}
+
+ary::info::AtTag &
+Adoc_PE::CurAtTag()
+{
+    if (NOT pCurAtTag)
+    {
+        if ( int(eDocuState) <  int(ds_in_descr) )
+        {
+            InstallAtTag(
+                CurDocu().Create_StdTag(ary::info::atid_short),
+                true );
+        }
+        else
+        {
+            InstallAtTag(
+                CurDocu().Create_StdTag(ary::info::atid_descr),
+                true );
+        }
+    }
+    return *pCurAtTag;
+}
+
+void
+Adoc_PE::RenameCurShortTag()
+{
+    CurDocu().Replace_AtShort_By_AtDescr();
+}
+
+void
+Adoc_PE::FinishCurShortTag()
+{
+    InstallAtTag(
+        CurDocu().Create_StdTag(ary::info::atid_descr),
+        true );
+}
+
+
+}   // namespace adoc
+
+
+
+
+
diff --git a/autodoc/source/parser/adoc/makefile.mk b/autodoc/source/parser/adoc/makefile.mk
new file mode 100644
index 000000000000..48e4084ee401
--- /dev/null
+++ b/autodoc/source/parser/adoc/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_adoc
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/adoc_tok.obj   	\
+    $(OBJ)$/a_rdocu.obj		\
+    $(OBJ)$/cx_a_std.obj	\
+    $(OBJ)$/cx_a_sub.obj	\
+    $(OBJ)$/docu_pe.obj		\
+    $(OBJ)$/prs_adoc.obj	\
+    $(OBJ)$/tk_attag.obj  	\
+    $(OBJ)$/tk_docw.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/adoc/prs_adoc.cxx b/autodoc/source/parser/adoc/prs_adoc.cxx
new file mode 100644
index 000000000000..81ae380629b8
--- /dev/null
+++ b/autodoc/source/parser/adoc/prs_adoc.cxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/prs_adoc.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <adoc/cx_a_std.hxx>
+
+
+
+namespace adoc
+{
+
+DocuParser_AutodocStyle::DocuParser_AutodocStyle()
+{
+}
+
+DocuParser_AutodocStyle::~DocuParser_AutodocStyle()
+{
+}
+
+DYN autodoc::TkpDocuContext *
+DocuParser_AutodocStyle::Create_DocuContext() const
+{
+    return new Context_AdocStd;
+}
+
+}   // namespace adoc
+
+
+
diff --git a/autodoc/source/parser/adoc/tk_attag.cxx b/autodoc/source/parser/adoc/tk_attag.cxx
new file mode 100644
index 000000000000..49f71b82c7c7
--- /dev/null
+++ b/autodoc/source/parser/adoc/tk_attag.cxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/tk_attag.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/tokintpr.hxx>
+
+
+
+namespace adoc {
+
+#if 0
+#define  EV_AtTagId( val, tex ) ENUM_VALUE(E_AtTagId, eATTAGID_##val, val, tex )
+
+EV_AtTagId(atid_ATT, "ATTENTION" );
+EV_AtTagId(atid_author, "Author" );
+EV_AtTagId(atid_change, "Change" );
+EV_AtTagId(atid_collab, "Collaborators" );
+EV_AtTagId(atid_contact, "Contact" );
+EV_AtTagId(atid_copyright, "Copyright (c)" );
+EV_AtTagId(atid_descr, "Description" );
+EV_AtTagId(atid_devstat, "Development State" );
+EV_AtTagId(atid_docdate, "Date of Documentation" );
+EV_AtTagId(atid_derive, "How to Derive from this class" );
+EV_AtTagId(atid_instance, "Instances" );
+EV_AtTagId(atid_life, "Lifecycle" );
+EV_AtTagId(atid_multi, "Multiplicity" );
+EV_AtTagId(atid_onerror, "On Error" );
+EV_AtTagId(atid_persist, "Persistence" );
+EV_AtTagId(atid_postcond, "Postcondition" );
+EV_AtTagId(atid_precond, "Precondition" );
+EV_AtTagId(atid_return, "Return" );
+EV_AtTagId(atid_short, "Summary" );
+EV_AtTagId(atid_since, "Valid Since" );
+EV_AtTagId(atid_todo, "Todo" );
+EV_AtTagId(atid_version, "Version" );
+#endif // 0
+
+void
+Tok_at_std::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_at_std(*this);
+}
+
+const char *
+Tok_at_std::Text() const
+{
+    // KORR_FUTURE
+    return "A Tag";
+
+//  return eId.Text();
+}
+
+
+#define DEFINE_TOKEN_CLASS(name, text) \
+void \
+Tok_##name::Trigger( TokenInterpreter & io_rInterpreter ) const \
+{   io_rInterpreter.Hdl_##name(*this); } \
+const char * \
+Tok_##name::Text() const \
+{   return text; }
+
+DEFINE_TOKEN_CLASS(at_base,  "Base Classes")
+DEFINE_TOKEN_CLASS(at_exception,  "Exceptions")
+DEFINE_TOKEN_CLASS(at_impl,  "Implements")
+DEFINE_TOKEN_CLASS(at_key,  "Keywords")
+DEFINE_TOKEN_CLASS(at_param,  "Parameters")
+DEFINE_TOKEN_CLASS(at_see,  "See Also")
+DEFINE_TOKEN_CLASS(at_template,  "Template Parameters")
+DEFINE_TOKEN_CLASS(at_interface, "Interface")
+DEFINE_TOKEN_CLASS(at_internal,  "[ INTERNAL ]")
+DEFINE_TOKEN_CLASS(at_obsolete,  "[ DEPRECATED ]")
+DEFINE_TOKEN_CLASS(at_module,  "Module")
+DEFINE_TOKEN_CLASS(at_file,  "File")
+DEFINE_TOKEN_CLASS(at_gloss,  "Glossary")
+DEFINE_TOKEN_CLASS(at_global,  "<global doc text>")
+DEFINE_TOKEN_CLASS(at_include,  "<included text>")
+DEFINE_TOKEN_CLASS(at_label,  "Label")
+DEFINE_TOKEN_CLASS(at_HTML,  "")
+DEFINE_TOKEN_CLASS(at_NOHTML,  "")
+DEFINE_TOKEN_CLASS(at_since, "Since");
+
+}   // namespace adoc
+
diff --git a/autodoc/source/parser/adoc/tk_docw.cxx b/autodoc/source/parser/adoc/tk_docw.cxx
new file mode 100644
index 000000000000..0b8bc0051edd
--- /dev/null
+++ b/autodoc/source/parser/adoc/tk_docw.cxx
@@ -0,0 +1,128 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/tk_docw.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/tokintpr.hxx>
+
+
+
+namespace adoc {
+
+
+    static const char C_sSpace[300] =
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                        ";
+
+
+//***********************   Tok_DocWord     ******************//
+
+void
+Tok_DocWord::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_DocWord(*this);
+}
+
+const char *
+Tok_DocWord::Text() const
+{
+    return sText;
+}
+
+//***********************   Tok_Whitespace     ******************//
+
+
+void
+Tok_Whitespace::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_Whitespace(*this);
+}
+
+const char *
+Tok_Whitespace::Text() const
+{
+    return C_sSpace + 299 - nSize;
+}
+
+
+
+//***********************   Tok_LineStart     ******************//
+
+
+void
+Tok_LineStart::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_LineStart(*this);
+}
+
+const char *
+Tok_LineStart::Text() const
+{
+    return C_sSpace + 299 - nSize;
+}
+
+
+//***********************   Tok_Eol     ******************//
+
+void
+Tok_Eol::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_Eol(*this);
+}
+
+const char *
+Tok_Eol::Text() const
+{
+    return "\n";
+}
+
+
+
+//***********************   Tok_EoDocu     ******************//
+
+void
+Tok_EoDocu::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_EoDocu(*this);
+}
+
+const char *
+Tok_EoDocu::Text() const
+{
+    return "*/";
+}
+
+}   // namespace adoc
+
+
diff --git a/autodoc/source/parser/cpp/all_toks.cxx b/autodoc/source/parser/cpp/all_toks.cxx
new file mode 100644
index 000000000000..db2af0ab0ad3
--- /dev/null
+++ b/autodoc/source/parser/cpp/all_toks.cxx
@@ -0,0 +1,151 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <all_toks.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cpp/ctokdeal.hxx>
+#include "c_dealer.hxx"
+#include "tokintpr.hxx"
+
+
+
+namespace cpp {
+
+
+void
+Token::DealOut( ::TokenDealer & o_rDealer )
+{
+    // KORR_FUTURE HACK (casting to derivation cpp::TokenDealer)
+    o_rDealer.AsDistributor()->Deal_CppCode(*this);
+}
+
+
+#define DEF_TOKEN_CLASS(name) \
+void \
+Tok_##name::Trigger( TokenInterpreter & io_rInterpreter ) const \
+{ io_rInterpreter.Hdl_##name(*this); } \
+INT16 \
+Tok_##name::TypeId() const { return Tid_##name; } \
+const char * \
+Tok_##name::Text() const { return #name; }
+
+#define DEF_TOKEN_CLASS_WITHTEXT(name, text ) \
+void \
+Tok_##name::Trigger( TokenInterpreter & io_rInterpreter ) const \
+{ io_rInterpreter.Hdl_##name(*this); } \
+INT16 \
+Tok_##name::TypeId() const { return Tid_##name; } \
+const char * \
+Tok_##name::Text() const { return text; }
+
+
+DEF_TOKEN_CLASS_WITHTEXT(Identifier,sText)
+DEF_TOKEN_CLASS_WITHTEXT(Operator,sText)
+
+DEF_TOKEN_CLASS(operator)
+DEF_TOKEN_CLASS(class)
+DEF_TOKEN_CLASS(struct)
+DEF_TOKEN_CLASS(union)
+DEF_TOKEN_CLASS(enum)
+DEF_TOKEN_CLASS(typedef)
+DEF_TOKEN_CLASS(public)
+DEF_TOKEN_CLASS(protected)
+DEF_TOKEN_CLASS(private)
+DEF_TOKEN_CLASS(template)
+DEF_TOKEN_CLASS(virtual)
+DEF_TOKEN_CLASS(friend)
+DEF_TOKEN_CLASS_WITHTEXT(Tilde,"~")
+DEF_TOKEN_CLASS(const)
+DEF_TOKEN_CLASS(volatile)
+DEF_TOKEN_CLASS(extern)
+DEF_TOKEN_CLASS(static)
+DEF_TOKEN_CLASS(mutable)
+DEF_TOKEN_CLASS(register)
+DEF_TOKEN_CLASS(inline)
+DEF_TOKEN_CLASS(explicit)
+DEF_TOKEN_CLASS(namespace)
+DEF_TOKEN_CLASS(using)
+DEF_TOKEN_CLASS(throw)
+DEF_TOKEN_CLASS_WITHTEXT(SwBracket_Left,"{")
+DEF_TOKEN_CLASS_WITHTEXT(SwBracket_Right,"}")
+DEF_TOKEN_CLASS_WITHTEXT(ArrayBracket_Left,"[")
+DEF_TOKEN_CLASS_WITHTEXT(ArrayBracket_Right,"]")
+DEF_TOKEN_CLASS_WITHTEXT(Bracket_Left,"(")
+DEF_TOKEN_CLASS_WITHTEXT(Bracket_Right,")")
+DEF_TOKEN_CLASS_WITHTEXT(DoubleColon,"::")
+DEF_TOKEN_CLASS_WITHTEXT(Semicolon,";")
+DEF_TOKEN_CLASS_WITHTEXT(Comma,",")
+DEF_TOKEN_CLASS_WITHTEXT(Colon,":")
+DEF_TOKEN_CLASS_WITHTEXT(Assign,"=")
+DEF_TOKEN_CLASS_WITHTEXT(Less,"<")
+DEF_TOKEN_CLASS_WITHTEXT(Greater,">")
+DEF_TOKEN_CLASS_WITHTEXT(Asterix,"*")
+DEF_TOKEN_CLASS_WITHTEXT(AmpersAnd,"&")
+DEF_TOKEN_CLASS_WITHTEXT(Ellipse,"...")
+DEF_TOKEN_CLASS(typename)
+
+DEF_TOKEN_CLASS_WITHTEXT(DefineName,sText)
+DEF_TOKEN_CLASS_WITHTEXT(MacroName,sText)
+DEF_TOKEN_CLASS_WITHTEXT(MacroParameter,sText)
+// DEF_TOKEN_CLASS_WITHTEXT(PreProDefinition,sText)
+
+void
+Tok_PreProDefinition::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{ io_rInterpreter.Hdl_PreProDefinition(*this); }
+
+INT16
+Tok_PreProDefinition::TypeId() const { return Tid_PreProDefinition; }
+
+const char *
+Tok_PreProDefinition::Text() const
+{
+    return sText;
+}
+
+
+
+DEF_TOKEN_CLASS_WITHTEXT(BuiltInType,sText)
+DEF_TOKEN_CLASS_WITHTEXT(TypeSpecializer,sText)
+DEF_TOKEN_CLASS_WITHTEXT(Constant,sText)
+
+const char *
+Tok_UnblockMacro::Text() const
+{
+    return sMacroName;
+}
+
+void
+Tok_UnblockMacro::DealOut( ::TokenDealer & o_rDealer )
+{
+    // KORR_FUTURE HACK (casting to derivation cpp::TokenDealer)
+    o_rDealer.AsDistributor()->Deal_Cpp_UnblockMacro(*this);
+}
+
+}   // namespace cpp
diff --git a/autodoc/source/parser/cpp/all_toks.hxx b/autodoc/source/parser/cpp/all_toks.hxx
new file mode 100644
index 000000000000..485588d5fbc1
--- /dev/null
+++ b/autodoc/source/parser/cpp/all_toks.hxx
@@ -0,0 +1,219 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_ALL_TOKS_HXX
+#define ADC_CPP_ALL_TOKS_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_tok.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp {
+
+class Tok_Identifier : public cpp::Token
+{
+  public:
+                        Tok_Identifier(
+                            const char *        i_sText ) : sText(i_sText) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual INT16       TypeId() const;
+    virtual const char *
+                        Text() const;
+  private:
+    String              sText;
+};
+const INT16 Tid_Identifier = 1;
+
+/** == != <= >=  && || !
+
+    new delete sizeof typeid
+    + - / %  ^ | << >>
+    . ->  ?
+    += -= *= /= %= &= |= ^= <<= >>=
+*/
+class Tok_Operator : public cpp::Token
+{
+  public:
+                        Tok_Operator(
+                            const char *        i_sText ) : sText(i_sText) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual INT16       TypeId() const;
+    virtual const char *
+                        Text() const;
+  private:
+    String              sText;
+};
+const INT16 Tid_Operator = 2;
+
+
+
+#define DECL_TOKEN_CLASS(name,tid) \
+class Tok_##name : public cpp::Token \
+{ public: \
+    virtual void        Trigger( \
+                            TokenInterpreter &  io_rInterpreter ) const; \
+    virtual INT16       TypeId() const; \
+    virtual const char * \
+                        Text() const; \
+}; \
+const INT16 Tid_##name = tid
+
+DECL_TOKEN_CLASS(operator,3);
+DECL_TOKEN_CLASS(class,4);
+DECL_TOKEN_CLASS(struct,5);
+DECL_TOKEN_CLASS(union,6);
+DECL_TOKEN_CLASS(enum,7);
+DECL_TOKEN_CLASS(typedef,8);
+DECL_TOKEN_CLASS(public,9);
+DECL_TOKEN_CLASS(protected,10);
+DECL_TOKEN_CLASS(private,11);
+DECL_TOKEN_CLASS(template,12);
+DECL_TOKEN_CLASS(virtual,13);
+DECL_TOKEN_CLASS(friend,14);
+DECL_TOKEN_CLASS(Tilde,15);
+DECL_TOKEN_CLASS(const,16);
+DECL_TOKEN_CLASS(volatile,17);
+DECL_TOKEN_CLASS(extern,18);
+DECL_TOKEN_CLASS(static,19);
+DECL_TOKEN_CLASS(mutable,20);
+DECL_TOKEN_CLASS(register,21);
+DECL_TOKEN_CLASS(inline,22);
+DECL_TOKEN_CLASS(explicit,23);
+DECL_TOKEN_CLASS(namespace,24);
+DECL_TOKEN_CLASS(using,25);
+DECL_TOKEN_CLASS(throw,26);
+DECL_TOKEN_CLASS(SwBracket_Left,27);
+DECL_TOKEN_CLASS(SwBracket_Right,28);
+DECL_TOKEN_CLASS(ArrayBracket_Left,29);
+DECL_TOKEN_CLASS(ArrayBracket_Right,30);
+DECL_TOKEN_CLASS(Bracket_Left,31);
+DECL_TOKEN_CLASS(Bracket_Right,32);
+DECL_TOKEN_CLASS(DoubleColon,33);
+DECL_TOKEN_CLASS(Semicolon,34);
+DECL_TOKEN_CLASS(Comma,35);
+DECL_TOKEN_CLASS(Colon,36);
+DECL_TOKEN_CLASS(Assign,37);
+DECL_TOKEN_CLASS(Less,38);
+DECL_TOKEN_CLASS(Greater,39);
+DECL_TOKEN_CLASS(Asterix,40);
+DECL_TOKEN_CLASS(AmpersAnd,41);
+DECL_TOKEN_CLASS(Ellipse,42);
+DECL_TOKEN_CLASS(typename,43);
+
+#undef DECL_TOKEN_CLASS
+
+#define DECL_TOKEN_CLASS_WITHTEXT(name,tid) \
+class Tok_##name : public cpp::Token \
+{ public: \
+                        Tok_##name( \
+                            const char *        i_sText ) : sText(i_sText) {} \
+    virtual void        Trigger( \
+                            TokenInterpreter &  io_rInterpreter ) const; \
+    virtual INT16       TypeId() const; \
+    virtual const char * \
+                        Text() const; \
+  private: \
+    String              sText; \
+}; \
+const INT16 Tid_##name = tid
+
+
+
+DECL_TOKEN_CLASS_WITHTEXT(DefineName,44);
+DECL_TOKEN_CLASS_WITHTEXT(MacroName,45);
+DECL_TOKEN_CLASS_WITHTEXT(MacroParameter,46);
+DECL_TOKEN_CLASS_WITHTEXT(PreProDefinition,47);
+
+/** char short int long float double wchar_t size_t
+*/
+DECL_TOKEN_CLASS_WITHTEXT(BuiltInType, 48);
+
+/** signed unsigned
+*/
+DECL_TOKEN_CLASS_WITHTEXT(TypeSpecializer, 49);
+DECL_TOKEN_CLASS_WITHTEXT(Constant, 50);
+
+
+
+/** This token does nothing in C++ code. It is added by the
+    internal macro-replacer to mark the position, where a
+    define or macro becomes valid again, which was until then
+    invalid, because the text was a replacement of this macro.
+    ( Avoiding endless recursive macro replacement. )
+*/
+class Tok_UnblockMacro : public ::TextToken
+{
+  public:
+                        Tok_UnblockMacro(
+                            const char *        i_sMacroName ) : sMacroName(i_sMacroName) {}
+    virtual const char* Text() const;
+
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer );
+  private:
+    String              sMacroName;
+};
+
+
+
+#if 0 // just for viewing:
+class Tok_TypeKey : public cpp::Token                  // file-><type-PE>
+class Tok_Template : public cpp::Token                 // file
+class Tok_Namespace : public cpp::Token                // file
+class Tok_Bracket : public cpp::Token                  // ueberall
+class Tok_Separator : public cpp::Token                // ueberall
+
+class Tok_Identifier : public cpp::Token               // ueberall
+class Tok_NameSeparator : public cpp::Token            // Type, Name
+class Tok_BuiltInType : public cpp::Token              // ueberall
+class Tok_ConVol : public cpp::Token                   // class-><FuVa>
+class Tok_StorageClass : public cpp::Token             // file-><type>,<FuVa>
+class Tok_OperatorFunctionName : public cpp::Token     // class
+
+class Tok_Protection : public cpp::Token               // class
+class Tok_Virtual : public cpp::Token                  // class
+class Tok_Friend : public cpp::Token                   // class
+class Tok_Tilde : public cpp::Token                    // class, expression
+
+class Tok_Ellipse : public cpp::Token                  // function-ParaList
+class Tok_Assignment : public cpp::Token               // VariableDeclaraton, Function, Parameter
+class Tok_Throw : public cpp::Token                    // function
+class Tok_LessMore : public cpp::Token
+class Tok_Operator : public cpp::Token                 // expression
+
+class Tok_Ignore : public cpp::Token
+class Tok_ContextChanger : public cpp::Token
+#endif // 0
+
+
+}   // namespace cpp
+
+#endif
diff --git a/autodoc/source/parser/cpp/c_dealer.cxx b/autodoc/source/parser/cpp/c_dealer.cxx
new file mode 100644
index 000000000000..2917aab1bb6c
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_dealer.cxx
@@ -0,0 +1,149 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "c_dealer.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/loc/loc_root.hxx>
+#include <ary/loc/loc_file.hxx>
+//#include <ary/docu.hxx>
+#include <adoc/a_rdocu.hxx>
+#include "all_toks.hxx"
+#include "c_rcode.hxx"
+
+
+namespace ary
+{
+namespace loc
+{
+    class Root;
+}
+}
+
+
+
+
+namespace cpp
+{
+
+Distributor::Distributor( ary::cpp::Gate & io_rAryGate )
+    :   aCppPreProcessor(),
+        aCodeExplorer(io_rAryGate),
+        aDocuExplorer(),
+        pGate(&io_rAryGate),
+        pFileEventHandler(0),
+        pDocuDistributor(0)
+{
+    pFileEventHandler = & aCodeExplorer.FileEventHandler();
+    pDocuDistributor = & aCodeExplorer.DocuDistributor();
+}
+
+void
+Distributor::AssignPartners( CharacterSource &   io_rSourceText,
+                             const MacroMap &    i_rValidMacros )
+{
+    aCppPreProcessor.AssignPartners(aCodeExplorer, io_rSourceText, i_rValidMacros);
+}
+
+Distributor::~Distributor()
+{
+}
+
+void
+Distributor::StartNewFile( const csv::ploc::Path & i_file )
+{
+    const csv::ploc::Root &
+        root_dir = i_file.RootDir();
+    StreamLock
+        sl(700);
+    root_dir.Get(sl());
+    csv::ploc::Path
+        root_path( sl().c_str(), true );
+    ary::loc::Le_id
+        root_id = pGate->Locations().CheckIn_Root(root_path).LeId();
+    ary::loc::File &
+        rFile = pGate->Locations().CheckIn_File(
+                                        i_file.File(),
+                                        i_file.DirChain(),
+                                        root_id  );
+    pFileEventHandler->SetCurFile(rFile);
+
+    aCodeExplorer.StartNewFile();
+
+    csv_assert( pDocuDistributor != 0 );
+    aDocuExplorer.StartNewFile(*pDocuDistributor);
+}
+
+
+void
+Distributor::Deal_Eol()
+{
+    pFileEventHandler->Event_IncrLineCount();
+}
+
+void
+Distributor::Deal_Eof()
+{
+    // Do nothing yet.
+}
+
+void
+Distributor::Deal_Cpp_UnblockMacro( Tok_UnblockMacro & let_drToken )
+{
+    aCppPreProcessor.UnblockMacro(let_drToken.Text());
+    delete &let_drToken;
+}
+
+void
+Distributor::Deal_CppCode( cpp::Token & let_drToken )
+{
+    aCppPreProcessor.Process_Token(let_drToken);
+}
+
+void
+Distributor::Deal_AdcDocu( adoc::Token & let_drToken )
+{
+    aDocuExplorer.Process_Token(let_drToken);
+}
+
+Distributor *
+Distributor::AsDistributor()
+{
+     return this;
+}
+
+
+
+
+
+}   // namespace cpp
+
+
diff --git a/autodoc/source/parser/cpp/c_dealer.hxx b/autodoc/source/parser/cpp/c_dealer.hxx
new file mode 100644
index 000000000000..a48c3281574d
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_dealer.hxx
@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_C_DEALER_HXX
+#define ADC_CPP_C_DEALER_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cpp/ctokdeal.hxx>
+#include <adoc/atokdeal.hxx>
+#include <ary/info/docstore.hxx>
+    // COMPONENTS
+#include "preproc.hxx"
+#include "c_rcode.hxx"
+#include <adoc/a_rdocu.hxx>
+    // PARAMETERS
+
+namespace csv
+{
+    namespace ploc
+    {
+        class Path;
+        class DirectoryChain;
+    }
+}
+
+
+class TokenParser;
+
+
+namespace cpp
+{
+
+class PE_File;
+class DefineDescription;
+
+
+class Distributor : public cpp::TokenDealer,        /// Handle C++ code tokens.
+                    public adoc::TokenDealer        /// Handle Autodoc documentation tokens.
+{
+  public:
+    typedef std::map< String, DefineDescription* >     MacroMap;
+
+    // LIFECYCLE
+                        Distributor(
+                            ary::cpp::Gate &    io_rGate );
+                        ~Distributor();
+    // OPERATIONS
+    void                AssignPartners(
+                            CharacterSource &   io_rSourceText,
+                            const MacroMap &    i_rValidMacros );
+    void                StartNewFile(
+                            const csv::ploc::Path &
+                                                i_file );
+    virtual void        Deal_Eol();
+    virtual void        Deal_Eof();
+
+    virtual void        Deal_CppCode(
+                            cpp::Token &        let_drToken );
+    virtual void        Deal_Cpp_UnblockMacro(
+                            Tok_UnblockMacro &  let_drToken );
+
+    virtual void        Deal_AdcDocu(
+                            adoc::Token &       let_drToken );
+    virtual Distributor *
+                        AsDistributor();
+  private:
+    // DATA
+    PreProcessor        aCppPreProcessor;
+    CodeExplorer        aCodeExplorer;
+    adoc::DocuExplorer  aDocuExplorer;
+    ary::cpp::Gate *    pGate;
+    FileScope_EventHandler *
+                        pFileEventHandler;
+    DocuDealer *        pDocuDistributor;
+};
+
+
+
+}   // namespace cpp
+#endif
+
diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx
new file mode 100644
index 000000000000..ceac10902070
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_rcode.cxx
@@ -0,0 +1,161 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "c_rcode.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+// #include <ary/cpp/c_groups.hxx>
+#include <ary/loc/locp_le.hxx>
+#include "cpp_pe.hxx"
+#include <adc_cl.hxx>
+#include <x_parse.hxx>
+#include "pe_file.hxx"
+
+const uintt C_nNO_TRY = uintt(-1);
+
+
+namespace cpp {
+
+
+CodeExplorer::CodeExplorer( ary::cpp::Gate & io_rAryGate )
+    :   aGlobalParseContext(io_rAryGate),
+        // aEnvironments,
+        pPE_File(0),
+        pGate(&io_rAryGate),
+        dpCurToken(0)
+{
+    pPE_File = new PE_File( aGlobalParseContext );
+}
+
+CodeExplorer::~CodeExplorer()
+{
+}
+
+void
+CodeExplorer::StartNewFile()
+{
+    csv::erase_container(aEnvironments);
+
+    aEnvironments.push_back( pPE_File.MutablePtr() );
+    pPE_File->Enter(push);
+}
+
+void
+CodeExplorer::Process_Token( DYN cpp::Token & let_drToken )
+{
+if (DEBUG_ShowTokens())
+{
+    Cout() << let_drToken.Text() << Endl();
+}
+    dpCurToken = &let_drToken;
+    aGlobalParseContext.ResetResult();
+
+    do {
+        CurToken().Trigger( CurEnv() );
+        AcknowledgeResult();
+    } while ( dpCurToken );
+}
+
+void
+CodeExplorer::AcknowledgeResult()
+{
+    if (CurResult().eDone == done)
+        dpCurToken = 0;
+
+    switch ( CurResult().eStackAction )
+    {
+        case stay:
+                break;
+        case push:
+                CurEnv().Leave(push);
+                aEnvironments.push_back( &PushEnv() );
+                PushEnv().Enter(push);
+                break;
+        case pop_success:
+                CurEnv().Leave(pop_success);
+                aEnvironments.pop_back();
+                CurEnv().Enter(pop_success);
+                break;
+        case pop_failure:
+        {
+                Cpp_PE * pRecover = 0;
+                do {
+                    CurEnv().Leave(pop_failure);
+                    aEnvironments.pop_back();
+                    if ( aEnvironments.empty() )
+                        break;
+                    pRecover = CurEnv().Handle_ChildFailure();
+                } while ( pRecover == 0 );
+                if ( pRecover != 0 )
+                {
+                    aEnvironments.push_back(pRecover);
+                    pRecover->Enter(push);
+                }
+                else
+                {
+                    throw X_Parser( X_Parser::x_UnexpectedToken, CurToken().Text(), aGlobalParseContext.CurFileName(), aGlobalParseContext.LineCount() );
+                }
+        }       break;
+        default:
+            csv_assert(false);
+    }   // end switch(CurResult().eStackAction)
+}
+
+const Token &
+CodeExplorer::CurToken() const
+{
+    csv_assert(dpCurToken);
+
+    return *dpCurToken;
+}
+
+Cpp_PE &
+CodeExplorer::CurEnv() const
+{
+    csv_assert(aEnvironments.size() > 0);
+    csv_assert(aEnvironments.back() != 0);
+
+    return *aEnvironments.back();
+}
+
+Cpp_PE &
+CodeExplorer::PushEnv() const
+{
+    TokenProcessing_Result & rCurResult = const_cast< TokenProcessing_Result& >(aGlobalParseContext.CurResult());
+    Cpp_PE * ret = dynamic_cast< Cpp_PE* >(rCurResult.pEnv2Push);
+    csv_assert( ret != 0 );
+    return *ret;
+}
+
+
+
+}   // namespace cpp
+
diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx
new file mode 100644
index 000000000000..64d8b3137344
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_rcode.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_C_RCODE_HXX
+#define ADC_CPP_C_RCODE_HXX
+
+// BASE CLASSES
+#include <tokens/tokproct.hxx>
+// USED SERVICES
+#include <cosv/ploc.hxx>
+#include "cxt2ary.hxx"
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+namespace doc
+{
+    class OldCppDocu;
+}
+}
+
+namespace cpp
+{
+    class PE_File;
+    class Token;
+    class Cpp_PE;
+
+
+
+
+class CodeExplorer : private TokenProcessing_Types
+
+{
+  public:
+                        CodeExplorer(
+                            ary::cpp::Gate &    io_rAryGate );
+                        ~CodeExplorer();
+
+    void                StartNewFile();
+    void                Process_Token(
+                            DYN cpp::Token &    let_drToken );
+    // ACCESS
+    FileScope_EventHandler &
+                        FileEventHandler()      { return aGlobalParseContext; }
+    DocuDealer &        DocuDistributor()       { return aGlobalParseContext; }
+
+  private:
+    typedef std::vector< cpp::Cpp_PE* >      EnvironmentStack;
+
+    void                AcknowledgeResult();
+    const Token &       CurToken() const;
+    Cpp_PE &            CurEnv() const;
+    Cpp_PE &            PushEnv() const;
+    TokenProcessing_Result &
+                        CurResult()             { return aGlobalParseContext.CurResult(); }
+
+    // DATA
+    ContextForAry       aGlobalParseContext;
+
+    EnvironmentStack    aEnvironments;
+    Dyn<PE_File>        pPE_File;
+
+    ary::cpp::Gate *    pGate;
+    cpp::Token *        dpCurToken;
+};
+
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/cpp_pe.cxx b/autodoc/source/parser/cpp/cpp_pe.cxx
new file mode 100644
index 000000000000..05758989cbb3
--- /dev/null
+++ b/autodoc/source/parser/cpp/cpp_pe.cxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cpp_pe.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldcppdocu.hxx>
+#include "cpp_tok.hxx"
+
+
+
+
+namespace cpp {
+
+void
+Cpp_PE::SetTokenResult( E_TokenDone         i_eDone,
+                        E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                        ParseEnvironment *  i_pParseEnv2Push )
+{
+    rMyEnv.SetTokenResult(      i_eDone,
+                                i_eWhat2DoWithEnvStack,
+                                i_pParseEnv2Push );
+}
+
+Cpp_PE::Cpp_PE( Cpp_PE * io_pParent )
+    :   ParseEnvironment( io_pParent ),
+        rMyEnv( io_pParent->Env() )
+{
+    csv_assert(io_pParent != 0);
+}
+
+Cpp_PE::Cpp_PE( EnvData & i_rEnv )
+    :   ParseEnvironment(0),
+        rMyEnv(i_rEnv)
+{
+}
+
+void
+Cpp_PE::StdHandlingOfSyntaxError( const char * )
+{
+    SetTokenResult(not_done, pop_failure);
+}
+
+
+Cpp_PE *
+Cpp_PE::Handle_ChildFailure()
+{
+     return 0;
+}
+
+}   // namespace cpp
+
diff --git a/autodoc/source/parser/cpp/cpp_pe.hxx b/autodoc/source/parser/cpp/cpp_pe.hxx
new file mode 100644
index 000000000000..fb67cdd34616
--- /dev/null
+++ b/autodoc/source/parser/cpp/cpp_pe.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CPP_PE_HXX
+#define ADC_CPP_CPP_PE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <semantic/parseenv.hxx>
+#include "tokintpr.hxx"
+    // COMPONENTS
+#include "pev.hxx"
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+namespace cpp {
+
+class Cpp_PE : public ::ParseEnvironment,
+               public TokenInterpreter
+{
+  public:
+    typedef cpp::PeEnvironment  EnvData;
+
+    void                SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push = 0 );
+
+    virtual Cpp_PE *    Handle_ChildFailure();  // Defaulted to 0.
+
+  protected:
+                        Cpp_PE(
+                            Cpp_PE *            io_pParent );
+                        Cpp_PE(
+                            EnvData &           i_rEnv );
+
+    EnvData &           Env() const;
+
+    void                StdHandlingOfSyntaxError(
+                            const char *        i_sText );
+
+  private:
+    // DATA
+    EnvData &           rMyEnv;
+};
+
+inline  Cpp_PE::EnvData &
+Cpp_PE::Env() const
+    { return rMyEnv; }
+
+}   // namespace cpp
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/cpp_tok.hxx b/autodoc/source/parser/cpp/cpp_tok.hxx
new file mode 100644
index 000000000000..7dc5da1f15f5
--- /dev/null
+++ b/autodoc/source/parser/cpp/cpp_tok.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_TOK_HXX
+#define ADC_CPP_TOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class TokenInterpreter;
+
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual INT16       TypeId() const = 0;
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer );
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+
+}   // namespace cpp
+
+#endif
+
+
diff --git a/autodoc/source/parser/cpp/cx_base.cxx b/autodoc/source/parser/cpp/cx_base.cxx
new file mode 100644
index 000000000000..0b7f751b3bcc
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_base.cxx
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cx_base.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/token.hxx>
+#include "c_dealer.hxx"
+
+
+
+namespace cpp {
+
+
+
+Cx_Base::Cx_Base( TkpContext * io_pFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(io_pFollowUpContext)
+        // pNewToken
+{
+}
+
+bool
+Cx_Base::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(Dealer());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_Base::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Cx_Base::AssignDealer( Distributor &  o_rDealer )
+{
+    pDealer = &o_rDealer;
+}
+
+
+}   // namespace cpp
+
+
+
+
diff --git a/autodoc/source/parser/cpp/cx_base.hxx b/autodoc/source/parser/cpp/cx_base.hxx
new file mode 100644
index 000000000000..c6485ab4e5c1
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_base.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CX_BASE_HXX
+#define ADC_CPP_CX_BASE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class TextToken;
+
+
+namespace cpp
+{
+
+class Distributor;
+
+
+class Cx_Base : public ::TkpContext
+{
+  public:
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+
+    virtual void        AssignDealer(
+                            Distributor &       o_rDealer );
+  protected:
+    // LIFECYCLE
+                        Cx_Base(
+                            TkpContext *        io_pFollowUpContext );
+
+    void                SetNewToken(
+                            DYN ::TextToken *   let_dpToken );
+    void                SetFollowUpContext(
+                            TkpContext  *       io_pContext );
+
+    Distributor &       Dealer() const;
+
+  private:
+    // DATA
+    Distributor *       pDealer;
+    TkpContext *        pFollowUpContext;
+    Dyn< ::TextToken >  pNewToken;
+};
+
+
+
+
+inline void
+Cx_Base::SetNewToken( DYN ::TextToken * let_dpToken )
+    { pNewToken = let_dpToken; }
+inline void
+Cx_Base::SetFollowUpContext( TkpContext * io_pContext )
+    { pFollowUpContext = io_pContext; }
+inline Distributor &
+Cx_Base::Dealer() const
+    { csv_assert(pDealer != 0);
+      return *pDealer; }
+
+
+
+
+
+} // namespace cpp
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/cx_c_pp.cxx b/autodoc/source/parser/cpp/cx_c_pp.cxx
new file mode 100644
index 000000000000..0b69979a13f8
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_pp.cxx
@@ -0,0 +1,180 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cx_c_pp.hxx"
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include "c_dealer.hxx"
+#include <tokens/parseinc.hxx>
+#include <x_parse.hxx>
+#include "all_toks.hxx"
+
+
+namespace cpp
+{
+
+Context_Preprocessor::Context_Preprocessor( TkpContext & i_rFollowUpContext )
+    :   Cx_Base(&i_rFollowUpContext),
+        pContext_Parent(&i_rFollowUpContext),
+        pContext_PP_MacroParams( 0 ),
+        pContext_PP_Definition( new Context_PP_Definition(i_rFollowUpContext) )
+{
+    pContext_PP_MacroParams = new Context_PP_MacroParams(*pContext_PP_Definition);
+}
+
+void
+Context_Preprocessor::ReadCharChain( CharacterSource &  io_rText )
+{
+    jumpOverWhite( io_rText );
+    jumpToWhite( io_rText );
+    const char * sPP_Keyword = io_rText.CutToken();
+    if ( strcmp(sPP_Keyword, "define") == 0 )
+        ReadDefine(io_rText);
+    else
+        ReadDefault(io_rText);
+}
+
+void
+Context_Preprocessor::AssignDealer( Distributor & o_rDealer )
+{
+    Cx_Base::AssignDealer(o_rDealer);
+    pContext_PP_MacroParams->AssignDealer(o_rDealer);
+    pContext_PP_Definition->AssignDealer(o_rDealer);
+}
+
+void
+Context_Preprocessor::ReadDefault( CharacterSource & io_rText )
+{
+    int o_rCount_BackslashedLineBreaks = 0;
+    jumpToEol(io_rText,o_rCount_BackslashedLineBreaks);
+    for ( ; o_rCount_BackslashedLineBreaks > 0; --o_rCount_BackslashedLineBreaks )
+        Dealer().Deal_Eol();
+
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    io_rText.CutToken();
+    Dealer().Deal_Eol();
+    SetNewToken(0);
+    SetFollowUpContext( pContext_Parent );
+}
+
+void
+Context_Preprocessor::ReadDefine( CharacterSource & io_rText )
+{
+    jumpOverWhite( io_rText );
+    io_rText.CutToken();
+
+    char cNext = '\0';
+    for ( cNext = io_rText.CurChar();
+          static_cast<UINT8>(cNext) > 32 AND cNext != '(';
+          cNext = io_rText.MoveOn() )
+    { }
+
+    bool bMacro = cNext == '(';
+
+    if ( NOT bMacro )
+    {
+        SetNewToken( new Tok_DefineName(io_rText.CutToken()) );
+        SetFollowUpContext( pContext_PP_Definition.Ptr() );
+    }
+    else
+    {
+        SetNewToken( new Tok_MacroName(io_rText.CutToken()) );
+        io_rText.MoveOn();
+        io_rText.CutToken();
+        SetFollowUpContext( pContext_PP_MacroParams.Ptr() );
+    }
+}
+
+
+Context_PP_MacroParams::Context_PP_MacroParams( Cx_Base & i_rFollowUpContext )
+    :   Cx_Base(&i_rFollowUpContext),
+        pContext_PP_Definition(&i_rFollowUpContext)
+{
+}
+
+void
+Context_PP_MacroParams::ReadCharChain( CharacterSource & io_rText )
+{
+    uintt nLen;
+
+    jumpOverWhite( io_rText );
+    // KORR_FUTURE Handling line breaks within macro parameters:
+    char cSeparator = jumpTo( io_rText, ',', ')' );
+    csv_assert( cSeparator != 0 );
+
+    static char cBuf[500];
+    // KORR_FUTURE, make it still safer, here:
+    strcpy( cBuf, io_rText.CutToken() );    // SAFE STRCPY (#100211# - checked)
+    for ( nLen = strlen(cBuf);
+          nLen > 0 AND cBuf[nLen-1] < 33;
+          --nLen )
+    { }
+    cBuf[nLen] = '\0';
+    SetNewToken( new Tok_MacroParameter(cBuf) );
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    if ( cSeparator == ',')
+        SetFollowUpContext( this );
+    else    // Must be ')'
+        SetFollowUpContext( pContext_PP_Definition );
+}
+
+Context_PP_Definition::Context_PP_Definition( TkpContext & i_rFollowUpContext )
+    :   Cx_Base(&i_rFollowUpContext),
+        pContext_Parent(&i_rFollowUpContext)
+{
+}
+
+void
+Context_PP_Definition::ReadCharChain( CharacterSource & io_rText )
+{
+    int o_rCount_BackslashedLineBreaks = 0;
+    jumpToEol(io_rText,o_rCount_BackslashedLineBreaks);
+    for ( ; o_rCount_BackslashedLineBreaks > 0; --o_rCount_BackslashedLineBreaks )
+        Dealer().Deal_Eol();
+    SetNewToken( new Tok_PreProDefinition(io_rText.CutToken()) );
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    Dealer().Deal_Eol();
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+
+
+
+
diff --git a/autodoc/source/parser/cpp/cx_c_pp.hxx b/autodoc/source/parser/cpp/cx_c_pp.hxx
new file mode 100644
index 000000000000..726a5e6de05d
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_pp.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CX_C_PP_HXX
+#define ADC_CPP_CX_C_PP_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+#include "cx_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp
+{
+
+class Context_Preprocessor : public Cx_Base
+{
+  public:
+                        Context_Preprocessor(
+                            TkpContext &        i_rFollowUpContext );
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual void        AssignDealer(
+                            Distributor &       o_rDealer );
+  private:
+    // Locals
+    void                ReadDefault(
+                            CharacterSource &   io_rText );
+    void                ReadDefine(
+                            CharacterSource &   io_rText );
+
+    // DATA
+    TkpContext *        pContext_Parent;
+    Dyn<Cx_Base>        pContext_PP_MacroParams;
+    Dyn<Cx_Base>        pContext_PP_Definition;
+};
+
+class Context_PP_MacroParams : public Cx_Base
+{
+  public:
+                        Context_PP_MacroParams(
+                            Cx_Base &           i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+  private:
+    // DATA
+    Cx_Base *           pContext_PP_Definition;
+};
+
+class Context_PP_Definition : public Cx_Base
+{
+  public:
+                        Context_PP_Definition(
+                            TkpContext &        i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+
+  private:
+    // DATA
+    TkpContext *        pContext_Parent;
+};
+
+
+}   // namespace cpp
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx
new file mode 100644
index 000000000000..133cb393785c
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_std.cxx
@@ -0,0 +1,529 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cx_c_std.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include "all_toks.hxx"
+#include "cx_c_pp.hxx"
+#include "cx_c_sub.hxx"
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpstama.hxx>
+#include <x_parse.hxx>
+#include "c_dealer.hxx"
+
+
+namespace cpp {
+
+
+const intt C_nCppInitialNrOfStati = 600;
+const intt C_nStatusSize = 128;
+
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_CreateWithoutText = 2;
+const uintt nF_fin_CreateWithText = 3;
+const uintt nF_fin_Ignore = 4;
+const uintt nF_fin_EOL = 5;
+const uintt nF_fin_EOF = 6;
+const uintt nF_fin_Bezeichner = 7;
+
+const uintt nF_goto_Preprocessor = 10;
+const uintt nF_goto_Comment = 11;
+const uintt nF_goto_Docu = 12;
+const uintt nF_goto_Const = 13;
+const uintt nF_goto_UnblockMacro = 14;
+
+// Token create functions for the state machine:
+DYN TextToken * TCF_Identifier(const char * text) { return new Tok_Identifier(text); }
+
+DYN TextToken * TCF_operator(const char *) { return new Tok_operator; }
+DYN TextToken * TCF_class(const char *) { return new Tok_class; }
+DYN TextToken * TCF_struct(const char *) { return new Tok_struct; }
+DYN TextToken * TCF_union(const char *) { return new Tok_union; }
+DYN TextToken * TCF_enum(const char *) { return new Tok_enum; }
+DYN TextToken * TCF_typedef(const char *) { return new Tok_typedef; }
+DYN TextToken * TCF_public(const char *) { return new Tok_public; }
+DYN TextToken * TCF_protected(const char *) { return new Tok_protected; }
+DYN TextToken * TCF_private(const char *) { return new Tok_private; }
+DYN TextToken * TCF_template(const char *) { return new Tok_template; }
+DYN TextToken * TCF_virtual(const char *) { return new Tok_virtual; }
+DYN TextToken * TCF_friend(const char *) { return new Tok_friend; }
+DYN TextToken * TCF_Tilde(const char *) { return new Tok_Tilde; }
+DYN TextToken * TCF_const(const char *) { return new Tok_const; }
+DYN TextToken * TCF_volatile(const char *) { return new Tok_volatile; }
+DYN TextToken * TCF_extern(const char *) { return new Tok_extern; }
+DYN TextToken * TCF_static(const char *) { return new Tok_static; }
+DYN TextToken * TCF_mutable(const char *) { return new Tok_mutable; }
+DYN TextToken * TCF_register(const char *) { return new Tok_register; }
+DYN TextToken * TCF_inline(const char *) { return new Tok_inline; }
+DYN TextToken * TCF_explicit(const char *) { return new Tok_explicit; }
+DYN TextToken * TCF_namespace(const char *) { return new Tok_namespace; }
+DYN TextToken * TCF_using(const char *) { return new Tok_using; }
+DYN TextToken * TCF_throw(const char *) { return new Tok_throw; }
+DYN TextToken * TCF_SwBracketOpen(const char *) { return new Tok_SwBracket_Left; }
+DYN TextToken * TCF_SwBracketClose(const char *) { return new Tok_SwBracket_Right; }
+DYN TextToken * TCF_ArBracketOpen(const char *) { return new Tok_ArrayBracket_Left; }
+DYN TextToken * TCF_ArBracketClose(const char *) { return new Tok_ArrayBracket_Right; }
+DYN TextToken * TCF_BracketOpen(const char *) { return new Tok_Bracket_Left; }
+DYN TextToken * TCF_BracketClose(const char *) { return new Tok_Bracket_Right; }
+DYN TextToken * TCF_DblColon(const char *) { return new Tok_DoubleColon; }
+DYN TextToken * TCF_Semikolon(const char *) { return new Tok_Semicolon; }
+DYN TextToken * TCF_Komma(const char *) { return new Tok_Comma; }
+DYN TextToken * TCF_Colon(const char *) { return new Tok_Colon; }
+DYN TextToken * TCF_Zuweisung(const char *) { return new Tok_Assign; }
+DYN TextToken * TCF_Smaller(const char *) { return new Tok_Less; }
+DYN TextToken * TCF_Bigger(const char *) { return new Tok_Greater; }
+DYN TextToken * TCF_Stern(const char *) { return new Tok_Asterix; }
+DYN TextToken * TCF_Ampersand(const char *) { return new Tok_AmpersAnd; }
+DYN TextToken * TCF_Ellipse(const char *) { return new Tok_Ellipse; }
+DYN TextToken * TCF_typename(const char *) { return new Tok_typename; }
+
+    // Operators
+DYN TextToken * TCF_Operator(const char * text) { return new Tok_Operator(text); }
+
+DYN TextToken * TCF_BuiltInType(const char * text) { return new Tok_BuiltInType(text); }
+DYN TextToken * TCF_TypeModifier(const char * text) { return new Tok_TypeSpecializer(text); }
+
+DYN TextToken * TCF_Eof(const char *) { return new Tok_Eof; }
+
+
+
+Context_CppStd::Context_CppStd( DYN autodoc::TkpDocuContext & let_drContext_Docu )
+    :   Cx_Base(0),
+        aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati),
+        pDocuContext(&let_drContext_Docu),
+        pContext_Comment(0),
+        pContext_Preprocessor(0),
+        pContext_ConstString(0),
+        pContext_ConstChar(0),
+        pContext_ConstNumeric(0),
+        pContext_UnblockMacro(0)
+{
+    pDocuContext->SetParentContext(*this,"*/");
+
+    pContext_Comment = new Context_Comment(*this);
+    pContext_Preprocessor = new Context_Preprocessor(*this);
+    pContext_ConstString = new Context_ConstString(*this);
+    pContext_ConstChar = new Context_ConstChar(*this);
+    pContext_ConstNumeric = new Context_ConstNumeric(*this);
+    pContext_UnblockMacro = new Context_UnblockMacro(*this);
+
+    SetupStateMachine();
+}
+
+Context_CppStd::~Context_CppStd()
+{
+}
+
+void
+Context_CppStd::ReadCharChain( CharacterSource & io_rText )
+{
+    SetNewToken(0);
+
+    TextToken::F_CRTOK fTokenCreateFunction = 0;
+    StmBoundsStatus & rBound = aStateMachine.GetCharChain(fTokenCreateFunction, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    SetFollowUpContext(rBound.FollowUpContext());
+    PerformStatusFunction(rBound.StatusFunctionNr(), fTokenCreateFunction, io_rText);
+}
+
+void
+Context_CppStd::AssignDealer( Distributor & o_rDealer )
+{
+    Cx_Base::AssignDealer(o_rDealer);
+
+    pDocuContext->AssignDealer(o_rDealer);
+    pContext_Comment->AssignDealer(o_rDealer);
+    pContext_Preprocessor->AssignDealer(o_rDealer);
+    pContext_ConstString->AssignDealer(o_rDealer);
+    pContext_ConstChar->AssignDealer(o_rDealer);
+    pContext_ConstNumeric->AssignDealer(o_rDealer);
+    pContext_UnblockMacro->AssignDealer(o_rDealer);
+}
+
+void
+Context_CppStd::PerformStatusFunction( uintt                    i_nStatusSignal,
+                                       F_CRTOK                  i_fTokenCreateFunction,
+                                       CharacterSource &        io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_CreateWithoutText:
+            io_rText.CutToken();
+            csv_assert(i_fTokenCreateFunction != 0);
+            SetNewToken( (*i_fTokenCreateFunction)(0) );
+            break;
+        case nF_fin_CreateWithText:
+            csv_assert(i_fTokenCreateFunction != 0);
+            SetNewToken( (*i_fTokenCreateFunction)(io_rText.CutToken()) );
+            break;
+        case nF_fin_Ignore:
+            io_rText.CutToken();
+            SetNewToken(0);
+            break;
+        case nF_fin_EOL:
+            io_rText.CutToken();
+            SetNewToken(0);
+            Dealer().Deal_Eol();
+            break;
+        case nF_fin_EOF:
+            io_rText.CutToken();
+            SetNewToken( TCF_Eof(0) );
+            break;
+        case nF_fin_Bezeichner:
+            SetNewToken( TCF_Identifier(io_rText.CutToken()) );
+            break;
+
+        case nF_goto_Preprocessor:
+            io_rText.CutToken();
+            SetNewToken(0);
+            break;
+        case nF_goto_Comment:
+            SetNewToken(0);
+            pContext_Comment->SetMode_IsMultiLine( io_rText.CutToken()[1] == '*' );
+            break;
+        case nF_goto_Docu:
+            SetNewToken(0);
+            pDocuContext->SetMode_IsMultiLine( io_rText.CutToken()[1] == '*' );
+            break;
+        case nF_goto_Const:
+            SetNewToken(0);
+            break;
+        case nF_goto_UnblockMacro:
+            SetNewToken(0);
+            break;
+
+        case nF_fin_Error:
+        default:
+        {
+            char cCC = io_rText.CurChar();
+            String  sCurChar( &cCC, 1 );
+            throw X_Parser( X_Parser::x_InvalidChar, sCurChar, String::Null_(), 0 );
+        }
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_CppStd::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 top = 0;        // Top-Status
+    const INT16 wht = 1;        // Whitespace-�berlese-Status
+    const INT16 bez = 2;        // Bezeichner-lese-Status
+
+    // Tokenfinish-Stati:
+    const INT16 finError = 3;
+    const INT16 finIgnore = 4;
+    const INT16 finBezeichner = 5;
+    const INT16 finKeyword = 6;
+    const INT16 finPunctuation = 7;
+    const INT16 finBiType = 8;
+    const INT16 finTypeModifier = 9;
+    const INT16 finEOL = 10;
+    const INT16 finEOF = 11;
+
+    // Kontextwechsel-Stati:
+    const INT16 gotoComment = 12;
+    const INT16 gotoDocu = 13;
+    const INT16 gotoPreprocessor = 14;
+    const INT16 gotoConstString = 15;
+    const INT16 gotoConstChar = 16;
+    const INT16 gotoConstNumeric = 17;
+    const INT16 gotoUnblockMacro = 18;
+
+    // Abbreviations to be used in status tables:
+    const INT16 err = finError;
+    const INT16 fig = finIgnore;
+    const INT16 fbz = finBezeichner;
+    const INT16 fof = finEOF;
+    const INT16 cst = gotoConstString;
+    const INT16 cch = gotoConstChar;
+    const INT16 cnr = gotoConstNumeric;
+
+
+    /// Zeros - '0' - will be replaced by AddToken().
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,  0,cst,  0,err,  0,  0,cch,  0,  0,  0,  0,  0,  0,  0,  0,
+     cnr,cnr,cnr,cnr,cnr,cnr,cnr,cnr,cnr,cnr,  0,  0,  0,  0,  0,  0, // 48 ...
+       0,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,  0,  0,  0,bez, // 80 ...
+       0,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,  0,  0,  0,err, // 80 ...
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fig,wht,wht,fig,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 48 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 80 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,err
+    };
+
+    const INT16 A_nBezeichnerStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err
+    };
+
+
+    const INT16 A_nOperatorDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err
+    };
+
+    const INT16 A_nBezDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err
+    };
+
+    DYN StmArrayStatus * dpStatusTop
+            = new StmArrayStatus( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatus * dpStatusWhite
+            = new StmArrayStatus( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatus * dpStatusBez
+            = new StmArrayStatus( C_nStatusSize, A_nBezeichnerStatus, TCF_Identifier, true);
+
+    DYN StmBoundsStatus *   dpBst_finError
+            = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Error, true );
+    DYN StmBoundsStatus *   dpBst_finIgnore
+            = new StmBoundsStatus( *this, *this, nF_fin_Ignore, true );
+    DYN StmBoundsStatus *   dpBst_finBezeichner
+            = new StmBoundsStatus( *this, *this, nF_fin_Bezeichner, true );
+    DYN StmBoundsStatus *   dpBst_finKeyword
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithoutText, false );
+    DYN StmBoundsStatus *   dpBst_finPunctuation
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false );
+    DYN StmBoundsStatus *   dpBst_finBiType
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false );
+    DYN StmBoundsStatus *   dpBst_finTypeModifier
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false );
+    DYN StmBoundsStatus *   dpBst_finEOL
+            = new StmBoundsStatus( *this, *this, nF_fin_EOL, false );
+    DYN StmBoundsStatus *   dpBst_finEOF
+            = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_EOF, false );
+
+    DYN StmBoundsStatus *   dpBst_gotoComment
+            = new StmBoundsStatus( *this, *pContext_Comment, nF_goto_Comment, false );
+    DYN StmBoundsStatus *   dpBst_gotoDocu
+            = new StmBoundsStatus( *this, *pDocuContext, nF_goto_Docu, false );
+    DYN StmBoundsStatus *   dpBst_gotoPreprocessor
+            = new StmBoundsStatus( *this, *pContext_Preprocessor, nF_goto_Preprocessor, false );
+    DYN StmBoundsStatus *   dpBst_gotoConstString
+            = new StmBoundsStatus( *this, *pContext_ConstString, nF_goto_Const, false );
+    DYN StmBoundsStatus *   dpBst_gotoConstChar
+            = new StmBoundsStatus( *this, *pContext_ConstChar, nF_goto_Const, false );
+    DYN StmBoundsStatus *   dpBst_gotoConstNumeric
+            = new StmBoundsStatus( *this, *pContext_ConstNumeric, nF_goto_Const, false );
+    DYN StmBoundsStatus *   dpBst_gotoUnblockMacro
+            = new StmBoundsStatus( *this, *pContext_UnblockMacro, nF_goto_UnblockMacro, false );
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusBez);
+
+    aStateMachine.AddStatus(dpBst_finError);
+    aStateMachine.AddStatus(dpBst_finIgnore);
+    aStateMachine.AddStatus(dpBst_finBezeichner);
+    aStateMachine.AddStatus(dpBst_finKeyword);
+    aStateMachine.AddStatus(dpBst_finPunctuation);
+    aStateMachine.AddStatus(dpBst_finBiType);
+    aStateMachine.AddStatus(dpBst_finTypeModifier);
+    aStateMachine.AddStatus(dpBst_finEOL);
+    aStateMachine.AddStatus(dpBst_finEOF);
+
+    aStateMachine.AddStatus(dpBst_gotoComment);
+    aStateMachine.AddStatus(dpBst_gotoDocu);
+    aStateMachine.AddStatus(dpBst_gotoPreprocessor);
+    aStateMachine.AddStatus(dpBst_gotoConstString);
+    aStateMachine.AddStatus(dpBst_gotoConstChar);
+    aStateMachine.AddStatus(dpBst_gotoConstNumeric);
+    aStateMachine.AddStatus(dpBst_gotoUnblockMacro);
+
+    // Identifier
+
+    // Keywords and other unique Tokens
+    aStateMachine.AddToken("operator",TCF_operator,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("class",TCF_class,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("struct",TCF_struct,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("union",TCF_union,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("enum",TCF_enum,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("typedef",TCF_typedef,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("public",TCF_public,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("protected",TCF_protected,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("private",TCF_private,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("template",TCF_template,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("virtual",TCF_virtual,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("friend",TCF_friend,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("~",TCF_Tilde,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("const",TCF_const,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("volatile",TCF_volatile,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("extern",TCF_extern,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("static",TCF_static,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("mutable",TCF_mutable,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("register",TCF_register,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("inline",TCF_inline,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("explicit",TCF_explicit,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("namespace",TCF_namespace,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("using",TCF_using,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("throw",TCF_throw,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("{",TCF_SwBracketOpen,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("}",TCF_SwBracketClose,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("[",TCF_ArBracketOpen,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("]",TCF_ArBracketClose,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("(",TCF_BracketOpen,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(")",TCF_BracketClose,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("::",TCF_DblColon,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(";",TCF_Semikolon,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(",",TCF_Komma,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(":",TCF_Colon,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("=",TCF_Zuweisung,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("<",TCF_Smaller,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(">",TCF_Bigger,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("*",TCF_Stern,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("&",TCF_Ampersand,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("...",TCF_Ellipse,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("typename",TCF_typename,A_nOperatorDefStatus,finKeyword);
+
+    // Operators
+    aStateMachine.AddToken("==",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("!=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("<=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(">=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("&&",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("||",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("!",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("new",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("delete",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("sizeof",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("typeid",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("+",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("-",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("/",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("%",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("^",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("|",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("<<",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(">>",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(".",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("->",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("?",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("+=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("-=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("*=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("/=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("%=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("&=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("|=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("^=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("<<=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(">>=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+
+    // Builtin types
+    aStateMachine.AddToken("char",  TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("short", TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("int",   TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("long",  TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("float", TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("double",TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("wchar_t",TCF_BuiltInType,   A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("size_t",TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+
+    // Type modifiers
+    aStateMachine.AddToken("signed",    TCF_TypeModifier,   A_nBezDefStatus,    finTypeModifier);
+    aStateMachine.AddToken("unsigned",  TCF_TypeModifier,   A_nBezDefStatus,    finTypeModifier);
+
+    // To ignore
+    aStateMachine.AddToken("auto",      0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("_cdecl",    0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("__cdecl",   0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("__stdcall", 0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("__fastcall",0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("/**/",      0,  A_nOperatorDefStatus,finIgnore);
+
+    // Context changers
+    aStateMachine.AddToken("#",     0,  A_nOperatorDefStatus,   gotoPreprocessor);
+    aStateMachine.AddToken("#undef",0,  A_nOperatorDefStatus,   gotoPreprocessor);
+    aStateMachine.AddToken("#unblock-",
+                                    0,  A_nOperatorDefStatus,   gotoUnblockMacro);
+    aStateMachine.AddToken("/*",    0,  A_nOperatorDefStatus,   gotoComment);
+    aStateMachine.AddToken("//",    0,  A_nOperatorDefStatus,   gotoComment);
+    aStateMachine.AddToken("/**",   0,  A_nOperatorDefStatus,   gotoDocu);
+    aStateMachine.AddToken("///",   0,  A_nOperatorDefStatus,   gotoDocu);
+
+    // Line ends
+        //  regular
+    aStateMachine.AddToken("\r\n",  0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\n",    0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\r",    0,  A_nOperatorDefStatus,   finEOL);
+        //  To ignore in some cases(may be only at preprocessor?), but
+        //      linecount has to be incremented.
+    aStateMachine.AddToken("\\\r\n",0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\\\n",  0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\\\r",  0,  A_nOperatorDefStatus,   finEOL);
+};
+
+
+}   // namespace cpp
+
diff --git a/autodoc/source/parser/cpp/cx_c_std.hxx b/autodoc/source/parser/cpp/cx_c_std.hxx
new file mode 100644
index 000000000000..b9c946c3c2a6
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_std.hxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CX_C_STD_HXX
+#define ADC_CPP_CX_C_STD_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+#include "cx_base.hxx"
+    // COMPONENTS
+#include <tokens/tkpstama.hxx>
+    // PARAMETERS
+
+
+
+namespace cpp {
+
+class Context_Comment;
+
+/**
+*/
+class Context_CppStd : public Cx_Base,
+                       private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_CppStd(
+                            DYN autodoc::TkpDocuContext &
+                                                let_drContext_Docu  );
+                        ~Context_CppStd();
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual void        AssignDealer(
+                            Distributor &       o_rDealer );
+  private:
+    //  SERVICE FUNCTIONS
+    void                PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            StmArrayStatus::F_CRTOK
+                                                i_fTokenCreateFunction,
+                            CharacterSource &   io_rText );
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachine        aStateMachine;
+
+        // Contexts
+    Dyn<autodoc::TkpDocuContext>
+                        pDocuContext;
+
+    Dyn<Context_Comment>
+                        pContext_Comment;
+    Dyn<Cx_Base>        pContext_Preprocessor;
+    Dyn<Cx_Base>        pContext_ConstString;
+    Dyn<Cx_Base>        pContext_ConstChar;
+    Dyn<Cx_Base>        pContext_ConstNumeric;
+    Dyn<Cx_Base>        pContext_UnblockMacro;
+};
+
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx
new file mode 100644
index 000000000000..266e5e2c6c53
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_sub.cxx
@@ -0,0 +1,157 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cx_c_sub.hxx"
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ctype.h>
+#include "c_dealer.hxx"
+#include <tokens/parseinc.hxx>
+#include <x_parse.hxx>
+#include "all_toks.hxx"
+
+
+namespace cpp {
+
+
+
+void
+Context_Comment::ReadCharChain( CharacterSource &   io_rText )
+{
+    // KORR_FUTURE
+    //      Counting of lines must be implemented.
+    if (bCurrentModeIsMultiline)
+    {
+        char cNext = NULCH;
+
+        do {
+            do {
+                cNext = jumpTo( io_rText,'*',char(10) );
+                if (cNext == NULCH)
+                    throw X_Parser( X_Parser::x_UnexpectedEOF, "", String::Null_(), 0 );
+                else if ( cNext == char(10) )
+                {
+                    jumpOverEol(io_rText);
+                    Dealer().Deal_Eol();
+                }
+            }   while ( cNext != '*');
+            cNext = jumpOver(io_rText,'*');
+            if (cNext == NULCH)
+                throw X_Parser( X_Parser::x_UnexpectedEOF, "", String::Null_(), 0 );
+        } while (cNext != '/');
+        io_rText.MoveOn();
+        io_rText.CutToken();
+        SetNewToken(0);
+    }
+    else //
+    {
+        int o_rCount_BackslashedLineBreaks = 0;
+        jumpToEol(io_rText,o_rCount_BackslashedLineBreaks);
+        for ( ; o_rCount_BackslashedLineBreaks > 0; --o_rCount_BackslashedLineBreaks )
+            Dealer().Deal_Eol();
+
+        if (io_rText.CurChar() != NULCH)
+            jumpOverEol(io_rText);
+        io_rText.CutToken();
+        Dealer().Deal_Eol();
+        SetNewToken(0);
+    }  // endif
+}
+
+
+void
+Context_ConstString::ReadCharChain( CharacterSource &   io_rText )
+{
+    char cNext = io_rText.MoveOn();
+
+    while (cNext != '"')
+    {   // Get one complete string constant:  "...."
+        while (cNext != '"' AND cNext != '\\')
+        {   // Get string till next '\\'
+            cNext = io_rText.MoveOn();
+        }
+        if (cNext == '\\')
+        {
+            io_rText.MoveOn();
+            cNext = io_rText.MoveOn();
+        }
+    }
+    io_rText.MoveOn();
+    SetNewToken(new Tok_Constant(io_rText.CutToken()));
+}
+
+void
+Context_ConstChar::ReadCharChain( CharacterSource & io_rText )
+{
+    char cNext = io_rText.MoveOn();
+
+    while (cNext != '\'')
+    {   // Get one complete char constant:  "...."
+        while (cNext != '\'' AND cNext != '\\')
+        {   // Get string till next '\\'
+            cNext = io_rText.MoveOn();
+        }
+        if (cNext == '\\')
+        {
+            io_rText.MoveOn();
+            cNext = io_rText.MoveOn();
+        }
+    }
+    io_rText.MoveOn();
+    SetNewToken(new Tok_Constant(io_rText.CutToken()));
+}
+
+void
+Context_ConstNumeric::ReadCharChain(CharacterSource & io_rText)
+{
+    char cNext = 0;
+
+    do {
+        do {
+            cNext = static_cast<char>( tolower(io_rText.MoveOn()) );
+        } while ( (cNext != 'e' AND isalnum(cNext)) OR cNext == '.');
+        if (cNext == 'e')
+        {
+            cNext = io_rText.MoveOn();
+            if (cNext == '+' OR cNext == '-')
+                cNext = io_rText.MoveOn();
+        }   // endif
+    } while (isalnum(cNext) OR cNext == '.');     // Reicht aus, wenn Zahlen korrekt geschrieben sind
+    SetNewToken(new Tok_Constant(io_rText.CutToken()));
+}
+
+void
+Context_UnblockMacro::ReadCharChain(CharacterSource & io_rText)
+{
+    jumpToWhite(io_rText);
+    SetNewToken(new Tok_UnblockMacro( io_rText.CutToken() + strlen("#unblock-") ));
+}
+
+}   // namespace cpp
diff --git a/autodoc/source/parser/cpp/cx_c_sub.hxx b/autodoc/source/parser/cpp/cx_c_sub.hxx
new file mode 100644
index 000000000000..3bff9a6e52d8
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_sub.hxx
@@ -0,0 +1,103 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CX_C_SUB_HXX
+#define ADC_CPP_CX_C_SUB_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+#include "cx_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class Context_Comment : public Cx_Base
+{
+  public:
+                        Context_Comment(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetMode_IsMultiLine(
+                            bool                i_bTrue )
+                                                { bCurrentModeIsMultiline = i_bTrue; }
+  private:
+    bool                bCurrentModeIsMultiline;
+};
+
+class Context_ConstString : public Cx_Base
+{
+  public:
+                        Context_ConstString(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_ConstChar : public Cx_Base
+{
+  public:
+                        Context_ConstChar(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_ConstNumeric : public Cx_Base
+{
+  public:
+                        Context_ConstNumeric(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_UnblockMacro : public Cx_Base
+{
+  public:
+                        Context_UnblockMacro(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/cxt2ary.cxx b/autodoc/source/parser/cpp/cxt2ary.cxx
new file mode 100644
index 000000000000..b78f4496b95f
--- /dev/null
+++ b/autodoc/source/parser/cpp/cxt2ary.cxx
@@ -0,0 +1,357 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cxt2ary.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/entity.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/docstore.hxx>
+#include "icprivow.hxx"
+
+// Implementationheaders, only to be used in this file!
+#include "sfscope.hxx"
+#include "sownstck.hxx"
+#include "sdocdist.hxx"
+#include "srecover.hxx"
+
+
+
+
+
+namespace cpp
+{
+
+using ary::cpp::E_Protection;
+
+ContextForAry::ContextForAry( ary::cpp::Gate &  io_rAryGate )
+    :   pGate(&io_rAryGate),
+        aTokenResult(),
+        pFileScopeInfo( new S_FileScopeInfo ),
+        pOwnerStack( new S_OwnerStack ),
+        pDocuDistributor( new S_DocuDistributor ),
+        pRecoveryGuard( new S_RecoveryGuard )
+{
+    OpenNamespace( pGate->Ces().GlobalNamespace() );
+}
+
+ContextForAry::~ContextForAry()
+{
+}
+
+ary::loc::File &
+ContextForAry::inq_CurFile() const
+{
+    csv_assert(pFileScopeInfo->pCurFile != 0);
+
+    return *pFileScopeInfo->pCurFile;
+}
+
+ary::cpp::Namespace &
+ContextForAry::inq_CurNamespace() const
+{
+    return pOwnerStack->CurNamespace();
+}
+
+ary::cpp::Class *
+ContextForAry::inq_CurClass() const
+{
+    return pOwnerStack->CurClass();
+}
+
+ary::cpp::Enum *
+ContextForAry::inq_CurEnum() const
+{
+    return pOwnerStack->CurEnum();
+}
+
+
+ary::cpp::InputContext::Owner &
+ContextForAry::inq_CurOwner() const
+{
+    return pOwnerStack->CurOwner();
+}
+
+E_Protection
+ContextForAry::inq_CurProtection() const
+{
+    return pOwnerStack->CurProtection();
+}
+
+void
+ContextForAry::do_SetTokenResult( E_TokenDone           i_eDone,
+                                  E_EnvStackAction      i_eWhat2DoWithEnvStack,
+                                  ParseEnvironment *    i_pParseEnv2Push )
+{
+    aTokenResult.eDone = i_eDone;
+    aTokenResult.eStackAction = i_eWhat2DoWithEnvStack;
+    aTokenResult.pEnv2Push = i_pParseEnv2Push;
+}
+
+void
+ContextForAry::do_OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
+{
+    pOwnerStack->OpenNamespace( io_rOpenedNamespace );
+}
+
+void
+ContextForAry::do_OpenExternC( bool )
+{
+    pOwnerStack->OpenExternC();
+    // KORR_FUTURE
+    // use i_bOnlyForOneDeclaration
+}
+
+void
+ContextForAry::do_OpenClass( ary::cpp::Class & io_rOpenedClass )
+{
+    pOwnerStack->OpenClass(io_rOpenedClass);
+    pDocuDistributor->SetCurrentlyStoredRe(io_rOpenedClass);
+}
+
+void
+ContextForAry::do_OpenEnum( ary::cpp::Enum & io_rOpenedEnum )
+{
+    pOwnerStack->OpenEnum(io_rOpenedEnum);
+    pDocuDistributor->SetCurrentlyStoredRe(io_rOpenedEnum);
+}
+
+void
+ContextForAry::do_CloseBlock()
+{
+    pOwnerStack->CloseBlock();
+}
+
+void
+ContextForAry::do_CloseClass()
+{
+    pOwnerStack->CloseClass();
+}
+
+void
+ContextForAry::do_CloseEnum()
+{
+    pOwnerStack->CloseEnum();
+}
+
+void
+ContextForAry::do_SetCurProtection( ary::cpp::E_Protection i_eProtection )
+{
+    pOwnerStack->SetCurProtection(i_eProtection);
+}
+
+void
+ContextForAry::do_OpenTemplate( const StringVector & i_rParameters )
+{
+    pFileScopeInfo->pCurTemplateParameters = new StringVector(i_rParameters);
+}
+
+DYN StringVector *
+ContextForAry::do_Get_CurTemplateParameters()
+{
+    return pFileScopeInfo->pCurTemplateParameters.Release();
+}
+
+void
+ContextForAry::do_Close_OpenTemplate()
+{
+    if (pFileScopeInfo->pCurTemplateParameters)
+        delete pFileScopeInfo->pCurTemplateParameters.Release();
+}
+
+void
+ContextForAry::do_Event_Class_FinishedBase( const String & )
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_Store_Typedef( ary::cpp::Typedef & io_rTypedef )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rTypedef);
+}
+
+void
+ContextForAry::do_Event_Store_EnumValue( ary::cpp::EnumValue & io_rEnumValue )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rEnumValue);
+}
+
+void
+ContextForAry::do_Event_Store_CppDefinition( ary::cpp::DefineEntity & io_rDefinition )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rDefinition);
+}
+
+void
+ContextForAry::do_Event_EnterFunction_ParameterList()
+{
+    // KORR_FUTURE
+    // Inform pDocuDistributor about possibility of parameters' inline documentation.
+}
+
+void
+ContextForAry::do_Event_Function_FinishedParameter( const String & )
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_LeaveFunction_ParameterList()
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_EnterFunction_Implementation()
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_LeaveFunction_Implementation()
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_Store_Function( ary::cpp::Function & io_rFunction )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rFunction);
+}
+
+
+void
+ContextForAry::do_Event_Store_Variable( ary::cpp::Variable & io_rVariable )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rVariable);
+}
+
+void
+ContextForAry::do_TakeDocu( DYN ary::doc::OldCppDocu & let_drInfo )
+{
+    let_drInfo.Store2(*pDocuDistributor);
+}
+
+void
+ContextForAry::do_StartWaitingFor_Recovery()
+{
+    pRecoveryGuard->StartWaitingFor_Recovery();
+}
+
+ary::cpp::Gate &
+ContextForAry::inq_AryGate() const
+{
+     return * const_cast< ary::cpp::Gate* >(pGate);
+}
+
+const ary::cpp::InputContext &
+ContextForAry::inq_Context() const
+{
+    return *this;
+}
+
+String
+ContextForAry::inq_CurFileName() const
+{
+    return pFileScopeInfo->pCurFile != 0
+            ?   pFileScopeInfo->pCurFile->LocalName()
+            :   String::Null_();
+}
+
+uintt
+ContextForAry::inq_LineCount() const
+{
+    return pFileScopeInfo->nLineCount;
+}
+
+bool
+ContextForAry::inq_IsWaitingFor_Recovery() const
+{
+    return pRecoveryGuard->IsWithinRecovery();
+}
+
+bool
+ContextForAry::inq_IsExternC() const
+{
+     return pOwnerStack->IsExternC();
+}
+
+void
+ContextForAry::do_SetCurFile( ary::loc::File &  io_rCurFile )
+{
+    pFileScopeInfo->pCurFile = &io_rCurFile;
+    pFileScopeInfo->nLineCount = 0;
+    pFileScopeInfo->pCurTemplateParameters = 0;
+
+    pOwnerStack->Reset();
+    pDocuDistributor->Reset();
+    pRecoveryGuard->Reset();
+}
+
+void
+ContextForAry::do_Event_IncrLineCount()
+{
+    ++pFileScopeInfo->nLineCount;
+    pDocuDistributor->Event_LineBreak();
+}
+
+void
+ContextForAry::do_Event_SwBracketOpen()
+{
+    pRecoveryGuard->Hdl_SwBracketOpen();
+}
+
+void
+ContextForAry::do_Event_SwBracketClose()
+{
+    pRecoveryGuard->Hdl_SwBracketClose();
+}
+
+void
+ContextForAry::do_Event_Semicolon()
+{
+    pRecoveryGuard->Hdl_Semicolon();
+}
+
+
+
+
+}   // namespace cpp
diff --git a/autodoc/source/parser/cpp/cxt2ary.hxx b/autodoc/source/parser/cpp/cxt2ary.hxx
new file mode 100644
index 000000000000..977d526d0d31
--- /dev/null
+++ b/autodoc/source/parser/cpp/cxt2ary.hxx
@@ -0,0 +1,198 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CTX2ARY_HXX
+#define ADC_CPP_CTX2ARY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/inpcontx.hxx>
+#include <doc_deal.hxx>
+#include "pev.hxx"
+#include "fevnthdl.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+namespace cpp
+{
+
+
+/** @descr
+    This class provides information about the context of an
+    CodeEntity, which is going to be stored in the repository.
+    The information is used mainly by class ary::cpp::Gate.
+
+    Also it provides information for the parser about actual
+    state of several public variables.
+
+    @todo
+    Include events, which allow correct storing of inline
+    documentation after enum values, parameters,
+    base classes.
+*/
+class ContextForAry : public ary::cpp::InputContext,
+                      public cpp::PeEnvironment,
+                      public cpp::FileScope_EventHandler,
+                      public DocuDealer
+{
+  public:
+    // LIFECYCLE
+                        ContextForAry(
+                            ary::cpp::Gate &  io_rAryGate );
+    virtual             ~ContextForAry();
+
+    // OPERATIONS
+    void                ResetResult()           { aTokenResult.Reset(); }
+
+    // INQUIRY
+    const TokenProcessing_Result &
+                        CurResult() const       { return aTokenResult; }
+    // ACCESS
+    TokenProcessing_Result &
+                        CurResult()             { return aTokenResult; }
+
+  private:
+    // Interface ary::cpp::InputContext:
+    virtual ary::loc::File &
+                        inq_CurFile() const;
+    virtual ary::cpp::Namespace &
+                        inq_CurNamespace() const;
+    virtual ary::cpp::Class *
+                        inq_CurClass() const;
+    virtual ary::cpp::Enum *
+                        inq_CurEnum() const;
+
+    virtual Owner &     inq_CurOwner() const;
+    virtual ary::cpp::E_Protection
+                        inq_CurProtection() const;
+
+    // Interface PeEnvironment
+    virtual void        do_SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push );
+    virtual void        do_OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace );
+    virtual void        do_OpenExternC(
+                            bool                i_bOnlyForOneDeclaration );
+    virtual void        do_OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass );
+    virtual void        do_OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum );
+    virtual void        do_CloseBlock();
+    virtual void        do_CloseClass();
+    virtual void        do_CloseEnum();
+    virtual void        do_SetCurProtection(
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    virtual void        do_OpenTemplate(
+                            const StringVector &
+                                                i_rParameters );
+    virtual DYN StringVector *
+                        do_Get_CurTemplateParameters();
+    virtual void        do_Close_OpenTemplate();
+    virtual void        do_Event_Class_FinishedBase(
+                            const String  &     i_sBaseName );
+
+    virtual void        do_Event_Store_Typedef(
+                            ary::cpp::Typedef & io_rTypedef );
+    virtual void        do_Event_Store_EnumValue(
+                            ary::cpp::EnumValue &
+                                                io_rEnumValue );
+    virtual void        do_Event_Store_CppDefinition(
+                            ary::cpp::DefineEntity &
+                                                io_rDefinition );
+    virtual void        do_Event_EnterFunction_ParameterList();
+    virtual void        do_Event_Function_FinishedParameter(
+                            const String  &     i_sParameterName );
+    virtual void        do_Event_LeaveFunction_ParameterList();
+    virtual void        do_Event_EnterFunction_Implementation();
+    virtual void        do_Event_LeaveFunction_Implementation();
+    virtual void        do_Event_Store_Function(
+                            ary::cpp::Function &
+                                                io_rFunction );
+    virtual void        do_Event_Store_Variable(
+                            ary::cpp::Variable &
+                                                io_rVariable );
+    virtual void        do_TakeDocu(
+                            DYN ary::doc::OldCppDocu &
+                                                let_drInfo );
+    virtual void        do_StartWaitingFor_Recovery();
+    virtual ary::cpp::Gate &
+                        inq_AryGate() const;
+    virtual const ary::cpp::InputContext &
+                        inq_Context() const;
+    virtual String      inq_CurFileName() const;
+    virtual uintt       inq_LineCount() const;
+    virtual bool        inq_IsWaitingFor_Recovery() const;
+    virtual bool        inq_IsExternC() const;
+
+    // Interface FileScope_EventHandler
+    virtual void        do_SetCurFile(
+                            ary::loc::File &    io_rCurFile );
+    virtual void        do_Event_IncrLineCount();
+    virtual void        do_Event_SwBracketOpen();
+    virtual void        do_Event_SwBracketClose();
+    virtual void        do_Event_Semicolon();
+
+    // Local types
+    struct S_FileScopeInfo;
+    struct S_OwnerStack;
+    struct S_DocuDistributor;
+    struct S_RecoveryGuard;
+
+    // DATA
+    ary::cpp::Gate *    pGate;
+    TokenProcessing_Result
+                        aTokenResult;
+    Dyn<S_FileScopeInfo>
+                        pFileScopeInfo;
+    Dyn<S_OwnerStack>   pOwnerStack;
+    Dyn<S_DocuDistributor>
+                        pDocuDistributor;
+    Dyn<S_RecoveryGuard>
+                        pRecoveryGuard;
+};
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/defdescr.cxx b/autodoc/source/parser/cpp/defdescr.cxx
new file mode 100644
index 000000000000..f69c433293fb
--- /dev/null
+++ b/autodoc/source/parser/cpp/defdescr.cxx
@@ -0,0 +1,225 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "defdescr.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <prprpr.hxx>
+
+
+
+
+namespace cpp
+{
+
+
+
+
+DefineDescription::DefineDescription( const String  &       i_sName,
+                                      const str_vector &    i_rDefinition )
+    :   sName(i_sName),
+        // aParams,
+        aDefinition(i_rDefinition),
+        eDefineType(type_define)
+{
+}
+
+DefineDescription::DefineDescription( const String  &       i_sName,
+                                      const str_vector &    i_rParams,
+                                      const str_vector &    i_rDefinition )
+    :   sName(i_sName),
+        aParams(i_rParams),
+        aDefinition(i_rDefinition),
+        eDefineType(type_macro)
+{
+}
+
+DefineDescription::~DefineDescription()
+{
+}
+
+void
+DefineDescription::GetDefineText( csv::StreamStr & o_rText ) const
+{
+    if ( aDefinition.begin() == aDefinition.end() OR eDefineType != type_define )
+        return;
+
+
+    bool bSwitch_Stringify = false;
+    bool bSwitch_Concatenate = false;
+
+    for ( str_vector::const_iterator it = aDefinition.begin();
+          it != aDefinition.end();
+          ++it )
+    {
+        if ( HandleOperatorsBeforeTextItem( o_rText,
+                                            bSwitch_Stringify,
+                                            bSwitch_Concatenate,
+                                            *it ) )
+        {
+            continue;
+        }
+
+        o_rText << (*it);
+
+        Do_bStringify_end(o_rText, bSwitch_Stringify);
+        o_rText << " ";
+    }
+    o_rText.seekp(-1, csv::cur);
+}
+
+void
+DefineDescription::GetMacroText( csv::StreamStr &               o_rText,
+                                 const StringVector & i_rGivenArguments ) const
+{
+    bool bSwitch_Stringify = false;
+    bool bSwitch_Concatenate = false;
+    intt nActiveParamNr = -1;
+
+    if ( aDefinition.begin() == aDefinition.end() OR eDefineType != type_macro )
+        return;
+
+    for ( str_vector::const_iterator it = aDefinition.begin();
+          it != aDefinition.end();
+          ++it )
+    {
+        if ( HandleOperatorsBeforeTextItem( o_rText,
+                                            bSwitch_Stringify,
+                                            bSwitch_Concatenate,
+                                            *it ) )
+        {
+            continue;
+        }
+
+        for ( str_vector::const_iterator param_it = aParams.begin();
+              param_it != aParams.end() AND nActiveParamNr == -1;
+              ++param_it )
+        {
+             if ( strcmp(*it, *param_it) == 0 )
+                nActiveParamNr = param_it - aParams.begin();
+        }
+        if ( nActiveParamNr == -1 )
+        {
+            o_rText << (*it);
+        }
+        else
+        {
+            o_rText << i_rGivenArguments[nActiveParamNr];
+            nActiveParamNr = -1;
+        }
+
+        Do_bStringify_end(o_rText, bSwitch_Stringify);
+        o_rText << " ";
+    }
+    o_rText.seekp(-1, csv::cur);
+}
+
+
+
+}   // end namespace cpp
+
+
+
+
+
+bool
+CheckForOperator( bool &              o_bStringify,
+                  bool &              o_bConcatenate,
+                  const String &      i_sTextItem )
+{
+    if ( strcmp(i_sTextItem, "##") == 0 )
+    {
+        o_bConcatenate = true;
+        return true;
+    }
+    else if ( strcmp(i_sTextItem, "#") == 0 )
+    {
+        o_bStringify = true;
+        return true;
+    }
+    return false;
+}
+
+void
+Do_bConcatenate( csv::StreamStr &    o_rText,
+                 bool &              io_bConcatenate )
+{
+    if ( io_bConcatenate )
+    {
+        uintt nPos;
+        for ( nPos = o_rText.tellp() - 1;
+              nPos > 0 ? o_rText.c_str()[nPos] == ' ' : false;
+              --nPos ) ;
+        o_rText.seekp(nPos+1);
+        io_bConcatenate = false;
+    }
+}
+
+void
+Do_bStringify_begin( csv::StreamStr & o_rText,
+                     bool             i_bStringify )
+{
+    if ( i_bStringify )
+    {
+        o_rText << "\"";
+    }
+}
+
+void
+Do_bStringify_end( csv::StreamStr & o_rText,
+                   bool &           io_bStringify )
+{
+    if ( io_bStringify )
+    {
+        o_rText << "\"";
+        io_bStringify = false;
+    }
+}
+
+
+bool
+HandleOperatorsBeforeTextItem( csv::StreamStr &    o_rText,
+                               bool &              io_bStringify,
+                               bool &              io_bConcatenate,
+                               const String  &     i_sTextItem )
+{
+    if ( CheckForOperator( io_bStringify,
+                           io_bConcatenate,
+                           i_sTextItem) )
+    {
+        return true;
+    }
+    Do_bConcatenate(o_rText, io_bConcatenate);
+    Do_bStringify_begin(o_rText, io_bStringify);
+
+    return false;
+}
+
+
+
diff --git a/autodoc/source/parser/cpp/defdescr.hxx b/autodoc/source/parser/cpp/defdescr.hxx
new file mode 100644
index 000000000000..5b1d299ef428
--- /dev/null
+++ b/autodoc/source/parser/cpp/defdescr.hxx
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_DEFDESCR_HXX
+#define ADC_CPP_DEFDESCR_HXX
+
+
+
+
+namespace cpp
+{
+
+/** Describes a C/C++ #define statement. May be a define or a macro, for which
+    two cases the two different constructors are to be used.
+
+    This class is used by cpp::PreProcessor.
+*/
+class DefineDescription
+{
+  public:
+    enum E_DefineType
+    {
+        type_define,
+        type_macro
+    };
+    typedef StringVector str_vector;
+
+                        DefineDescription(      /// Used for: #define DEFINE xyz
+                            const String  &     i_sName,
+                            const str_vector &  i_rDefinition );
+                        DefineDescription(      /// Used for: #define MACRO(...) abc
+                            const String  &     i_sName,
+                            const str_vector &  i_rParams,
+                            const str_vector &  i_rDefinition );
+                        ~DefineDescription();
+
+    /// Only vaild if (eDefineType == type_define) else returns "".
+    void                GetDefineText(
+                            csv::StreamStr &    o_rText ) const;
+
+    /// Only vaild if (eDefineType == type_macro) else returns "".
+    void                GetMacroText(
+                            csv::StreamStr &    o_rText,
+                            const StringVector &
+                                                i_rGivenArguments ) const;
+
+    uintt               ParamCount() const;
+    E_DefineType        DefineType() const;
+
+  private:
+    // DATA
+    String              sName;
+    str_vector          aParams;
+    str_vector          aDefinition;
+    E_DefineType        eDefineType;
+};
+
+
+
+
+// IMPLEMENTATION
+inline uintt
+DefineDescription::ParamCount() const
+    { return aParams.size(); }
+inline DefineDescription::E_DefineType
+DefineDescription::DefineType() const
+    { return eDefineType; }
+
+
+
+
+}   // end namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/fevnthdl.hxx b/autodoc/source/parser/cpp/fevnthdl.hxx
new file mode 100644
index 000000000000..20283ace42d8
--- /dev/null
+++ b/autodoc/source/parser/cpp/fevnthdl.hxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_FEVNTHDL_HXX
+#define ADC_CPP_FEVNTHDL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+
+namespace cpp
+{
+
+
+/** This is an interface, which accepts the file scope events that may
+    be important for parsing. It is implementation-dependant, where to
+    put or what to do with them.
+*/
+class FileScope_EventHandler
+{
+  public:
+    // LIFECYCLE
+    virtual             ~FileScope_EventHandler() {}
+
+    // OPERATIONS
+    void                SetCurFile(
+                            ary::loc::File &    io_rCurFile );
+    void                Event_IncrLineCount();
+    void                Event_SwBracketOpen();
+    void                Event_SwBracketClose();
+    void                Event_Semicolon();
+
+  private:
+    virtual void        do_SetCurFile(
+                            ary::loc::File &    io_rCurFile ) = 0;
+    virtual void        do_Event_IncrLineCount() = 0;
+    virtual void        do_Event_SwBracketOpen() = 0;
+    virtual void        do_Event_SwBracketClose() = 0;
+    virtual void        do_Event_Semicolon() = 0;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+FileScope_EventHandler::SetCurFile( ary::loc::File & io_rCurFile )
+    { do_SetCurFile(io_rCurFile); }
+inline void
+FileScope_EventHandler::Event_IncrLineCount()
+    { do_Event_IncrLineCount(); }
+inline void
+FileScope_EventHandler::Event_SwBracketOpen()
+    { do_Event_SwBracketOpen(); }
+inline void
+FileScope_EventHandler::Event_SwBracketClose()
+    { do_Event_SwBracketClose(); }
+inline void
+FileScope_EventHandler::Event_Semicolon()
+    { do_Event_Semicolon(); }
+
+
+
+
+}   // namespace cpp
+#endif
+
diff --git a/autodoc/source/parser/cpp/icprivow.cxx b/autodoc/source/parser/cpp/icprivow.cxx
new file mode 100644
index 000000000000..54c8e147e170
--- /dev/null
+++ b/autodoc/source/parser/cpp/icprivow.cxx
@@ -0,0 +1,192 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <icprivow.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+
+
+
+namespace cpp
+{
+
+
+
+//******************          Owner_Namespace          ********************//
+Owner_Namespace::Owner_Namespace()
+    :   pScope(0)
+{
+}
+
+void
+Owner_Namespace::SetAnotherNamespace( ary::cpp::Namespace & io_rScope )
+{
+    pScope = &io_rScope;
+}
+
+bool
+Owner_Namespace::HasClass( const String & i_sLocalName )
+{
+    return pScope->Search_LocalClass(i_sLocalName).IsValid();
+}
+
+void
+Owner_Namespace::do_Add_Class( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalClass(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Enum( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalEnum(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Typedef( const String  &     i_sLocalName,
+                                 Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalTypedef(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Operation( const String  &     i_sLocalName,
+                                   Cid                 i_nId,
+                                   bool                )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalOperation(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Variable( const String  &     i_sLocalName,
+                                  Cid                 i_nId,
+                                  bool                i_bIsConst,
+                                  bool                )
+{
+    csv_assert(pScope != 0);
+    if (i_bIsConst)
+        pScope->Add_LocalConstant(i_sLocalName, i_nId);
+    else
+        pScope->Add_LocalVariable(i_sLocalName, i_nId);
+}
+
+
+Cid
+Owner_Namespace::inq_CeId() const
+{
+    csv_assert(pScope != 0);
+    return pScope->CeId();
+}
+
+
+//******************            Owner_Class          ********************//
+
+Owner_Class::Owner_Class()
+    :   pScope(0)
+{
+}
+
+void
+Owner_Class::SetAnotherClass( ary::cpp::Class & io_rScope )
+{
+    pScope = &io_rScope;
+}
+
+bool
+Owner_Class::HasClass( const String  & )
+{
+    return false;
+}
+
+void
+Owner_Class::do_Add_Class( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalClass(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Enum( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalEnum(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Typedef( const String  &     i_sLocalName,
+                             Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalTypedef(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Operation( const String  &      i_sLocalName,
+                               Cid                  i_nId,
+                               bool                 i_bIsStatic )
+{
+    csv_assert(pScope != 0);
+    if (i_bIsStatic)
+        pScope->Add_LocalStaticOperation(i_sLocalName, i_nId);
+    else
+        pScope->Add_LocalOperation(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Variable( const String  &     i_sLocalName,
+                              Cid                 i_nId,
+                              bool                ,
+                              bool                i_bIsStatic )
+{
+    csv_assert(pScope != 0);
+    if (i_bIsStatic)
+        pScope->Add_LocalStaticData(i_sLocalName, i_nId);
+    else
+        pScope->Add_LocalData(i_sLocalName, i_nId);
+}
+
+Cid
+Owner_Class::inq_CeId() const
+{
+    csv_assert(pScope != 0);
+    return pScope->CeId();
+}
+
+
+}   // namespace cpp
diff --git a/autodoc/source/parser/cpp/icprivow.hxx b/autodoc/source/parser/cpp/icprivow.hxx
new file mode 100644
index 000000000000..590d01c99935
--- /dev/null
+++ b/autodoc/source/parser/cpp/icprivow.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ARY_CPP_ICPRIVOW_HXX
+#define ARY_CPP_ICPRIVOW_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/inpcontx.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+
+
+typedef ary::cpp::Ce_id     Cid;
+
+
+class Owner_Namespace : public ary::cpp::InputContext::Owner
+{
+  public:
+                        Owner_Namespace();
+    void                SetAnotherNamespace(
+                            ary::cpp::Namespace &
+                                                io_rScope );
+    virtual bool        HasClass(
+                                const String  &     i_sLocalName );
+  private:
+    virtual void        do_Add_Class(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Enum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Typedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                 );
+    virtual void        do_Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStatic );
+    virtual Cid         inq_CeId() const;
+
+    // DATA
+    ary::cpp::Namespace *
+                        pScope;
+};
+
+class Owner_Class : public ary::cpp::InputContext::Owner
+{
+  public:
+                        Owner_Class();
+    void                SetAnotherClass(
+                            ary::cpp::Class &   io_rScope );
+
+    /** @attention Only a dummy for use at ary::cpp::Gate!
+        Will work nerver!
+    */
+    virtual bool        HasClass(
+                                const String  &     i_sLocalName );
+  private:
+    virtual void        do_Add_Class(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Enum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Typedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsStaticMember );
+    virtual void        do_Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStatic );
+    virtual Cid         inq_CeId() const;
+
+    // DATA
+    ary::cpp::Class *   pScope;
+};
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/makefile.mk b/autodoc/source/parser/cpp/makefile.mk
new file mode 100644
index 000000000000..9729ee2d57b1
--- /dev/null
+++ b/autodoc/source/parser/cpp/makefile.mk
@@ -0,0 +1,87 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_cpp
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/all_toks.obj	\
+    $(OBJ)$/c_dealer.obj	\
+    $(OBJ)$/c_rcode.obj		\
+    $(OBJ)$/cpp_pe.obj		\
+    $(OBJ)$/cx_base.obj	    \
+    $(OBJ)$/cx_c_pp.obj	    \
+    $(OBJ)$/cx_c_std.obj	\
+    $(OBJ)$/cx_c_sub.obj	\
+    $(OBJ)$/cxt2ary.obj	    \
+    $(OBJ)$/defdescr.obj	\
+    $(OBJ)$/icprivow.obj	\
+    $(OBJ)$/pe_base.obj		\
+    $(OBJ)$/pe_class.obj	\
+    $(OBJ)$/pe_defs.obj	    \
+    $(OBJ)$/pe_expr.obj	    \
+    $(OBJ)$/pe_enum.obj	    \
+    $(OBJ)$/pe_enval.obj    \
+    $(OBJ)$/pe_file.obj		\
+    $(OBJ)$/pe_funct.obj	\
+    $(OBJ)$/pe_ignor.obj	\
+    $(OBJ)$/pe_namsp.obj	\
+    $(OBJ)$/pe_param.obj	\
+    $(OBJ)$/pe_tpltp.obj    \
+    $(OBJ)$/pe_type.obj		\
+    $(OBJ)$/pe_tydef.obj	\
+    $(OBJ)$/pe_vafu.obj		\
+    $(OBJ)$/pe_vari.obj		\
+    $(OBJ)$/preproc.obj		\
+    $(OBJ)$/prs_cpp.obj		\
+    $(OBJ)$/tkp_cpp.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_base.cxx b/autodoc/source/parser/cpp/pe_base.cxx
new file mode 100644
index 000000000000..dd81d7575ecc
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_base.cxx
@@ -0,0 +1,224 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_base.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_type.hxx>
+#include "pe_type.hxx"
+
+
+
+
+namespace cpp
+{
+
+
+static const PE_Base::Base aNullBase_;
+
+
+PE_Base::PE_Base( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati(new PeStatusArray<PE_Base>)
+        // aBaseIds,
+        // pSpType,
+        // pSpuBaseName
+{
+    Setup_StatusFunctions();
+    aBaseIds.reserve(4);
+
+    pSpType         = new SP_Type(*this);
+    pSpuBaseName    = new SPU_BaseName(*pSpType, 0, &PE_Base::SpReturn_BaseName);
+}
+
+
+PE_Base::~PE_Base()
+{
+}
+
+void
+PE_Base::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Base::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Base>::F_Tok    F_Tok;
+    static F_Tok stateF_startOfNext[] =     { &PE_Base::On_startOfNext_Identifier,
+                                              &PE_Base::On_startOfNext_public,
+                                              &PE_Base::On_startOfNext_protected,
+                                              &PE_Base::On_startOfNext_private,
+                                              &PE_Base::On_startOfNext_virtual,
+                                              &PE_Base::On_startOfNext_DoubleColon };
+    static INT16 stateT_startOfNext[] =     { Tid_Identifier,
+                                              Tid_public,
+                                              Tid_protected,
+                                              Tid_private,
+                                              Tid_virtual,
+                                              Tid_DoubleColon };
+    static F_Tok stateF_inName[] =          { &PE_Base::On_inName_Identifier,
+                                              &PE_Base::On_inName_virtual,
+                                              &PE_Base::On_inName_SwBracket_Left,
+                                              &PE_Base::On_inName_DoubleColon,
+                                              &PE_Base::On_inName_Comma };
+    static INT16 stateT_inName[] =          { Tid_Identifier,
+                                              Tid_virtual,
+                                              Tid_SwBracket_Left,
+                                              Tid_DoubleColon,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Base, startOfNext, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Base, inName, Hdl_SyntaxError);
+}
+
+void
+PE_Base::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Base::InitData()
+{
+    pStati->SetCur(startOfNext);
+    csv::erase_container(aBaseIds);
+    aBaseIds.push_back(aNullBase_);
+}
+
+void
+PE_Base::TransferData()
+{
+    // Does nothing.
+}
+
+void
+PE_Base::SpReturn_BaseName()
+{
+    CurObject().nId = pSpuBaseName->Child().Result_Type().Id();
+
+    static StreamStr aBaseName(100);
+    aBaseName.seekp(0);
+    pSpuBaseName->Child().Result_Type().Get_Text( aBaseName, Env().AryGate() );
+
+    Env().Event_Class_FinishedBase(aBaseName.c_str());
+}
+
+void
+PE_Base::On_startOfNext_public(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inName);
+
+    CurObject().eProtection = ary::cpp::PROTECT_public;
+}
+
+void
+PE_Base::On_startOfNext_protected(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inName);
+
+    CurObject().eProtection = ary::cpp::PROTECT_protected;
+}
+
+void
+PE_Base::On_startOfNext_private(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inName);
+
+    CurObject().eProtection = ary::cpp::PROTECT_private;
+}
+
+void
+PE_Base::On_startOfNext_virtual(const char *)
+{
+    SetTokenResult(done, stay);
+
+    CurObject().eVirtuality = ary::cpp::VIRTUAL_virtual;
+}
+
+void
+PE_Base::On_startOfNext_Identifier(const char * )
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_startOfNext_DoubleColon(const char *)
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_inName_Identifier(const char * )
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_inName_virtual(const char *)
+{
+    SetTokenResult(done, stay);
+
+    CurObject().eVirtuality = ary::cpp::VIRTUAL_virtual;
+}
+
+void
+PE_Base::On_inName_DoubleColon(const char *)
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_inName_Comma(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(startOfNext);
+
+    aBaseIds.push_back( aNullBase_ );
+}
+
+void
+PE_Base::On_inName_SwBracket_Left(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_base.hxx b/autodoc/source/parser/cpp/pe_base.hxx
new file mode 100644
index 000000000000..dc5225c63fa2
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_base.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ADC_CPP_PE_BASE_HXX
+#define ADC_CPP_PE_BASE_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+
+
+namespace cpp
+{
+
+class PE_Type;
+
+class PE_Base : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        startOfNext,
+        inName,
+        size_of_states
+    };
+
+    typedef ary::cpp::List_Bases        BaseList;
+    typedef ary::cpp::S_Classes_Base    Base;
+
+                        PE_Base(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Base();
+
+    const BaseList &    Result_BaseIds() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    typedef SubPe< PE_Base, PE_Type >           SP_Type;
+    typedef SubPeUse< PE_Base, PE_Type>         SPU_BaseName;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_BaseName();
+
+    void                On_startOfNext_Identifier(const char *);
+    void                On_startOfNext_public(const char *);
+    void                On_startOfNext_protected(const char *);
+    void                On_startOfNext_private(const char *);
+    void                On_startOfNext_virtual(const char *);
+    void                On_startOfNext_DoubleColon(const char *);
+
+    void                On_inName_Identifier(const char *);
+    void                On_inName_virtual(const char *);
+    void                On_inName_SwBracket_Left(const char *);
+    void                On_inName_DoubleColon(const char *);
+    void                On_inName_Comma(const char *);
+
+    Base &              CurObject();
+
+    // DATA
+    Dyn< PeStatusArray<PE_Base> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;            /// till "{" incl.
+    Dyn<SPU_BaseName>   pSpuBaseName;
+
+    BaseList            aBaseIds;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const PE_Base::BaseList &
+PE_Base::Result_BaseIds() const
+    { return aBaseIds; }
+
+
+inline PE_Base::Base &
+PE_Base::CurObject()
+    { return aBaseIds.back(); }
+
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/pe_class.cxx b/autodoc/source/parser/cpp/pe_class.cxx
new file mode 100644
index 000000000000..d9554bd35b59
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_class.cxx
@@ -0,0 +1,503 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_class.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <all_toks.hxx>
+#include "pe_base.hxx"
+#include "pe_defs.hxx"
+#include "pe_enum.hxx"
+#include "pe_tydef.hxx"
+#include "pe_vafu.hxx"
+#include "pe_ignor.hxx"
+
+
+namespace cpp {
+
+// using ary::Cid;
+
+PE_Class::PE_Class(Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Class> ),
+        // pSpBase,
+        // pSpTypedef,
+        // pSpVarFunc,
+        // pSpIgnore,
+        // pSpuBase,
+        // pSpuTypedef,
+        // pSpuVarFunc,
+        // pSpuUsing,
+        // pSpuIgnoreFailure,
+        // sLocalName,
+        eClassKey(ary::cpp::CK_class),
+        pCurObject(0),
+        // aBases,
+        eResult_KindOf(is_declaration)
+{
+    Setup_StatusFunctions();
+
+    pSpBase     = new SP_Base(*this);
+    pSpTypedef  = new SP_Typedef(*this);
+    pSpVarFunc  = new SP_VarFunc(*this);
+    pSpIgnore   = new SP_Ignore(*this);
+    pSpDefs     = new SP_Defines(*this);
+
+    pSpuBase    = new SPU_Base(*pSpBase, 0, &PE_Class::SpReturn_Base);
+    pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0);
+    pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, 0);
+
+    pSpuTemplate= new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuUsing   = new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuIgnoreFailure
+                = new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuDefs    = new SPU_Defines(*pSpDefs, 0, 0);
+}
+
+
+PE_Class::~PE_Class()
+{
+}
+
+void
+PE_Class::Call_Handler( const cpp::Token &  i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+Cpp_PE *
+PE_Class::Handle_ChildFailure()
+{
+    SetCurSPU(pSpuIgnoreFailure.Ptr());
+    return &pSpuIgnoreFailure->Child();
+}
+
+void
+PE_Class::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Class>::F_Tok   F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_Class::On_start_class,
+                                              &PE_Class::On_start_struct,
+                                              &PE_Class::On_start_union };
+    static INT16 stateT_start[] =           { Tid_class,
+                                              Tid_struct,
+                                              Tid_union };
+
+    static F_Tok stateF_expectName[] =      { &PE_Class::On_expectName_Identifier,
+                                              &PE_Class::On_expectName_SwBracket_Left,
+                                              &PE_Class::On_expectName_Colon
+                                            };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_SwBracket_Left,
+                                              Tid_Colon
+                                            };
+
+    static F_Tok stateF_gotName[] =         { &PE_Class::On_gotName_SwBracket_Left,
+                                              &PE_Class::On_gotName_Semicolon,
+                                              &PE_Class::On_gotName_Colon };
+    static INT16 stateT_gotName[] =         { Tid_SwBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Colon };
+
+    static F_Tok stateF_bodyStd[] =         { &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_ClassKey,
+                                              &PE_Class::On_bodyStd_ClassKey,
+                                              &PE_Class::On_bodyStd_ClassKey,
+
+                                              &PE_Class::On_bodyStd_enum,
+                                              &PE_Class::On_bodyStd_typedef,
+                                              &PE_Class::On_bodyStd_public,
+                                              &PE_Class::On_bodyStd_protected,
+                                              &PE_Class::On_bodyStd_private,
+
+                                              &PE_Class::On_bodyStd_template,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_friend,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+
+                                              &PE_Class::On_bodyStd_using,
+                                              &PE_Class::On_bodyStd_SwBracket_Right,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_DefineName,
+                                              &PE_Class::On_bodyStd_MacroName,
+
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc, };
+
+    static INT16 stateT_bodyStd[] =         { Tid_Identifier,
+                                              Tid_operator,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+
+                                              Tid_enum,
+                                              Tid_typedef,
+                                              Tid_public,
+                                              Tid_protected,
+                                              Tid_private,
+
+                                              Tid_template,
+                                              Tid_virtual,
+                                              Tid_friend,
+                                              Tid_Tilde,
+                                              Tid_const,
+
+                                              Tid_volatile,
+                                              Tid_static,
+                                              Tid_mutable,
+                                                Tid_inline,
+                                              Tid_explicit,
+
+                                              Tid_using,
+                                              Tid_SwBracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_DefineName,
+
+                                              Tid_MacroName,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+                                              static F_Tok stateF_inProtection[] =  { &PE_Class::On_inProtection_Colon };
+    static INT16 stateT_inProtection[] =    { Tid_Colon };
+
+    static F_Tok stateF_afterDecl[] =       { &PE_Class::On_afterDecl_Semicolon };
+    static INT16 stateT_afterDecl[] =       { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Class, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, gotName, On_gotName_Return2Type);
+    SEMPARSE_CREATE_STATUS(PE_Class, bodyStd, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, inProtection, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, afterDecl, On_afterDecl_Return2Type);
+
+#if 0
+    static F_Tok stateF_inFriend[] =        { On_inFriend_class,
+                                              On_inFriend_struct,
+                                              On_inFriend_union };
+                                              // Default: On_inFriend_Function
+    static INT16 stateT_inFriend[] =        { Tid_class,
+                                              Tid_struct,
+                                              Tid_union };
+#endif // 0
+}
+
+void
+PE_Class::InitData()
+{
+    pStati->SetCur(start);
+    sLocalName.clear();
+    eClassKey = ary::cpp::CK_class;
+    pCurObject = 0;
+    csv::erase_container(aBases);
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Class::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Class::Hdl_SyntaxError( const char * i_sText)
+{
+    if ( *i_sText == ';' )
+    {
+         Cerr() << Env().CurFileName() << ", line "
+                  << Env().LineCount()
+                  << ": Sourcecode warning: ';' as a toplevel declaration is deprecated."
+                  << Endl();
+        SetTokenResult(done,stay);
+        return;
+    }
+
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Class::Init_CurObject()
+{
+    // KORR_FUTURE
+    //   This will have to be done before parsing base classes, because of
+    //   possible inline documentation for base classes.
+    pCurObject = & Env().AryGate().Ces().Store_Class( Env().Context(), sLocalName, eClassKey );
+
+      for ( PE_Base::BaseList::const_iterator it = aBases.begin();
+          it !=  aBases.end();
+          ++it )
+    {
+        pCurObject->Add_BaseClass( *it );
+    }  // end for
+
+    Dyn< StringVector >
+            pTplParams( Env().Get_CurTemplateParameters() );
+    if ( pTplParams )
+    {
+          for ( StringVector::const_iterator it = pTplParams->begin();
+              it !=  pTplParams->end();
+              ++it )
+        {
+            pCurObject->Add_TemplateParameterType( *it, ary::cpp::Type_id(0) );
+        }  // end for
+    }
+}
+
+void
+PE_Class::SpReturn_Base()
+{
+    aBases = pSpuBase->Child().Result_BaseIds();
+    pStati->SetCur(gotName);
+}
+
+void
+PE_Class::On_start_class( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+    eClassKey = ary::cpp::CK_class;
+}
+
+void
+PE_Class::On_start_struct( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+    eClassKey = ary::cpp::CK_struct;
+}
+
+void
+PE_Class::On_start_union( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+    eClassKey = ary::cpp::CK_union;
+}
+
+void
+PE_Class::On_expectName_Identifier( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotName);
+    sLocalName = i_sText;
+}
+
+void
+PE_Class::On_expectName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+
+    sLocalName = "";
+    Init_CurObject();
+    sLocalName = pCurObject->LocalName();
+
+    Env().OpenClass(*pCurObject);
+}
+
+void
+PE_Class::On_expectName_Colon( const char * )
+{
+    pStati->SetCur(gotName);
+    sLocalName = "";
+
+    pSpuBase->Push(done);
+}
+
+void
+PE_Class::On_gotName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+
+    Init_CurObject();
+    if ( sLocalName.empty() )
+        sLocalName = pCurObject->LocalName();
+
+    Env().OpenClass(*pCurObject);
+}
+
+void
+PE_Class::On_gotName_Semicolon( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+
+    eResult_KindOf = is_predeclaration;
+}
+
+void
+PE_Class::On_gotName_Colon( const char * )
+{
+    pSpuBase->Push(done);
+}
+
+void
+PE_Class::On_gotName_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+
+    eResult_KindOf = is_qualified_typename;
+}
+
+void
+PE_Class::On_bodyStd_VarFunc( const char * )
+{
+    pSpuVarFunc->Push(not_done);
+}
+
+void
+PE_Class::On_bodyStd_ClassKey( const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   classes are parsed via PE_Type.
+}
+
+void
+PE_Class::On_bodyStd_enum( const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   enums are parsed via PE_Type.
+}
+
+void
+PE_Class::On_bodyStd_typedef( const char * )
+{
+    pSpuTypedef->Push(not_done);
+}
+
+void
+PE_Class::On_bodyStd_public( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inProtection);
+
+    Env().SetCurProtection(ary::cpp::PROTECT_public);
+}
+
+void
+PE_Class::On_bodyStd_protected( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inProtection);
+
+    Env().SetCurProtection(ary::cpp::PROTECT_protected);
+}
+
+void
+PE_Class::On_bodyStd_private( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inProtection);
+
+    Env().SetCurProtection(ary::cpp::PROTECT_private);
+}
+
+void
+PE_Class::On_bodyStd_template( const char * )
+{
+    pSpuTemplate->Push(done);
+}
+
+void
+PE_Class::On_bodyStd_friend( const char * )
+{
+    // KORR_FUTURE
+    pSpuUsing->Push(done);
+}
+
+void
+PE_Class::On_bodyStd_using( const char * )
+{
+    pSpuUsing->Push(done);
+}
+
+void
+PE_Class::On_bodyStd_SwBracket_Right( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterDecl);
+
+    Env().CloseClass();
+}
+
+void
+PE_Class::On_bodyStd_DefineName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+void
+PE_Class::On_bodyStd_MacroName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+
+void
+PE_Class::On_inProtection_Colon( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+}
+
+void
+PE_Class::On_afterDecl_Semicolon( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Class::On_afterDecl_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_implicit_declaration;
+}
+
+
+}   // namespace cpp
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_class.hxx b/autodoc/source/parser/cpp/pe_class.hxx
new file mode 100644
index 000000000000..737bb3a4111d
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_class.hxx
@@ -0,0 +1,256 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_CLASS_HXX
+#define ADC_CPP_PE_CLASS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // OTHER
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+#include "all_toks.hxx"
+
+namespace ary
+{
+namespace cpp
+{
+    class Class;
+}
+}
+
+
+namespace cpp
+{
+
+
+using ary::cpp::E_Protection;
+using ary::cpp::E_Virtuality;
+
+
+class PE_Base;
+class PE_Enum;
+class PE_Typedef;
+class PE_VarFunc;
+class PE_Ignore;
+class PE_Defines;
+
+
+class PE_Class : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,              /// before class, struct or union
+        expectName,         /// after class, struct or union
+        gotName,            /// after name, before : or {
+        bodyStd,            /// after {
+        inProtection,       /// after public, protected or private and before ":"
+        afterDecl,          /// after ending }
+        size_of_states
+    };
+
+    enum E_KindOfResult
+    {
+        is_declaration,             // normal
+        is_implicit_declaration,    // like in: class Abc { public int n; } aAbc;
+        is_predeclaration,          // like:    class Abc;
+        is_qualified_typename       // like in: class Abc * fx();
+
+    };
+
+                        PE_Class(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Class();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+    virtual Cpp_PE *    Handle_ChildFailure();
+
+    E_KindOfResult      Result_KindOf() const;
+    const String  &     Result_LocalName() const;
+    const String  &     Result_FirstNameSegment() const;
+
+  private:
+    typedef SubPe< PE_Class, PE_Base >          SP_Base;
+//  typedef SubPe< PE_Class, PE_Enum>           SP_Enum;
+    typedef SubPe< PE_Class, PE_Typedef>        SP_Typedef;
+    typedef SubPe< PE_Class, PE_VarFunc>        SP_VarFunc;
+    typedef SubPe< PE_Class, PE_Ignore >        SP_Ignore;
+    typedef SubPe< PE_Class, PE_Defines>        SP_Defines;
+
+    typedef SubPeUse< PE_Class, PE_Base>        SPU_Base;
+//  typedef SubPeUse< PE_Class, PE_Enum>            SPU_Enum;
+    typedef SubPeUse< PE_Class, PE_Typedef>     SPU_Typedef;
+    typedef SubPeUse< PE_Class, PE_VarFunc>     SPU_VarFunc;
+    typedef SubPeUse< PE_Class, PE_Ignore>      SPU_Ignore;
+    typedef SubPeUse< PE_Class, PE_Defines>     SPU_Defines;
+
+    typedef ary::cpp::List_Bases                BaseList;
+    typedef ary::cpp::S_Classes_Base            Base;
+    typedef ary::cpp::E_Protection              E_Protection;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+    void                Init_CurObject();
+
+    void                SpReturn_Base();
+
+    void                On_start_class( const char * );
+    void                On_start_struct( const char * );
+    void                On_start_union( const char * );
+
+    void                On_expectName_Identifier( const char * );
+    void                On_expectName_SwBracket_Left( const char * );
+    void                On_expectName_Colon( const char * );
+
+    void                On_gotName_SwBracket_Left( const char * );
+    void                On_gotName_Semicolon( const char * );
+    void                On_gotName_Colon( const char * );
+    void                On_gotName_Return2Type( const char * );
+
+    void                On_bodyStd_VarFunc( const char * );
+    void                On_bodyStd_ClassKey( const char * );
+    void                On_bodyStd_enum( const char * );
+    void                On_bodyStd_typedef( const char * );
+    void                On_bodyStd_public( const char * );
+    void                On_bodyStd_protected( const char * );
+    void                On_bodyStd_private( const char * );
+    void                On_bodyStd_template( const char * );
+    void                On_bodyStd_friend( const char * );
+    void                On_bodyStd_using( const char * );
+    void                On_bodyStd_SwBracket_Right( const char * );
+    void                On_bodyStd_DefineName(const char * );
+    void                On_bodyStd_MacroName(const char * );
+
+    void                On_inProtection_Colon( const char * );
+
+    void                On_afterDecl_Semicolon( const char * );
+    void                On_afterDecl_Return2Type( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Class> >
+                        pStati;
+
+    Dyn<SP_Base>        pSpBase;
+//  Dyn<SP_Enum>        pSpEnum;
+    Dyn<SP_Typedef>     pSpTypedef;
+    Dyn<SP_VarFunc>     pSpVarFunc;
+    Dyn<SP_Ignore>      pSpIgnore;
+    Dyn<SP_Defines>     pSpDefs;
+
+    Dyn<SPU_Base>       pSpuBase;
+//  Dyn<SPU_Enum>       pSpuEnum;
+    Dyn<SPU_Typedef>    pSpuTypedef;
+    Dyn<SPU_VarFunc>    pSpuVarFunc;
+
+    Dyn<SPU_Ignore>     pSpuTemplate;
+    Dyn<SPU_Ignore>     pSpuUsing;
+    Dyn<SPU_Ignore>     pSpuIgnoreFailure;
+    Dyn<SPU_Defines>    pSpuDefs;
+
+
+
+    String              sLocalName;
+    ary::cpp::E_ClassKey
+                        eClassKey;
+    ary::cpp::Class *   pCurObject;
+    BaseList            aBases;
+
+    E_KindOfResult      eResult_KindOf;
+};
+
+
+
+// IMPLEMENTATION
+
+inline PE_Class::E_KindOfResult
+PE_Class::Result_KindOf() const
+{
+    return eResult_KindOf;
+}
+
+inline const String  &
+PE_Class::Result_LocalName() const
+{
+    return sLocalName;
+}
+
+inline const String  &
+PE_Class::Result_FirstNameSegment() const
+{
+    return sLocalName;
+}
+
+
+
+
+}   // namespace cpp
+
+
+#if 0   // Branches
+
+class struct union
+    -> Class
+    -> Predeclaration
+
+typedef
+    -> Typedef
+
+enum
+    -> Enum
+
+TypeDeclaration
+    -> Function In Class
+    -> Variable
+
+public, protected, private
+    -> Protection declaration
+
+friend
+    ->  Friend Class
+    ->  Friend Function
+
+virtual
+    -> Function In Class
+
+using
+    -> Using Declaration
+
+
+#endif // 0
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/pe_defs.cxx b/autodoc/source/parser/cpp/pe_defs.cxx
new file mode 100644
index 000000000000..f3db23a51316
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_defs.cxx
@@ -0,0 +1,180 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_defs.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/cp_def.hxx>
+#include "all_toks.hxx"
+
+
+namespace cpp
+{
+
+
+PE_Defines::PE_Defines( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Defines> ),
+        // sName,
+        // aParameters,
+        // sDefinition,
+        bIsMacro(false)
+{
+    Setup_StatusFunctions();
+}
+
+
+PE_Defines::~PE_Defines()
+{
+}
+
+void
+PE_Defines::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Defines::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Defines>::F_Tok F_Tok;
+    static F_Tok stateF_expectName[] =      { &PE_Defines::On_expectName_DefineName,
+                                              &PE_Defines::On_expectName_MacroName
+                                            };
+    static INT16 stateT_expectName[] =      { Tid_DefineName,
+                                              Tid_MacroName
+                                            };
+
+    static F_Tok stateF_gotDefineName[] =   { &PE_Defines::On_gotDefineName_PreProDefinition };
+    static INT16 stateT_gotDefineName[] =   { Tid_PreProDefinition };
+
+    static F_Tok stateF_expectMacroParameters[] =
+                                            { &PE_Defines::On_expectMacroParameters_MacroParameter,
+                                              &PE_Defines::On_expectMacroParameters_PreProDefinition
+                                            };
+    static INT16 stateT_expectMacroParameters[] =
+                                               { Tid_MacroParameter,
+                                              Tid_PreProDefinition
+                                            };
+
+    SEMPARSE_CREATE_STATUS(PE_Defines, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Defines, gotDefineName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Defines, expectMacroParameters, Hdl_SyntaxError);
+}
+
+void
+PE_Defines::InitData()
+{
+    pStati->SetCur(expectName);
+
+    sName.clear();
+    csv::erase_container( aParameters );
+    csv::erase_container( aDefinition );
+    bIsMacro = false;
+}
+
+void
+PE_Defines::TransferData()
+{
+    if (NOT bIsMacro)
+    {
+        if (aDefinition.empty() OR aDefinition.front().empty())
+            return;
+
+        ary::cpp::Define &
+            rNew = Env().AryGate().Defs().Store_Define(
+                            Env().Context(), sName, aDefinition );
+        Env().Event_Store_CppDefinition(rNew);
+    }
+    else
+    {
+        ary::cpp::Macro &
+            rNew = Env().AryGate().Defs().Store_Macro(
+                            Env().Context(), sName, aParameters, aDefinition );
+        Env().Event_Store_CppDefinition(rNew);
+    }
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Defines::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Defines::On_expectName_DefineName( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotDefineName);
+
+    sName = i_sText;
+    bIsMacro = false;
+}
+
+void
+PE_Defines::On_expectName_MacroName( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectMacroParameters);
+
+    sName = i_sText;
+    bIsMacro = true;
+}
+
+void
+PE_Defines::On_gotDefineName_PreProDefinition( const char * i_sText )
+{
+    SetTokenResult(done, pop_success);
+
+    aDefinition.push_back( String (i_sText) );
+}
+
+void
+PE_Defines::On_expectMacroParameters_MacroParameter( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    aParameters.push_back( String (i_sText) );
+}
+
+void
+PE_Defines::On_expectMacroParameters_PreProDefinition( const char * i_sText )
+{
+    SetTokenResult(done, pop_success);
+
+    aDefinition.push_back( String (i_sText) );
+}
+
+
+}   // namespace cpp
+
diff --git a/autodoc/source/parser/cpp/pe_defs.hxx b/autodoc/source/parser/cpp/pe_defs.hxx
new file mode 100644
index 000000000000..82b87ad51cca
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_defs.hxx
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_DEFS_HXX
+#define ADC_CPP_PE_DEFS_HXX
+
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp
+{
+
+
+
+class PE_Defines : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        expectName,
+        gotDefineName,
+        expectMacroParameters,
+        size_of_states
+    };
+
+                        PE_Defines(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Defines();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                On_expectName_DefineName( const char * );
+    void                On_expectName_MacroName( const char * );
+
+    void                On_gotDefineName_PreProDefinition( const char * );
+
+    void                On_expectMacroParameters_MacroParameter( const char * );
+    void                On_expectMacroParameters_PreProDefinition( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Defines> >
+                        pStati;
+
+    String              sName;
+    StringVector        aParameters;
+    StringVector        aDefinition;
+    bool                bIsMacro;
+};
+
+
+
+}   //namespace cpp
+#endif
+
diff --git a/autodoc/source/parser/cpp/pe_enum.cxx b/autodoc/source/parser/cpp/pe_enum.cxx
new file mode 100644
index 000000000000..5fda19e4484d
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enum.cxx
@@ -0,0 +1,189 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_enum.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <all_toks.hxx>
+#include "pe_enval.hxx"
+
+
+namespace cpp {
+
+
+PE_Enum::PE_Enum(Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Enum> ),
+        // pSpValue,
+        // pSpuValue,
+        // sLocalName,
+        pCurObject(0),
+        eResult_KindOf(is_declaration)
+{
+    Setup_StatusFunctions();
+
+    pSpValue    = new SP_EnumValue(*this);
+    pSpuValue   = new SPU_EnumValue(*pSpValue, 0, 0);
+}
+
+
+PE_Enum::~PE_Enum()
+{
+}
+
+void
+PE_Enum::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Enum::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Enum>::F_Tok    F_Tok;
+    static F_Tok stateF_expectName[] =      { &PE_Enum::On_expectName_Identifier,
+                                              &PE_Enum::On_expectName_SwBracket_Left
+                                            };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_SwBracket_Left
+                                            };
+
+    static F_Tok stateF_gotName[] =         { &PE_Enum::On_gotName_SwBracket_Left };
+    static INT16 stateT_gotName[] =         { Tid_SwBracket_Left };
+
+    static F_Tok stateF_bodyStd[] =         { &PE_Enum::On_bodyStd_Identifier,
+                                              &PE_Enum::On_bodyStd_SwBracket_Right };
+    static INT16 stateT_bodyStd[] =         { Tid_Identifier,
+                                              Tid_SwBracket_Right };
+
+    static F_Tok stateF_afterBlock[] =      { &PE_Enum::On_afterBlock_Semicolon };
+    static INT16 stateT_afterBlock[] =      { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Enum, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Enum, gotName, On_gotName_Return2Type);
+    SEMPARSE_CREATE_STATUS(PE_Enum, bodyStd, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Enum, afterBlock, On_afterBlock_Return2Type);
+}
+
+void
+PE_Enum::InitData()
+{
+    pStati->SetCur(expectName);
+    pCurObject = 0;
+    sLocalName.clear();
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Enum::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Enum::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Enum::On_expectName_Identifier( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotName);
+
+    sLocalName = i_sText;
+    pCurObject = & Env().AryGate().Ces().Store_Enum( Env().Context(), sLocalName );
+}
+
+void
+PE_Enum::On_expectName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+
+    sLocalName = "";
+    pCurObject = & Env().AryGate().Ces().Store_Enum( Env().Context(), sLocalName );
+    sLocalName = pCurObject->LocalName();
+
+    Env().OpenEnum(*pCurObject);
+}
+
+void
+PE_Enum::On_gotName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+    Env().OpenEnum(*pCurObject);
+}
+
+void
+PE_Enum::On_gotName_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+
+    eResult_KindOf = is_qualified_typename;
+}
+
+void
+PE_Enum::On_bodyStd_Identifier( const char * )
+{
+    pSpuValue->Push(not_done);
+}
+
+void
+PE_Enum::On_bodyStd_SwBracket_Right( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterBlock);
+
+    Env().CloseEnum();
+}
+
+void
+PE_Enum::On_afterBlock_Semicolon( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Enum::On_afterBlock_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_implicit_declaration;
+}
+
+}   // namespace cpp
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_enum.hxx b/autodoc/source/parser/cpp/pe_enum.hxx
new file mode 100644
index 000000000000..eb6e0e25afe6
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enum.hxx
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_ENUM_HXX
+#define ADC_CPP_PE_ENUM_HXX
+
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+// #include "all_toks.hxx"
+
+
+namespace cpp {
+
+
+class PE_EnumValue;
+
+class PE_Enum : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        expectName,         /// after "enum"
+        gotName,            /// after name, before : or {
+        bodyStd,            /// after {
+        afterBlock,         /// after ending }
+        size_of_states
+    };
+
+    enum E_KindOfResult
+    {
+        is_declaration,             // normal
+        is_implicit_declaration,    // like in: enum Abc { rot, gelb, blau } aAbc;
+        is_qualified_typename       // like in: enum Abc * fx();
+
+    };
+                        PE_Enum(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Enum();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    E_KindOfResult      Result_KindOf() const;
+    const String  &     Result_LocalName() const;
+    const String  &     Result_FirstNameSegment() const;
+
+  private:
+    typedef SubPe< PE_Enum, PE_EnumValue >      SP_EnumValue;
+    typedef SubPeUse< PE_Enum, PE_EnumValue>    SPU_EnumValue;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                On_expectName_Identifier( const char * );
+    void                On_expectName_SwBracket_Left( const char * );
+
+    void                On_gotName_SwBracket_Left( const char * );
+    void                On_gotName_Return2Type( const char * );
+
+    void                On_bodyStd_Identifier( const char * );
+    void                On_bodyStd_SwBracket_Right( const char * );
+
+    void                On_afterBlock_Semicolon( const char * );
+    void                On_afterBlock_Return2Type( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Enum> >
+                        pStati;
+    Dyn<SP_EnumValue>   pSpValue;
+    Dyn<SPU_EnumValue>  pSpuValue;
+
+    String              sLocalName;
+    ary::cpp::Enum *    pCurObject;
+
+    E_KindOfResult      eResult_KindOf;
+};
+
+
+
+// IMPLEMENTATION
+inline PE_Enum::E_KindOfResult
+PE_Enum::Result_KindOf() const
+{
+    return eResult_KindOf;
+}
+
+inline const String  &
+PE_Enum::Result_LocalName() const
+{
+    return sLocalName;
+}
+
+inline const String  &
+PE_Enum::Result_FirstNameSegment() const
+{
+    return sLocalName;
+}
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/pe_enval.cxx b/autodoc/source/parser/cpp/pe_enval.cxx
new file mode 100644
index 000000000000..cdf2038a8dc7
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enval.cxx
@@ -0,0 +1,168 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_enval.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include "pe_expr.hxx"
+
+
+
+namespace cpp {
+
+
+PE_EnumValue::PE_EnumValue( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_EnumValue> )
+        // pSpExpression,
+        // pSpuInitExpression
+{
+    Setup_StatusFunctions();
+
+    pSpExpression       = new SP_Expression(*this);
+    pSpuInitExpression  = new SPU_Expression(*pSpExpression, 0, &PE_EnumValue::SpReturn_InitExpression);
+}
+
+PE_EnumValue::~PE_EnumValue()
+{
+}
+
+void
+PE_EnumValue::Call_Handler( const cpp::Token &  i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_EnumValue::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_EnumValue>::F_Tok   F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_EnumValue::On_start_Identifier };
+    static INT16 stateT_start[] =           { Tid_Identifier };
+
+    static F_Tok stateF_afterName[] =       { &PE_EnumValue::On_afterName_SwBracket_Right,
+                                              &PE_EnumValue::On_afterName_Comma,
+                                              &PE_EnumValue::On_afterName_Assign };
+    static INT16 stateT_afterName[] =       { Tid_SwBracket_Right,
+                                              Tid_Comma,
+                                              Tid_Assign };
+
+    static F_Tok stateF_expectFinish[] =    { &PE_EnumValue::On_expectFinish_SwBracket_Right,
+                                              &PE_EnumValue::On_expectFinish_Comma };
+    static INT16 stateT_expectFinish[] =    { Tid_SwBracket_Right,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_EnumValue, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_EnumValue, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_EnumValue, expectFinish, Hdl_SyntaxError);
+}
+
+void
+PE_EnumValue::InitData()
+{
+    pStati->SetCur(start);
+
+    sName.clear();
+    sInitExpression.clear();
+}
+
+void
+PE_EnumValue::TransferData()
+{
+    pStati->SetCur(size_of_states);
+
+    ary::cpp::EnumValue &
+    rEnVal = Env().AryGate().Ces().Store_EnumValue(
+                     Env().Context(), sName, sInitExpression );
+    Env().Event_Store_EnumValue(rEnVal);
+}
+
+void
+PE_EnumValue::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_EnumValue::SpReturn_InitExpression()
+{
+    pStati->SetCur(expectFinish);
+
+    sInitExpression = pSpuInitExpression->Child().Result_Text();
+}
+
+void
+PE_EnumValue::On_start_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+
+    sName = i_sText;
+}
+
+void
+PE_EnumValue::On_afterName_SwBracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_EnumValue::On_afterName_Comma(const char * )
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_EnumValue::On_afterName_Assign(const char * )
+{
+    pSpuInitExpression->Push(done);
+}
+
+void
+PE_EnumValue::On_expectFinish_SwBracket_Right(const char * )
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_EnumValue::On_expectFinish_Comma(const char * )
+{
+    SetTokenResult(done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_enval.hxx b/autodoc/source/parser/cpp/pe_enval.hxx
new file mode 100644
index 000000000000..8f42b7e04316
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enval.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_ENVAL_HXX
+#define ADC_CPP_PE_ENVAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+class PE_Expression;
+
+
+class PE_EnumValue : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,                      // before name
+        afterName,
+        expectFinish,               // after init-expression
+        size_of_states
+    };
+                        PE_EnumValue(
+                            Cpp_PE *            i_pParent );
+                        ~PE_EnumValue();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    typedef SubPe< PE_EnumValue, PE_Expression >        SP_Expression;
+    typedef SubPeUse< PE_EnumValue, PE_Expression>      SPU_Expression;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char *);
+
+    void                SpReturn_InitExpression();
+
+    void                On_start_Identifier(const char * );
+
+    void                On_afterName_SwBracket_Right(const char * );
+    void                On_afterName_Comma(const char * );
+    void                On_afterName_Assign(const char * );
+
+    void                On_expectFinish_SwBracket_Right(const char * );
+    void                On_expectFinish_Comma(const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_EnumValue> >
+                        pStati;
+    Dyn<SP_Expression>  pSpExpression;
+    Dyn<SPU_Expression> pSpuInitExpression;
+
+    String              sName;
+    String              sInitExpression;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
diff --git a/autodoc/source/parser/cpp/pe_expr.cxx b/autodoc/source/parser/cpp/pe_expr.cxx
new file mode 100644
index 000000000000..d3b25bdf33df
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_expr.cxx
@@ -0,0 +1,204 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_expr.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace cpp {
+
+
+
+PE_Expression::PE_Expression( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Expression> ),
+        aResult_Text(100),
+        nBracketCounter(0)
+{
+    Setup_StatusFunctions();
+}
+
+
+PE_Expression::~PE_Expression()
+{
+}
+
+void
+PE_Expression::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+
+#if 0
+    switch (i_rTok.TypeId())
+    {
+        case Tid_SwBracket_Left:    SetTokenResult(done, stay);
+                                    nBracketCounter++;
+                                    bBlockOpened = true;
+                                    break;
+        case Tid_SwBracket_Right:   SetTokenResult(done, stay);
+                                    nBracketCounter--;
+                                    break;
+        case Tid_Semicolon:         if (nBracketCounter == 0)
+                                        SetTokenResult(done, pop_success);
+                                    else
+                                        SetTokenResult(done, stay);
+                                    break;
+        default:
+                                    if  ( bBlockOpened AND nBracketCounter == 0 )
+                                    {
+                                        SetTokenResult(not_done, pop_success);
+                                    }
+                                    else
+                                    {
+                                        SetTokenResult(done, stay);
+                                    }
+    }   // end switch
+#endif // 0
+}
+
+void
+PE_Expression::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Expression>::F_Tok  F_Tok;
+
+    static F_Tok stateF_std[] =             { &PE_Expression::On_std_SwBracket_Left,
+                                              &PE_Expression::On_std_SwBracket_Right,
+                                              &PE_Expression::On_std_ArrayBracket_Left,
+                                              &PE_Expression::On_std_ArrayBracket_Right,
+                                              &PE_Expression::On_std_Bracket_Left,
+                                              &PE_Expression::On_std_Bracket_Right,
+                                              &PE_Expression::On_std_Semicolon,
+                                              &PE_Expression::On_std_Comma };
+    static INT16 stateT_std[] =             { Tid_SwBracket_Left,
+                                              Tid_SwBracket_Right,
+                                              Tid_ArrayBracket_Left,
+                                              Tid_ArrayBracket_Right,
+                                              Tid_Bracket_Left,
+                                              Tid_Bracket_Right,
+                                              Tid_Semicolon,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Expression, std, On_std_Default);
+}
+
+void
+PE_Expression::InitData()
+{
+    pStati->SetCur(std);
+    aResult_Text.seekp(0);
+    nBracketCounter = 0;
+}
+
+void
+PE_Expression::TransferData()
+{
+    pStati->SetCur(size_of_states);
+    if ( aResult_Text.tellp() > 0)
+        aResult_Text.pop_back(1);
+}
+
+void
+PE_Expression::On_std_Default( const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    aResult_Text << i_sText << " ";
+}
+
+void
+PE_Expression::On_std_SwBracket_Left( const char *)
+{
+    SetTokenResult(done, stay);
+    nBracketCounter++;
+}
+
+void
+PE_Expression::On_std_SwBracket_Right( const char *)
+{
+    nBracketCounter--;
+    if ( nBracketCounter >= 0 )
+        SetTokenResult(done, stay);
+    else
+        SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_ArrayBracket_Left( const char *)
+{
+    SetTokenResult(done, stay);
+    nBracketCounter++;
+}
+
+void
+PE_Expression::On_std_ArrayBracket_Right( const char *)
+{
+    nBracketCounter--;
+    if ( nBracketCounter >= 0 )
+        SetTokenResult(done, stay);
+    else
+        SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_Bracket_Left( const char *)
+{
+    SetTokenResult(done, stay);
+    nBracketCounter++;
+}
+
+void
+PE_Expression::On_std_Bracket_Right( const char *)
+{
+    nBracketCounter--;
+    if ( nBracketCounter >= 0 )
+        SetTokenResult(done, stay);
+    else
+        SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_Semicolon( const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_Comma( const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_expr.hxx b/autodoc/source/parser/cpp/pe_expr.hxx
new file mode 100644
index 000000000000..24ff08e2fbb9
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_expr.hxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ADC_CPP_PE_EXPR_HXX
+#define ADC_CPP_PE_EXPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class PE_Expression : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        std,
+        size_of_states
+    };
+                        PE_Expression(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Expression();
+
+    const char *        Result_Text() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                On_std_Default( const char *);
+
+    void                On_std_SwBracket_Left( const char *);
+    void                On_std_SwBracket_Right( const char *);
+    void                On_std_ArrayBracket_Left( const char *);
+    void                On_std_ArrayBracket_Right( const char *);
+    void                On_std_Bracket_Left( const char *);
+    void                On_std_Bracket_Right( const char *);
+    void                On_std_Semicolon( const char *);
+    void                On_std_Comma( const char *);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Expression> >
+                        pStati;
+
+    csv::StreamStr      aResult_Text;
+
+    intt                nBracketCounter;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const char *
+PE_Expression::Result_Text() const
+{
+    return aResult_Text.c_str();
+}
+
+
+}   // namespace cpp
+
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx
new file mode 100644
index 000000000000..c6d6935a57ad
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_file.cxx
@@ -0,0 +1,317 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_file.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include "pe_defs.hxx"
+#include "pe_enum.hxx"
+#include "pe_namsp.hxx"
+#include "pe_tpltp.hxx"
+#include "pe_tydef.hxx"
+#include "pe_vafu.hxx"
+#include "pe_ignor.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace cpp
+{
+
+PE_File::PE_File( cpp::PeEnvironment & io_rEnv)
+    :   Cpp_PE(io_rEnv),
+        pEnv(&io_rEnv),
+        pStati( new PeStatusArray<PE_File> ),
+        // pSpNamespace,
+        // pSpTypedef,
+        // pSpVarFunc,
+        // pSpIgnore,
+        // pSpuNamespace,
+        // pSpuClass,
+        // pSpuTypedef,
+        // pSpuVarFunc,
+        // pSpuTemplate,
+        // pSpuUsing,
+        // pSpuIgnoreFailure,
+        bWithinSingleExternC(false)
+{
+    Setup_StatusFunctions();
+
+    pSpNamespace = new SP_Namespace(*this);
+    pSpTypedef   = new SP_Typedef(*this);
+    pSpVarFunc   = new SP_VarFunc(*this);
+    pSpTemplate  = new SP_Template(*this);
+    pSpDefs      = new SP_Defines(*this);
+    pSpIgnore    = new SP_Ignore(*this);
+
+    pSpuNamespace   = new SPU_Namespace(*pSpNamespace, 0, 0);
+    pSpuTypedef     = new SPU_Typedef(*pSpTypedef, 0, 0);
+    pSpuVarFunc     = new SPU_VarFunc(*pSpVarFunc, 0, &PE_File::SpReturn_VarFunc);
+    pSpuTemplate    = new SPU_Template(*pSpTemplate, 0, &PE_File::SpReturn_Template);
+    pSpuDefs        = new SPU_Defines(*pSpDefs, 0, 0);
+    pSpuUsing       = new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuIgnoreFailure
+                    = new SPU_Ignore(*pSpIgnore, 0, 0);
+}
+
+PE_File::~PE_File()
+{
+}
+
+void
+PE_File::Call_Handler( const cpp::Token &   i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+Cpp_PE *
+PE_File::Handle_ChildFailure()
+{
+    SetCurSPU(pSpuIgnoreFailure.Ptr());
+    return &pSpuIgnoreFailure->Child();
+}
+
+void
+PE_File::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_File>::F_Tok    F_Tok;
+    static F_Tok stateF_std[] =             { &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_ClassKey,
+                                              &PE_File::On_std_ClassKey,
+                                              &PE_File::On_std_ClassKey,
+                                              &PE_File::On_std_enum,
+
+                                              &PE_File::On_std_typedef,
+                                              &PE_File::On_std_template,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_extern,
+
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_namespace,
+                                              &PE_File::On_std_using,
+
+                                              &PE_File::On_std_SwBracketRight,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_DefineName,
+                                              &PE_File::On_std_MacroName,
+
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc };
+
+    static INT16 stateT_std[] =             { Tid_Identifier,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+
+                                              Tid_typedef,
+                                              Tid_template,
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_extern,
+
+                                              Tid_static,
+                                              Tid_register,
+                                              Tid_inline,
+                                              Tid_namespace,
+                                              Tid_using,
+
+                                              Tid_SwBracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_DefineName,
+                                              Tid_MacroName,
+
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_in_extern[] =       { &PE_File::On_in_extern_Constant };
+    static INT16 stateT_in_extern[] =       { Tid_Constant };
+
+    static F_Tok stateF_in_externC[] =      { &PE_File::On_in_externC_SwBracket_Left };
+    static INT16 stateT_in_externC[] =      { Tid_SwBracket_Left };
+
+
+    SEMPARSE_CREATE_STATUS(PE_File, std, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_File, in_extern, On_in_extern_Ignore);
+    SEMPARSE_CREATE_STATUS(PE_File, in_externC, On_in_externC_NoBlock);
+}
+
+void
+PE_File::InitData()
+{
+    pStati->SetCur(std);
+}
+
+void
+PE_File::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_File::Hdl_SyntaxError( const char * i_sText)
+{
+    if ( *i_sText == ';' )
+    {
+         Cerr() << Env().CurFileName() << ", line "
+                  << Env().LineCount()
+                  << ": Sourcecode warning: ';' as a toplevel declaration is deprecated."
+                  << Endl();
+        SetTokenResult(done,stay);
+        return;
+    }
+
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_File::SpReturn_VarFunc()
+{
+     if (bWithinSingleExternC)
+    {
+        access_Env().CloseBlock();
+         bWithinSingleExternC = false;
+    }
+}
+
+void
+PE_File::SpReturn_Template()
+{
+    access_Env().OpenTemplate( pSpuTemplate->Child().Result_Parameters() );
+}
+
+void
+PE_File::On_std_namespace(const char * )
+{
+    pSpuNamespace->Push(done);
+}
+
+void
+PE_File::On_std_ClassKey(const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   classes are parsed via PE_Type.
+}
+
+void
+PE_File::On_std_typedef(const char * )
+{
+    pSpuTypedef->Push(not_done);
+}
+
+void
+PE_File::On_std_enum(const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   enums are parsed via PE_Type.
+}
+
+void
+PE_File::On_std_VarFunc(const char * )
+{
+    pSpuVarFunc->Push(not_done);
+}
+
+void
+PE_File::On_std_template(const char * )
+{
+    pSpuTemplate->Push(done);
+}
+
+void
+PE_File::On_std_extern(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(in_extern);
+}
+
+void
+PE_File::On_std_using(const char * )
+{
+    pSpuUsing->Push(done);
+}
+
+void
+PE_File::On_std_SwBracketRight(const char * )
+{
+    SetTokenResult(done,stay);
+    access_Env().CloseBlock();
+}
+
+void
+PE_File::On_std_DefineName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+void
+PE_File::On_std_MacroName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+void
+PE_File::On_in_extern_Constant(const char * )
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(in_externC);
+
+    access_Env().OpenExternC();
+}
+
+void
+PE_File::On_in_extern_Ignore(const char * )
+{
+    SetTokenResult(not_done, stay);
+    pStati->SetCur(std);
+}
+
+void
+PE_File::On_in_externC_SwBracket_Left(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(std);
+}
+
+void
+PE_File::On_in_externC_NoBlock(const char * )
+{
+    SetTokenResult(not_done, stay);
+    pStati->SetCur(std);
+
+    bWithinSingleExternC = true;
+}
+
+
+}   // namespace cpp
diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx
new file mode 100644
index 000000000000..eb88a311e558
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_file.hxx
@@ -0,0 +1,209 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_FILE_HXX
+#define ADC_CPP_PE_FILE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+    class PeEnvironment;
+
+    class PE_Namespace;
+    class PE_Enum;
+    class PE_Typedef;
+    class PE_VarFunc;
+    class PE_TemplateTop;
+    class PE_Defines;
+    class PE_Ignore;
+
+#if 0
+class PE_Template;
+class PE_Extern;
+#endif
+
+
+class PE_File : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        std,            /// before class, struct or union
+        in_extern,
+        in_externC,
+        size_of_states
+    };
+
+                        PE_File(
+                            PeEnvironment &     io_rEnv );
+                        ~PE_File();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+    virtual Cpp_PE *    Handle_ChildFailure();
+
+  private:
+    typedef SubPe< PE_File, PE_Namespace>   SP_Namespace;
+    typedef SubPe< PE_File, PE_Typedef>     SP_Typedef;
+    typedef SubPe< PE_File, PE_VarFunc>     SP_VarFunc;
+    typedef SubPe< PE_File, PE_TemplateTop> SP_Template;
+    typedef SubPe< PE_File, PE_Defines>     SP_Defines;
+    typedef SubPe< PE_File, PE_Ignore >     SP_Ignore;
+#if 0
+    typedef SubPe< PE_File, PE_Using>       SP_Using;
+#endif // 0
+
+    typedef SubPeUse< PE_File, PE_Namespace>    SPU_Namespace;
+    typedef SubPeUse< PE_File, PE_Typedef>      SPU_Typedef;
+    typedef SubPeUse< PE_File, PE_VarFunc>      SPU_VarFunc;
+    typedef SubPeUse< PE_File, PE_TemplateTop>  SPU_Template;
+    typedef SubPeUse< PE_File, PE_Defines>      SPU_Defines;
+    typedef SubPeUse< PE_File, PE_Ignore>       SPU_Ignore;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_VarFunc();
+    void                SpReturn_Template();
+
+    void                On_std_namespace(const char * i_sText);
+    void                On_std_ClassKey(const char * i_sText);
+    void                On_std_typedef(const char * i_sText);
+    void                On_std_enum(const char * i_sText);
+    void                On_std_VarFunc(const char * i_sText);
+    void                On_std_template(const char * i_sText);
+    void                On_std_extern(const char * i_sText);
+    void                On_std_using(const char * i_sText);
+    void                On_std_SwBracketRight(const char * i_sText);
+
+    void                On_std_DefineName(const char * i_sText);
+    void                On_std_MacroName(const char * i_sText);
+
+    void                On_in_extern_Constant(const char * i_sText);
+    void                On_in_extern_Ignore(const char * i_sText);
+    void                On_in_externC_SwBracket_Left(const char * i_sText);
+    void                On_in_externC_NoBlock(const char * i_sText);
+
+    PeEnvironment &     access_Env()            { return *pEnv; }
+
+
+    // DATA
+    PeEnvironment *     pEnv;
+
+    Dyn< PeStatusArray<PE_File> >
+                        pStati;
+
+    Dyn<SP_Namespace>   pSpNamespace;
+    Dyn<SP_Typedef>     pSpTypedef;
+    Dyn<SP_VarFunc>     pSpVarFunc;
+    Dyn<SP_Template>    pSpTemplate;
+    Dyn<SP_Defines>     pSpDefs;
+
+    Dyn<SP_Ignore>      pSpIgnore;
+#if 0
+    SP_Using            aSpUsing;
+#endif // 0
+
+    Dyn<SPU_Namespace>  pSpuNamespace;
+    Dyn<SPU_Typedef>    pSpuTypedef;
+    Dyn<SPU_VarFunc>    pSpuVarFunc;
+    Dyn<SPU_Template>   pSpuTemplate;
+    Dyn<SPU_Defines>    pSpuDefs;
+
+    Dyn<SPU_Ignore>     pSpuUsing;
+    Dyn<SPU_Ignore>     pSpuIgnoreFailure;
+
+    bool                bWithinSingleExternC;   /** After 'extern "C"' without following '{',
+                                                    waiting for the next function or variable to
+                                                    set back to false.
+                                                */
+};
+
+}   // namespace cpp
+
+
+
+#if 0   // Branches
+
+namespace
+    -> Named Namespace declaration
+    -> Unnamed Namespace declaration
+    -> Namespace alias definition
+
+class struct union
+    -> Class
+    -> Predeclaration
+
+typedef
+    -> Typedef
+
+enum
+    -> Enum
+
+extern
+    -> Extern-"C"
+    -> TypeDeclaration
+
+TypeDeclaration
+    -> FunctionDecl
+    -> FunctionDef
+    -> Variable
+
+template
+    -> TemplateClass
+    -> TemplateFunction
+    -> TemplateFunction/Method-Implementation
+    -> TemplatePredeclaration
+
+}
+    -> End of Namespace
+    -> End of Extern-"C"
+
+asm
+    -> AssemblerDeclaration
+
+using
+    -> Using-Declaration
+    -> Using-Directive
+
+#endif // 0
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/pe_funct.cxx b/autodoc/source/parser/cpp/pe_funct.cxx
new file mode 100644
index 000000000000..14bff991cb4d
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_funct.cxx
@@ -0,0 +1,610 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_funct.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include "pe_type.hxx"
+#include "pe_param.hxx"
+
+
+
+
+namespace cpp
+{
+
+
+inline void
+PE_Function::PerformFinishingPunctuation()
+{
+    SetTokenResult(not_done,pop_success);
+}
+
+
+PE_Function::PE_Function( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Function> ),
+        // pSpParameter,
+        // pSpuParameter,
+        // pSpType,
+        // pSpuException,
+        // pSpuCastOperatorType,
+        nResult(0),
+        bResult_WithImplementation(false),
+        aName(60),
+        eVirtuality(ary::cpp::VIRTUAL_none),
+        eConVol(ary::cpp::CONVOL_none),
+        // aFlags,
+        nReturnType(0),
+        // aParameters
+        // aExceptions,
+        bThrow(false),
+        nBracketCounterInImplementation(0)
+{
+    Setup_StatusFunctions();
+
+    pSpParameter     = new SP_Parameter(*this);
+    pSpType          = new SP_Type(*this);
+
+    pSpuParameter           = new SPU_Parameter(*pSpParameter, 0, &PE_Function::SpReturn_Parameter);
+    pSpuException           = new SPU_Type(*pSpType, 0, &PE_Function::SpReturn_Exception);
+    pSpuCastOperatorType    = new SPU_Type(*pSpType, &PE_Function::SpInit_CastOperatorType, &PE_Function::SpReturn_CastOperatorType);
+}
+
+PE_Function::~PE_Function()
+{
+
+}
+
+void
+PE_Function::Init_Std( const String  &          i_sName,
+                       ary::cpp::Type_id        i_nReturnType,
+                       bool                     i_bVirtual,
+                       ary::cpp::FunctionFlags  i_aFlags )
+{
+    aName << i_sName;
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = i_nReturnType;
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Function::Init_Ctor( const String  &         i_sName,
+                        ary::cpp::FunctionFlags i_aFlags )
+{
+    aName << i_sName;
+    eVirtuality = ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = 0;
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Function::Init_Dtor( const String  &         i_sName,
+                        bool                    i_bVirtual,
+                        ary::cpp::FunctionFlags i_aFlags )
+{
+    aName << "~" << i_sName;
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = 0;
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Function::Init_CastOperator( bool                    i_bVirtual,
+                                ary::cpp::FunctionFlags i_aFlags )
+{
+    aName << "operator ";
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = 0;
+    pStati->SetCur(afterCastOperator);
+}
+
+void
+PE_Function::Init_NormalOperator( ary::cpp::Type_id                  i_nReturnType,
+                                  bool                      i_bVirtual,
+                                  ary::cpp::FunctionFlags   i_aFlags )
+{
+    aName << "operator";
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = i_nReturnType;
+    pStati->SetCur(afterStdOperator);
+}
+
+ary::cpp::Ce_id
+PE_Function::Result_Id() const
+{
+    return nResult;
+}
+
+void
+PE_Function::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Function::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Function>::F_Tok    F_Tok;
+
+    static F_Tok stateF_afterStdOperator[] =
+                                            { &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_LeftBracket,
+                                              &PE_Function::On_afterOperator_Std_LeftBracket,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator };
+    static INT16 stateT_afterStdOperator[] =
+                                            { Tid_Operator,
+                                              Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Left,
+                                              Tid_Comma,
+                                              Tid_Assign,
+                                              Tid_Less,
+                                              Tid_Greater,
+                                              Tid_Asterix,
+                                              Tid_AmpersAnd };
+
+    static F_Tok stateF_afterStdOperatorLeftBracket[] =
+                                            { &PE_Function::On_afterStdOperatorLeftBracket_RightBracket,
+                                              &PE_Function::On_afterStdOperatorLeftBracket_RightBracket };
+    static INT16 stateT_afterStdOperatorLeftBracket[] =
+                                            { Tid_ArrayBracket_Right,
+                                              Tid_Bracket_Right };
+
+    static F_Tok stateF_afterCastOperator[] =
+                                            { &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type };
+    static INT16 stateT_afterCastOperator[] =
+                                            { Tid_Identifier,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_afterName[] =       { &PE_Function::On_afterName_Bracket_Left };
+    static INT16 stateT_afterName[] =       { Tid_Bracket_Left };
+
+    static F_Tok stateF_expectParameterSeparator[] =
+                                            { &PE_Function::On_expectParameterSeparator_BracketRight,
+                                              &PE_Function::On_expectParameterSeparator_Comma };
+    static INT16 stateT_expectParameterSeparator[] =
+                                            { Tid_Bracket_Right,
+                                              Tid_Comma };
+
+    static F_Tok stateF_afterParameters[] = { &PE_Function::On_afterParameters_const,
+                                              &PE_Function::On_afterParameters_volatile,
+                                              &PE_Function::On_afterParameters_throw,
+                                              &PE_Function::On_afterParameters_SwBracket_Left,
+                                              &PE_Function::On_afterParameters_Semicolon,
+                                              &PE_Function::On_afterParameters_Comma,
+                                              &PE_Function::On_afterParameters_Colon,
+                                              &PE_Function::On_afterParameters_Assign };
+    static INT16 stateT_afterParameters[] = { Tid_const,
+                                              Tid_volatile,
+                                              Tid_throw,
+                                              Tid_SwBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Colon,
+                                              Tid_Assign };
+
+    static F_Tok stateF_afterThrow[] =      { &PE_Function::On_afterThrow_Bracket_Left };
+    static INT16 stateT_afterThrow[] =      { Tid_Bracket_Left };
+
+    static F_Tok stateF_expectExceptionSeparator[] =
+                                            { &PE_Function::On_expectExceptionSeparator_BracketRight,
+                                              &PE_Function::On_expectExceptionSeparator_Comma };
+    static INT16 stateT_expectExceptionSeparator[] =
+                                            { Tid_Bracket_Right,
+                                              Tid_Comma };
+
+    static F_Tok stateF_afterExceptions[] = { &PE_Function::On_afterExceptions_SwBracket_Left,
+                                              &PE_Function::On_afterExceptions_Semicolon,
+                                              &PE_Function::On_afterExceptions_Comma,
+                                              &PE_Function::On_afterExceptions_Colon,
+                                              &PE_Function::On_afterExceptions_Assign };
+    static INT16 stateT_afterExceptions[] = { Tid_SwBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Colon,
+                                              Tid_Assign };
+
+    static F_Tok stateF_expectZero[] =      { &PE_Function::On_expectZero_Constant };
+    static INT16 stateT_expectZero[] =      { Tid_Constant };
+
+    static F_Tok stateF_inImplementation[] =
+                                            { &PE_Function::On_inImplementation_SwBracket_Left,
+                                              &PE_Function::On_inImplementation_SwBracket_Right };
+    static INT16 stateT_inImplementation[] =
+                                            { Tid_SwBracket_Left,
+                                              Tid_SwBracket_Right };
+
+    SEMPARSE_CREATE_STATUS(PE_Function, afterStdOperator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterStdOperatorLeftBracket, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterCastOperator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, expectParameterSeparator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterParameters, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterThrow, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, expectExceptionSeparator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterExceptions, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, expectZero, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, inImplementation, On_inImplementation_Default );
+}
+
+void
+PE_Function::InitData()
+{
+    pStati->SetCur( afterName ),
+    nResult = 0;
+    bResult_WithImplementation = false;
+    aName.seekp(0);
+    eVirtuality = ary::cpp::VIRTUAL_none;
+    eConVol = ary::cpp::CONVOL_none;
+    aFlags.Reset();
+    nReturnType = 0;
+    csv::erase_container(aParameters);
+    csv::erase_container(aExceptions);
+    bThrow = false;
+}
+
+void
+PE_Function::TransferData()
+{
+    String  sName( aName.c_str() );
+    ary::cpp::Function *
+        pFunction = Env().AryGate().Ces().Store_Operation(
+                                                Env().Context(),
+                                                sName,
+                                                nReturnType,
+                                                aParameters,
+                                                eVirtuality,
+                                                eConVol,
+                                                aFlags,
+                                                bThrow,
+                                                aExceptions );
+    if (pFunction != 0)
+    {
+        // KORR_FUTURE: How to handle differing documentation?
+
+        Dyn< StringVector >
+                pTplParams ( Env().Get_CurTemplateParameters() );
+        if ( pTplParams )
+        {
+              for ( StringVector::const_iterator it = pTplParams->begin();
+                  it !=  pTplParams->end();
+                  ++it )
+            {
+                pFunction->Add_TemplateParameterType( *it, ary::cpp::Type_id(0) );
+            }  // end for
+        }
+
+        Env().Event_Store_Function(*pFunction);
+    }
+
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Function::Hdl_SyntaxError(const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Function::SpInit_CastOperatorType()
+{
+    pSpuCastOperatorType->Child().Init_AsCastOperatorType();
+}
+
+void
+PE_Function::SpReturn_Parameter()
+{
+    pStati->SetCur(expectParameterSeparator);
+
+    ary::cpp::Type_id nParamType = pSpuParameter->Child().Result_FrontType();
+    if ( nParamType.IsValid() )      // Check, if there was a parameter, or only the closing ')'.
+    {
+        aParameters.push_back( pSpuParameter->Child().Result_ParamInfo() );
+    }
+}
+
+void
+PE_Function::SpReturn_Exception()
+{
+    pStati->SetCur(expectExceptionSeparator);
+
+    ary::cpp::Type_id
+        nException = pSpuException->Child().Result_Type().TypeId();
+    if ( nException.IsValid() AND pSpuException->Child().Result_KindOf() == PE_Type::is_type )
+    {
+        aExceptions.push_back( nException );
+    }
+}
+
+void
+PE_Function::SpReturn_CastOperatorType()
+{
+    pStati->SetCur(afterName);
+
+    Env().AryGate().Types().Get_TypeText(
+            aName, pSpuCastOperatorType->Child().Result_Type().TypeId() );
+}
+
+void
+PE_Function::On_afterOperator_Std_Operator(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterName);
+
+    if ( 'a' <= *i_sText AND *i_sText <= 'z' )
+        aName << ' ';
+    aName << i_sText;
+}
+
+void
+PE_Function::On_afterOperator_Std_LeftBracket(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterStdOperatorLeftBracket);
+
+    aName << i_sText;
+}
+
+void
+PE_Function::On_afterStdOperatorLeftBracket_RightBracket(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterName);
+
+    aName << i_sText;
+}
+
+void
+PE_Function::On_afterOperator_Cast_Type(const char *)
+{
+    pSpuCastOperatorType->Push(not_done);
+}
+
+void
+PE_Function::On_afterName_Bracket_Left(const char *)
+{
+    pSpuParameter->Push(done);
+}
+
+void
+PE_Function::On_expectParameterSeparator_BracketRight(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterParameters);
+}
+
+void
+PE_Function::On_expectParameterSeparator_Comma(const char *)
+{
+    pSpuParameter->Push(done);
+}
+
+void
+PE_Function::On_afterParameters_const(const char *)
+{
+    SetTokenResult(done,stay);
+    eConVol = static_cast<E_ConVol>(
+                    static_cast<int>(eConVol) | static_cast<int>(ary::cpp::CONVOL_const) );
+}
+
+void
+PE_Function::On_afterParameters_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    eConVol = static_cast<E_ConVol>(
+                    static_cast<int>(eConVol) | static_cast<int>(ary::cpp::CONVOL_volatile) );
+}
+
+void
+PE_Function::On_afterParameters_throw(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterThrow);
+    bThrow = true;
+}
+
+void
+PE_Function::On_afterParameters_SwBracket_Left(const char *)
+{
+    EnterImplementation(1);
+}
+
+void
+PE_Function::On_afterParameters_Semicolon(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterParameters_Comma(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterParameters_Colon(const char *)
+{
+    EnterImplementation(0);
+}
+
+void
+PE_Function::On_afterParameters_Assign(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(expectZero);
+}
+
+void
+PE_Function::On_afterThrow_Bracket_Left(const char *)
+{
+    pSpuException->Push(done);
+}
+
+void
+PE_Function::On_expectExceptionSeparator_BracketRight(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterExceptions);
+}
+
+void
+PE_Function::On_expectExceptionSeparator_Comma(const char *)
+{
+    pSpuException->Push(done);
+}
+
+void
+PE_Function::On_afterExceptions_SwBracket_Left(const char *)
+{
+    EnterImplementation(1);
+}
+
+void
+PE_Function::On_afterExceptions_Semicolon(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterExceptions_Comma(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterExceptions_Colon(const char *)
+{
+    EnterImplementation(0);
+}
+
+void
+PE_Function::On_afterExceptions_Assign(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(expectZero);
+}
+
+void
+PE_Function::On_expectZero_Constant(const char * i_sText)
+{
+    if ( strcmp(i_sText,"0") != 0 )
+        Hdl_SyntaxError(i_sText);
+
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterExceptions);
+
+    eVirtuality = ary::cpp::VIRTUAL_abstract;
+}
+
+void
+PE_Function::On_inImplementation_SwBracket_Left(const char *)
+{
+    SetTokenResult(done,stay);
+    nBracketCounterInImplementation++;
+}
+
+void
+PE_Function::On_inImplementation_SwBracket_Right(const char *)
+{
+    nBracketCounterInImplementation--;
+    if (nBracketCounterInImplementation == 0)
+    {
+        SetTokenResult(done,pop_success);
+    }
+    else
+    {
+        SetTokenResult(done,stay);
+    }
+}
+
+void
+PE_Function::On_inImplementation_Default(const char *)
+{
+    SetTokenResult(done,stay);
+}
+
+void
+PE_Function::EnterImplementation( intt i_nBracketCountStart )
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(inImplementation);
+
+    bResult_WithImplementation = true;
+    nBracketCounterInImplementation = i_nBracketCountStart;
+    if ( Env().Context().CurClass() != 0 )
+    {
+        aFlags.SetInline();
+    }
+}
+
+
+
+}   // namespace cpp
+
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_funct.hxx b/autodoc/source/parser/cpp/pe_funct.hxx
new file mode 100644
index 000000000000..9bbd56329b01
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_funct.hxx
@@ -0,0 +1,281 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ADC_CPP_PE_FUNCT_HXX
+#define ADC_CPP_PE_FUNCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace cpp
+{
+class Function;
+struct S_VariableInfo;
+}
+}
+
+namespace cpp
+{
+
+class PE_Type;
+class PE_Parameter;
+
+class PE_Function : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        afterStdOperator,           // if initializes as operator
+        afterStdOperatorLeftBracket,
+                                    // if initializes as operator with ( or [
+        afterCastOperator,          // if initializes as operator
+        afterName,                  // undecided
+        expectParameterSeparator,   //
+        afterParameters,            // before const, volatile throw or = 0.
+        afterThrow,                 // expect (
+        expectExceptionSeparator,   //
+        afterExceptions,            // = 0 oder ; oder ,
+        expectZero,                 // after '='
+        inImplementation,           // after {
+        size_of_states
+    };
+    typedef ary::cpp::E_Protection              E_Protection;
+    typedef ary::cpp::E_Virtuality              E_Virtuality;
+    typedef ary::cpp::E_ConVol                  E_ConVol;
+
+                        PE_Function(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Function();
+
+    void                Init_Std(
+                            const String  &     i_sName,
+                            ary::cpp::Type_id   i_nReturnType,
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_Ctor(
+                            const String  &     i_sName,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_Dtor(
+                            const String  &     i_sName,
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_CastOperator(
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_NormalOperator(
+                            ary::cpp::Type_id   i_nReturnType,
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+
+    ary::cpp::Ce_id     Result_Id() const;
+    bool                Result_WithImplementation() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    typedef SubPe< PE_Function, PE_Type >           SP_Type;
+    typedef SubPeUse< PE_Function, PE_Type >        SPU_Type;
+    typedef SubPe< PE_Function, PE_Parameter>       SP_Parameter;
+    typedef SubPeUse<PE_Function, PE_Parameter>     SPU_Parameter;
+
+    typedef std::vector<ary::cpp::S_Parameter>      ParameterList;
+    typedef std::vector<ary::cpp::Type_id>          ExceptionTypeList;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char * i_sText);
+
+    void                SpInit_CastOperatorType();
+
+    void                SpReturn_Parameter();
+    void                SpReturn_Exception();
+    void                SpReturn_CastOperatorType();
+
+    void                On_afterOperator_Std_Operator(const char * i_sText);             // Operator+() etc.
+    void                On_afterOperator_Std_LeftBracket(const char * i_sText); // operator [] or ()
+    void                On_afterStdOperatorLeftBracket_RightBracket(const char * i_sText);
+    void                On_afterOperator_Cast_Type(const char * i_sText);    // Type
+
+    void                On_afterName_Bracket_Left(const char * i_sText);
+
+    void                On_expectParameterSeparator_BracketRight(const char * i_sText);
+    void                On_expectParameterSeparator_Comma(const char * i_sText);
+
+    void                On_afterParameters_const(const char * i_sText);
+    void                On_afterParameters_volatile(const char * i_sText);
+    void                On_afterParameters_throw(const char * i_sText);
+    void                On_afterParameters_SwBracket_Left(const char * i_sText);
+    void                On_afterParameters_Semicolon(const char * i_sText);
+    void                On_afterParameters_Comma(const char * i_sText);
+    void                On_afterParameters_Colon(const char * i_sText);
+    void                On_afterParameters_Assign(const char * i_sText);
+
+    void                On_afterThrow_Bracket_Left(const char * i_sText);
+
+    void                On_expectExceptionSeparator_BracketRight(const char * i_sText);
+    void                On_expectExceptionSeparator_Comma(const char * i_sText);
+
+    void                On_afterExceptions_SwBracket_Left(const char * i_sText);
+    void                On_afterExceptions_Semicolon(const char * i_sText);
+    void                On_afterExceptions_Comma(const char * i_sText);
+    void                On_afterExceptions_Colon(const char * i_sText);
+    void                On_afterExceptions_Assign(const char * i_sText);
+
+    void                On_expectZero_Constant(const char * i_sText);
+
+    void                On_inImplementation_SwBracket_Left(const char * i_sText);
+    void                On_inImplementation_SwBracket_Right(const char * i_sText);
+    void                On_inImplementation_Default(const char * i_sText);
+
+    void                PerformFinishingPunctuation();
+    void                EnterImplementation(
+                            intt                i_nBracketCountStart ); /// 1 normally, 0 in initialisation section of c'tors.
+
+    // DATA
+    Dyn< PeStatusArray<PE_Function> >
+                        pStati;
+
+    Dyn< SP_Parameter > pSpParameter;
+    Dyn< SPU_Parameter> pSpuParameter;
+    Dyn< SP_Type >      pSpType;
+    Dyn< SPU_Type >     pSpuException;
+    Dyn< SPU_Type >     pSpuCastOperatorType;       // in "operator int()" or "operator ThatClass *()"
+
+    ary::cpp::Ce_id     nResult;
+    bool                bResult_WithImplementation; // Necessary for the parent ParseEnvironment
+                                                    //   to know, there is no semicolon or comma following.
+        // Pre results
+    StreamStr           aName;
+    E_Virtuality        eVirtuality;
+    E_ConVol            eConVol;
+    ary::cpp::FunctionFlags
+                        aFlags;
+    ary::cpp::Type_id   nReturnType;
+    ParameterList       aParameters;
+    ExceptionTypeList   aExceptions;
+    bool                bThrow;                     // Indicates, if there is a throw - important, if there are 0 exceptions listed.
+    intt                nBracketCounterInImplementation;
+};
+
+
+
+
+// IMPLEMENTATION
+inline bool
+PE_Function::Result_WithImplementation() const
+    { return bResult_WithImplementation; }
+
+
+
+
+}   // namespace cpp
+#endif
+
+
+
+
+
+/*  // Overview of Stati
+
+Undecided
+---------
+
+start           // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName      // Typ ist da
+
+afterName
+
+
+
+
+Variable
+--------
+
+start           // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName      // Typ ist da  -> im Falle von '(': notyetimplemented
+afterName
+
+expectSize      // after [
+expectFinish
+                // vor ; oder ,
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+Function
+--------
+
+start               // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName          // Typ ist da
+expectBracket       // Nach Name
+expectParameter     // nach ( oder ,
+-> Parameter
+after Parameters    // before const, volatile throw or = 0.
+after throw         // expect (
+expectException     // after (
+after exceptions    // = 0 oder ; oder ,
+
+
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+
+
+*/
diff --git a/autodoc/source/parser/cpp/pe_ignor.cxx b/autodoc/source/parser/cpp/pe_ignor.cxx
new file mode 100644
index 000000000000..685c4baff783
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_ignor.cxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_ignor.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace cpp {
+
+
+
+PE_Ignore::PE_Ignore( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        nBracketCounter(0),
+        bBlockOpened(false)
+{
+    Setup_StatusFunctions();
+}
+
+
+PE_Ignore::~PE_Ignore()
+{
+}
+
+void
+PE_Ignore::Call_Handler( const cpp::Token & i_rTok )
+{
+    if ( NOT bBlockOpened )
+    {
+        switch (i_rTok.TypeId())
+        {
+            case Tid_SwBracket_Left:    SetTokenResult(done, stay);
+                                        nBracketCounter++;
+                                        bBlockOpened = true;
+                                        break;
+            case Tid_Semicolon:         SetTokenResult(done, pop_success);
+                                        break;
+            default:
+                                        SetTokenResult(done, stay);
+        }   // end switch
+    }
+    else if ( nBracketCounter > 0 )
+    {
+        SetTokenResult(done, stay);
+
+        switch (i_rTok.TypeId())
+        {
+            case Tid_SwBracket_Left:    nBracketCounter++;
+                                        break;
+            case Tid_SwBracket_Right:   nBracketCounter--;
+                                        break;
+        }   // end switch
+    }
+    else if ( i_rTok.TypeId() == Tid_Semicolon )
+    {
+        SetTokenResult(done, pop_success);
+    }
+    else
+    {
+        SetTokenResult(not_done, pop_success);
+    }
+}
+
+void
+PE_Ignore::Setup_StatusFunctions()
+{
+    // Does nothing.
+}
+
+void
+PE_Ignore::InitData()
+{
+    nBracketCounter = 0;
+    bBlockOpened = false;
+}
+
+void
+PE_Ignore::TransferData()
+{
+    // Does nothing.
+}
+
+
+}   // namespace cpp
+
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_ignor.hxx b/autodoc/source/parser/cpp/pe_ignor.hxx
new file mode 100644
index 000000000000..2a8c6baf44fd
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_ignor.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ADC_CPP_PE_IGNOR_HXX
+#define ADC_CPP_PE_IGNOR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cpp_pe.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class PE_Ignore : public Cpp_PE
+{
+  public:
+                        PE_Ignore(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Ignore();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+
+    // DATA
+    uintt               nBracketCounter;
+    bool                bBlockOpened;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace cpp
+
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/cpp/pe_namsp.cxx b/autodoc/source/parser/cpp/pe_namsp.cxx
new file mode 100644
index 000000000000..673c19f55349
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_namsp.cxx
@@ -0,0 +1,163 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <pe_namsp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <all_toks.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <semantic/callf.hxx>
+#include "x_parse.hxx"
+
+
+
+
+namespace cpp
+{
+
+PE_Namespace::PE_Namespace( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Namespace> ),
+        // sLocalname
+        bPush(false)
+{
+    Setup_StatusFunctions();
+}
+
+PE_Namespace::~PE_Namespace()
+{
+}
+
+void
+PE_Namespace::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Namespace>::F_Tok   F_Tok;
+    static F_Tok stateF_start[] =           { &PE_Namespace::On_start_Identifier,
+                                              &PE_Namespace::On_start_SwBracket_Left };
+    static INT16 stateT_start[] =           { Tid_Identifier,
+                                              Tid_SwBracket_Left };
+    static F_Tok stateF_gotName[] =         { &PE_Namespace::On_gotName_SwBracket_Left,
+                                              &PE_Namespace::On_gotName_Assign };
+    static INT16 stateT_gotName[] =         { Tid_SwBracket_Left,
+                                              Tid_Assign };
+    static F_Tok stateF_expectSemicolon[] = { &PE_Namespace::On_expectSemicolon_Semicolon };
+    static INT16 stateT_expectSemicolon[] = { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Namespace, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Namespace, gotName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Namespace, expectSemicolon, Hdl_SyntaxError);
+}
+
+void
+PE_Namespace::Call_Handler( const cpp::Token &  i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Namespace::InitData()
+{
+    pStati->SetCur(start);
+    sLocalName = "";
+    bPush = false;
+}
+
+void
+PE_Namespace::TransferData()
+{
+    if (bPush)
+    {
+        ary::cpp::Namespace &
+            rNew = Env().AryGate().Ces().CheckIn_Namespace(
+                                             Env().Context(),
+                                             sLocalName );
+        Env().OpenNamespace(rNew);
+    }
+}
+
+void
+PE_Namespace::Hdl_SyntaxError( const char * i_sText)
+{
+    throw X_Parser( X_Parser::x_UnexpectedToken,
+                    i_sText != 0 ? i_sText : "",
+                    Env().CurFileName(),
+                    Env().LineCount() );
+}
+
+void
+PE_Namespace::On_start_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotName);
+
+    sLocalName = i_sText;
+}
+
+void
+PE_Namespace::On_start_SwBracket_Left(const char * )
+{
+    SetTokenResult(done, pop_success);
+    pStati->SetCur(size_of_states);
+
+    sLocalName = "";    // Anonymous namespace, a name is created in
+                        //   Gate().CheckIn_Namespace() .
+
+    bPush = true;
+}
+
+void
+PE_Namespace::On_gotName_SwBracket_Left(const char * )
+{
+    SetTokenResult(done, pop_success);
+    pStati->SetCur(size_of_states);
+
+    bPush = true;
+}
+
+void
+PE_Namespace::On_gotName_Assign(const char * )
+{
+    // KORR_FUTURE
+    Hdl_SyntaxError(0);
+}
+
+void
+PE_Namespace::On_expectSemicolon_Semicolon(const char * )
+{
+    SetTokenResult(done,pop_success);
+    pStati->SetCur(size_of_states);
+}
+
+}   // namespace cpp
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_namsp.hxx b/autodoc/source/parser/cpp/pe_namsp.hxx
new file mode 100644
index 000000000000..4809dcceceb5
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_namsp.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_NAMSP_HXX
+#define ADC_CPP_PE_NAMSP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_pe.hxx>
+    // PARAMETERS
+
+namespace ary
+{
+namespace cpp
+{
+class Namespace;
+}
+}
+
+
+namespace cpp
+{
+
+
+class PE_Namespace : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        gotName,
+        expectSemicolon,        /// after namespace assignment
+        size_of_states
+    };
+                        PE_Namespace(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Namespace();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    ary::cpp::Namespace *
+                        Result_OpenedNamespace() const;
+  private:
+    void                Setup_StatusFunctions();
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                On_start_Identifier(const char * i_sText);
+    void                On_start_SwBracket_Left(const char * i_sText);
+    void                On_gotName_SwBracket_Left(const char * i_sText);
+    void                On_gotName_Assign(const char * i_sText);
+    void                On_expectSemicolon_Semicolon(const char * i_sText);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Namespace> >
+                        pStati;
+
+    String              sLocalName;
+    bool                bPush;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx
new file mode 100644
index 000000000000..5b70505d0964
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_param.cxx
@@ -0,0 +1,280 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_param.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include "pe_type.hxx"
+#include "pe_vari.hxx"
+
+
+namespace cpp {
+
+
+
+//***********************       PE_Parameter        ***********************//
+
+
+PE_Parameter::PE_Parameter( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Parameter> )
+        // pSpType,
+        // pSpuType,
+        // pSpVariable,
+        // pSpuVariable,
+        // aResultParamInfo
+{
+    Setup_StatusFunctions();
+
+    pSpType         = new SP_Type(*this);
+    pSpuType        = new SPU_Type(*pSpType, &PE_Parameter::SpInit_Type, &PE_Parameter::SpReturn_Type);
+    pSpVariable     = new SP_Variable(*this);
+    pSpuVariable    = new SPU_Variable(*pSpVariable, &PE_Parameter::SpInit_Variable, &PE_Parameter::SpReturn_Variable);
+}
+
+PE_Parameter::~PE_Parameter()
+{
+}
+
+void
+PE_Parameter::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Parameter::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Parameter>::F_Tok   F_Tok;
+    static F_Tok stateF_start[] =           { &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Bracket_Right,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Ellipse,
+
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type };
+    static INT16 stateT_start[] =           { Tid_Identifier,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_Bracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_Ellipse,
+
+                                              Tid_typename,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_expectName[] =      { &PE_Parameter::On_expectName_Identifier,
+                                              &PE_Parameter::On_expectName_ArrayBracket_Left,
+                                              &PE_Parameter::On_expectName_Bracket_Right,
+                                              &PE_Parameter::On_expectName_Comma,
+                                              &PE_Parameter::On_afterName_Assign  };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Right,
+                                              Tid_Comma,
+                                              Tid_Assign };
+    static F_Tok stateF_afterName[] =       { &PE_Parameter::On_afterName_ArrayBracket_Left,
+                                              &PE_Parameter::On_afterName_Bracket_Right,
+                                              &PE_Parameter::On_afterName_Comma,
+                                              &PE_Parameter::On_afterName_Assign };
+    static INT16 stateT_afterName[] =       { Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Right,
+                                              Tid_Comma,
+                                              Tid_Assign };
+    static F_Tok stateF_finished[] =        { &PE_Parameter::On_finished_Comma,
+                                              &PE_Parameter::On_finished_Bracket_Right };
+    static INT16 stateT_finished[] =        { Tid_Bracket_Right,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Parameter, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Parameter, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Parameter, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Parameter, finished, Hdl_SyntaxError);
+}
+
+
+void
+PE_Parameter::InitData()
+{
+    pStati->SetCur(start);
+    aResultParamInfo.Empty();
+}
+
+void
+PE_Parameter::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Parameter::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Parameter::SpInit_Type()
+{
+    // Does nothing.
+}
+
+void
+PE_Parameter::SpInit_Variable()
+{
+    // Does nothing.
+}
+
+void
+PE_Parameter::SpReturn_Type()
+{
+    aResultParamInfo.nType = pSpuType->Child().Result_Type().Id();
+    pStati->SetCur(expectName);
+}
+
+void
+PE_Parameter::SpReturn_Variable()
+{
+    if (pSpuVariable->Child().Result_Pattern() > 0)
+    {
+        aResultParamInfo.sSizeExpression = pSpuVariable->Child().Result_SizeExpression();
+        aResultParamInfo.sInitExpression = pSpuVariable->Child().Result_InitExpression();
+    }
+}
+
+void
+PE_Parameter::On_start_Type(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_Parameter::On_start_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_start_Ellipse(const char *)
+{
+    SetTokenResult(done, pop_success);
+
+    aResultParamInfo.nType = Env().AryGate().Types().Tid_Ellipse();
+}
+
+void
+PE_Parameter::On_expectName_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+
+    aResultParamInfo.sName = i_sText;
+}
+
+void
+PE_Parameter::On_expectName_ArrayBracket_Left(const char * i_sText)
+{
+    On_afterName_ArrayBracket_Left(i_sText);
+}
+
+void
+PE_Parameter::On_expectName_Bracket_Right(const char * i_sText)
+{
+    On_afterName_Bracket_Right(i_sText);
+}
+
+void
+PE_Parameter::On_expectName_Comma(const char * i_sText)
+{
+    On_afterName_Comma(i_sText);
+}
+
+void
+PE_Parameter::On_afterName_ArrayBracket_Left(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_Parameter::On_afterName_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_afterName_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_afterName_Assign(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_Parameter::On_finished_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_finished_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx
new file mode 100644
index 000000000000..07c602d6aee1
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_param.hxx
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ADC_CPP_PE_PARAM_HXX
+#define ADC_CPP_PE_PARAM_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+
+
+
+
+namespace cpp
+{
+    class PE_Type;
+    class PE_Variable;
+
+
+
+
+class PE_Parameter : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expectName,
+        afterName,
+        finished,
+        size_of_states
+    };
+    typedef ary::cpp::S_Parameter       S_ParamInfo;
+
+    explicit            PE_Parameter(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Parameter();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    ary::cpp::Type_id   Result_FrontType() const;
+    const S_ParamInfo & Result_ParamInfo() const;
+
+  private:
+    typedef SubPe< PE_Parameter, PE_Type >          SP_Type;
+    typedef SubPeUse< PE_Parameter, PE_Type >       SPU_Type;
+    typedef SubPe< PE_Parameter, PE_Variable >      SP_Variable;
+    typedef SubPeUse< PE_Parameter, PE_Variable >   SPU_Variable;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpInit_Type();       // Type and Ignore.
+    void                SpInit_Variable();
+    void                SpReturn_Type();
+    void                SpReturn_Variable();
+
+    void                On_start_Type(const char * i_sText);
+    void                On_start_Bracket_Right(const char * i_sText);
+    void                On_start_Ellipse(const char * i_sText);
+
+    void                On_expectName_Identifier(const char * i_sText);
+    void                On_expectName_ArrayBracket_Left(const char * i_sText);
+    void                On_expectName_Bracket_Right(const char * i_sText);
+    void                On_expectName_Comma(const char * i_sText);
+
+    void                On_afterName_ArrayBracket_Left(const char * i_sText);
+    void                On_afterName_Bracket_Right(const char * i_sText);
+    void                On_afterName_Comma(const char * i_sText);
+    void                On_afterName_Assign(const char * i_sText);
+
+    void                On_finished_Bracket_Right(const char * i_sText);
+    void                On_finished_Comma(const char * i_sText);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Parameter> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType;
+    Dyn<SP_Variable>    pSpVariable;
+    Dyn<SPU_Variable>   pSpuVariable;
+
+    S_ParamInfo         aResultParamInfo;
+};
+
+
+
+
+// IMPLEMENTATION
+inline ary::cpp::Type_id
+PE_Parameter::Result_FrontType() const
+{
+    return aResultParamInfo.nType;
+}
+
+inline const PE_Parameter::S_ParamInfo &
+PE_Parameter::Result_ParamInfo() const
+{
+    return aResultParamInfo;
+}
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/pe_tpltp.cxx b/autodoc/source/parser/cpp/pe_tpltp.cxx
new file mode 100644
index 000000000000..0993b7e587a8
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tpltp.cxx
@@ -0,0 +1,175 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_tpltp.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+
+
+
+namespace cpp {
+
+
+
+PE_TemplateTop::PE_TemplateTop( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_TemplateTop> ),
+        // aResult_Parameters,
+        bCurIsConstant(false)
+{
+        Setup_StatusFunctions();
+}
+
+
+PE_TemplateTop::~PE_TemplateTop()
+{
+}
+
+void
+PE_TemplateTop::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_TemplateTop::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_TemplateTop>::F_Tok F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_TemplateTop::On_start_Less };
+    static INT16 stateT_start[] =           { Tid_Less };
+
+    static F_Tok stateF_expect_qualifier[]= { &PE_TemplateTop::On_expect_qualifier_ClassOrTypename,
+                                              &PE_TemplateTop::On_expect_qualifier_Greater,
+                                              &PE_TemplateTop::On_expect_qualifier_ClassOrTypename };
+    static INT16 stateT_expect_qualifier[]= { Tid_class,
+                                              Tid_Greater,
+                                              Tid_typename };
+
+    static F_Tok stateF_expect_name[] =     { &PE_TemplateTop::On_expect_name_Identifier };
+    static INT16 stateT_expect_name[] =     { Tid_Identifier };
+
+    static F_Tok stateF_expect_separator[]= { &PE_TemplateTop::On_expect_separator_Comma,
+                                              &PE_TemplateTop::On_expect_separator_Greater };
+    static INT16 stateT_expect_separator[]= { Tid_Comma,
+                                              Tid_Greater };
+
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, start,            Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, expect_qualifier, On_expect_qualifier_Other);
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, expect_name,      Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, expect_separator, Hdl_SyntaxError);
+}
+
+void
+PE_TemplateTop::InitData()
+{
+    pStati->SetCur(start);
+    csv::erase_container(aResult_Parameters);
+    bCurIsConstant = false;
+}
+
+void
+PE_TemplateTop::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_TemplateTop::Hdl_SyntaxError(const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_TemplateTop::On_start_Less( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_qualifier);
+}
+
+void
+PE_TemplateTop::On_expect_qualifier_ClassOrTypename( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_name);
+}
+
+void
+PE_TemplateTop::On_expect_qualifier_Greater(const char *)
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_TemplateTop::On_expect_qualifier_Other( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_name);
+
+    bCurIsConstant = true;
+}
+
+void
+PE_TemplateTop::On_expect_name_Identifier( const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_separator);
+
+    StreamLock sl(50);
+    if ( NOT bCurIsConstant )
+    {
+        String sText( sl() << "typename " << i_sText << c_str );
+        aResult_Parameters.push_back(sText);
+    }
+    else //
+    {
+        String sText( sl() << "constant " << i_sText << c_str );
+        aResult_Parameters.push_back(sText);
+        bCurIsConstant = false;
+    }  // endif
+}
+
+void
+PE_TemplateTop::On_expect_separator_Comma( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_qualifier);
+}
+
+void
+PE_TemplateTop::On_expect_separator_Greater( const char *)
+{
+    SetTokenResult(done, pop_success);
+}
+
+
+
+
+}   // namespace cpp
diff --git a/autodoc/source/parser/cpp/pe_tpltp.hxx b/autodoc/source/parser/cpp/pe_tpltp.hxx
new file mode 100644
index 000000000000..31f352a7ae56
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tpltp.hxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_TPLTP_HXX
+#define ADC_CPP_PE_TPLTP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+
+class PE_TemplateTop : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expect_qualifier,
+        expect_name,
+        expect_separator,
+        size_of_states
+    };
+                        PE_TemplateTop(
+                            Cpp_PE *            i_pParent );
+                        ~PE_TemplateTop();
+
+    const StringVector &
+                        Result_Parameters() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char *);
+
+
+    void                On_start_Less(const char *);
+
+    void                On_expect_qualifier_ClassOrTypename(const char *);
+    void                On_expect_qualifier_Greater(const char *);
+    void                On_expect_qualifier_Other(const char *);
+
+    void                On_expect_name_Identifier(const char *);
+
+    void                On_expect_separator_Comma(const char *);
+    void                On_expect_separator_Greater(const char *);
+
+    // DATA
+    Dyn< PeStatusArray<PE_TemplateTop> >
+                        pStati;
+
+    StringVector
+                        aResult_Parameters;
+    bool                bCurIsConstant;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const StringVector &
+PE_TemplateTop::Result_Parameters() const
+    { return aResult_Parameters; }
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/pe_tydef.cxx b/autodoc/source/parser/cpp/pe_tydef.cxx
new file mode 100644
index 000000000000..9361a5bc7740
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tydef.cxx
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_tydef.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <all_toks.hxx>
+#include "pe_type.hxx"
+
+
+namespace cpp {
+
+
+PE_Typedef::PE_Typedef(Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Typedef> ),
+        // pSpType,
+        // pSpuType,
+        // sName
+        nType(0)
+{
+    Setup_StatusFunctions();
+
+    pSpType    = new SP_Type(*this);
+    pSpuType   = new SPU_Type(*pSpType, 0, &PE_Typedef::SpReturn_Type);
+}
+
+PE_Typedef::~PE_Typedef()
+{
+}
+
+void
+PE_Typedef::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Typedef::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Typedef>::F_Tok F_Tok;
+    static F_Tok stateF_start[] =       { &PE_Typedef::On_start_typedef };
+    static INT16 stateT_start[] =       { Tid_typedef };
+
+    static F_Tok stateF_expectName[] =  { &PE_Typedef::On_expectName_Identifier };
+    static INT16 stateT_expectName[] =  { Tid_Identifier };
+
+    static F_Tok stateF_afterName[] =   { &PE_Typedef::On_afterName_Semicolon };
+    static INT16 stateT_afterName[] =   { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Typedef, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Typedef, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Typedef, afterName, Hdl_SyntaxError);
+}
+
+void
+PE_Typedef::InitData()
+{
+    pStati->SetCur(start);
+
+    sName.clear();
+    nType = 0;
+}
+
+void
+PE_Typedef::TransferData()
+{
+    pStati->SetCur(size_of_states);
+
+    ary::cpp::Typedef &
+    rTypedef = Env().AryGate().Ces().Store_Typedef(
+                        Env().Context(), sName, nType );
+    Env().Event_Store_Typedef(rTypedef);
+}
+
+void
+PE_Typedef::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Typedef::SpReturn_Type()
+{
+    pStati->SetCur(expectName);
+
+    nType = pSpuType->Child().Result_Type().Id();
+}
+
+void
+PE_Typedef::On_start_typedef( const char * )
+{
+    pSpuType->Push(done);
+}
+
+void
+PE_Typedef::On_expectName_Identifier( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+
+    sName = i_sText;
+}
+
+void
+PE_Typedef::On_afterName_Semicolon( const char * )
+{
+    SetTokenResult(done, pop_success);
+}
+
+}   // namespace cpp
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_tydef.hxx b/autodoc/source/parser/cpp/pe_tydef.hxx
new file mode 100644
index 000000000000..7a09eb01333b
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tydef.hxx
@@ -0,0 +1,90 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_TYDEF_HXX
+#define ADC_CPP_PE_TYDEF_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+
+
+namespace cpp
+{
+    class PE_Type;
+
+
+
+
+class PE_Typedef : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expectName,
+        afterName,
+        size_of_states
+    };
+                        PE_Typedef(
+                            Cpp_PE *        i_pParent );
+                        ~PE_Typedef();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    typedef SubPe< PE_Typedef, PE_Type >        SP_Type;
+    typedef SubPeUse< PE_Typedef, PE_Type>      SPU_Type;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_Type();
+
+    void                On_start_typedef( const char * );
+    void                On_expectName_Identifier( const char * );
+    void                On_afterName_Semicolon( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Typedef> >
+                        pStati;
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType;
+
+    String              sName;
+    ary::cpp::Type_id   nType;
+};
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/pe_type.cxx b/autodoc/source/parser/cpp/pe_type.cxx
new file mode 100644
index 000000000000..bf1eb2c69c7e
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_type.cxx
@@ -0,0 +1,554 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/inpcontx.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include "pe_class.hxx"
+#include "pe_enum.hxx"
+#include <x_parse.hxx>
+
+
+
+class NullType : public ary::cpp::Type
+{
+  private:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    virtual ary::ClassId
+                        get_AryClass() const;
+    virtual bool        inq_IsConst() const;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+};
+
+void
+NullType::do_Accept(csv::ProcessorIfc & ) const
+{
+    // Does nothing.
+}
+
+ary::ClassId
+NullType::get_AryClass() const
+{
+    return 0;
+}
+
+bool
+NullType::inq_IsConst() const
+{
+    return true;
+}
+
+void
+NullType::inq_Get_Text(     StreamStr &         ,
+                            StreamStr &         ,
+                            StreamStr &         ,
+                            const ary::cpp::Gate &  ) const
+{
+    // Does nothing.
+}
+
+
+
+
+namespace cpp
+{
+
+
+inline bool
+PE_Type::IsType() const
+    { return eResult_KindOf == is_type; }
+
+
+PE_Type::PE_Type( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Type> ),
+        pSpType(0),
+        pSpuType_TemplateParameter(0),
+        // pSpClass,
+        // pSpuClass,
+        // pSpEnum,
+        // pSpuEnum,
+        pType(0),
+        pCurTemplate_ParameterList(0),
+        // sOwningClassName,
+        // sParsedClass_Name,
+        pResult_Type(0),
+        eResult_KindOf(is_none),
+        bIsCastOperatorType(false)
+{
+    Setup_StatusFunctions();
+
+    pSpType         = new SP_Type(*this);
+    pSpClass        = new SP_Class(*this);
+    pSpEnum         = new SP_Enum(*this);
+
+    pSpuType_TemplateParameter
+                    = new SPU_Type(  *pSpType, 0,
+                                     &PE_Type::SpReturn_Type_TemplateParameter );
+    pSpuClass       = new SPU_Class( *pSpClass, 0,
+                                &    PE_Type::SpReturn_Class );
+    pSpuEnum        = new SPU_Enum( *pSpEnum, 0,
+                                &    PE_Type::SpReturn_Enum );
+}
+
+PE_Type::~PE_Type()
+{
+}
+
+void
+PE_Type::Init_AsCastOperatorType()
+{
+    bIsCastOperatorType = true;
+}
+
+void
+PE_Type::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Type::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Type>::F_Tok    F_Tok;
+    static F_Tok stateF_start[] =               { &PE_Type::On_start_Identifier,
+                                                  &PE_Type::On_start_class,
+                                                  &PE_Type::On_start_class,
+                                                  &PE_Type::On_start_class,
+                                                  &PE_Type::On_start_enum,
+                                                  &PE_Type::On_start_const,
+                                                  &PE_Type::On_start_volatile,
+                                                  &PE_Type::On_start_Bracket_Right,
+                                                  &PE_Type::On_start_DoubleColon,
+                                                  &PE_Type::On_start_typename,
+                                                  &PE_Type::On_start_BuiltInType,
+                                                  &PE_Type::On_start_TypeSpecializer };
+    static INT16 stateT_start[] =               { Tid_Identifier,
+                                                  Tid_class,
+                                                  Tid_struct,
+                                                  Tid_union,
+                                                  Tid_enum,
+                                                  Tid_const,
+                                                  Tid_volatile,
+                                                  Tid_Bracket_Right,
+                                                  Tid_DoubleColon,
+                                                  Tid_typename,
+                                                  Tid_BuiltInType,
+                                                  Tid_TypeSpecializer };
+
+    static F_Tok stateF_expect_namesegment[] =  { &PE_Type::On_expect_namesegment_Identifier,
+                                                  &PE_Type::On_expect_namesegment_Identifier };
+    static INT16 stateT_expect_namesegment[] =  { Tid_Identifier,
+                                                  Tid_BuiltInType };
+
+    static F_Tok stateF_after_namesegment[] =   { &PE_Type::On_after_namesegment_const,
+                                                  &PE_Type::On_after_namesegment_volatile,
+                                                  &PE_Type::On_after_namesegment_Bracket_Left,
+                                                  &PE_Type::On_after_namesegment_DoubleColon,
+                                                  &PE_Type::On_after_namesegment_Less,
+                                                  &PE_Type::On_after_namesegment_Asterix,
+                                                  &PE_Type::On_after_namesegment_AmpersAnd };
+    static INT16 stateT_after_namesegment[] =   { Tid_const,
+                                                  Tid_volatile,
+                                                  Tid_Bracket_Left,
+                                                  Tid_DoubleColon,
+                                                  Tid_Less,
+                                                  Tid_Asterix,
+                                                  Tid_AmpersAnd };
+
+    static F_Tok stateF_afterclass_expect_semicolon[] =
+                                                { &PE_Type::On_afterclass_expect_semicolon_Semicolon };
+    static INT16 stateT_afterclass_expect_semicolon[] =
+                                                { Tid_Semicolon };
+
+    static F_Tok stateF_within_template[] =     { &PE_Type::On_within_template_Comma,
+                                                  &PE_Type::On_within_template_Greater,
+                                                  &PE_Type::On_within_template_Constant };
+    static INT16 stateT_within_template[] =     { Tid_Comma,
+                                                  Tid_Greater,
+                                                  Tid_Constant };
+
+    static F_Tok stateF_within_indirection[] =  { &PE_Type::On_within_indirection_const,
+                                                  &PE_Type::On_within_indirection_volatile,
+                                                  &PE_Type::On_within_indirection_Asterix,
+                                                  &PE_Type::On_within_indirection_AmpersAnd };
+    static INT16 stateT_within_indirection[] =  { Tid_const,
+                                                  Tid_volatile,
+                                                  Tid_Asterix,
+                                                  Tid_AmpersAnd };
+
+    SEMPARSE_CREATE_STATUS(PE_Type, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Type, expect_namesegment, On_EndOfType);
+    SEMPARSE_CREATE_STATUS(PE_Type, after_namesegment, On_EndOfType);
+    SEMPARSE_CREATE_STATUS(PE_Type, afterclass_expect_semicolon, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Type, within_template, On_within_template_TypeStart);
+    SEMPARSE_CREATE_STATUS(PE_Type, within_indirection, On_EndOfType);
+}
+
+void
+PE_Type::InitData()
+{
+    pStati->SetCur(start);
+
+    ary::cpp::Ce_id
+        scope_id = Env().Context().CurClass() != 0
+                    ?   Env().Context().CurClass()->CeId()
+                    :   Env().Context().CurNamespace().CeId();
+
+    pType = new ary::cpp::UsedType(scope_id);
+    pCurTemplate_ParameterList = 0;
+    sOwningClassName
+            =   Env().Context().CurClass() != 0
+                    ?   Env().Context().CurClass()->LocalName().c_str()
+                    :   "";
+    sParsedClass_Name.clear();
+    pResult_Type = 0;
+    eResult_KindOf = is_type;
+    bIsCastOperatorType = false;
+}
+
+void
+PE_Type::TransferData()
+{
+    pStati->SetCur(size_of_states);
+
+    if ( IsType() )
+        pResult_Type = & Env().AryGate().Types().CheckIn_UsedType(
+                                                        Env().Context(),
+                                                        *pType.Release() );
+    else
+        pResult_Type = new NullType;
+}
+
+void
+PE_Type::Hdl_SyntaxError( const char * i_sText )
+{
+    StdHandlingOfSyntaxError( i_sText );
+}
+
+void
+PE_Type::SpReturn_Type_TemplateParameter()
+{
+    if ( pSpuType_TemplateParameter->Child().Result_KindOf() != is_type )
+        throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+    pCurTemplate_ParameterList->AddParam_Type(
+            pSpuType_TemplateParameter->Child().Result_Type().TypeId() );
+}
+
+void
+PE_Type::SpReturn_Class()
+{
+    switch ( pSpuClass->Child().Result_KindOf() )
+    {
+        case PE_Class::is_declaration:
+                    pStati->SetCur(afterclass_expect_semicolon);
+                    eResult_KindOf = is_explicit_class_declaration;
+                    break;
+        case PE_Class::is_implicit_declaration:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuClass->Child().Result_LocalName() );
+                    break;
+        case PE_Class::is_predeclaration:
+                    pStati->SetCur(afterclass_expect_semicolon);
+                    eResult_KindOf = is_class_predeclaration;
+                    break;
+        case PE_Class::is_qualified_typename:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuClass->Child().Result_FirstNameSegment() );
+                    break;
+        default:
+                    csv_assert(false);
+    }
+}
+
+void
+PE_Type::SpReturn_Enum()
+{
+    switch ( pSpuEnum->Child().Result_KindOf() )
+    {
+        case PE_Enum::is_declaration:
+                    pStati->SetCur(afterclass_expect_semicolon);
+                    eResult_KindOf = is_explicit_enum_declaration;
+                    break;
+        case PE_Enum::is_implicit_declaration:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuEnum->Child().Result_LocalName() );
+                    break;
+        case PE_Enum::is_qualified_typename:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuEnum->Child().Result_FirstNameSegment() );
+                    break;
+        default:
+                    csv_assert(false);
+    }
+}
+
+void
+PE_Type::On_EndOfType(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Type::On_start_Identifier( const char * i_sText )
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(after_namesegment);
+
+    pType->Add_NameSegment(i_sText);
+}
+
+void
+PE_Type::On_start_class(const char *)
+{
+    pSpuClass->Push(not_done);
+}
+
+void
+PE_Type::On_start_enum(const char *)
+{
+    pSpuEnum->Push(done);
+}
+
+void
+PE_Type::On_start_const(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Const();
+}
+
+void
+PE_Type::On_start_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Volatile();
+}
+
+void
+PE_Type::On_start_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done,pop_success);
+
+    eResult_KindOf = is_none;
+}
+
+void
+PE_Type::On_start_DoubleColon(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Absolute();
+}
+
+void
+PE_Type::On_start_BuiltInType(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(after_namesegment);
+    pType->Set_BuiltIn(i_sText);
+}
+
+void
+PE_Type::On_start_TypeSpecializer(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    if (*i_sText == 'u') {
+        pType->Set_Unsigned();
+    }
+    else if (*i_sText == 's') {
+        pType->Set_Signed();
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Type::On_start_typename(const char *)
+{
+    SetTokenResult(done,stay);
+}
+
+void
+PE_Type::On_expect_namesegment_Identifier(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(after_namesegment);
+    pType->Add_NameSegment(i_sText);
+}
+
+void
+PE_Type::On_after_namesegment_const(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Const();
+}
+
+void
+PE_Type::On_after_namesegment_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Volatile();
+}
+
+void
+PE_Type::On_after_namesegment_Bracket_Left(const char * i_sText)
+{
+    if ( bIsCastOperatorType )
+    {
+        SetTokenResult(not_done, pop_success);
+    }
+    else if ( pType->LocalName() == sOwningClassName )
+    {
+        SetTokenResult(not_done,pop_success);
+        eResult_KindOf = is_constructor;
+
+    }
+    else //
+    {
+        On_EndOfType(i_sText);
+    }  // endif
+}
+
+void
+PE_Type::On_after_namesegment_DoubleColon(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(expect_namesegment);
+}
+
+void
+PE_Type::On_after_namesegment_Less(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(within_template);
+
+    pCurTemplate_ParameterList = & pType->Enter_Template();
+}
+
+void
+PE_Type::On_after_namesegment_Asterix(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(within_indirection);
+    pType->Add_PtrLevel();
+}
+
+void
+PE_Type::On_after_namesegment_AmpersAnd(const char *)
+{
+    SetTokenResult(done,pop_success);
+    pType->Set_Reference();
+}
+
+void
+PE_Type::On_afterclass_expect_semicolon_Semicolon(const char *)
+{
+    csv_assert( NOT IsType() );
+    SetTokenResult(not_done,pop_success);
+}
+
+void
+PE_Type::On_within_template_Comma(const char *)
+{
+    SetTokenResult(done,stay);
+}
+
+void
+PE_Type::On_within_template_Greater(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(after_namesegment);
+
+    pCurTemplate_ParameterList = 0;
+}
+
+void
+PE_Type::On_within_template_Constant(const char * i_sText)
+{
+    // KORR_FUTURE
+    Cerr() << "Templates with constants as parameters are not yet supported by Autodoc" << Endl();
+    Hdl_SyntaxError(i_sText);
+}
+
+void
+PE_Type::On_within_template_TypeStart(const char *)
+{
+    pSpuType_TemplateParameter->Push(not_done);
+}
+
+void
+PE_Type::On_within_indirection_const(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Const();
+}
+
+void
+PE_Type::On_within_indirection_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Volatile();
+}
+
+void
+PE_Type::On_within_indirection_Asterix(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Add_PtrLevel();
+}
+
+void
+PE_Type::On_within_indirection_AmpersAnd(const char *)
+{
+    SetTokenResult(done,pop_success);
+    pType->Set_Reference();
+}
+
+}   // namespace cpp
+
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_type.hxx b/autodoc/source/parser/cpp/pe_type.hxx
new file mode 100644
index 000000000000..8bd3dfb093b4
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_type.hxx
@@ -0,0 +1,185 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ADC_CPP_PE_TYPE_HXX
+#define ADC_CPP_PE_TYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <ary/cpp/usedtype.hxx>
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace cpp {
+
+class PE_Class;
+class PE_Enum;
+class PE_Expression;
+
+class PE_Type : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expect_namesegment,
+        after_namesegment,
+        afterclass_expect_semicolon,
+        within_template,
+        within_indirection,
+        size_of_states
+    };
+    enum E_KindOfResult
+    {
+        is_none,
+        is_type,
+        is_constructor,
+        is_explicit_class_declaration,
+        is_class_predeclaration,
+        is_explicit_enum_declaration
+    };
+
+                        PE_Type(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Type();
+
+    void                Init_AsCastOperatorType();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    E_KindOfResult      Result_KindOf() const;
+    const ary::cpp::Type &
+                        Result_Type() const;
+  private:
+    typedef SubPe< PE_Type, PE_Type >           SP_Type;
+    typedef SubPe< PE_Type, PE_Class >          SP_Class;
+    typedef SubPe< PE_Type, PE_Enum >           SP_Enum;
+    typedef SubPeUse< PE_Type, PE_Type >        SPU_Type;
+    typedef SubPeUse< PE_Type, PE_Class >       SPU_Class;
+    typedef SubPeUse< PE_Type, PE_Enum >        SPU_Enum;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_Type_TemplateParameter();
+    void                SpReturn_Class();
+    void                SpReturn_Enum();
+
+    void                On_EndOfType(const char *);
+
+    void                On_start_Identifier(const char *);
+    void                On_start_class(const char *);
+    void                On_start_enum(const char *);
+    void                On_start_const(const char *);
+    void                On_start_volatile(const char *);
+    void                On_start_Bracket_Right(const char *);
+    void                On_start_DoubleColon(const char *);
+    void                On_start_BuiltInType(const char *);
+    void                On_start_TypeSpecializer(const char *);
+    void                On_start_typename(const char *);
+
+    void                On_expect_namesegment_Identifier(const char *);
+
+    void                On_after_namesegment_const(const char *);
+    void                On_after_namesegment_volatile(const char *);
+    void                On_after_namesegment_Bracket_Left(const char *);
+    void                On_after_namesegment_DoubleColon(const char *);
+    void                On_after_namesegment_Less(const char *);
+    void                On_after_namesegment_Asterix(const char *);
+    void                On_after_namesegment_AmpersAnd(const char *);
+
+    void                On_afterclass_expect_semicolon_Semicolon(const char *);
+
+    void                On_within_template_Comma(const char *);
+    void                On_within_template_Greater(const char *);
+    void                On_within_template_Constant(const char *);
+    void                On_within_template_TypeStart(const char *);
+
+    void                On_within_indirection_const(const char *);
+    void                On_within_indirection_volatile(const char *);
+    void                On_within_indirection_Asterix(const char *);
+    void                On_within_indirection_AmpersAnd(const char *);
+
+    bool                IsType() const;
+
+    // DATA
+    Dyn< PeStatusArray<PE_Type> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType_TemplateParameter;
+    Dyn<SP_Class>       pSpClass;
+    Dyn<SPU_Class>      pSpuClass;
+    Dyn<SP_Enum>        pSpEnum;
+    Dyn<SPU_Enum>       pSpuEnum;
+
+    Dyn<ary::cpp::UsedType>
+                        pType;
+    ary::cpp::ut::List_TplParameter *
+                        pCurTemplate_ParameterList;
+    String              sOwningClassName;
+    String              sParsedClass_Name;
+
+    const ary::cpp::Type *
+                        pResult_Type;
+    E_KindOfResult      eResult_KindOf;
+    bool                bIsCastOperatorType;
+};
+
+
+
+// IMPLEMENTATION
+
+
+inline const ary::cpp::Type &
+PE_Type::Result_Type() const
+    { csv_assert(pResult_Type != 0);
+      return *pResult_Type; }
+inline PE_Type::E_KindOfResult
+PE_Type::Result_KindOf() const
+    { return eResult_KindOf; }
+
+
+}   // namespace cpp
+
+
+#endif
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_vafu.cxx b/autodoc/source/parser/cpp/pe_vafu.cxx
new file mode 100644
index 000000000000..08026c1f00a0
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vafu.cxx
@@ -0,0 +1,649 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_vafu.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include "pe_type.hxx"
+#include "pe_vari.hxx"
+#include "pe_funct.hxx"
+#include "pe_ignor.hxx"
+#include <x_parse.hxx>
+
+
+
+
+namespace cpp {
+
+
+
+//***********************       PE_VarFunc      ***********************//
+
+
+PE_VarFunc::PE_VarFunc( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_VarFunc> ),
+        // pSpType,
+        // pSpuType,
+        // pSpVariable,
+        // pSpuVariable,
+        // pSpFunction,
+        // pSpuFunctionStd,
+        // pSpuFunctionCtor,
+        // pSpuFunctionDtor,
+        // pSpuFunctionCastOperator,
+        // pSpuFunctionNormalOperator
+        // pSpIgnore,
+        // pSpuIgnore,
+        nCounter_TemplateBrackets(0),
+        bInDestructor(false),
+        // aResultIds,
+        nResultFrontType(0),
+        eResultType(result_unknown),
+        bVirtual(false),
+        bStatic(false),
+        bExtern(false),
+        bExternC(false),
+        bMutable(false),
+        bInline(false),
+        bRegister(false),
+        bExplicit(false)
+{
+    Setup_StatusFunctions();
+
+    pSpType             = new SP_Type(*this);
+    pSpuType            = new SPU_Type(*pSpType, 0, &PE_VarFunc::SpReturn_Type);
+    pSpVariable         = new SP_Variable(*this);
+    pSpuVariable        = new SPU_Variable(*pSpVariable, 0, &PE_VarFunc::SpReturn_Variable);
+    pSpFunction         = new SP_Function(*this);
+    pSpuFunctionStd     = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionStd, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionCtor    = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionCtor, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionDtor    = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionDtor, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionCastOperator
+                        = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionCastOperator, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionNormalOperator
+                        = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionNormalOperator, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpIgnore           = new SP_Ignore(*this);
+    pSpuIgnore          = new SPU_Ignore(*pSpIgnore, 0, &PE_VarFunc::SpReturn_Ignore);
+}
+
+PE_VarFunc::~PE_VarFunc()
+{
+}
+
+void
+PE_VarFunc::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_VarFunc::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_VarFunc>::F_Tok F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_VarFunc::On_start_Identifier,
+                                              &PE_VarFunc::On_start_operator,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_virtual,
+                                              &PE_VarFunc::On_start_Tilde,
+                                              &PE_VarFunc::On_start_const,
+                                              &PE_VarFunc::On_start_volatile,
+                                              &PE_VarFunc::On_start_extern,
+                                              &PE_VarFunc::On_start_static,
+                                              &PE_VarFunc::On_start_mutable,
+                                              &PE_VarFunc::On_start_register,
+                                              &PE_VarFunc::On_start_inline,
+                                              &PE_VarFunc::On_start_explicit,
+                                              &PE_VarFunc::On_start_Bracket_Right,
+                                              &PE_VarFunc::On_start_Identifier,
+                                              &PE_VarFunc::On_start_typename,
+                                              &PE_VarFunc::On_start_Identifier,
+                                              &PE_VarFunc::On_start_Identifier };
+    static INT16 stateT_start[] =           { Tid_Identifier,
+                                              Tid_operator,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+                                              Tid_virtual,
+                                              Tid_Tilde,
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_extern,
+                                              Tid_static,
+                                              Tid_mutable,
+                                              Tid_register,
+                                              Tid_inline,
+                                              Tid_explicit,
+                                              Tid_Bracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_expectCtor[] =      { &PE_VarFunc::On_expectCtor_Bracket_Left };
+    static INT16 stateT_expectCtor[] =      { Tid_Bracket_Left };
+
+    static F_Tok stateF_afterClassDecl[] =  { &PE_VarFunc::On_afterClassDecl_Semicolon };
+    static INT16 stateT_afterClassDecl[] =  { Tid_Semicolon };
+
+    static F_Tok stateF_expectName[] =      { &PE_VarFunc::On_expectName_Identifier,
+                                              &PE_VarFunc::On_expectName_operator,
+                                              &PE_VarFunc::On_expectName_Bracket_Left };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_operator,
+                                              Tid_Bracket_Left };
+
+    static F_Tok stateF_afterName[] =       { &PE_VarFunc::On_afterName_ArrayBracket_Left,
+                                              &PE_VarFunc::On_afterName_Bracket_Left,
+                                              &PE_VarFunc::On_afterName_DoubleColon,
+                                              &PE_VarFunc::On_afterName_Semicolon,
+                                              &PE_VarFunc::On_afterName_Comma,
+                                              &PE_VarFunc::On_afterName_Assign,
+                                              &PE_VarFunc::On_afterName_Less };
+    static INT16 stateT_afterName[] =       { Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Left,
+                                              Tid_DoubleColon,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Assign,
+                                              Tid_Less };
+
+    static F_Tok stateF_afterName_inErraneousTemplate[] =
+                                            { &PE_VarFunc::On_afterName_inErraneousTemplate_Less,
+                                              &PE_VarFunc::On_afterName_inErraneousTemplate_Greater };
+    static INT16 stateT_afterName_inErraneousTemplate[] =
+                                            { Tid_Less,
+                                              Tid_Greater };
+
+    static F_Tok stateF_finished[] =        { &PE_VarFunc::On_finished_Semicolon,
+                                              &PE_VarFunc::On_finished_Comma };
+    static INT16 stateT_finished[] =        { Tid_Semicolon,
+                                              Tid_Comma };
+
+    static F_Tok stateF_finishedIncludingFunctionImplementation[] =
+                                            { &PE_VarFunc::On_finishedIncludingFunctionImplementation_Default
+                                            };
+    static INT16 stateT_finishedIncludingFunctionImplementation[] =
+                                            { Tid_BuiltInType     // Just to have one entry, but it is default handled, too.
+                                            };
+
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, start, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, expectCtor, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, afterClassDecl, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, expectName, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, afterName, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, afterName_inErraneousTemplate, On_afterName_inErraneousTemplate_Default);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, finished, On_finished_Default);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, finishedIncludingFunctionImplementation, On_finishedIncludingFunctionImplementation_Default);
+}
+
+void
+PE_VarFunc::InitData()
+{
+    pStati->SetCur(start);
+    csv::erase_container(aResultIds);
+
+    nCounter_TemplateBrackets = 0;
+    bInDestructor = false;
+
+    nResultFrontType = 0;
+    eResultType = result_unknown;
+    sName.clear();
+    bVirtual = ary::cpp::VIRTUAL_none;
+    bStatic = false;
+    bExtern = false;
+    bExternC = false;
+    bMutable = false;
+    bInline = false;
+    bRegister = false;
+    bExplicit = false;
+}
+
+void
+PE_VarFunc::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_VarFunc::Hdl_UnknownToken( const char *)
+{
+    pSpuIgnore->Push(not_done);
+}
+
+void
+PE_VarFunc::SpInit_FunctionStd()
+{
+    if ( nResultFrontType.IsValid() AND sName.length() > 0 )
+    {
+        pSpuFunctionStd->Child().Init_Std(
+                                       sName,
+                                       nResultFrontType,
+                                       bVirtual,
+                                       CreateFunctionFlags() );
+    }
+    else
+    {
+        throw X_Parser( X_Parser::x_UnexpectedToken,
+                        "",
+                        Env().CurFileName(),
+                        Env().LineCount() );
+    }
+}
+
+void
+PE_VarFunc::SpInit_FunctionCtor()
+{
+    ary::cpp::Class * pOwnerClass = Env().Context().CurClass();
+    csv_assert( pOwnerClass != 0 );
+    pSpuFunctionStd->Child().Init_Ctor( pOwnerClass->LocalName(),
+                                        CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpInit_FunctionDtor()
+{
+    pSpuFunctionStd->Child().Init_Dtor( sName,
+                                        bVirtual,
+                                        CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpInit_FunctionCastOperator()
+{
+    pSpuFunctionStd->Child().Init_CastOperator( bVirtual,
+                                                CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpInit_FunctionNormalOperator()
+{
+    pSpuFunctionStd->Child().Init_NormalOperator( nResultFrontType,
+                                                  bVirtual,
+                                                  CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpReturn_Type()
+{
+    switch ( pSpuType->Child().Result_KindOf() )
+    {
+        case PE_Type::is_type:
+                            pStati->SetCur(expectName);
+                            nResultFrontType
+                                    = pSpuType->Child().Result_Type().Id();
+                            break;
+        case PE_Type::is_constructor:
+                            pStati->SetCur(expectCtor);
+                            eResultType = result_function;
+                            break;
+        case PE_Type::is_explicit_class_declaration:
+        case PE_Type::is_explicit_enum_declaration:
+                            pStati->SetCur(afterClassDecl);
+                            eResultType = result_ignore;
+                            break;
+        case PE_Type::is_class_predeclaration:
+                            pStati->SetCur(afterClassDecl);
+                            eResultType = result_ignore;
+                            break;
+        default:
+                            ;
+    }
+}
+
+void
+PE_VarFunc::SpReturn_Variable()
+{
+    typedef ary::cpp::VariableFlags  VarFlags;
+
+    if ( NOT bExtern )
+    {
+        VarFlags aFlags( UINT16(
+                           ( bStatic AND Env().Context().CurClass() == 0 ? VarFlags::f_static_local : 0 )
+                         | ( bStatic AND Env().Context().CurClass() != 0 ? VarFlags::f_static_member : 0 )
+                         | ( bMutable  ? VarFlags::f_mutable : 0 ) )
+                       );
+
+//      ary::S_InitData aData( 0, Env().CurCeSpace().Id(), i_sName, 0 );
+        ary::cpp::Variable & rCurParsedVariable
+                = Env().AryGate().Ces().Store_Variable( Env().Context(),
+                                                    sName,
+                                                    nResultFrontType,
+                                                    aFlags,
+                                                    pSpuVariable->Child().Result_SizeExpression(),
+                                                    pSpuVariable->Child().Result_InitExpression() );
+        Env().Event_Store_Variable(rCurParsedVariable);
+        aResultIds.push_back( rCurParsedVariable.CeId() );
+        eResultType = result_variable;
+    }
+    else if (bExtern)
+    {
+        eResultType = result_ignore;
+    }
+
+    pStati->SetCur(finished);
+}
+
+void
+PE_VarFunc::SpReturn_FunctionStd()
+{
+    if ( (NOT bExtern) OR bExternC )
+    {
+        aResultIds.push_back(pSpuFunctionStd->Child().Result_Id());
+        eResultType = result_function;
+    }
+    else
+    {
+        eResultType = result_ignore;
+    }
+
+    if ( NOT pSpuFunctionStd->Child().Result_WithImplementation() )
+        pStati->SetCur(finished);
+    else
+        pStati->SetCur(finishedIncludingFunctionImplementation);
+}
+
+void
+PE_VarFunc::SpReturn_Ignore()
+{
+    pStati->SetCur(finished);
+}
+
+void
+PE_VarFunc::On_start_Identifier(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_operator(const char *)
+{
+    pSpuFunctionCastOperator->Push(done);
+}
+
+void
+PE_VarFunc::On_start_TypeKey(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_virtual(const char *)
+{
+    SetTokenResult(done, stay);
+    bVirtual = true;
+}
+
+void
+PE_VarFunc::On_start_Tilde(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+
+    bInDestructor = true;
+}
+
+void
+PE_VarFunc::On_start_const(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_volatile(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_extern(const char *)
+{
+    SetTokenResult(done, stay);
+    bExtern = true;
+}
+
+void
+PE_VarFunc::On_start_static(const char *)
+{
+    SetTokenResult(done, stay);
+    bStatic = true;
+}
+
+void
+PE_VarFunc::On_start_mutable(const char *)
+{
+    SetTokenResult(done, stay);
+    bMutable = true;
+}
+
+void
+PE_VarFunc::On_start_register(const char *)
+{
+    SetTokenResult(done, stay);
+    bRegister = true;
+}
+
+void
+PE_VarFunc::On_start_inline(const char *)
+{
+       SetTokenResult(done, stay);
+
+    bInline = true;
+}
+
+void
+PE_VarFunc::On_start_explicit(const char *)
+{
+    SetTokenResult(done, stay);
+    bExplicit = true;
+}
+
+void
+PE_VarFunc::On_start_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_VarFunc::On_start_typename(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_expectCtor_Bracket_Left(const char *)
+{
+    pSpuFunctionCtor->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterClassDecl_Semicolon(const char *)
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_VarFunc::On_expectName_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+    sName = i_sText;
+}
+
+void
+PE_VarFunc::On_expectName_operator(const char *)
+{
+    pSpuFunctionNormalOperator->Push(done);
+}
+
+void
+PE_VarFunc::On_expectName_Bracket_Left(const char *)
+{
+    // Function pointer declaration
+    pSpuIgnore->Push(not_done);
+    // TODO
+}
+
+
+void
+PE_VarFunc::On_afterName_ArrayBracket_Left(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Bracket_Left(const char *)
+{
+    if ( NOT bInDestructor)
+        pSpuFunctionStd->Push(not_done);
+    else
+        pSpuFunctionDtor->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_DoubleColon(const char *)
+{
+    pSpuIgnore->Push(done);   // This seems to be only an implementation.
+
+    // This may have been a template.
+    // In that case, the declaration needs to be closed.
+    Env().Close_OpenTemplate();
+}
+
+void
+PE_VarFunc::On_afterName_Semicolon(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Comma(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Assign(const char * )
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Less(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName_inErraneousTemplate);
+
+    nCounter_TemplateBrackets = 1;
+}
+
+void
+PE_VarFunc::On_afterName_inErraneousTemplate_Less(const char * )
+{
+    SetTokenResult(done, stay);
+
+    nCounter_TemplateBrackets++;
+}
+
+void
+PE_VarFunc::On_afterName_inErraneousTemplate_Greater(const char * )
+{
+    SetTokenResult(done, stay);
+
+    nCounter_TemplateBrackets--;
+    if ( nCounter_TemplateBrackets == 0 )
+        pStati->SetCur(afterName);
+}
+
+void
+PE_VarFunc::On_afterName_inErraneousTemplate_Default(const char * )
+{
+    SetTokenResult(done, stay);
+}
+
+void
+PE_VarFunc::On_finished_Semicolon(const char * )  // Should be Semicolon !!!
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_VarFunc::On_finished_Comma(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+}
+
+void
+PE_VarFunc::On_finished_Default(const char * )
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_VarFunc::On_finishedIncludingFunctionImplementation_Default(const char * )
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+ary::cpp::FunctionFlags
+PE_VarFunc::CreateFunctionFlags()
+{
+    typedef ary::cpp::FunctionFlags  FuncFlags;
+
+    return FuncFlags(     UINT16(
+                            ( bStatic AND Env().Context().CurClass() == 0 ? FuncFlags::f_static_local : 0 )
+                          | ( bStatic AND Env().Context().CurClass() != 0 ? FuncFlags::f_static_member : 0 )
+                          | ( bExtern ? FuncFlags::f_extern : 0 )
+                          | ( Env().IsExternC() ? FuncFlags::f_externC : 0 )
+                          | ( bMutable  ? FuncFlags::f_mutable : 0 )
+                          | ( bInline  ? FuncFlags::f_inline : 0 )
+                          | ( bRegister  ? FuncFlags::f_register : 0 )
+                          | ( bExplicit  ? FuncFlags::f_explicit : 0 ) )
+                        );
+
+}
+
+
+}   // namespace cpp
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_vafu.hxx b/autodoc/source/parser/cpp/pe_vafu.hxx
new file mode 100644
index 000000000000..df151a3ca18d
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vafu.hxx
@@ -0,0 +1,289 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ADC_CPP_PE_VAFU_HXX
+#define ADC_CPP_PE_VAFU_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+
+
+
+namespace cpp
+{
+
+class PE_Type;
+class PE_Variable;
+class PE_Function;
+class PE_Ignore;
+
+
+
+
+class PE_VarFunc : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expectCtor,
+        afterClassDecl,     // Also used for after enum declaration.
+        expectName,
+        afterName,
+        afterName_inErraneousTemplate,
+        finished,
+        finishedIncludingFunctionImplementation,
+        size_of_states
+    };
+    enum E_ResultType
+    {
+        result_unknown = 0,
+        result_ignore,          /// Used for class and enum declarations and predeclarations and for extern variables and functions.
+        result_variable,
+        result_function
+    };
+
+    typedef ary::cpp::E_Protection              E_Protection;
+
+
+                        PE_VarFunc(
+                            Cpp_PE *            i_pParent );
+                        ~PE_VarFunc();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    const std::vector<ary::cpp::Ce_id> &
+                        Result_Ids() const;
+    ary::cpp::Type_id   Result_FrontType() const;
+    const StringVector &
+                        Result_Names() const;
+    E_ResultType        Result_CeType() const;
+
+  private:
+    typedef SubPe< PE_VarFunc, PE_Type >        SP_Type;
+    typedef SubPeUse< PE_VarFunc, PE_Type >     SPU_Type;
+    typedef SubPe< PE_VarFunc, PE_Variable >    SP_Variable;
+    typedef SubPeUse< PE_VarFunc, PE_Variable > SPU_Variable;
+    typedef SubPe< PE_VarFunc, PE_Function >    SP_Function;
+    typedef SubPeUse< PE_VarFunc, PE_Function > SPU_Function;
+    typedef SubPe< PE_VarFunc, PE_Ignore >      SP_Ignore;
+    typedef SubPeUse< PE_VarFunc, PE_Ignore >   SPU_Ignore;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_UnknownToken( const char *);
+
+    void                SpInit_FunctionStd();
+    void                SpInit_FunctionCtor();
+    void                SpInit_FunctionDtor();
+    void                SpInit_FunctionCastOperator();
+    void                SpInit_FunctionNormalOperator();
+    void                SpReturn_Type();
+    void                SpReturn_Variable();
+    void                SpReturn_FunctionStd();
+    void                SpReturn_Ignore();
+
+    void                On_start_Identifier(const char * i_sText);
+    void                On_start_operator(const char * i_sText);
+    void                On_start_TypeKey(const char * i_sText);
+    void                On_start_virtual(const char * i_sText);
+    void                On_start_Tilde(const char * i_sText);
+    void                On_start_const(const char * i_sText);
+    void                On_start_volatile(const char * i_sText);
+    void                On_start_extern(const char * i_sText);
+    void                On_start_static(const char * i_sText);
+    void                On_start_mutable(const char * i_sText);
+    void                On_start_register(const char * i_sText);
+    void                On_start_inline(const char * i_sText);
+    void                On_start_explicit(const char * i_sText);
+    void                On_start_Bracket_Right(const char * i_sText);
+    void                On_start_typename(const char * i_sText);
+
+    void                On_expectCtor_Bracket_Left(const char * i_sText);
+
+    void                On_afterClassDecl_Semicolon(const char * i_sText);
+
+    void                On_expectName_Identifier(const char * i_sText);
+    void                On_expectName_operator(const char * i_sText);
+    void                On_expectName_Bracket_Left(const char * i_sText);
+
+    void                On_afterName_ArrayBracket_Left(const char * i_sText);
+    void                On_afterName_Bracket_Left(const char * i_sText);
+    void                On_afterName_DoubleColon(const char * i_sText);
+    void                On_afterName_Semicolon(const char * i_sText);
+    void                On_afterName_Comma(const char * i_sText);
+    void                On_afterName_Assign(const char * i_sText);
+    void                On_afterName_Less(const char * i_sText);
+
+    void                On_afterName_inErraneousTemplate_Less(const char * i_sText);
+    void                On_afterName_inErraneousTemplate_Greater(const char * i_sText);
+    void                On_afterName_inErraneousTemplate_Default(const char * i_sText);
+
+    void                On_finished_Semicolon(const char * i_sText);
+    void                On_finished_Comma(const char * i_sText);
+    void                On_finished_Default(const char * i_sText);
+
+    void                On_finishedIncludingFunctionImplementation_Default(const char * i_sText);
+
+    ary::cpp::FunctionFlags
+                        CreateFunctionFlags();
+
+    // DATA
+    Dyn< PeStatusArray<PE_VarFunc> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType;
+    Dyn<SP_Variable>    pSpVariable;
+    Dyn<SPU_Variable>   pSpuVariable;
+    Dyn<SP_Function>    pSpFunction;
+    Dyn<SPU_Function>   pSpuFunctionStd;
+    Dyn<SPU_Function>   pSpuFunctionCtor;
+    Dyn<SPU_Function>   pSpuFunctionDtor;
+    Dyn<SPU_Function>   pSpuFunctionCastOperator;
+    Dyn<SPU_Function>   pSpuFunctionNormalOperator;
+    Dyn<SP_Ignore>      pSpIgnore;
+    Dyn<SPU_Ignore>     pSpuIgnore;
+
+    intt                nCounter_TemplateBrackets;
+    bool                bInDestructor;
+
+    std::vector<ary::cpp::Ce_id>
+                        aResultIds;
+    ary::cpp::Type_id   nResultFrontType;
+    E_ResultType        eResultType;
+
+    // Pre-Results
+    String              sName;
+
+    bool                bVirtual;
+    bool                bStatic;
+    bool                bExtern;
+    bool                bExternC;
+    bool                bMutable;
+    bool                bInline;
+    bool                bRegister;
+    bool                bExplicit;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const std::vector<ary::cpp::Ce_id> &
+PE_VarFunc::Result_Ids() const
+    { return aResultIds; }
+inline ary::cpp::Type_id
+PE_VarFunc::Result_FrontType() const
+    { return nResultFrontType; }
+inline PE_VarFunc::E_ResultType
+PE_VarFunc::Result_CeType() const
+    { return eResultType; }
+
+
+
+}   // namespace cpp
+
+
+
+
+#endif
+
+
+/*  // Overview of Stati
+
+Undecided
+---------
+
+start           // vor und w�hrend storage class specifiern
+    any         ->stay
+    operaator   ->goto Function
+
+->Typ
+
+expectName
+    Identifier  ->stay
+    operator    ->goto Function
+
+afterName       ->goto Variable or Function
+
+
+
+
+Variable
+--------
+
+start           // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName      // Typ ist da  -> im Falle von '(': notyetimplemented
+afterName
+
+expectSize      // after [
+expectFinish
+                // vor ; oder ,
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+Function
+--------
+
+start               // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName          // Typ ist da
+expectBracket       // Nach Name
+expectParameter     // nach ( oder ,
+-> Parameter
+after Parameters    // before const, volatile throw or = 0.
+after throw         // expect (
+expectException     // after (
+after exceptions    // = 0 oder ; oder ,
+
+
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+
+
+*/
diff --git a/autodoc/source/parser/cpp/pe_vari.cxx b/autodoc/source/parser/cpp/pe_vari.cxx
new file mode 100644
index 000000000000..a3accd3963c2
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vari.cxx
@@ -0,0 +1,187 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_vari.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include "pe_expr.hxx"
+
+
+
+
+namespace cpp {
+
+
+PE_Variable::PE_Variable( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Variable> )
+        // pSpExpression,
+        // pSpuArraySizeExpression,
+        // pSpuInitExpression,
+        // sResultSizeExpression,
+        // sResultInitExpression
+{
+    Setup_StatusFunctions();
+
+    pSpExpression       = new SP_Expression(*this);
+
+    pSpuArraySizeExpression  = new SPU_Expression(*pSpExpression, 0, &PE_Variable::SpReturn_ArraySizeExpression);
+    pSpuInitExpression  = new SPU_Expression(*pSpExpression, 0, &PE_Variable::SpReturn_InitExpression);
+}
+
+PE_Variable::~PE_Variable()
+{
+}
+
+void
+PE_Variable::Call_Handler( const cpp::Token &   i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Variable::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Variable>::F_Tok    F_Tok;
+
+    static F_Tok stateF_afterName[] =       { &PE_Variable::On_afterName_ArrayBracket_Left,
+                                              &PE_Variable::On_afterName_Semicolon,
+                                              &PE_Variable::On_afterName_Comma,
+                                              &PE_Variable::On_afterName_Assign };
+    static INT16 stateT_afterName[] =       { Tid_ArrayBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Assign };
+    static F_Tok stateF_afterSize[] =       { &PE_Variable::On_afterSize_ArrayBracket_Right };
+    static INT16 stateT_afterSize[] =       { Tid_ArrayBracket_Right };
+    static F_Tok stateF_expectFinish[] =    { &PE_Variable::On_expectFinish_Bracket_Right,
+                                              &PE_Variable::On_expectFinish_Semicolon,
+                                              &PE_Variable::On_expectFinish_Comma };
+    static INT16 stateT_expectFinish[] =    { Tid_Bracket_Right,
+                                              Tid_Semicolon,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Variable, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Variable, afterSize, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Variable, expectFinish, Hdl_SyntaxError);
+}
+
+void
+PE_Variable::InitData()
+{
+    pStati->SetCur(afterName);
+
+    sResultSizeExpression.clear();
+    sResultInitExpression.clear();
+}
+
+void
+PE_Variable::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Variable::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Variable::SpReturn_ArraySizeExpression()
+{
+    pStati->SetCur(afterSize);
+
+    sResultSizeExpression = pSpuArraySizeExpression->Child().Result_Text();
+}
+
+void
+PE_Variable::SpReturn_InitExpression()
+{
+    pStati->SetCur(expectFinish);
+
+    sResultInitExpression = pSpuInitExpression->Child().Result_Text();
+}
+
+void
+PE_Variable::On_afterName_ArrayBracket_Left(const char *)
+{
+    pSpuArraySizeExpression->Push(done);
+}
+
+void
+PE_Variable::On_afterName_Semicolon(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_afterName_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_afterName_Assign(const char *)
+{
+    pSpuInitExpression->Push(done);
+}
+
+void
+PE_Variable::On_afterSize_ArrayBracket_Right(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Variable::On_expectFinish_Semicolon(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_expectFinish_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_expectFinish_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_vari.hxx b/autodoc/source/parser/cpp/pe_vari.hxx
new file mode 100644
index 000000000000..00087600ec3a
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vari.hxx
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PE_VARI_HXX
+#define ADC_CPP_PE_VARI_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+class PE_Expression;
+
+
+class PE_Variable : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        afterName,                  //
+        afterSize,                  // after ]
+        expectFinish,               // after InitExpression
+        size_of_states
+    };
+                        PE_Variable(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Variable();
+
+    /** @return
+        Bit 0x0001 != 0, if there is a size and
+        bit 0x0002 != 0, if there is an initialisation.
+    */
+    UINT16              Result_Pattern() const;
+    const String  &     Result_SizeExpression() const;
+    const String  &     Result_InitExpression() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    typedef SubPe< PE_Variable, PE_Expression >         SP_Expression;
+    typedef SubPeUse< PE_Variable, PE_Expression>       SPU_Expression;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char *);
+
+    void                SpReturn_ArraySizeExpression();
+    void                SpReturn_InitExpression();
+
+    void                On_afterName_ArrayBracket_Left(const char * i_sText);
+    void                On_afterName_Semicolon(const char * i_sText);
+    void                On_afterName_Comma(const char * i_sText);
+    void                On_afterName_Assign(const char * i_sText);
+
+    void                On_afterSize_ArrayBracket_Right(const char * i_sText);
+
+    void                On_expectFinish_Semicolon(const char * i_sText);
+    void                On_expectFinish_Comma(const char * i_sText);
+    void                On_expectFinish_Bracket_Right(const char * i_sText);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Variable> >
+                        pStati;
+
+    Dyn<SP_Expression>  pSpExpression;
+    Dyn<SPU_Expression> pSpuArraySizeExpression;
+    Dyn<SPU_Expression> pSpuInitExpression;
+
+    String              sResultSizeExpression;
+    String              sResultInitExpression;
+};
+
+
+
+// IMPLEMENTATION
+
+
+inline UINT16
+PE_Variable::Result_Pattern() const
+    { return ( sResultSizeExpression.length() > 0 ? 1 : 0 )
+             + ( sResultInitExpression.length() > 0 ? 2 : 0 ); }
+inline const String  &
+PE_Variable::Result_SizeExpression() const
+    { return sResultSizeExpression; }
+inline const String  &
+PE_Variable::Result_InitExpression() const
+    { return sResultInitExpression; }
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/pev.hxx b/autodoc/source/parser/cpp/pev.hxx
new file mode 100644
index 000000000000..5394dcd0fc21
--- /dev/null
+++ b/autodoc/source/parser/cpp/pev.hxx
@@ -0,0 +1,304 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PEV_HXX
+#define ADC_CPP_PEV_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Gate;
+        class InputContext;
+
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+        class EnumValue;
+
+        class DefineEntity;
+    }
+
+    class Documentation;
+}
+
+
+namespace cpp
+{
+
+
+class PeEnvironment : protected TokenProcessing_Types
+{
+  public:
+    // INQUIRY
+    virtual             ~PeEnvironment() {}
+
+    // OPERATIONS
+        // Token results
+    void                SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push = 0 );
+
+        // Owner stack
+    void                OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace );
+    void                OpenExternC(
+                            bool                i_bOnlyForOneDeclaration = false );
+    void                OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass );
+    void                OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum );
+    void                CloseBlock();           /// Handles a '}' on file scope.
+    void                CloseClass();
+    void                CloseEnum();
+    void                SetCurProtection(       /// Handles 'public:', 'protected:' and 'private:' on class scope.
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    void                OpenTemplate(
+                            const StringVector &
+                                                i_rParameters );
+    /// Removes parameters from this object.
+    DYN StringVector *  Get_CurTemplateParameters();
+    /// Checks, if a template is still open, and if yes, closes it.
+    void                Close_OpenTemplate();
+
+        // Special events
+    void                Event_Class_FinishedBase(
+                            const String  &     i_sParameterName );
+
+    void                Event_Store_Typedef(
+                            ary::cpp::Typedef & io_rTypedef );
+    void                Event_Store_EnumValue(
+                            ary::cpp::EnumValue &
+                                                io_rEnumValue );
+    void                Event_Store_CppDefinition(
+                            ary::cpp::DefineEntity  &
+                                                io_rDefinition );
+
+    void                Event_EnterFunction_ParameterList();
+    void                Event_Function_FinishedParameter(
+                            const String  &     i_sParameterName );
+    void                Event_LeaveFunction_ParameterList();
+    void                Event_EnterFunction_Implementation();
+    void                Event_LeaveFunction_Implementation();
+
+    void                Event_Store_Function(
+                            ary::cpp::Function &
+                                                io_rFunction );
+    void                Event_Store_Variable(
+                            ary::cpp::Variable &
+                                                io_rVariable );
+        // Error recovery
+    void                StartWaitingFor_Recovery();
+
+    // INQUIRY
+    ary::cpp::Gate &  AryGate() const;
+    const ary::cpp::InputContext &
+                        Context() const;
+    String              CurFileName() const;
+    uintt               LineCount() const;
+    bool                IsWaitingFor_Recovery() const;
+    bool                IsExternC() const;
+
+  private:
+    virtual void        do_SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push ) = 0;
+    virtual void        do_OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace ) = 0;
+    virtual void        do_OpenExternC(
+                            bool                i_bOnlyForOneDeclaration ) = 0;
+    virtual void        do_OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass ) = 0;
+    virtual void        do_OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum ) = 0;
+    virtual void        do_CloseBlock() = 0;
+    virtual void        do_CloseClass() = 0;
+    virtual void        do_CloseEnum() = 0;
+    virtual void        do_SetCurProtection(
+                            ary::cpp::E_Protection
+                                                i_eProtection ) = 0;
+    virtual void        do_OpenTemplate(
+                            const StringVector &
+                                                i_rParameters ) = 0;
+    virtual DYN StringVector *
+                        do_Get_CurTemplateParameters() = 0;
+    virtual void        do_Close_OpenTemplate() = 0;
+    virtual void        do_Event_Class_FinishedBase(
+                            const String  &     i_sBaseName ) = 0;
+
+    virtual void        do_Event_Store_Typedef(
+                            ary::cpp::Typedef & io_rTypedef ) = 0;
+    virtual void        do_Event_Store_EnumValue(
+                            ary::cpp::EnumValue &
+                                                io_rEnumValue ) = 0;
+    virtual void        do_Event_Store_CppDefinition(
+                            ary::cpp::DefineEntity &
+                                                io_rDefinition ) = 0;
+    virtual void        do_Event_EnterFunction_ParameterList() = 0;
+    virtual void        do_Event_Function_FinishedParameter(
+                            const String  &     i_sParameterName ) = 0;
+    virtual void        do_Event_LeaveFunction_ParameterList() = 0;
+    virtual void        do_Event_EnterFunction_Implementation() = 0;
+    virtual void        do_Event_LeaveFunction_Implementation() = 0;
+    virtual void        do_Event_Store_Function(
+                            ary::cpp::Function &
+                                                io_rFunction ) = 0;
+    virtual void        do_Event_Store_Variable(
+                            ary::cpp::Variable &
+                                                io_rVariable ) = 0;
+    virtual void        do_StartWaitingFor_Recovery() = 0;
+    virtual ary::cpp::Gate &
+                        inq_AryGate() const = 0;
+    virtual const ary::cpp::InputContext &
+                        inq_Context() const = 0;
+    virtual String      inq_CurFileName() const = 0;
+    virtual uintt       inq_LineCount() const = 0;
+    virtual bool        inq_IsWaitingFor_Recovery() const = 0;
+    virtual bool        inq_IsExternC() const = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+PeEnvironment::SetTokenResult( E_TokenDone          i_eDone,
+                               E_EnvStackAction     i_eWhat2DoWithEnvStack,
+                               ParseEnvironment *   i_pParseEnv2Push )
+    { do_SetTokenResult(i_eDone, i_eWhat2DoWithEnvStack,  i_pParseEnv2Push); }
+inline void
+PeEnvironment::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
+    { do_OpenNamespace(io_rOpenedNamespace); }
+inline void
+PeEnvironment::OpenExternC( bool i_bOnlyForOneDeclaration )
+    { do_OpenExternC(i_bOnlyForOneDeclaration); }
+inline void
+PeEnvironment::OpenClass( ary::cpp::Class & io_rOpenedClass )
+    { do_OpenClass(io_rOpenedClass); }
+inline void
+PeEnvironment::OpenEnum( ary::cpp::Enum & io_rOpenedEnum )
+    { do_OpenEnum(io_rOpenedEnum); }
+inline void
+PeEnvironment::CloseBlock()
+    { do_CloseBlock(); }
+inline void
+PeEnvironment::CloseClass()
+    { do_CloseClass(); }
+inline void
+PeEnvironment::CloseEnum()
+    { do_CloseEnum(); }
+inline void
+PeEnvironment::SetCurProtection( ary::cpp::E_Protection i_eProtection )
+    { do_SetCurProtection(i_eProtection); }
+inline void
+PeEnvironment::OpenTemplate( const StringVector & i_rParameters )
+    { do_OpenTemplate(i_rParameters); }
+inline DYN StringVector *
+PeEnvironment::Get_CurTemplateParameters()
+    { return do_Get_CurTemplateParameters(); }
+inline void
+PeEnvironment::Close_OpenTemplate()
+    { do_Close_OpenTemplate(); }
+inline void
+PeEnvironment::Event_Class_FinishedBase( const String  &  i_sBaseName )
+    { do_Event_Class_FinishedBase(i_sBaseName); }
+inline void
+PeEnvironment::Event_Store_Typedef( ary::cpp::Typedef & io_rTypedef )
+    { do_Event_Store_Typedef(io_rTypedef); }
+inline void
+PeEnvironment::Event_Store_EnumValue( ary::cpp::EnumValue & io_rEnumValue )
+    { do_Event_Store_EnumValue(io_rEnumValue); }
+inline void
+PeEnvironment::Event_Store_CppDefinition( ary::cpp::DefineEntity & io_rDefinition )
+    { do_Event_Store_CppDefinition(io_rDefinition); }
+inline void
+PeEnvironment::Event_EnterFunction_ParameterList()
+    { do_Event_EnterFunction_ParameterList(); }
+inline void
+PeEnvironment::Event_Function_FinishedParameter( const String  & i_sParameterName )
+    { do_Event_Function_FinishedParameter(i_sParameterName); }
+inline void
+PeEnvironment::Event_LeaveFunction_ParameterList()
+    { do_Event_LeaveFunction_ParameterList(); }
+inline void
+PeEnvironment::Event_EnterFunction_Implementation()
+    { do_Event_EnterFunction_Implementation(); }
+inline void
+PeEnvironment::Event_LeaveFunction_Implementation()
+    { do_Event_LeaveFunction_Implementation(); }
+inline void
+PeEnvironment::Event_Store_Function( ary::cpp::Function & io_rFunction )
+    { do_Event_Store_Function(io_rFunction); }
+inline void
+PeEnvironment::Event_Store_Variable( ary::cpp::Variable & io_rVariable )
+    { do_Event_Store_Variable(io_rVariable); }
+inline void
+PeEnvironment::StartWaitingFor_Recovery()
+    { do_StartWaitingFor_Recovery(); }
+inline ary::cpp::Gate &
+PeEnvironment::AryGate() const
+    { return inq_AryGate(); }
+inline const ary::cpp::InputContext &
+PeEnvironment::Context() const
+    { return inq_Context(); }
+inline String
+PeEnvironment::CurFileName() const
+    { return inq_CurFileName(); }
+inline uintt
+PeEnvironment::LineCount() const
+    { return inq_LineCount(); }
+inline bool
+PeEnvironment::IsWaitingFor_Recovery() const
+    { return inq_IsWaitingFor_Recovery(); }
+inline bool
+PeEnvironment::IsExternC() const
+    { return inq_IsExternC(); }
+
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/preproc.cxx b/autodoc/source/parser/cpp/preproc.cxx
new file mode 100644
index 000000000000..332645114b7c
--- /dev/null
+++ b/autodoc/source/parser/cpp/preproc.cxx
@@ -0,0 +1,231 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "preproc.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include "all_toks.hxx"
+#include "defdescr.hxx"
+#include <tools/tkpchars.hxx>
+#include "c_rcode.hxx"
+
+
+namespace cpp
+{
+
+
+PreProcessor::F_TOKENPROC PreProcessor::aTokProcs[PreProcessor::state_MAX] =
+    {
+        &PreProcessor::On_plain,
+        &PreProcessor::On_expect_macro_bracket_left,
+        &PreProcessor::On_expect_macro_param
+    };
+
+
+PreProcessor::PreProcessor()
+    :   pCppExplorer(0),
+        pSourceText(0),
+        pCurValidDefines(0),
+        // aTokens,
+        eState(plain),
+        pCurMacro(0),
+        dpCurMacroName(0),
+        // aCurMacroParams,
+        aCurParamText(60000),
+        nBracketInParameterCounter(0)
+        // aBlockedMacroNames
+{
+}
+
+PreProcessor::~PreProcessor()
+{
+}
+
+void
+PreProcessor::AssignPartners( CodeExplorer &      o_rCodeExplorer,
+                              CharacterSource &   o_rCharSource,
+                              const MacroMap &    i_rCurValidDefines )
+{
+    pCppExplorer = &o_rCodeExplorer;
+    pSourceText = &o_rCharSource;
+    pCurValidDefines = &i_rCurValidDefines;
+}
+
+void
+PreProcessor::Process_Token( cpp::Token & let_drToken )
+{
+    csv_assert(pCppExplorer != 0);  // Implies pSourceText and pCurValidDefines.
+
+    (this->*aTokProcs[eState])(let_drToken);
+}
+
+void
+PreProcessor::On_plain( cpp::Token & let_drToken )
+{
+    if ( let_drToken.TypeId() == Tid_Identifier )
+    {
+        if (CheckForDefine(let_drToken))
+            return;
+    }
+
+    pCppExplorer->Process_Token(let_drToken);
+}
+
+void
+PreProcessor::On_expect_macro_bracket_left( cpp::Token & let_drToken )
+{
+    if ( let_drToken.TypeId() == Tid_Bracket_Left )
+    {
+        aCurParamText.seekp(0);
+        eState = expect_macro_param;
+    }
+    else
+    {
+        pCppExplorer->Process_Token(*dpCurMacroName);
+        dpCurMacroName = 0;
+        pCppExplorer->Process_Token(let_drToken);
+        eState = plain;
+    }
+}
+
+void
+PreProcessor::On_expect_macro_param( cpp::Token & let_drToken )
+{
+    if ( let_drToken.TypeId() == Tid_Bracket_Left )
+        nBracketInParameterCounter++;
+    else if ( let_drToken.TypeId() == Tid_Bracket_Right )
+    {
+        if ( nBracketInParameterCounter > 0 )
+            nBracketInParameterCounter--;
+        else
+        {
+            if ( NOT csv::no_str(aCurParamText.c_str()) )
+            {
+                aCurMacroParams.push_back( String(aCurParamText.c_str()) );
+            }
+            csv_assert( aCurMacroParams.size() == pCurMacro->ParamCount() );
+
+            InterpretMacro();
+            eState = plain;
+            return;
+        }
+    }
+    else if ( let_drToken.TypeId() == Tid_Comma AND nBracketInParameterCounter == 0 )
+    {
+        aCurMacroParams.push_back( String (aCurParamText.c_str()) );
+        aCurParamText.seekp(0);
+        return;
+    }
+
+    // KORR_FUTURE:
+    //  If in future whitespace is parsed also, that should match exactly and the
+    //  safety spaces, " ", here should be removed.
+    aCurParamText << let_drToken.Text() << " ";
+}
+
+bool
+PreProcessor::CheckForDefine( cpp::Token & let_drToken )
+{
+    String  sTokenText(let_drToken.Text());
+     pCurMacro = csv::value_from_map( *pCurValidDefines, sTokenText );
+    if (pCurMacro == 0 )
+        return false;
+    for ( StringVector::const_iterator it = aBlockedMacroNames.begin();
+          it != aBlockedMacroNames.end();
+          ++it )
+    {
+        if ( strcmp( (*it).c_str(), let_drToken.Text() ) == 0 )
+            return false;
+    }
+
+    if ( pCurMacro->DefineType() == DefineDescription::type_define )
+    {
+        delete &let_drToken;
+
+        aCurParamText.seekp(0);
+        pCurMacro->GetDefineText(aCurParamText);
+
+        if ( aCurParamText.tellp() > 1 )
+            pSourceText->InsertTextAtCurPos(aCurParamText.c_str());
+    }
+    else // ( pCurMacro->DefineType() == DefineDescription::type_macro )
+    {
+        dpCurMacroName = &let_drToken;
+        eState = expect_macro_bracket_left;
+        csv::erase_container( aCurMacroParams );
+        aCurParamText.seekp(0);
+        nBracketInParameterCounter = 0;
+    }  // endif
+
+    return true;
+}
+
+void
+PreProcessor::UnblockMacro( const char * i_sMacroName )
+{
+    for ( StringVector::iterator it = aBlockedMacroNames.begin();
+          it != aBlockedMacroNames.end();
+          ++it )
+    {
+        if ( strcmp( (*it), i_sMacroName ) == 0 )
+        {
+            aBlockedMacroNames.erase(it);
+            break;
+        }
+    }   /// end for
+}
+
+void
+PreProcessor::InterpretMacro()
+{
+    aCurParamText.seekp(0);
+    pCurMacro->GetMacroText(aCurParamText, aCurMacroParams);
+
+    if ( NOT csv::no_str(aCurParamText.c_str()) )
+    {
+        aCurParamText.seekp(-1, csv::cur);
+        aCurParamText << " #unblock-" << dpCurMacroName->Text() << " ";
+
+        pSourceText->InsertTextAtCurPos(aCurParamText.c_str());
+        String  sCurMacroName(dpCurMacroName->Text());
+        aBlockedMacroNames.insert( aBlockedMacroNames.begin(), sCurMacroName );
+    }
+
+    delete dpCurMacroName;
+    dpCurMacroName = 0;
+    pCurMacro = 0;
+    csv::erase_container(aCurMacroParams);
+    aCurParamText.seekp(0);
+}
+
+
+}   // end namespace cpp
+
+
diff --git a/autodoc/source/parser/cpp/preproc.hxx b/autodoc/source/parser/cpp/preproc.hxx
new file mode 100644
index 000000000000..93c6f9cd425f
--- /dev/null
+++ b/autodoc/source/parser/cpp/preproc.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PREPROC_HXX
+#define ADC_CPP_PREPROC_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <deque>
+    // PARAMETERS
+
+class CharacterSource;
+
+
+namespace cpp
+{
+
+class Token;
+class CodeExplorer;
+class DefineDescription;
+
+
+class PreProcessor
+{
+  public:
+    typedef std::map< String, DefineDescription* > MacroMap;
+
+    // LIFECYCLE
+                        PreProcessor();
+                        ~PreProcessor();
+    // OPERATONS
+    void                AssignPartners(
+                            CodeExplorer &      o_rCodeExplorer,
+                            CharacterSource &   o_rCharSource,
+                            const MacroMap &    i_rCurValidDefines );
+    void                Process_Token(
+                            cpp::Token &        let_drToken );
+    void                UnblockMacro(
+                            const char *        i_sMacroName );
+  private:
+    public: // Necessary for instantiation of static variable:
+    enum E_State
+    {
+        plain = 0,
+        expect_macro_bracket_left,
+        expect_macro_param,
+        state_MAX
+    };
+    typedef void (PreProcessor::*                   F_TOKENPROC )(cpp::Token &);
+    void                On_plain( cpp::Token & );
+    void                On_expect_macro_bracket_left( cpp::Token & );
+    void                On_expect_macro_param( cpp::Token & );
+
+    private:  // Reprivate again:
+    typedef std::deque< DYN cpp::Token * >          TokenQueue;
+    typedef StringVector                  List_MacroParams;
+
+
+    bool                CheckForDefine(
+                            cpp::Token &        let_drToken );
+    void                InterpretMacro();
+
+    // DATA
+    static F_TOKENPROC  aTokProcs[state_MAX];
+        // Referenced extern objects
+    CodeExplorer *      pCppExplorer;
+    CharacterSource *   pSourceText;
+    const MacroMap *    pCurValidDefines;
+
+        // internal data
+    TokenQueue          aTokens;
+
+    E_State             eState;
+
+    DefineDescription * pCurMacro;
+    DYN Token *         dpCurMacroName;
+    List_MacroParams    aCurMacroParams;
+    csv::StreamStr      aCurParamText;
+
+    intt                nBracketInParameterCounter;
+    StringVector        aBlockedMacroNames;
+};
+
+
+
+}   // end namespace cpp
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/prs_cpp.cxx b/autodoc/source/parser/cpp/prs_cpp.cxx
new file mode 100644
index 000000000000..615fe016e620
--- /dev/null
+++ b/autodoc/source/parser/cpp/prs_cpp.cxx
@@ -0,0 +1,248 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <cpp/prs_cpp.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <ary/ary.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <autodoc/prs_docu.hxx>
+#include <autodoc/filecoli.hxx>
+#include <autodoc/x_parsing.hxx>
+#include <tools/tkpchars.hxx>
+#include <adc_cl.hxx>
+#include "c_dealer.hxx"
+#include "defdescr.hxx"
+#include "tkp_cpp.hxx"
+
+
+// Helper function
+static bool         Local_LoadFile(
+                        CharacterSource &       o_rTextBuffer,
+                        const String  &         i_rFullFilePath );
+
+
+
+
+namespace cpp
+{
+
+// This class is used for the UDK as workaround for the missing
+//   feature of parsing #define s.
+
+class Udk_MacroMap
+{
+  public:
+    typedef std::map< String , DefineDescription* > Data;
+
+                        Udk_MacroMap();
+                        ~Udk_MacroMap();
+
+    const Data &        GetData() const         { return aData; }
+
+  private:
+    Data                aData;
+};
+
+struct S_RunningData
+{
+    CharacterSource     aFileContent;
+    ary::cpp::Gate &    rCppGate;
+    Udk_MacroMap        aMacros;
+    Distributor         aDealer;
+    TokenParser_Cpp     aTkp;
+
+                            S_RunningData(
+                                ary::Repository &   o_rRepository,
+                                const autodoc::DocumentationParser_Ifc &
+                                                    i_rDocumentationInterpreter );
+};
+
+
+
+
+Cpluplus_Parser::Cpluplus_Parser()
+//    : pRunningData
+{
+}
+
+Cpluplus_Parser::~Cpluplus_Parser()
+{
+}
+
+void
+Cpluplus_Parser::Setup( ary::Repository &                        o_rRepository,
+                        const autodoc::DocumentationParser_Ifc & i_rDocumentationInterpreter )
+{
+    pRunningData = new S_RunningData(o_rRepository, i_rDocumentationInterpreter);
+}
+
+void
+Cpluplus_Parser::Run( const autodoc::FileCollector_Ifc &    i_rFiles )
+{
+    for ( autodoc::FileCollector_Ifc::const_iterator iter = i_rFiles.Begin();
+          iter != i_rFiles.End();
+          ++iter )
+    {
+        csv::ploc::Path
+            aFilePath(*iter);
+
+        try
+        {
+            if ( NOT Local_LoadFile(pRunningData->aFileContent, *iter) )
+                continue;
+            for ( pRunningData->aTkp.StartNewFile(aFilePath);
+                  pRunningData->aTkp.HasMore();
+                  pRunningData->aTkp.GetNextToken() )
+                ;
+        }
+        catch (autodoc::X_Parser_Ifc & rX_Parse)
+        {
+            if ( DEBUG_ShowStoring() OR DEBUG_ShowText() )
+                Cerr() << rX_Parse << Endl();
+        }
+        catch (...)
+        {
+            if ( DEBUG_ShowStoring() OR DEBUG_ShowText() )
+                Cerr() << "Error:  Unknown exception." << Endl();
+        }
+    }   // end for (iter)
+}
+
+S_RunningData::S_RunningData( ary::Repository &                        o_rRepository,
+                              const autodoc::DocumentationParser_Ifc & i_rDocumentationInterpreter )
+    :   aFileContent(),
+        rCppGate( o_rRepository.Gate_Cpp() ),
+        aMacros(),
+        aDealer(o_rRepository.Gate_Cpp()),
+        aTkp( * i_rDocumentationInterpreter.Create_DocuContext() )
+{
+    aDealer.AssignPartners( aFileContent,
+                            aMacros.GetData() );
+    aTkp.AssignPartners( aFileContent, aDealer );
+}
+
+
+Udk_MacroMap::Udk_MacroMap()
+{
+    String  sSAL_CALL("SAL_CALL");
+    String  sSAL_CALL_ELLIPSE("SAL_CALL_ELLIPSE");
+    String  sSAL_NO_VTABLE("SAL_NO_VTABLE");
+    String  sREGISTRY_CALLTYPE("REGISTRY_CALLTYPE");
+    String  sSAL_THROW("SAL_THROW");
+    String  sSAL_THROW_EXTERN_C("SAL_THROW_EXTERN_C");
+
+    String  s__DEF_COMPIMPLHELPER_A("__DEF_COMPIMPLHELPER_A");
+    String  s__DEF_COMPIMPLHELPER_B("__DEF_COMPIMPLHELPER_B");
+    String  s__DEF_COMPIMPLHELPER("__DEF_COMPIMPLHELPER");
+
+    String  s__DEF_IMPLHELPER_PRE("__DEF_IMPLHELPER_PRE");
+    String  s__IFC_WRITEOFFSET("__IFC_WRITEOFFSET");
+    String  s__DEF_IMPLHELPER_POST("__DEF_IMPLHELPER_POST");
+
+    String  sSAL_EXCEPTION_DLLPUBLIC_EXPORT("SAL_EXCEPTION_DLLPUBLIC_EXPORT");
+    String  sSAL_EXCEPTION_DLLPRIVATE("SAL_EXCEPTION_DLLPRIVATE");
+
+
+    StringVector aEmpty;
+
+    StringVector aParamsSAL_THROW;
+    aParamsSAL_THROW.push_back( String ("exc") );
+    StringVector aDefSAL_THROW;
+    aDefSAL_THROW.push_back( String ("throw") );
+    aDefSAL_THROW.push_back( String ("exc") );
+
+    StringVector aCompImplHelperParams;
+    aCompImplHelperParams.push_back(String ("N"));
+
+
+    // filling up the list
+
+
+    aData[sSAL_CALL] = new DefineDescription(sSAL_CALL, aEmpty);
+    aData[sSAL_CALL_ELLIPSE] = new DefineDescription(sSAL_CALL_ELLIPSE, aEmpty);
+    aData[sSAL_NO_VTABLE] = new DefineDescription(sSAL_NO_VTABLE, aEmpty);
+    aData[sREGISTRY_CALLTYPE] = new DefineDescription(sREGISTRY_CALLTYPE, aEmpty);
+
+    aData[sSAL_THROW] = new DefineDescription(sSAL_THROW, aParamsSAL_THROW, aDefSAL_THROW);
+    aData[sSAL_THROW_EXTERN_C] = new DefineDescription(sSAL_THROW_EXTERN_C, aEmpty, aEmpty);
+
+    aData[s__DEF_COMPIMPLHELPER_A]
+        = new DefineDescription( s__DEF_COMPIMPLHELPER_A, aCompImplHelperParams, aEmpty);
+    aData[s__DEF_COMPIMPLHELPER_B]
+        = new DefineDescription(s__DEF_COMPIMPLHELPER_B, aCompImplHelperParams, aEmpty);
+    aData[s__DEF_COMPIMPLHELPER]
+        = new DefineDescription(s__DEF_COMPIMPLHELPER, aCompImplHelperParams, aEmpty);
+
+    aData[s__DEF_IMPLHELPER_PRE]
+        = new DefineDescription(s__DEF_IMPLHELPER_PRE, aCompImplHelperParams, aEmpty);
+    aData[s__IFC_WRITEOFFSET]
+        = new DefineDescription(s__IFC_WRITEOFFSET, aCompImplHelperParams, aEmpty);
+    aData[s__DEF_IMPLHELPER_POST]
+        = new DefineDescription(s__DEF_IMPLHELPER_POST, aCompImplHelperParams, aEmpty);
+
+    aData[sSAL_EXCEPTION_DLLPUBLIC_EXPORT]
+        = new DefineDescription(sSAL_EXCEPTION_DLLPUBLIC_EXPORT, aEmpty);
+    aData[sSAL_EXCEPTION_DLLPRIVATE]
+        = new DefineDescription(sSAL_EXCEPTION_DLLPRIVATE, aEmpty);
+}
+
+Udk_MacroMap::~Udk_MacroMap()
+{
+    for ( Data::iterator it = aData.begin(); it != aData.end(); ++it )
+    {
+         delete (*it).second;
+    }
+}
+
+
+
+} // namespace cpp
+
+
+bool
+Local_LoadFile( CharacterSource &       o_rTextBuffer,
+                const String  &         i_rFullFilePath )
+{
+    Cout() << "Parse " << i_rFullFilePath << " ..." << Endl();
+
+    csv::File aFile( i_rFullFilePath, csv::CFM_READ );
+    if (NOT aFile.open())
+    {
+        Cerr() << "   could not be opened.\n" << Endl();
+        return false;
+    }
+    o_rTextBuffer.LoadText(aFile);
+    aFile.close();
+    return true;
+}
+
+
+
diff --git a/autodoc/source/parser/cpp/sdocdist.hxx b/autodoc/source/parser/cpp/sdocdist.hxx
new file mode 100644
index 000000000000..f8d87931a4df
--- /dev/null
+++ b/autodoc/source/parser/cpp/sdocdist.hxx
@@ -0,0 +1,158 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_SDOCDIST_HXX
+#define ADC_CPP_SDOCDIST_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cxt2ary.hxx"
+#include <ary/info/docstore.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+using ary::Documentation;
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+
+struct ContextForAry::S_DocuDistributor : public ary::info::DocuStore
+{
+  public:
+                        S_DocuDistributor()     :   pCurRe(0) {}
+                        ~S_DocuDistributor()    {}
+
+    void                Reset()                 { pCurRe = 0; pLastStoredDocu = 0; }
+
+    void                SetCurrentlyStoredRe(
+                            ary::cpp::CppEntity &
+                                                io_rRe );
+    void                Event_LineBreak();
+
+  private:
+    // Interface ary::info::DocuStore
+    virtual void        do_Store2CurFile(
+                            DYN ary::doc::Node& let_drDocu );
+    virtual void        do_Store2CurNamespace(
+                            DYN ary::doc::Node& let_drDocu );
+
+    virtual void        do_Store2ConnectedDeclaration(
+                            DYN ary::doc::Node& let_drDocu );
+
+    virtual void        do_Store2Glossary(
+                            DYN ary::doc::Node& let_drDocu,
+                            const String  &     i_sExplainedTerm );
+    virtual void        do_Store2GlobalTexts(
+                            DYN ary::doc::Node& let_drDocu,
+                            ary::info::GlobalTextId
+                                                i_nId );
+    // DATA
+    ary::cpp::CppEntity *
+                        pCurRe;
+    Dyn<ary::doc::Node> pLastStoredDocu;
+};
+
+
+// IMPLEMENTATION
+
+/*  The implementation is in header, though not all inline, because this file
+    is included in cxt2ary.cxx only!
+*/
+
+
+void
+ContextForAry::
+S_DocuDistributor::SetCurrentlyStoredRe( ary::cpp::CppEntity & io_rRe )
+{
+    pCurRe = &io_rRe;
+    if ( pLastStoredDocu )
+        pCurRe->Set_Docu( *pLastStoredDocu.Release() );
+}
+
+inline void
+ContextForAry::
+S_DocuDistributor::Event_LineBreak()
+{
+    pCurRe = 0;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2CurFile( DYN ary::doc::Node & let_drDocu )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2CurNamespace( DYN ary::doc::Node & let_drDocu )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2ConnectedDeclaration( DYN ary::doc::Node & let_drDocu )
+{
+    if ( pCurRe != 0 )
+        pCurRe->Set_Docu(let_drDocu);
+    else
+        pLastStoredDocu = &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2Glossary( DYN ary::doc::Node & let_drDocu,
+                                      const String &           // i_sExplainedTerm
+                                      )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2GlobalTexts( DYN ary::doc::Node &       let_drDocu,
+                                         ary::info::GlobalTextId    // i_nId
+                                       )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/sfscope.hxx b/autodoc/source/parser/cpp/sfscope.hxx
new file mode 100644
index 000000000000..1e7a70af009b
--- /dev/null
+++ b/autodoc/source/parser/cpp/sfscope.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_SFSCOPE_HXX
+#define ADC_CPP_SFSCOPE_HXX
+
+// USED SERVICES
+#include "cxt2ary.hxx"
+
+
+
+
+namespace cpp
+{
+
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+struct ContextForAry::S_FileScopeInfo
+{
+    ary::loc::File *    pCurFile;
+    uintt               nLineCount;
+    Dyn<StringVector>   pCurTemplateParameters;
+
+                        S_FileScopeInfo();
+};
+
+
+
+
+// IMPLEMENTATION
+inline
+ContextForAry::
+S_FileScopeInfo::S_FileScopeInfo()
+    :   pCurFile(0),
+        nLineCount(0),
+        pCurTemplateParameters(0)
+{
+}
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/cpp/sownstck.hxx b/autodoc/source/parser/cpp/sownstck.hxx
new file mode 100644
index 000000000000..32c3f9f40a42
--- /dev/null
+++ b/autodoc/source/parser/cpp/sownstck.hxx
@@ -0,0 +1,325 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_SOWNSTCK_HXX
+#define ADC_CPP_SOWNSTCK_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cxt2ary.hxx"
+    // COMPONENTS
+#include <ary/cpp/c_types4cpp.hxx>
+#include <estack.hxx>
+    // PARAMETERS
+#include <ary/cpp/c_namesp.hxx>
+#include <x_parse.hxx>
+
+
+namespace cpp
+{
+
+using ary::cpp::E_Protection;
+
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+struct ContextForAry::S_OwnerStack
+{
+  public:
+                        S_OwnerStack();
+    void                SetGlobalNamespace(
+                            ary::cpp::Namespace &
+                                                io_rGlobalNamespace );
+                        ~S_OwnerStack();
+
+    void                Reset();
+
+    void                OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace );
+    void                OpenExternC();
+    void                OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass );
+    void                OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum );
+    void                CloseBlock();
+    void                CloseClass();
+    void                CloseEnum();
+    void                SetCurProtection(
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    ary::cpp::Namespace &
+                        CurNamespace() const;
+    ary::cpp::Class *   CurClass() const;
+    ary::cpp::Enum *    CurEnum() const;
+
+    Owner &             CurOwner() const;
+    ary::cpp::E_Protection
+                        CurProtection() const;
+    bool                IsExternC() const       { return nExternC > 0; }
+
+  private:
+    typedef std::pair< ary::cpp::Class*, E_Protection >     ClassEnv;
+    typedef EStack< ary::cpp::Namespace* >                  Stack_Namespaces;
+    typedef EStack< ClassEnv >                              Stack_Classes;
+    typedef ary::cpp::InputContext::Owner                   Ifc_Owner;
+
+    void                SetOwner_2CurNamespace();
+    void                SetOwner_2CurClass();
+    void                SetOwner_2None();
+
+    // DATA
+    Stack_Namespaces    aStack_Namespaces;
+    Stack_Classes       aStack_Classes;
+    ary::cpp::Enum *    pCurEnum;
+    uintt               nExternC;               /// This is a number, for the case that extern "C" blocks are nested.
+
+    Dyn<Owner_Namespace>
+                        pOwner_Namespace;
+    Dyn<Owner_Class>    pOwner_Class;
+    Ifc_Owner *         pOwner_Cur;
+};
+
+
+// IMPLEMENTATION
+
+/*  The implementation is in header, though not inline, because this file is included
+    in cxt2ary.cxx only!
+*/
+
+inline ary::cpp::Namespace &
+ContextForAry::
+S_OwnerStack::CurNamespace() const
+{
+    csv_assert( aStack_Namespaces.size() > 0 );
+    return *aStack_Namespaces.top();
+}
+
+inline ary::cpp::Class *
+ContextForAry::
+S_OwnerStack::CurClass() const
+{
+    return aStack_Classes.size() > 0
+                ?   aStack_Classes.top().first
+                :   (ary::cpp::Class *) 0;
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetOwner_2CurNamespace()
+{
+    csv_assert( aStack_Namespaces.size() > 0 );
+    pOwner_Cur = pOwner_Namespace.MutablePtr();
+    pOwner_Namespace->SetAnotherNamespace( CurNamespace() );
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetOwner_2CurClass()
+{
+    csv_assert( aStack_Classes.size() > 0 );
+    pOwner_Cur = pOwner_Class.MutablePtr();
+    pOwner_Class->SetAnotherClass( *CurClass() );
+}
+
+ContextForAry::
+S_OwnerStack::S_OwnerStack()
+    :   // aStack_Namespaces,
+        // aStack_Classes,
+        pCurEnum(0),
+        nExternC(0),
+        pOwner_Namespace(new Owner_Namespace),
+        pOwner_Class(new Owner_Class),
+        pOwner_Cur(0)
+{
+}
+
+void
+ContextForAry::
+S_OwnerStack::Reset()
+{
+    while ( aStack_Namespaces.top()->Owner().IsValid() )
+        aStack_Namespaces.pop();
+    while ( NOT aStack_Classes.empty() )
+        aStack_Classes.pop();
+    pCurEnum = 0;
+    nExternC = 0;
+    SetOwner_2CurNamespace();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetGlobalNamespace( ary::cpp::Namespace & io_rGlobalNamespace )
+{
+    csv_assert( aStack_Namespaces.size() == 0 );
+    aStack_Namespaces.push(&io_rGlobalNamespace);
+    SetOwner_2CurNamespace();
+}
+
+ContextForAry::
+S_OwnerStack::~S_OwnerStack()
+{
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
+{
+    csv_assert( aStack_Namespaces.size() > 0  OR io_rOpenedNamespace.Parent() == 0 );
+    aStack_Namespaces.push(&io_rOpenedNamespace);
+    SetOwner_2CurNamespace();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::OpenExternC()
+{
+    ++nExternC;
+//    SetOwner_2None();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetCurProtection( ary::cpp::E_Protection i_eProtection )
+{
+    csv_assert( aStack_Classes.size() > 0 );
+    aStack_Classes.top().second = i_eProtection;
+}
+
+inline ary::cpp::Enum *
+ContextForAry::
+S_OwnerStack::CurEnum() const
+{
+    return pCurEnum;
+}
+
+
+inline ary::cpp::InputContext::Owner &
+ContextForAry::
+S_OwnerStack::CurOwner() const
+{
+    csv_assert( pOwner_Cur != 0 );
+    return *pOwner_Cur;
+}
+
+inline E_Protection
+ContextForAry::
+S_OwnerStack::CurProtection() const
+{
+    return aStack_Classes.size() > 0
+                ?   aStack_Classes.top().second
+                :   ary::cpp::PROTECT_global;
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetOwner_2None()
+{
+    pOwner_Cur = 0;
+}
+
+void
+ContextForAry::
+S_OwnerStack::OpenClass( ary::cpp::Class & io_rOpenedClass )
+{
+    E_Protection eDefaultProtection
+            = io_rOpenedClass.ClassKey() == ary::cpp::CK_class
+                    ?   ary::cpp::PROTECT_private
+                    :   ary::cpp::PROTECT_public;
+    aStack_Classes.push( ClassEnv(&io_rOpenedClass, eDefaultProtection) );
+    SetOwner_2CurClass();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::OpenEnum( ary::cpp::Enum & io_rOpenedEnum )
+{
+    csv_assert( pCurEnum == 0 );
+    pCurEnum = &io_rOpenedEnum;
+    SetOwner_2None();
+}
+
+void
+ContextForAry::
+S_OwnerStack::CloseBlock()
+{
+    if (nExternC > 0)
+    {
+        --nExternC;
+    }
+    else
+    {
+        // csv_assert( aStack_Classes.size() == 0 );
+        if ( aStack_Classes.size() > 0 )
+            throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+        csv_assert( pCurEnum == 0 );
+        aStack_Namespaces.pop();
+
+        // csv_assert( aStack_Namespaces.size() > 0 );
+        if( aStack_Namespaces.size() == 0 )
+            throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+    }
+    SetOwner_2CurNamespace();
+}
+
+void
+ContextForAry::
+S_OwnerStack::CloseClass()
+{
+    // csv_assert( aStack_Classes.size() > 0 );
+    if ( aStack_Classes.size() == 0 )
+          throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+    aStack_Classes.pop();
+    if ( aStack_Classes.size() > 0 )
+        SetOwner_2CurClass();
+    else
+        SetOwner_2CurNamespace();
+}
+
+void
+ContextForAry::
+S_OwnerStack::CloseEnum()
+{
+    csv_assert( pCurEnum != 0 );
+    pCurEnum = 0;
+    if ( aStack_Classes.size() > 0 )
+        SetOwner_2CurClass();
+    else
+        SetOwner_2CurNamespace();
+}
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/srecover.hxx b/autodoc/source/parser/cpp/srecover.hxx
new file mode 100644
index 000000000000..e497404c08e9
--- /dev/null
+++ b/autodoc/source/parser/cpp/srecover.hxx
@@ -0,0 +1,132 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_SRECOVER_HXX
+#define ADC_CPP_SRECOVER_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cxt2ary.hxx"
+#include <ary/info/docstore.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+struct ContextForAry::S_RecoveryGuard
+{
+  public:
+                        S_RecoveryGuard();
+                        ~S_RecoveryGuard();
+
+    void                Reset()                 { bIsWithinRecovery = false; nBlockBracketsCounter = 0; }
+
+    void                StartWaitingFor_Recovery();
+
+    void                Hdl_SwBracketOpen();
+    void                Hdl_SwBracketClose();
+    void                Hdl_Semicolon();
+
+    bool                IsWithinRecovery() const;
+
+  private:
+    // DATA
+    bool                bIsWithinRecovery;
+    intt                nBlockBracketsCounter;
+};
+
+
+
+// IMPLEMENTATION
+
+/*  The implementation is in header, though not all inline, because this file
+    is included in cxt2ary.cxx only!
+*/
+
+ContextForAry::
+S_RecoveryGuard::S_RecoveryGuard()
+    :   bIsWithinRecovery(false),
+        nBlockBracketsCounter(0)
+{
+}
+
+ContextForAry::
+S_RecoveryGuard::~S_RecoveryGuard()
+{
+}
+
+inline void
+ContextForAry::
+S_RecoveryGuard::StartWaitingFor_Recovery()
+{
+    bIsWithinRecovery = true;
+    nBlockBracketsCounter = 0;
+}
+
+void
+ContextForAry::
+S_RecoveryGuard::Hdl_SwBracketOpen()
+{
+    if ( bIsWithinRecovery )
+        ++nBlockBracketsCounter;
+}
+
+void
+ContextForAry::
+S_RecoveryGuard::Hdl_SwBracketClose()
+{
+    if ( bIsWithinRecovery )
+        --nBlockBracketsCounter;
+}
+
+inline void
+ContextForAry::
+S_RecoveryGuard::Hdl_Semicolon()
+{
+    if (bIsWithinRecovery AND nBlockBracketsCounter == 0)
+       bIsWithinRecovery = false;
+}
+
+inline bool
+ContextForAry::
+S_RecoveryGuard::IsWithinRecovery() const
+{
+    return bIsWithinRecovery;
+}
+
+
+
+}   // namespace cpp
+
+
+#endif
+
diff --git a/autodoc/source/parser/cpp/tkp_cpp.cxx b/autodoc/source/parser/cpp/tkp_cpp.cxx
new file mode 100644
index 000000000000..fa3b456880e0
--- /dev/null
+++ b/autodoc/source/parser/cpp/tkp_cpp.cxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "tkp_cpp.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include "cx_c_std.hxx"
+#include "c_dealer.hxx"
+
+
+namespace cpp {
+
+
+
+
+TokenParser_Cpp::TokenParser_Cpp( DYN autodoc::TkpDocuContext & let_drDocuContext )
+    :   pBaseContext( new Context_CppStd( let_drDocuContext ) ),
+        pCurContext(0),
+        pDealer(0),
+        pCharacterSource(0)
+{
+    SetStartContext();
+}
+
+TokenParser_Cpp::~TokenParser_Cpp()
+{
+}
+
+void
+TokenParser_Cpp::AssignPartners( CharacterSource &   io_rCharacterSource,
+                                 cpp::Distributor &  o_rDealer )
+{
+    pDealer = &o_rDealer;
+    pBaseContext->AssignDealer(o_rDealer);
+    pCharacterSource = &io_rCharacterSource;
+}
+
+void
+TokenParser_Cpp::StartNewFile( const csv::ploc::Path & i_file )
+{
+    csv_assert(pDealer != 0);
+    pDealer->StartNewFile(i_file);
+
+    csv_assert(pCharacterSource != 0);
+    Start(*pCharacterSource);
+}
+
+void
+TokenParser_Cpp::SetStartContext()
+{
+    pCurContext = pBaseContext.Ptr();
+}
+
+void
+TokenParser_Cpp::SetCurrentContext( TkpContext & io_rContext )
+{
+    pCurContext = &io_rContext;
+}
+
+TkpContext &
+TokenParser_Cpp::CurrentContext()
+{
+    return *pCurContext;
+}
+
+}   // namespace cpp
+
diff --git a/autodoc/source/parser/cpp/tkp_cpp.hxx b/autodoc/source/parser/cpp/tkp_cpp.hxx
new file mode 100644
index 000000000000..36405ebadc49
--- /dev/null
+++ b/autodoc/source/parser/cpp/tkp_cpp.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKP_CPP_HXX
+#define ADC_TKP_CPP_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkp.hxx>
+    // COMPONENTS
+    // PARAMETRS
+
+namespace autodoc
+{
+    class TkpDocuContext;
+}
+
+namespace csv
+{
+    namespace ploc
+    {
+        class Path;
+        class DirectoryChain;
+    }
+}
+
+
+namespace cpp {
+
+class Context_CppStd;
+class DefineDescription;
+class Distributor;
+
+
+/** This is a TokenParser which is able to parse tokens from
+    C++ source code.
+*/
+class TokenParser_Cpp : public TokenParser
+{
+  public:
+    typedef std::map< String, DefineDescription* >     MacroMap;
+
+    // LIFECYCLE
+                        TokenParser_Cpp(
+                            DYN autodoc::TkpDocuContext &
+                                                let_drDocuContext );
+    virtual             ~TokenParser_Cpp();
+
+    // OPERATIONS
+    void                AssignPartners(
+                            CharacterSource &   io_rCharacterSource,
+                            cpp::Distributor &  o_rDealer );
+    void                StartNewFile(
+                            const csv::ploc::Path &
+                                                i_file );
+  private:
+    virtual void        SetStartContext();
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext );
+    virtual TkpContext &
+                        CurrentContext();
+    // DATA
+    Dyn<Context_CppStd> pBaseContext;
+    TkpContext *        pCurContext;
+    Distributor *       pDealer;
+    CharacterSource *   pCharacterSource;
+};
+
+
+}   // namespace cpp
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/cpp/tokintpr.hxx b/autodoc/source/parser/cpp/tokintpr.hxx
new file mode 100644
index 000000000000..898339a48021
--- /dev/null
+++ b/autodoc/source/parser/cpp/tokintpr.hxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_TOKINTPR_HXX
+#define ADC_CPP_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <all_toks.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp {
+
+
+
+#define DECL_TOK_HANDLER(token) \
+    void                Hdl_##token( \
+                            const Tok_##token & i_rTok ) { Call_Handler(i_rTok); }
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+                        DECL_TOK_HANDLER(Identifier)
+                        DECL_TOK_HANDLER(Operator)
+                        DECL_TOK_HANDLER(operator)
+                        DECL_TOK_HANDLER(class)
+                        DECL_TOK_HANDLER(struct)
+                        DECL_TOK_HANDLER(union)
+                        DECL_TOK_HANDLER(enum)
+                        DECL_TOK_HANDLER(typedef)
+                        DECL_TOK_HANDLER(public)
+                        DECL_TOK_HANDLER(protected)
+                        DECL_TOK_HANDLER(private)
+                        DECL_TOK_HANDLER(template)
+                        DECL_TOK_HANDLER(virtual)
+                        DECL_TOK_HANDLER(friend)
+                        DECL_TOK_HANDLER(Tilde)
+                        DECL_TOK_HANDLER(const)
+                        DECL_TOK_HANDLER(volatile)
+                        DECL_TOK_HANDLER(extern)
+                        DECL_TOK_HANDLER(static)
+                        DECL_TOK_HANDLER(mutable)
+                        DECL_TOK_HANDLER(register)
+                        DECL_TOK_HANDLER(inline)
+                        DECL_TOK_HANDLER(explicit)
+                        DECL_TOK_HANDLER(namespace)
+                        DECL_TOK_HANDLER(using)
+                        DECL_TOK_HANDLER(throw)
+                        DECL_TOK_HANDLER(SwBracket_Left)
+                        DECL_TOK_HANDLER(SwBracket_Right)
+                        DECL_TOK_HANDLER(ArrayBracket_Left)
+                        DECL_TOK_HANDLER(ArrayBracket_Right)
+                        DECL_TOK_HANDLER(Bracket_Left)
+                        DECL_TOK_HANDLER(Bracket_Right)
+                        DECL_TOK_HANDLER(DoubleColon)
+                        DECL_TOK_HANDLER(Semicolon)
+                        DECL_TOK_HANDLER(Comma)
+                        DECL_TOK_HANDLER(Colon)
+                        DECL_TOK_HANDLER(Assign)
+                        DECL_TOK_HANDLER(Less)
+                        DECL_TOK_HANDLER(Greater)
+                        DECL_TOK_HANDLER(Asterix)
+                        DECL_TOK_HANDLER(AmpersAnd)
+                        DECL_TOK_HANDLER(Ellipse)
+                        DECL_TOK_HANDLER(typename)
+                        DECL_TOK_HANDLER(DefineName)
+                        DECL_TOK_HANDLER(MacroName)
+                        DECL_TOK_HANDLER(MacroParameter)
+                        DECL_TOK_HANDLER(PreProDefinition)
+                        DECL_TOK_HANDLER(BuiltInType)
+                        DECL_TOK_HANDLER(TypeSpecializer)
+                        DECL_TOK_HANDLER(Constant)
+
+  protected:
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok ) = 0;
+};
+
+#undef DECL_TOK_HANDLER
+
+
+// IMPLEMENTATION
+
+
+}   // namespace cpp
+
+
+#endif
diff --git a/autodoc/source/parser/inc/adoc/a_rdocu.hxx b/autodoc/source/parser/inc/adoc/a_rdocu.hxx
new file mode 100644
index 000000000000..a58b80da1ec9
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/a_rdocu.hxx
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_A_RDOCU_HXX
+#define ADC_ADOC_A_RDOCU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+class DocuDealer;
+
+
+
+namespace adoc
+{
+
+class Token;
+class Adoc_PE;
+
+class DocuExplorer
+
+{
+  public:
+                        DocuExplorer();
+                        ~DocuExplorer();
+    void                StartNewFile(
+                            DocuDealer &        o_rDocuDistributor );
+
+    void                Process_Token(
+                            DYN adoc::Token &   let_drToken );
+  private:
+    DocuDealer *        pDocuDistributor;
+    Dyn<Adoc_PE>        pPE;
+    bool                bIsPassedFirstDocu;
+};
+
+
+}   // namespace adoc
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/adoc/adoc_tok.hxx b/autodoc/source/parser/inc/adoc/adoc_tok.hxx
new file mode 100644
index 000000000000..dc1d372d99b3
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/adoc_tok.hxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_ADOC_TOK_HXX
+#define ADC_ADOC_ADOC_TOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace adoc {
+
+
+class TokenInterpreter;
+
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer );
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+
+}   // namespace adoc
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/adoc/atokdeal.hxx b/autodoc/source/parser/inc/adoc/atokdeal.hxx
new file mode 100644
index 000000000000..b3e98dba2d0d
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/atokdeal.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_ATOKDEAL_HXX
+#define ADC_ADOC_ATOKDEAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokdeal.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace adoc
+{
+
+class Token;
+
+class TokenDealer : virtual public ::TokenDealer
+{
+  public:
+
+    virtual void        Deal_AdcDocu(
+                            adoc::Token &       let_drToken ) = 0;
+};
+
+
+} // namespace adoc
+
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/adoc/cx_a_std.hxx b/autodoc/source/parser/inc/adoc/cx_a_std.hxx
new file mode 100644
index 000000000000..b0f9bb0ce881
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/cx_a_std.hxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_CX_A_STD_HXX
+#define ADC_ADOC_CX_A_STD_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+#include <tokens/tkpstama.hxx>
+    // PARAMETERS
+
+class TextToken;
+
+
+namespace adoc {
+
+class Cx_LineStart;
+class Cx_CheckStar;
+class Cx_AtTagCompletion;
+
+
+/**
+@descr
+*/
+class Context_AdocStd : public autodoc::TkpDocuContext,
+                        private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_AdocStd();
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken );
+                        ~Context_AdocStd();
+
+    //  OPERATIONS
+    virtual void        AssignDealer(
+                            TokenDealer &       o_rDealer );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue );
+    //  INQUIRY
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    //  SERVICE FUNCTIONS
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            F_CRTOK             i_fTokenCreateFunction,
+                            CharacterSource &   io_rText );
+
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachine        aStateMachine;
+    TokenDealer *       pDealer;
+
+        // Contexts
+    TkpContext *        pParentContext;
+    TkpContext *        pFollowUpContext;
+    Dyn<Cx_LineStart>   pCx_LineStart;
+    Dyn<Cx_CheckStar>   pCx_CheckStar;
+    Dyn<Cx_AtTagCompletion>
+                        pCx_AtTagCompletion;
+
+        // Temporary data, used during ReadCharChain()
+    Dyn<TextToken>      pNewToken;
+    bool                bIsMultiline;
+};
+
+
+}   // namespace adoc
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/adoc/cx_a_sub.hxx b/autodoc/source/parser/inc/adoc/cx_a_sub.hxx
new file mode 100644
index 000000000000..e447ce416c65
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/cx_a_sub.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_CX_A_SUB_HXX
+#define ADC_ADOC_CX_A_SUB_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+#include <tokens/tkpstama.hxx>
+    // PARAMETERS
+#include <tokens/token.hxx>
+
+
+namespace adoc {
+
+
+
+
+class Cx_LineStart : public TkpContext
+{
+  public:
+                        Cx_LineStart(
+                            TkpContext &        i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+
+    void                SetCurToken(
+                            TextToken::F_CRTOK  i_fTokenCreateFunction )
+                                                { fCur_TokenCreateFunction = i_fTokenCreateFunction; }
+    void                AssignDealer(
+                            TokenDealer &       o_rDealer )
+                                                { pDealer = &o_rDealer; }
+  private:
+    // DATA
+    TokenDealer *       pDealer;
+    TkpContext *        pFollowUpContext;
+
+    Dyn<TextToken>      pNewToken;
+
+    TextToken::F_CRTOK  fCur_TokenCreateFunction;
+};
+
+
+/**
+@descr
+*/
+
+class Cx_CheckStar : public TkpContext
+{
+  public:
+    // LIFECYCLE
+                        Cx_CheckStar(
+                            TkpContext &        i_rFollowUpContext );
+    void                Set_End_FollowUpContext(
+                            TkpContext &        i_rEnd_FollowUpContext )
+                                                { pEnd_FollowUpContext = &i_rEnd_FollowUpContext; }
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+
+    void                SetCanBeEnd(
+                            bool                i_bCanBeEnd  )
+                                                { bCanBeEnd = i_bCanBeEnd; }
+    virtual TkpContext &
+                        FollowUpContext();
+    void                AssignDealer(
+                            TokenDealer &       o_rDealer )
+                                                { pDealer = &o_rDealer; }
+  private:
+    // DATA
+    TokenDealer *       pDealer;
+    TkpContext *        pFollowUpContext;
+    TkpContext *        pEnd_FollowUpContext;
+
+    Dyn<TextToken>      pNewToken;
+
+    bool                bCanBeEnd;
+    bool                bEndTokenFound;
+};
+
+
+class Cx_AtTagCompletion : public TkpContext
+{
+  public:
+                        Cx_AtTagCompletion(
+                            TkpContext &        i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+
+    void                SetCurToken(
+                            TextToken::F_CRTOK  i_fTokenCreateFunction )
+                                                { fCur_TokenCreateFunction = i_fTokenCreateFunction; }
+    void                AssignDealer(
+                            TokenDealer &       o_rDealer )
+                                                { pDealer = &o_rDealer; }
+  private:
+    // DATA
+    TokenDealer *       pDealer;
+    TkpContext *        pFollowUpContext;
+
+    Dyn<TextToken>      pNewToken;
+
+    TextToken::F_CRTOK  fCur_TokenCreateFunction;
+};
+
+
+}   // namespace adoc
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/adoc/docu_pe.hxx b/autodoc/source/parser/inc/adoc/docu_pe.hxx
new file mode 100644
index 000000000000..166eeb02fd24
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/docu_pe.hxx
@@ -0,0 +1,192 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DOCU_PE_HXX
+#define ADC_DOCU_PE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <adoc/tokintpr.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace doc
+{
+    class OldCppDocu;
+}
+namespace info
+{
+    class AtTag;
+}
+}
+
+
+
+namespace adoc
+{
+
+
+class Adoc_PE : public TokenInterpreter
+{
+  public:
+                        Adoc_PE();
+                        ~Adoc_PE();
+
+    virtual void        Hdl_at_std(
+                            const Tok_at_std &  i_rTok );
+    virtual void        Hdl_at_base(
+                            const Tok_at_base & i_rTok );
+    virtual void        Hdl_at_exception(
+                            const Tok_at_exception &
+                                                i_rTok );
+    virtual void        Hdl_at_impl(
+                            const Tok_at_impl & i_rTok );
+    virtual void        Hdl_at_key(
+                            const Tok_at_key &  i_rTok );
+    virtual void        Hdl_at_param(
+                            const Tok_at_param &
+                                                i_rTok );
+    virtual void        Hdl_at_see(
+                            const Tok_at_see &  i_rTok );
+    virtual void        Hdl_at_template(
+                            const Tok_at_template &
+                                                i_rTok );
+    virtual void        Hdl_at_interface(
+                            const Tok_at_interface &
+                                                i_rTok );
+    virtual void        Hdl_at_internal(
+                            const Tok_at_internal &
+                                                i_rTok );
+    virtual void        Hdl_at_obsolete(
+                            const Tok_at_obsolete &
+                                                i_rTok );
+    virtual void        Hdl_at_module(
+                            const Tok_at_module &
+                                                i_rTok );
+    virtual void        Hdl_at_file(
+                            const Tok_at_file & i_rTok );
+    virtual void        Hdl_at_gloss(
+                            const Tok_at_gloss &
+                                                i_rTok );
+    virtual void        Hdl_at_global(
+                            const Tok_at_global &
+                                                i_rTok );
+    virtual void        Hdl_at_include(
+                            const Tok_at_include &
+                                                i_rTok );
+    virtual void        Hdl_at_label(
+                            const Tok_at_label &
+                                                i_rTok );
+    virtual void        Hdl_at_since(
+                            const Tok_at_since &
+                                                i_rTok );
+    virtual void        Hdl_at_HTML(
+                            const Tok_at_HTML &
+                                                i_rTok );
+    virtual void        Hdl_at_NOHTML(
+                            const Tok_at_NOHTML &
+                                                i_rTok );
+
+    virtual void        Hdl_DocWord(
+                            const Tok_DocWord & i_rTok );
+
+    virtual void        Hdl_Whitespace(
+                            const Tok_Whitespace &
+                                                i_rTok );
+    virtual void        Hdl_LineStart(
+                            const Tok_LineStart &
+                                                i_rTok );
+    virtual void        Hdl_Eol(
+                            const Tok_Eol &     i_rTok );
+
+    virtual void        Hdl_EoDocu(
+                            const Tok_EoDocu &  i_rTok );
+
+
+    DYN ary::doc::OldCppDocu *
+                        ReleaseJustParsedDocu();
+
+    bool                IsComplete() const;
+
+  private:
+    void                InstallAtTag(
+                            DYN ary::info::AtTag *
+                                                let_dpTag,
+                            bool                i_bImplicit = false );  /// True for implicit @short and @descr.
+    ary::doc::OldCppDocu &
+                        CurDocu();
+    ary::info::AtTag &  CurAtTag();
+    bool                UsesHtmlInDocuText();
+
+    void                RenameCurShortTag();
+    void                FinishCurShortTag();
+
+
+    // DATA
+    enum E_TagState
+    {
+        ts_new,
+        ts_std
+    };
+    enum E_DocuState
+    {
+        ds_wait_for_short = 0,
+        ds_in_short,
+        ds_1newline_after_short,
+        ds_in_descr,
+        ds_std
+    };
+
+    Dyn<ary::doc::OldCppDocu>
+                        pCurDocu;
+    ary::info::AtTag *  pCurAtTag;
+    uintt               nLineCountInDocu;
+    UINT8               nCurSpecialMeaningTokens;
+    UINT8               nCurSubtractFromLineStart;
+    E_TagState          eCurTagState;
+    E_DocuState         eDocuState;
+    bool                bIsComplete;
+    bool                bUsesHtmlInDocuText;
+};
+
+
+// IMPLEMENTATION
+inline bool
+Adoc_PE::IsComplete() const
+{
+    return bIsComplete;
+}
+
+
+
+
+}   // namespace adoc
+#endif
diff --git a/autodoc/source/parser/inc/adoc/prs_adoc.hxx b/autodoc/source/parser/inc/adoc/prs_adoc.hxx
new file mode 100644
index 000000000000..ac4758be371f
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/prs_adoc.hxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_PRS_ADOC_HXX
+#define ADC_ADOC_PRS_ADOC_HXX
+
+
+
+#include <autodoc/prs_docu.hxx>
+
+namespace adoc
+{
+
+
+class DocuParser_AutodocStyle : public autodoc::DocumentationParser_Ifc
+{
+  public:
+                        DocuParser_AutodocStyle();
+    virtual             ~DocuParser_AutodocStyle();
+
+    virtual DYN autodoc::TkpDocuContext *
+                        Create_DocuContext() const;
+};
+
+
+
+}   // namespace adoc
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/adoc/tk_attag.hxx b/autodoc/source/parser/inc/adoc/tk_attag.hxx
new file mode 100644
index 000000000000..f5f87a4c21cc
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/tk_attag.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_TK_ATTAG_HXX
+#define ADC_ADOC_TK_ATTAG_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <adoc/adoc_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/info/inftypes.hxx>
+
+namespace adoc {
+
+typedef ary::info::E_AtTagId E_AtTagId;
+
+
+class Tok_at_std : public Token
+{
+  public:
+                        Tok_at_std(
+                            E_AtTagId           i_nId )
+                                                : eId(i_nId) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_AtTagId           Id() const              { return eId; }
+
+  private:
+    E_AtTagId           eId;
+};
+
+
+#define DECL_TOKEN_CLASS(name) \
+class Tok_##name : public Token \
+{ public: \
+    virtual void        Trigger( \
+                            TokenInterpreter &  io_rInterpreter ) const; \
+    virtual const char * \
+                        Text() const; \
+}
+
+
+DECL_TOKEN_CLASS(at_base);
+DECL_TOKEN_CLASS(at_exception);
+DECL_TOKEN_CLASS(at_impl);
+DECL_TOKEN_CLASS(at_key);
+DECL_TOKEN_CLASS(at_param);
+DECL_TOKEN_CLASS(at_see);
+DECL_TOKEN_CLASS(at_template);
+DECL_TOKEN_CLASS(at_interface);
+DECL_TOKEN_CLASS(at_internal);
+DECL_TOKEN_CLASS(at_obsolete);
+DECL_TOKEN_CLASS(at_module);
+DECL_TOKEN_CLASS(at_file);
+DECL_TOKEN_CLASS(at_gloss);
+DECL_TOKEN_CLASS(at_global);
+DECL_TOKEN_CLASS(at_include);
+DECL_TOKEN_CLASS(at_label);
+DECL_TOKEN_CLASS(at_HTML);
+DECL_TOKEN_CLASS(at_NOHTML);
+DECL_TOKEN_CLASS(at_since);
+
+
+#undef DECL_TOKEN_CLASS
+
+
+
+}   // namespace adoc
+
+#endif
+
diff --git a/autodoc/source/parser/inc/adoc/tk_docw.hxx b/autodoc/source/parser/inc/adoc/tk_docw.hxx
new file mode 100644
index 000000000000..dc20a63a4332
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/tk_docw.hxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_TK_DOCW_HXX
+#define ADC_ADOC_TK_DOCW_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <adoc/adoc_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace adoc {
+
+
+class Tok_DocWord : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_DocWord(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    uintt               Length() const          { return sText.length(); }
+
+  private:
+    // DATA
+    String              sText;
+};
+
+class Tok_Whitespace : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_Whitespace(
+                            UINT8               i_nSize )
+                                                :   nSize(i_nSize) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    UINT8               Size() const            { return nSize; }
+
+  private:
+    // DATA
+    UINT8               nSize;
+};
+
+class Tok_LineStart : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_LineStart(
+                            UINT8               i_nSize )
+                                                :   nSize(i_nSize) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    UINT8               Size() const            { return nSize; }
+
+  private:
+    // DATA
+    UINT8               nSize;
+};
+
+class Tok_Eol : public Token
+{ public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+class Tok_EoDocu : public Token
+{ public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace adoc
+
+#endif
+
diff --git a/autodoc/source/parser/inc/adoc/tokintpr.hxx b/autodoc/source/parser/inc/adoc/tokintpr.hxx
new file mode 100644
index 000000000000..6c2ff2bc0204
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/tokintpr.hxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_ADOC_TOKINTPR_HXX
+#define ADC_ADOC_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace adoc {
+
+
+class Tok_at_std;
+class Tok_at_base;
+class Tok_at_exception;
+class Tok_at_impl;
+class Tok_at_key;
+class Tok_at_param;
+class Tok_at_see;
+class Tok_at_template;
+class Tok_at_interface;
+class Tok_at_internal;
+class Tok_at_obsolete;
+class Tok_at_module;
+class Tok_at_file;
+class Tok_at_gloss;
+class Tok_at_global;
+class Tok_at_include;
+class Tok_at_label;
+class Tok_at_since;
+class Tok_at_HTML;          // Sets default to: Use HTML in DocuText
+class Tok_at_NOHTML;        // Sets default to: Don't use HTML in DocuText
+
+class Tok_DocWord;
+class Tok_LineStart;
+class Tok_Whitespace;
+class Tok_Eol;
+class Tok_EoDocu;
+
+
+#define DECL_TOK_HANDLER(token) \
+    virtual void        Hdl_##token( \
+                            const Tok_##token & i_rTok ) = 0
+
+
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+                        DECL_TOK_HANDLER(at_std);
+                        DECL_TOK_HANDLER(at_base);
+                        DECL_TOK_HANDLER(at_exception);
+                        DECL_TOK_HANDLER(at_impl);
+                        DECL_TOK_HANDLER(at_key);
+                        DECL_TOK_HANDLER(at_param);
+                        DECL_TOK_HANDLER(at_see);
+                        DECL_TOK_HANDLER(at_template);
+                        DECL_TOK_HANDLER(at_interface);
+                        DECL_TOK_HANDLER(at_internal);
+                        DECL_TOK_HANDLER(at_obsolete);
+                        DECL_TOK_HANDLER(at_module);
+                        DECL_TOK_HANDLER(at_file);
+                        DECL_TOK_HANDLER(at_gloss);
+                        DECL_TOK_HANDLER(at_global);
+                        DECL_TOK_HANDLER(at_include);
+                        DECL_TOK_HANDLER(at_label);
+                        DECL_TOK_HANDLER(at_since);
+                        DECL_TOK_HANDLER(at_HTML);
+                        DECL_TOK_HANDLER(at_NOHTML);
+                        DECL_TOK_HANDLER(DocWord);
+                        DECL_TOK_HANDLER(Whitespace);
+                        DECL_TOK_HANDLER(LineStart);
+                        DECL_TOK_HANDLER(Eol);
+                        DECL_TOK_HANDLER(EoDocu);
+};
+
+#undef DECL_TOK_HANDLER
+
+
+// IMPLEMENTATION
+
+
+}   // namespace adoc
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/cpp/ctokdeal.hxx b/autodoc/source/parser/inc/cpp/ctokdeal.hxx
new file mode 100644
index 000000000000..676bb8b40240
--- /dev/null
+++ b/autodoc/source/parser/inc/cpp/ctokdeal.hxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CTOKDEAL_HXX
+#define ADC_CPP_CTOKDEAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokdeal.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp
+{
+
+class Token;
+class Tok_UnblockMacro;
+
+
+class TokenDealer : virtual public ::TokenDealer
+{
+  public:
+
+    virtual void        Deal_CppCode(
+                            cpp::Token &        let_drToken ) = 0;
+
+    /** This is to be used only by the internal macro expander
+        ( ::cpp::PreProcessor ).
+        These tokens are inserted into the source text temporary to make clear,
+        where a specific macro replacement ends and therefore the macro's name
+        becomes valid again.
+
+        @see ::cpp::Tok_UnblockMacro
+        @see ::cpp::PreProcessor
+    */
+    virtual void        Deal_Cpp_UnblockMacro(
+                            Tok_UnblockMacro &  let_drToken ) = 0;
+};
+
+
+
+} // namespace cpp
+
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/cpp/prs_cpp.hxx b/autodoc/source/parser/inc/cpp/prs_cpp.hxx
new file mode 100644
index 000000000000..1b324eeebd18
--- /dev/null
+++ b/autodoc/source/parser/inc/cpp/prs_cpp.hxx
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_PRS_CPP_HXX
+#define ADC_CPP_PRS_CPP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <autodoc/prs_code.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+struct S_RunningData;
+
+class Cpluplus_Parser : public autodoc::CodeParser_Ifc
+{
+  public:
+                        Cpluplus_Parser();
+    virtual             ~Cpluplus_Parser();
+
+
+    virtual void        Setup(
+                            ary::Repository &   o_rRepository,
+                            const autodoc::DocumentationParser_Ifc &
+                                                i_rDocumentationInterpreter );
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles );
+  private:
+    Dyn<S_RunningData>  pRunningData;
+};
+
+
+
+
+}   // namespace cpp
+#endif
diff --git a/autodoc/source/parser/inc/doc_deal.hxx b/autodoc/source/parser/inc/doc_deal.hxx
new file mode 100644
index 000000000000..5ff17ee2264d
--- /dev/null
+++ b/autodoc/source/parser/inc/doc_deal.hxx
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DOC_DEAL_HXX
+#define ADC_DOC_DEAL_HXX
+
+// BASE CLASSES
+#include <tokens/tokproct.hxx>
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace doc
+{
+    class OldCppDocu;
+}
+}
+
+
+
+
+class DocuDealer
+{
+  public:
+    // INQUIRY
+    virtual             ~DocuDealer() {}
+
+    // OPERATIONS
+    /** @descr
+        This distributes the let_drDocu to the matching ary::RepositoryEntity .
+
+        If the docu is not inline, it will be saved and later given to the next
+        ary::CodeEntity. Or it will be discarded, if there does not come a matching
+        ary::CodeEntity .
+
+        If the docu is inline after a function header or after an enum value
+        or after a function parameter or after a base class, it will be stored
+        together with the matching function, enum value, parameter or base class.
+
+        If the documentation is @file or @project or @glos(sary) it will be
+        stored at the matching ary::cpp::FileGroup, ary::cpp::ProjectGroup
+        or ary::Glossary.
+    */
+    void                TakeDocu(
+                            DYN ary::doc::OldCppDocu &
+                                                let_drInfo );
+  private:
+    virtual void        do_TakeDocu(
+                            DYN ary::doc::OldCppDocu &
+                                                let_drInfo ) = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+DocuDealer::TakeDocu( DYN ary::doc::OldCppDocu & let_drInfo )
+    { do_TakeDocu(let_drInfo); }
+
+
+
+
+#endif
diff --git a/autodoc/source/parser/inc/semantic/callf.hxx b/autodoc/source/parser/inc/semantic/callf.hxx
new file mode 100644
index 000000000000..a76da81e280c
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/callf.hxx
@@ -0,0 +1,287 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_CALLF_HXX
+#define ADC_CPP_CALLF_HXX
+
+// USED SERVICES
+
+
+
+
+/** This represents a function to be called, if a specific kind of token
+    arrives in the semantic parser.
+
+    @descr This class is only to be used as member of PeStatus<PE>.
+    @template PE
+        The owning ParseEnvironment.
+    @see PeStatus, ParseEnvironment
+*/
+template <class PE>
+class CallFunction
+{
+  public:
+    typedef void (PE::*F_Tok)(const char *);
+
+                        CallFunction(
+                            F_Tok               i_f2Call,
+                            INT16               i_nTokType );
+
+    F_Tok               GetF() const;
+    INT16               TokType() const;
+
+  private:
+    // DATA
+    F_Tok               f2Call;
+    INT16               nTokType;
+};
+
+
+/** One state within a ParseEnvironment.
+
+    @template PE
+        The owning ParseEnvironment.
+*/
+template <class PE>
+class PeStatus
+{
+  public:
+    typedef typename CallFunction<PE>::F_Tok  F_Tok;
+
+                        PeStatus(
+                            PE &                i_rMyPE,
+                            uintt               i_nSize,
+                            F_Tok *             i_pFuncArray,
+                            INT16 *             i_pTokTypeArray,
+                            F_Tok               i_pDefault );
+    virtual             ~PeStatus();
+
+    virtual void        Call_Handler(
+                            INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const;
+
+  private:
+    bool                CheckForCall(
+                            uintt               i_nPos,
+                            INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const;
+
+    PE *                pMyPE;
+    std::vector< CallFunction<PE> >
+                        aBranches;
+    F_Tok               fDefault;
+};
+
+
+template <class PE>
+class PeStatusArray
+{
+  public:
+    typedef typename PE::E_State    State;
+
+                        PeStatusArray();
+    void                InsertState(
+                            State               i_ePosition,
+                            DYN PeStatus<PE> &  let_drState );
+                        ~PeStatusArray();
+
+    const PeStatus<PE> &
+                        operator[](
+                            State               i_ePosition ) const;
+
+    void                SetCur(
+                            State               i_eCurState );
+    const PeStatus<PE> &
+                        Cur() const;
+
+  private:
+    DYN PeStatus<PE> *  aStati[PE::size_of_states];
+    State               eState;
+};
+
+
+
+// IMPLEMENTATION
+
+
+// CallFunction
+
+template <class PE>
+CallFunction<PE>::CallFunction( F_Tok   i_f2Call,
+                                INT16   i_nTokType )
+    :   f2Call(i_f2Call),
+        nTokType(i_nTokType)
+{
+}
+
+template <class PE>
+inline typename CallFunction<PE>::F_Tok
+CallFunction<PE>::GetF() const
+{
+    return f2Call;
+}
+
+template <class PE>
+inline INT16
+CallFunction<PE>::TokType() const
+{
+    return nTokType;
+}
+
+
+
+// PeStatus
+
+template <class PE>
+PeStatus<PE>::PeStatus( PE &        i_rMyPE,
+                        uintt       i_nSize,
+                        F_Tok *     i_pFuncArray,
+                        INT16 *     i_pTokTypeArray,
+                        F_Tok       i_fDefault )
+    :   pMyPE(&i_rMyPE),
+        fDefault(i_fDefault)
+{
+    aBranches.reserve(i_nSize);
+    for ( uintt i = 0; i < i_nSize; ++i )
+    {
+//      csv_assert(i > 0 ? i_pTokTypeArray[i] > i_pTokTypeArray[i-1] : true);
+        aBranches.push_back( CallFunction<PE>( i_pFuncArray[i], i_pTokTypeArray[i]) );
+    }  // end for
+}
+
+template <class PE>
+PeStatus<PE>::~PeStatus()
+{
+
+}
+
+template <class PE>
+void
+PeStatus<PE>::Call_Handler( INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const
+{
+    uintt nSize = aBranches.size();
+    uintt nPos = nSize / 2;
+
+    if ( i_nTokTypeId < aBranches[nPos].TokType() )
+    {
+        for ( --nPos; intt(nPos) >= 0; --nPos )
+        {
+            if (CheckForCall(nPos, i_nTokTypeId, i_sTokenText))
+                return;
+        }
+    }
+    else
+    {
+        for ( ; nPos < nSize; ++nPos )
+        {
+            if (CheckForCall(nPos, i_nTokTypeId, i_sTokenText))
+                return;
+        }
+    }
+
+    (pMyPE->*fDefault)(i_sTokenText);
+}
+
+template <class PE>
+bool
+PeStatus<PE>::CheckForCall( uintt               i_nPos,
+                            INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const
+{
+    if ( aBranches[i_nPos].TokType() == i_nTokTypeId )
+    {
+        (pMyPE->*aBranches[i_nPos].GetF())(i_sTokenText);
+        return true;
+    }
+    return false;
+}
+
+// PeStatusArray
+
+template <class PE>
+PeStatusArray<PE>::PeStatusArray()
+    :   eState(PE::size_of_states)
+{
+    memset(aStati, 0, sizeof aStati);
+}
+
+template <class PE>
+void
+PeStatusArray<PE>::InsertState( State               i_ePosition,
+                                DYN PeStatus<PE> &  let_drState )
+{
+    csv_assert(aStati[i_ePosition] == 0);
+    aStati[i_ePosition] = &let_drState;
+}
+
+template <class PE>
+PeStatusArray<PE>::~PeStatusArray()
+{
+    int i_max = PE::size_of_states;
+    for (int i = 0; i < i_max; i++)
+    {
+        delete aStati[i];
+    }  // end for
+}
+
+template <class PE>
+inline const PeStatus<PE> &
+PeStatusArray<PE>::operator[]( State i_ePosition ) const
+{
+    csv_assert( uintt(i_ePosition) < PE::size_of_states );
+    csv_assert( aStati[i_ePosition] != 0 );
+    return *aStati[i_ePosition];
+}
+
+template <class PE>
+inline void
+PeStatusArray<PE>::SetCur( State i_eCurState )
+{
+    eState = i_eCurState;
+}
+
+
+template <class PE>
+const PeStatus<PE> &
+PeStatusArray<PE>::Cur() const
+{
+    return (*this)[eState];
+}
+
+#define SEMPARSE_CREATE_STATUS(penv, state, default_function) \
+    pStati->InsertState( state, \
+                        *new PeStatus<penv>( \
+        *this, \
+        sizeof( stateT_##state ) / sizeof (INT16), \
+        stateF_##state, \
+        stateT_##state, \
+        &penv::default_function ) )
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/semantic/parseenv.hxx b/autodoc/source/parser/inc/semantic/parseenv.hxx
new file mode 100644
index 000000000000..d6ba3daf661a
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/parseenv.hxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSEENV_HXX
+#define ADC_PARSEENV_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+class CodeInfo;
+}   // namespace info
+}   // namespace ary)
+
+
+
+class SubPeUseIfc;
+
+
+class ParseEnvironment : protected TokenProcessing_Types
+{
+  public:
+    virtual             ~ParseEnvironment() {}
+
+    // Parsing
+    void                Enter(
+                            E_EnvStackAction    i_eWayOfEntering );
+    void                Leave(
+                            E_EnvStackAction    i_eWayOfLeaving );
+    void                SetCurSPU(
+                            const SubPeUseIfc * i_pCurSPU );
+
+    ParseEnvironment *  Parent() const;
+
+
+    // ACCESS
+  protected:
+                        ParseEnvironment(
+                            ParseEnvironment *  i_pParent );
+    const SubPeUseIfc * CurSubPeUse() const;
+  private:
+    virtual void        InitData() = 0;
+    virtual void        TransferData() = 0;
+
+    ParseEnvironment *  pParent;
+    const SubPeUseIfc * pCurSubPe;
+};
+
+class SubPeUseIfc
+{
+  public:
+    virtual             ~SubPeUseIfc() {}
+
+    virtual void        InitParse() const = 0;
+    virtual void        GetResults() const = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+ParseEnvironment::SetCurSPU( const SubPeUseIfc * i_pCurSPU )
+    { pCurSubPe = i_pCurSPU; }
+
+inline ParseEnvironment *
+ParseEnvironment::Parent() const
+    { return pParent; }
+
+inline const SubPeUseIfc *
+ParseEnvironment::CurSubPeUse() const
+    { return pCurSubPe; }
+
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/semantic/sub_pe.hxx b/autodoc/source/parser/inc/semantic/sub_pe.hxx
new file mode 100644
index 000000000000..84775f2e9425
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/sub_pe.hxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_SUB_PE_HXX
+#define ADC_CPP_SUB_PE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParseEnvironment;
+
+template <class PE, class SUB>
+class SubPe
+{
+  public:
+    typedef SubPe< PE, SUB >    self;
+
+                        SubPe(
+                            PE &                i_rParent );
+    PE &                Parent() const;
+    SUB &               Child() const;
+
+    ParseEnvironment &  Get() const;
+
+  private:
+    SUB &               CreateChild() const;
+
+    PE &                rParent;
+    Dyn<SUB>            pChild;
+};
+
+
+
+// IMPLEMENTATION
+
+
+//  SubPe
+
+template <class PE, class SUB>
+SubPe<PE,SUB>::SubPe( PE & i_rParent )
+    :   rParent(i_rParent)
+{
+}
+
+template <class PE, class SUB>
+PE &
+SubPe<PE,SUB>::Parent() const
+{
+     return rParent;
+}
+
+template <class PE, class SUB>
+inline SUB &
+SubPe<PE,SUB>::Child() const
+{
+    return pChild ? *pChild.MutablePtr() : CreateChild();
+}
+
+template <class PE, class SUB>
+ParseEnvironment &
+SubPe<PE,SUB>::Get() const
+{
+    return Child();
+}
+
+template <class PE, class SUB>
+SUB &
+SubPe<PE,SUB>::CreateChild() const
+{
+    self * pThis = const_cast< self* >(this);
+
+    SUB * pNewChild = new SUB( &rParent);
+
+    pThis->pChild = pNewChild;
+
+    return *pChild.MutablePtr();
+}
+
+
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/semantic/sub_peu.hxx b/autodoc/source/parser/inc/semantic/sub_peu.hxx
new file mode 100644
index 000000000000..c939f295c373
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/sub_peu.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_SUB_PEU_HXX
+#define ADC_CPP_SUB_PEU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <semantic/parseenv.hxx>
+#include <tokens/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <semantic/sub_pe.hxx>
+
+
+
+template <class PE, class SUB>
+class SubPeUse  : public SubPeUseIfc,
+                  private TokenProcessing_Types
+{
+  public:
+    typedef void (PE::*F_INIT)();
+    typedef void (PE::*F_RETURN)();
+
+                        SubPeUse(
+                            SubPe<PE,SUB> &     i_rSubPeCreator,
+                            F_INIT              i_fInit,
+                            F_RETURN            i_fReturn );
+                        ~SubPeUse();
+
+    void                Push(
+                            E_TokenDone         i_eDone );
+    virtual void        InitParse() const;
+    virtual void        GetResults() const;
+
+    PE &                Parent() const;
+    SUB &               Child() const;
+
+  private:
+    // DATA
+    SubPe<PE,SUB> &     rSubPeCreator;
+    F_INIT              fInit;
+    F_RETURN            fReturn;
+};
+
+
+// IMPLEMENTATION
+
+
+template <class PE, class SUB>
+SubPeUse<PE,SUB>::SubPeUse( SubPe<PE,SUB> &     i_rSubPeCreator,
+                        F_INIT              i_fInit,
+                        F_RETURN            i_fReturn )
+    :   rSubPeCreator(i_rSubPeCreator),
+        fInit(i_fInit),
+        fReturn(i_fReturn)
+{
+}
+
+template <class PE, class SUB>
+SubPeUse<PE,SUB>::~SubPeUse()
+{
+}
+
+template <class PE, class SUB>
+void
+SubPeUse<PE,SUB>::Push( E_TokenDone i_eDone )
+{
+    Parent().SetTokenResult( i_eDone, push, &rSubPeCreator.Get() );
+    Parent().SetCurSPU(this);
+}
+
+template <class PE, class SUB>
+void
+SubPeUse<PE,SUB>::InitParse() const
+{
+    if (fInit != 0)
+        (Parent().*fInit)();
+}
+
+template <class PE, class SUB>
+void
+SubPeUse<PE,SUB>::GetResults() const
+{
+    if (fReturn != 0)
+        (Parent().*fReturn)();
+}
+
+template <class PE, class SUB>
+inline PE &
+SubPeUse<PE,SUB>::Parent() const
+{
+     return rSubPeCreator.Parent();
+}
+
+template <class PE, class SUB>
+inline SUB &
+SubPeUse<PE,SUB>::Child() const
+{
+     return rSubPeCreator.Child();
+}
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/tokens/parseinc.hxx b/autodoc/source/parser/inc/tokens/parseinc.hxx
new file mode 100644
index 000000000000..c1a20a2a11e3
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/parseinc.hxx
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSEINC_HXX
+#define ADC_PARSEINC_HXX
+
+
+#include <tools/tkpchars.hxx>
+
+inline char
+jumpOver( CharacterSource & io_rText,
+          char in_c )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext == in_c;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c1,
+        char              in_c2 )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c1 AND cNext != in_c2 AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c1,
+        char              in_c2,
+        char              in_c3 )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c1 AND cNext != in_c2 AND cNext != in_c3 AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c1,
+        char              in_c2,
+        char              in_c3,
+        char              in_c4 )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c1 AND cNext != in_c2 AND cNext != in_c3
+                         AND cNext != in_c4 AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpOverWhite(CharacterSource & io_rText)
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          static_cast<UINT8>(cNext) < 33
+              AND cNext != 0 AND cNext != 13 AND cNext != 10;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpToWhite(CharacterSource & io_rText)
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          static_cast<UINT8>(cNext) > 32;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpToEol(CharacterSource & io_rText, int & o_rCount_BackslashedLineBreaks )
+{
+    o_rCount_BackslashedLineBreaks = 0;
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != 13 AND cNext != 10 AND cNext != NULCH;
+          cNext = io_rText.MoveOn() )
+    {
+        if ( cNext == '\\')
+        {
+            cNext = io_rText.MoveOn();
+            if ( cNext == 13 )
+                io_rText.MoveOn();
+            if ( cNext == 10 )
+                ++o_rCount_BackslashedLineBreaks;
+        }
+    }
+    return cNext;
+}
+
+inline char
+jumpToEol(CharacterSource & io_rText)
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != 13 AND cNext != 10 AND cNext != NULCH;
+          cNext = io_rText.MoveOn() )
+    {
+        if ( cNext == '\\')
+            io_rText.MoveOn();
+    }
+    return cNext;
+}
+
+inline char
+jumpOverEol(CharacterSource & io_rText)
+{
+    char cNext = io_rText.CurChar();
+
+    if (cNext == 13)
+        io_rText.MoveOn();
+    if (cNext == 10)
+        io_rText.MoveOn();
+    return cNext;
+}
+
+
+inline char // Finds a matching closing bracket after the opening one is passed
+jumpToMatchingBracket( CharacterSource & io_rText,
+                       char              in_cBegin,
+                       char              in_cEnd )
+{
+    intt nCounter = 1;
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          nCounter - (cNext == in_cEnd ? 1 : 0) > 0 AND cNext != NULCH;
+          cNext = io_rText.MoveOn() )
+    {
+        if (cNext == in_cEnd)
+           nCounter++;
+        else if (cNext == in_cBegin)
+           nCounter--;
+    }
+
+    return cNext;
+}
+
+
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/tokens/stmstarr.hxx b/autodoc/source/parser/inc/tokens/stmstarr.hxx
new file mode 100644
index 000000000000..d95ac2b6aa1c
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/stmstarr.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_STMSTARR_HXX
+#define ADC_STMSTARR_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <tokens/token.hxx>
+
+
+class StmArrayStatus : public StmStatus
+{
+  public:
+    typedef TextToken::F_CRTOK F_CRTOK;
+
+    // LIFECYCLE
+                        StmArrayStatus(
+                            intt                i_nStatusSize,
+                            const INT16 *       in_aArrayModel,
+                            F_CRTOK             i_fTokenCreateFunction,
+                            bool                in_bIsDefault );
+                        ~StmArrayStatus();
+
+    // INQUIRY
+    StmStatus::Branch   NextBy(
+                            intt                in_nFollowersIndex) const;
+    F_CRTOK             TokenCreateFunction() const
+                                                { return fTokenCreateFunction; }
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmArrayStatus *
+                        AsArray();
+    bool                SetBranch(
+                            intt                in_nBranchIx,
+                            StmStatus::Branch   in_nBranch );
+    void                SetTokenCreateFunction(
+                            F_CRTOK             i_fTokenCreateFunction );
+  private:
+    StmStatus::Branch * dpBranches;
+    intt                nNrOfBranches;
+    F_CRTOK             fTokenCreateFunction;
+    bool                bIsADefault;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+StmArrayStatus::SetTokenCreateFunction( F_CRTOK i_fTokenCreateFunction )
+    { fTokenCreateFunction = i_fTokenCreateFunction; }
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/tokens/stmstate.hxx b/autodoc/source/parser/inc/tokens/stmstate.hxx
new file mode 100644
index 000000000000..59c40733de74
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/stmstate.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_STMSTATE_HXX
+#define ADC_STMSTATE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+class StmArrayStatus;
+class StmBoundsStatus;
+
+/** A StmStatus is a state within a StateMachine.
+    There are two kinds of it.  Either its an array of pointers to
+    other states within the state machine - an ArrayStatus.
+
+    Or it is a BoundsStatus, which shows, the token cannot be
+    followed further within the StateMachine.
+**/
+class StmStatus // := "State machine status"
+{
+  public:
+    typedef intt        Branch;         /// Values >= 0 give a next #Status' ID.
+                                        /// Values <= 0 tell, that a token is finished.
+                                        /// a value < 0 returns the status back to an upper level state machine.
+        // LIFECYCLE
+    virtual             ~StmStatus() {}
+
+        // OPERATIONS
+    virtual StmArrayStatus *
+                        AsArray();
+    virtual StmBoundsStatus *
+                        AsBounds();
+
+        // INQUIRY
+    virtual bool        IsADefault() const = 0;
+};
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/tokens/stmstfin.hxx b/autodoc/source/parser/inc/tokens/stmstfin.hxx
new file mode 100644
index 000000000000..67e8e4525f5a
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/stmstfin.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_STMSTFIN_HXX
+#define ADC_STMSTFIN_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class TkpContext;
+class StateMachineContext;
+
+/**
+**/
+class StmBoundsStatus : public StmStatus
+{
+  public:
+    // LIFECYCLE
+                        StmBoundsStatus(
+                            StateMachineContext &
+                                                o_rOwner,
+                            TkpContext &        i_rFollowUpContext,
+                            uintt               i_nStatusFunctionNr,
+                            bool                i_bIsDefault  );
+    // INQUIRY
+    TkpContext *        FollowUpContext();
+    uintt               StatusFunctionNr() const;
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmBoundsStatus *
+                        AsBounds();
+
+  private:
+    StateMachineContext *
+                        pOwner;
+    TkpContext *        pFollowUpContext;
+    uintt               nStatusFunctionNr;
+    bool                bIsDefault;
+};
+
+inline TkpContext *
+StmBoundsStatus::FollowUpContext()
+    { return pFollowUpContext; }
+inline uintt
+StmBoundsStatus::StatusFunctionNr() const
+    { return nStatusFunctionNr; }
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx
new file mode 100644
index 000000000000..6623230e9603
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tkp.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKP_HXX
+#define ADC_TKP_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+class CharacterSource;
+class TkpContext;
+    // PARAMETRS
+
+
+
+/** This is the interface for parser classes, which get a sequence of tokens from
+    a text.
+
+    Start() starts to parse the text from the given i_rSource.
+    GetNextToken() returns a Token on the heap as long as there are
+    still characters in the text left. This can be checked by
+    HasMore().
+
+    The algorithms for parsing tokens from the text are an issue of
+    the derived classes.
+*/
+#if 0
+/**
+    Parsing can be interrupted for a different source by PushSource().
+    The parsing before interruption is continued after PopSource().
+*/
+#endif // 0
+
+class TokenParser
+{
+  public:
+    // LIFECYCLE
+                        TokenParser();
+    virtual             ~TokenParser() {}
+
+    // OPERATIONS
+    /** Start parsing a character source. Any previously parsed sources
+        are discarded.
+    */
+    virtual void        Start(
+                            CharacterSource &
+                                            i_rSource );
+
+    /** @short  Gets the next identifiable token out of the
+        source code.
+    */
+    void                GetNextToken();
+
+    /// @return true, if there are more tokens to parse.
+    bool                HasMore() const         { return bHasMore; }
+
+  private:
+    void                InitSource(
+                            CharacterSource &
+                                            i_rSource );
+
+    virtual void        SetStartContext() = 0;
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext ) = 0;
+    virtual TkpContext &
+                        CurrentContext() = 0;
+    // DATA
+    CharacterSource *   pChars;
+    bool                bHasMore;
+};
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/tokens/tkpcontx.hxx b/autodoc/source/parser/inc/tokens/tkpcontx.hxx
new file mode 100644
index 000000000000..becc5c356051
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tkpcontx.hxx
@@ -0,0 +1,140 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKPCONTX_HXX
+#define ADC_TKPCONTX_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <tokens/token.hxx>
+class CharacterSource;
+class TkpNullContext;
+
+/** @task
+    Specifies a context within which tokens are interpreted in a special
+    way. For example in parsing C++ there could be a context for code,
+    one for comments and a third one for preprocessor statements, because
+    each of these would give the same token different meanings.
+
+    The three functions
+            ReadCharChain()
+            PassNewToken()
+            FollowUpContext()
+    have to be called in this sequence.
+
+**/
+class TkpContext
+{
+  public:
+    // LIFECYCLE
+    virtual                 ~TkpContext() {}
+
+    // OPERATIONS
+    /** @descr
+        The functions starts to parse with the CurChar() of io_rText.
+        It leaves io_rText.CurChar() at the first char of the following Token or
+        the following Context.
+
+        This function returns, when a context has parsed some characterss
+        and completed a token OR left the context.
+        If the token is to be ignored, it is cut from io_rText.
+
+        If the token is to be parsed further in a different context,
+        it is NOT cut from io_rText.
+
+        After this function PassNewToken() has to be called.
+
+        If the function has found a valid and complete token, PassNewToken()
+        passes the parsed token to the internally known receiver and
+        returns true. The token is cut from io_rText.
+    **/
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText ) = 0;
+    /** Has to pass the parsed token to a known receiver.
+        If the token is to be parsed further in a different context,
+        PassNewToken() returns false, but the token is NOT cut from io_rText.
+
+        @return true, if a token was passed.
+                false, if the token was not parsed completely by this context
+                       or if the token is to be ignored.
+    */
+    virtual bool        PassNewToken() = 0;
+    virtual TkpContext &
+                        FollowUpContext() = 0;
+
+    static TkpNullContext &
+                        Null_();
+};
+
+class StateMachineContext
+{
+  public:
+    typedef TextToken::F_CRTOK F_CRTOK;
+
+    virtual ~StateMachineContext() {}
+
+    /// Is used by StmBoundsStatus only.
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            F_CRTOK             i_fTokenCreateFunction,
+                            CharacterSource &   io_rText ) = 0;
+};
+
+class TkpNullContext : public TkpContext
+{
+  public:
+                        ~TkpNullContext();
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+};
+
+namespace autodoc
+{
+
+class TkpDocuContext : public TkpContext
+{
+  public:
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken ) = 0;
+    virtual void        AssignDealer(
+                            TokenDealer &       o_rDealer ) = 0;
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue ) = 0;
+};
+
+} // namespace autodoc
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx
new file mode 100644
index 000000000000..47d443275e8f
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tkpstama.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKPSTAMA_HXX
+#define ADC_TKPSTAMA_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+#include <tokens/stmstarr.hxx>
+#include <tokens/stmstfin.hxx>
+
+/** @descr
+    This state-machine models state transitions from one state to another
+    per indices of branches. If the indices represent ascii-char-values,
+    the state-machine can be used for recognising tokens of text.
+
+    The state-machine can be a status itself.
+
+    StateMachine needs the array-size of all stati as a guess, how many stati
+    the state machine will contain, when at work.
+
+
+**/
+class StateMachine
+{
+    public:
+        // Types
+        typedef StmStatus::Branch   Branch;
+        typedef StmStatus * *       StatusList;
+
+    //# Interface self
+        // LIFECYCLE
+                        StateMachine(
+                            intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize );   /// The user of the constructor should guess
+                                                                            ///   the approximate number of stati here to
+                                                                            ///   avoid multiple reallocations.
+        /// @#AddStatus
+        intt            AddStatus(      /// @return the new #Status' ID
+                            DYN StmStatus * let_dpStatus);
+        /// @#AddToken
+        void            AddToken(
+                            const char *        in_sToken,
+                            TextToken::F_CRTOK  in_fTokenCreateFunction,
+                            const INT16 *       in_aBranches,
+                            INT16               in_nBoundsStatus );
+                        ~StateMachine();
+
+
+        // OPERATIONS
+        StmBoundsStatus &
+                        GetCharChain(
+                            TextToken::F_CRTOK &
+                                                o_nTokenCreateFunction,
+                            CharacterSource &   io_rText );
+    private:
+        // SERVICE FUNCTIONS
+        StmStatus &     Status(
+                            intt            in_nStatusNr) const;
+        StmArrayStatus &
+                        CurrentStatus() const;
+        StmBoundsStatus *
+                        BoundsStatus() const;
+
+        /// Sets the PeekedStatus.
+        void            Peek(
+                            intt            in_nBranch);
+
+        void            ResizeStati();      // Adds space for 32 stati.
+
+        // DATA
+        StatusList      pStati;             /// List of Status, implemented as simple C-array of length #nStatiSpace
+                                            /// with nStatiLength valid members (beginning from zero).
+        intt            nCurrentStatus;
+        intt            nPeekedStatus;
+
+        intt            nStatusSize;        /// Size of the branch array of a single status.
+
+        intt            nNrofStati;         /// Nr of Stati so far.
+        intt            nStatiSpace;        /// Size of allocated array for #pStati (size in items).
+};
+
+
+
+/** @#AddToken
+    @descr
+    Adds a token, which will be recogniszeds by the
+    statemachine.
+
+
+**/
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/tokens/tokdeal.hxx b/autodoc/source/parser/inc/tokens/tokdeal.hxx
new file mode 100644
index 000000000000..0ab4155a42e3
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tokdeal.hxx
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TOKDEAL_HXX
+#define ADC_TOKDEAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+    class Distributor;
+}
+
+
+class TokenDealer
+
+{
+  public:
+    virtual             ~TokenDealer() {}
+
+    virtual void        Deal_Eol() = 0;
+    virtual void        Deal_Eof() = 0;
+    virtual cpp::Distributor *
+                        AsDistributor() = 0;
+};
+
+
+#if 0
+class TokenDealer
+
+{
+  public:
+    virtual void        Deal_IdlCode(
+                            idl::Token &        let_drToken );
+    virtual void        Deal_UdkDocu(
+                            udoc::Token &       let_drToken );
+    virtual void        Deal_JavaCode(
+                            java::Token &       let_drToken );
+    virtual void        Deal_SBasicCode(
+                            sbasic::Token &     let_drToken );
+};
+
+#endif // 0
+
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/tokens/token.hxx b/autodoc/source/parser/inc/tokens/token.hxx
new file mode 100644
index 000000000000..82d70b066fdf
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/token.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TOKEN_HXX
+#define ADC_TOKEN_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETRS
+
+
+class TokenDealer;
+
+/**
+*/
+class TextToken
+{
+  public:
+    typedef TextToken * (*F_CRTOK)(const char*);
+
+    // LIFECYCLE
+    virtual             ~TextToken() {}
+
+
+    // INQUIRY
+    virtual const char* Text() const = 0;
+
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer ) = 0;
+};
+
+class Tok_Eof : public TextToken
+{
+    virtual void        DealOut(                // Implemented in tokdeal.cxx
+                            TokenDealer &       o_rDealer );
+    virtual const char* Text() const;
+};
+
+#endif
+
+
diff --git a/autodoc/source/parser/inc/tokens/tokproct.hxx b/autodoc/source/parser/inc/tokens/tokproct.hxx
new file mode 100644
index 000000000000..940b7482ff8c
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tokproct.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CPP_TOKPROCT_HXX
+#define ADC_CPP_TOKPROCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParseEnvironment;
+
+/** is a parent class for classes, which take part in parsing tokens semantically.
+    It provides some types for them.
+*/
+class TokenProcessing_Types
+{
+  public:
+    enum E_TokenDone
+    {
+        not_done = 0,
+        done = 1
+    };
+
+    enum E_EnvStackAction
+    {
+        stay,           // same parse environment
+        push,           // push sub environment
+        pop_success,    // return to parent environment, parsing was successful
+        pop_failure     // return to parent environment, but an error occured.
+    };
+
+    struct TokenProcessing_Result
+    {
+        E_TokenDone         eDone;
+        E_EnvStackAction    eStackAction;
+        ParseEnvironment *  pEnv2Push;
+
+                            TokenProcessing_Result()
+                                                : eDone(not_done), eStackAction(stay), pEnv2Push(0) {}
+        void                Reset()             { eDone = not_done; eStackAction = stay; pEnv2Push = 0; }
+    };
+
+    enum E_ParseResult
+    {
+        res_error,
+        res_complete,
+        res_predeclaration
+    };
+};
+
+
+
+#endif
+
diff --git a/autodoc/source/parser/inc/x_docu.hxx b/autodoc/source/parser/inc/x_docu.hxx
new file mode 100644
index 000000000000..bc75b96f5743
--- /dev/null
+++ b/autodoc/source/parser/inc/x_docu.hxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_X_DOCU_HXX
+#define ADC_X_DOCU_HXX
+
+// BASE CLASSES
+#include <autodoc/x_parsing.hxx>
+
+
+
+
+class X_Docu : public autodoc::X_Parser_Ifc
+{
+  public:
+    // LIFECYCLE
+                        X_Docu(
+                            const char *        i_tag,
+                            const char *        i_explanation );
+                        ~X_Docu();
+    // INQUIRY
+    virtual E_Event     GetEvent() const;
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const;
+
+  private:
+    String              sTagName;
+    String              sExplanation;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/parser/inc/x_parse.hxx b/autodoc/source/parser/inc/x_parse.hxx
new file mode 100644
index 000000000000..7ccfa80056e7
--- /dev/null
+++ b/autodoc/source/parser/inc/x_parse.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_X_PARSE_HXX
+#define ADC_X_PARSE_HXX
+
+// BASE CLASSES
+#include <autodoc/x_parsing.hxx>
+
+
+
+
+class X_Parser : public autodoc::X_Parser_Ifc
+{
+  public:
+    // LIFECYCLE
+                        X_Parser(
+                            E_Event             i_eEvent,
+                            const char *        i_sObject,
+                            const String &      i_sCausingFile_FullPath,
+                            uintt               i_nCausingLineNr );
+                        ~X_Parser();
+    // INQUIRY
+    virtual E_Event     GetEvent() const;
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const;
+
+  private:
+    E_Event             eEvent;
+    String              sObject;
+    String              sCausingFile_FullPath;
+    uintt               nCausingLineNr;
+
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/parser/kernel/makefile.mk b/autodoc/source/parser/kernel/makefile.mk
new file mode 100644
index 000000000000..9baf8ab1c6ef
--- /dev/null
+++ b/autodoc/source/parser/kernel/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_kernel
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/parsefct.obj    \
+    $(OBJ)$/x_docu.obj      \
+    $(OBJ)$/x_parse.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/kernel/parsefct.cxx b/autodoc/source/parser/kernel/parsefct.cxx
new file mode 100644
index 000000000000..6f041ef8415e
--- /dev/null
+++ b/autodoc/source/parser/kernel/parsefct.cxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "parsefct.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cpp/prs_cpp.hxx>
+#include <adoc/prs_adoc.hxx>
+#include <tools/filecoll.hxx>
+
+
+DYN ParseToolsFactory * ParseToolsFactory::dpTheInstance_ = 0;
+
+
+namespace autodoc
+{
+
+ParseToolsFactory_Ifc &
+ParseToolsFactory_Ifc::GetIt_()
+{
+    if ( ParseToolsFactory::dpTheInstance_ == 0 )
+        ParseToolsFactory::dpTheInstance_ = new ParseToolsFactory;
+    return *ParseToolsFactory::dpTheInstance_;
+}
+
+}   // namespace autodoc
+
+
+ParseToolsFactory::ParseToolsFactory()
+{
+}
+
+ParseToolsFactory::~ParseToolsFactory()
+{
+}
+
+DYN autodoc::CodeParser_Ifc *
+ParseToolsFactory::Create_Parser_Cplusplus() const
+{
+    return new cpp::Cpluplus_Parser;
+}
+
+DYN autodoc::DocumentationParser_Ifc *
+ParseToolsFactory::Create_DocuParser_AutodocStyle() const
+{
+    return new adoc::DocuParser_AutodocStyle;
+}
+
+DYN autodoc::FileCollector_Ifc *
+ParseToolsFactory::Create_FileCollector( uintt i_nEstimatedNrOfFiles ) const
+{
+    return new FileCollector(i_nEstimatedNrOfFiles);
+}
+
+
diff --git a/autodoc/source/parser/kernel/parsefct.hxx b/autodoc/source/parser/kernel/parsefct.hxx
new file mode 100644
index 000000000000..0710e48ac1dc
--- /dev/null
+++ b/autodoc/source/parser/kernel/parsefct.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSER_PARSEFCT_HXX
+#define ADC_PARSER_PARSEFCT_HXX
+
+
+#include <autodoc/parsing.hxx>
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class ParseToolsFactory : public autodoc::ParseToolsFactory_Ifc
+{
+  public:
+                        ParseToolsFactory();
+    virtual             ~ParseToolsFactory();
+
+    virtual DYN autodoc::CodeParser_Ifc *
+                        Create_Parser_Cplusplus() const;
+    virtual DYN autodoc::DocumentationParser_Ifc *
+                        Create_DocuParser_AutodocStyle() const;
+    virtual DYN autodoc::FileCollector_Ifc *
+                        Create_FileCollector(
+                            uintt               i_nEstimatedNrOfFiles ) const;
+  private:
+    static DYN ParseToolsFactory *
+                        dpTheInstance_;
+
+    friend class autodoc::ParseToolsFactory_Ifc;
+};
+
+
+#endif
+
diff --git a/autodoc/source/parser/kernel/x_docu.cxx b/autodoc/source/parser/kernel/x_docu.cxx
new file mode 100644
index 000000000000..a811c5dca2e4
--- /dev/null
+++ b/autodoc/source/parser/kernel/x_docu.cxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <x_docu.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+X_Docu::X_Docu( const char *        i_tag,
+                const char *        i_explanation  )
+    :   sTagName(i_tag),
+        sExplanation(i_explanation)
+{
+}
+
+X_Docu::~X_Docu()
+{
+}
+
+X_Docu::E_Event
+X_Docu::GetEvent() const
+{
+     return x_Any;
+}
+
+void
+X_Docu::GetInfo( std::ostream & o_rOutputMedium ) const
+{
+    o_rOutputMedium
+        << "Error in tag '"
+        << sTagName
+        << "': "
+        << sExplanation
+        << Endl();
+}
diff --git a/autodoc/source/parser/kernel/x_parse.cxx b/autodoc/source/parser/kernel/x_parse.cxx
new file mode 100644
index 000000000000..74c3e520d0d0
--- /dev/null
+++ b/autodoc/source/parser/kernel/x_parse.cxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <x_parse.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+X_Parser::X_Parser( E_Event             i_eEvent,
+                    const char *        i_sObject,
+                    const String &      i_sCausingFile_FullPath,
+                    uintt               i_nCausingLineNr  )
+    :   eEvent(i_eEvent),
+        sObject(i_sObject),
+        sCausingFile_FullPath(i_sCausingFile_FullPath),
+        nCausingLineNr(i_nCausingLineNr)
+{
+}
+
+X_Parser::~X_Parser()
+{
+}
+
+X_Parser::E_Event
+X_Parser::GetEvent() const
+{
+     return eEvent;
+}
+
+void
+X_Parser::GetInfo( std::ostream & o_rOutputMedium ) const
+{
+    o_rOutputMedium << "Error in file "
+                    << sCausingFile_FullPath
+                    << " in line "
+                    << nCausingLineNr
+                    << ": ";
+
+
+    switch (eEvent)
+    {
+        case x_InvalidChar:
+            o_rOutputMedium << "Unknown character '"
+                            << sObject
+                            << "'";
+            break;
+        case x_UnexpectedToken:
+            o_rOutputMedium << "Unexpected token \""
+                            << sObject
+                            << "\"";
+            break;
+        case x_UnexpectedEOF:
+            o_rOutputMedium << "Unexpected end of file.";
+            break;
+        case x_UnspecifiedSyntaxError:
+            o_rOutputMedium << "Unspecified syntax problem in file.";
+            break;
+        case x_Any:
+        default:
+            o_rOutputMedium << "Unspecified parsing exception.";
+    }   // end switch
+    o_rOutputMedium << Endl();
+}
+
+
+std::ostream &
+operator<<( std::ostream &                  o_rOut,
+            const autodoc::X_Parser_Ifc &   i_rException )
+{
+    i_rException.GetInfo(o_rOut);
+     return o_rOut;
+}
diff --git a/autodoc/source/parser/semantic/makefile.mk b/autodoc/source/parser/semantic/makefile.mk
new file mode 100644
index 000000000000..da7e8f154b43
--- /dev/null
+++ b/autodoc/source/parser/semantic/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_semantic
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/parseenv.obj
+
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/semantic/parseenv.cxx b/autodoc/source/parser/semantic/parseenv.cxx
new file mode 100644
index 000000000000..4478f720189e
--- /dev/null
+++ b/autodoc/source/parser/semantic/parseenv.cxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <semantic/parseenv.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <x_parse.hxx>
+
+
+void
+ParseEnvironment::Enter( E_EnvStackAction   i_eWayOfEntering )
+{
+    switch (i_eWayOfEntering)
+    {
+        case push:
+                InitData();
+                if ( Parent() != 0 )
+                {
+                    csv_assert( Parent()->CurSubPeUse() != 0 );
+                    Parent()->CurSubPeUse()->InitParse();
+                }
+                break;
+        case pop_success:
+                break;
+        case pop_failure:
+                break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+ParseEnvironment::Leave( E_EnvStackAction   i_eWayOfLeaving )
+{
+    switch (i_eWayOfLeaving)
+    {
+        case push:
+                break;
+        case pop_success:
+                TransferData();
+                if ( Parent() != 0 )
+                {
+                    csv_assert( Parent()->CurSubPeUse() != 0 );
+                    Parent()->CurSubPeUse()->GetResults();
+                }
+                break;
+        case pop_failure:
+                break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+ParseEnvironment::ParseEnvironment( ParseEnvironment *  i_pParent )
+    :   pParent(i_pParent),
+        // pDocu,
+        pCurSubPe(0)
+{
+}
diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk
new file mode 100644
index 000000000000..beb3207154fb
--- /dev/null
+++ b/autodoc/source/parser/tokens/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=garden
+TARGET=parser_tokens
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/stmstarr.obj	\
+    $(OBJ)$/stmstate.obj	\
+    $(OBJ)$/stmstfin.obj	\
+    $(OBJ)$/tkpstama.obj	\
+    $(OBJ)$/tkp.obj			\
+    $(OBJ)$/tkpcontx.obj	\
+    $(OBJ)$/tokdeal.obj		
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/tokens/stmstarr.cxx b/autodoc/source/parser/tokens/stmstarr.cxx
new file mode 100644
index 000000000000..e029b3c11f45
--- /dev/null
+++ b/autodoc/source/parser/tokens/stmstarr.cxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/stmstarr.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <x_parse.hxx>
+
+
+
+StmArrayStatus::StmArrayStatus( intt            i_nStatusSize,
+                                const INT16 *   in_aArrayModel,
+                                F_CRTOK         i_fTokenCreateFunction,
+                                bool            in_bIsDefault )
+    :   dpBranches(new StmStatus::Branch[i_nStatusSize]),
+        nNrOfBranches(i_nStatusSize),
+        fTokenCreateFunction(i_fTokenCreateFunction),
+        bIsADefault(in_bIsDefault)
+{
+    if (in_aArrayModel != 0)
+    {
+        intt count = 0;
+        for (const INT16 * get = in_aArrayModel; count < nNrOfBranches; count++, get++)
+            dpBranches[count] = *get;
+    }
+    else //
+    {
+        memset(dpBranches, 0, nNrOfBranches);
+    }  // endif
+}
+
+StmArrayStatus::~StmArrayStatus()
+{
+    delete [] dpBranches;
+}
+
+bool
+StmArrayStatus::SetBranch( intt              in_nBranchIx,
+                           StmStatus::Branch in_nBranch )
+{
+    if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) )
+    {
+        dpBranches[in_nBranchIx] = in_nBranch;
+        return true;
+    }
+    return false;
+}
+
+
+StmStatus::Branch
+StmArrayStatus::NextBy(intt in_nIndex) const
+{
+    if (in_nIndex < 0)
+        throw X_Parser(X_Parser::x_InvalidChar, "", String::Null_(), 0);
+
+    return in_nIndex < nNrOfBranches
+                ?   dpBranches[in_nIndex]
+                :   dpBranches[nNrOfBranches - 1];
+}
+
+
+bool
+StmArrayStatus::IsADefault() const
+{
+    return bIsADefault;
+}
+
+StmArrayStatus *
+StmArrayStatus::AsArray()
+{
+    return this;
+}
+
diff --git a/autodoc/source/parser/tokens/stmstate.cxx b/autodoc/source/parser/tokens/stmstate.cxx
new file mode 100644
index 000000000000..991cad13cb85
--- /dev/null
+++ b/autodoc/source/parser/tokens/stmstate.cxx
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/stmstate.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+StmArrayStatus *
+StmStatus::AsArray()
+{
+    return 0;
+}
+
+StmBoundsStatus *
+StmStatus::AsBounds()
+{
+    return 0;
+}
+
+
diff --git a/autodoc/source/parser/tokens/stmstfin.cxx b/autodoc/source/parser/tokens/stmstfin.cxx
new file mode 100644
index 000000000000..c6999e596e58
--- /dev/null
+++ b/autodoc/source/parser/tokens/stmstfin.cxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/stmstfin.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/tkpcontx.hxx>
+
+
+StmBoundsStatus::StmBoundsStatus( StateMachineContext &
+                                                    o_rOwner,
+                                  TkpContext &      i_rFollowUpContext,
+                                  uintt             i_nStatusFunctionNr,
+                                  bool              i_bIsDefault )
+    :   pOwner(&o_rOwner),
+        pFollowUpContext(&i_rFollowUpContext),
+        nStatusFunctionNr(i_nStatusFunctionNr),
+        bIsDefault(i_bIsDefault)
+{
+}
+
+bool
+StmBoundsStatus::IsADefault() const
+{
+    return bIsDefault;
+}
+
+StmBoundsStatus *
+StmBoundsStatus::AsBounds()
+{
+    return this;
+}
+
+
+
diff --git a/autodoc/source/parser/tokens/tkp.cxx b/autodoc/source/parser/tokens/tkp.cxx
new file mode 100644
index 000000000000..900fdccefd43
--- /dev/null
+++ b/autodoc/source/parser/tokens/tkp.cxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkp.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpcontx.hxx>
+
+
+
+TokenParser::TokenParser()
+    :   pChars(0),
+        bHasMore(false)
+{
+}
+
+void
+TokenParser::Start( CharacterSource & i_rSource )
+{
+    InitSource(i_rSource);
+}
+
+void
+TokenParser::GetNextToken()
+{
+    csv_assert(pChars != 0);
+
+    bHasMore = NOT pChars->IsFinished();
+
+    for ( bool bDone = NOT bHasMore; NOT bDone; )
+    {
+        CurrentContext().ReadCharChain(*pChars);
+        bDone = CurrentContext().PassNewToken();
+        SetCurrentContext(CurrentContext().FollowUpContext());
+    }
+}
+
+void
+TokenParser::InitSource( CharacterSource & i_rSource )
+{
+    pChars = &i_rSource;
+    bHasMore = true;
+    SetStartContext();
+}
+
+
diff --git a/autodoc/source/parser/tokens/tkpcontx.cxx b/autodoc/source/parser/tokens/tkpcontx.cxx
new file mode 100644
index 000000000000..cbaab756c038
--- /dev/null
+++ b/autodoc/source/parser/tokens/tkpcontx.cxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkpcontx.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+TkpNullContext G_aNullContext;
+
+TkpNullContext &
+TkpContext::Null_()
+{
+    return G_aNullContext;
+}
+
+TkpNullContext::~TkpNullContext()
+{
+}
+
+void
+TkpNullContext::ReadCharChain( CharacterSource & )
+{
+}
+
+bool
+TkpNullContext::PassNewToken()
+{
+    return false;
+}
+
+TkpContext &
+TkpNullContext::FollowUpContext()
+{
+     return *this;
+}
+
+
+
+
+
+
diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx
new file mode 100644
index 000000000000..9cf964601798
--- /dev/null
+++ b/autodoc/source/parser/tokens/tkpstama.cxx
@@ -0,0 +1,177 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkpstama.hxx>
+
+// NOT FULLY DECLARED SERVICES
+// #include <srcfind.hxx>
+#include <tokens/stmstarr.hxx>
+//#include <parseinc.hxx>
+#include <tools/tkpchars.hxx>
+
+
+const intt  C_nStatuslistResizeValue = 32;
+const intt  C_nTopStatus = 0;
+
+StateMachine::StateMachine( intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize )
+    :   pStati(new StmStatus*[in_nInitial_StatusListSize]),
+        nCurrentStatus(C_nTopStatus),
+        nPeekedStatus(C_nTopStatus),
+        nStatusSize(in_nStatusSize),
+        nNrofStati(0),
+        nStatiSpace(in_nInitial_StatusListSize)
+{
+    csv_assert(in_nStatusSize > 0);
+    csv_assert(in_nInitial_StatusListSize > 0);
+
+    memset(pStati, 0, sizeof(StmStatus*) * nStatiSpace);
+}
+
+intt
+StateMachine::AddStatus(StmStatus * let_dpStatus)
+{
+    if (nNrofStati == nStatiSpace)
+    {
+        ResizeStati();
+    }
+    pStati[nNrofStati] = let_dpStatus;
+    return nNrofStati++;
+}
+
+void
+StateMachine::AddToken( const char *        in_sToken,
+                        TextToken::F_CRTOK  in_fTokenCreateFunction,
+                        const INT16 *       in_aBranches,
+                        INT16               in_nBoundsStatus )
+{
+    if (csv::no_str(in_sToken))
+        return;
+
+    // Durch existierende Stati durchhangeln:
+    nCurrentStatus = 0;
+    nPeekedStatus = 0;
+
+    for ( const char * pChar = in_sToken;
+          *pChar != NULCH;
+          ++pChar )
+    {
+        Peek(*pChar);
+        StmStatus & rPst = Status(nPeekedStatus);
+        if ( rPst.IsADefault() OR rPst.AsBounds() != 0 )
+        {
+            nPeekedStatus = AddStatus( new StmArrayStatus(nStatusSize, in_aBranches, 0, false ) );
+            CurrentStatus().SetBranch( *pChar, nPeekedStatus );
+        }
+        nCurrentStatus = nPeekedStatus;
+    }   // end for
+    StmArrayStatus & rLastStatus = CurrentStatus();
+    rLastStatus.SetTokenCreateFunction(in_fTokenCreateFunction);
+    for (intt i = 0; i < nStatusSize; i++)
+    {
+        if (Status(rLastStatus.NextBy(i)).AsBounds() != 0)
+            rLastStatus.SetBranch(i,in_nBoundsStatus);
+    }   // end for
+}
+
+StateMachine::~StateMachine()
+{
+    for (intt i = 0; i < nNrofStati; i++)
+    {
+        delete pStati[i];
+    }
+    delete [] pStati;
+}
+
+StmBoundsStatus &
+StateMachine::GetCharChain( TextToken::F_CRTOK &    o_nTokenCreateFunction,
+                            CharacterSource &       io_rText )
+{
+    nCurrentStatus = C_nTopStatus;
+
+    Peek(io_rText.CurChar());
+    while (BoundsStatus() == 0)
+    {
+        nCurrentStatus = nPeekedStatus;
+        Peek(io_rText.MoveOn());
+    }
+    o_nTokenCreateFunction = CurrentStatus().TokenCreateFunction();
+
+    return *BoundsStatus();
+}
+
+void
+StateMachine::ResizeStati()
+{
+    intt nNewSize = nStatiSpace + C_nStatuslistResizeValue;
+    intt i = 0;
+    StatusList pNewStati = new StmStatus*[nNewSize];
+
+    for ( ; i < nNrofStati; i++)
+    {
+        pNewStati[i] = pStati[i];
+    }
+    memset( pNewStati+i,
+            0,
+            (nNewSize-i) * sizeof(StmStatus*) );
+
+    delete [] pStati;
+    pStati = pNewStati;
+    nStatiSpace = nNewSize;
+}
+
+StmStatus &
+StateMachine::Status(intt in_nStatusNr) const
+{
+    csv_assert( csv::in_range(intt(0), in_nStatusNr, intt(nNrofStati)) );
+    return *pStati[in_nStatusNr];
+}
+
+StmArrayStatus &
+StateMachine::CurrentStatus() const
+{
+    StmArrayStatus * pCurSt = Status(nCurrentStatus).AsArray();
+
+    csv_assert(pCurSt != 0);
+//  if(pCurSt == 0)
+//      csv_assert(false);
+    return *pCurSt;
+}
+
+StmBoundsStatus *
+StateMachine::BoundsStatus() const
+{
+    return Status(nPeekedStatus).AsBounds();
+}
+
+void
+StateMachine::Peek(intt in_nBranch)
+{
+    StmArrayStatus & rSt = CurrentStatus();
+    nPeekedStatus = rSt.NextBy(in_nBranch);
+}
diff --git a/autodoc/source/parser/tokens/tokdeal.cxx b/autodoc/source/parser/tokens/tokdeal.cxx
new file mode 100644
index 000000000000..4f4273b36aba
--- /dev/null
+++ b/autodoc/source/parser/tokens/tokdeal.cxx
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tokdeal.hxx>
+#include <tokens/token.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+void
+Tok_Eof::DealOut( TokenDealer & o_rDealer )
+{
+    o_rDealer.Deal_Eof();
+};
+
+const char *
+Tok_Eof::Text() const
+{
+    return "";
+}
+
+
+
diff --git a/autodoc/source/parser_i/idl/cx_idlco.cxx b/autodoc/source/parser_i/idl/cx_idlco.cxx
new file mode 100644
index 000000000000..3ba1a41891af
--- /dev/null
+++ b/autodoc/source/parser_i/idl/cx_idlco.cxx
@@ -0,0 +1,545 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/cx_idlco.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/cx_sub.hxx>
+#include <s2_dsapi/cx_dsapi.hxx>
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpstam2.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tokrecv.hxx>
+#include <x_parse2.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+const intt C_nCppInitialNrOfStati = 400;
+const intt C_nStatusSize = 128;
+
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_Ignore = 2;
+const uintt nF_fin_Identifier = 3;
+const uintt nF_fin_Keyword = 4;
+const uintt nF_fin_Punctuation = 5;
+const uintt nF_fin_EOL = 6;
+const uintt nF_fin_EOF = 7;
+
+const uintt nF_goto_MLDocu = 10;
+const uintt nF_goto_SLDocu = 11;
+const uintt nF_goto_MLComment = 12;
+const uintt nF_goto_SLComment = 13;
+const uintt nF_goto_Praeprocessor = 14;
+const uintt nF_goto_Assignment = 15;
+
+
+
+const UINT16 nTok_bty_any = 100 + TokBuiltInType::bty_any;
+const UINT16 nTok_bty_boolean = 100 + TokBuiltInType::bty_boolean;
+const UINT16 nTok_bty_byte = 100 + TokBuiltInType::bty_byte;
+const UINT16 nTok_bty_char = 100 + TokBuiltInType::bty_char;
+const UINT16 nTok_bty_double = 100 + TokBuiltInType::bty_double;
+const UINT16 nTok_bty_hyper = 100 + TokBuiltInType::bty_hyper;
+const UINT16 nTok_bty_long = 100 + TokBuiltInType::bty_long;
+const UINT16 nTok_bty_short = 100 + TokBuiltInType::bty_short;
+const UINT16 nTok_bty_string = 100 + TokBuiltInType::bty_string;
+const UINT16 nTok_bty_void = 100 + TokBuiltInType::bty_void;
+const UINT16 nTok_bty_ellipse = 100 + TokBuiltInType::bty_ellipse;
+
+const UINT16 nTok_tmod_unsigned = 200 + TokTypeModifier::tmod_unsigned;
+const UINT16 nTok_tmod_sequence = 200 + TokTypeModifier::tmod_sequence;
+
+const UINT16 nTok_ph_in = 250 + TokParameterHandling::ph_in;
+const UINT16 nTok_ph_out = 250 + TokParameterHandling::ph_out;
+const UINT16 nTok_ph_inout = 250 + TokParameterHandling::ph_inout;
+
+const UINT16 nTok_mt_attribute = 300 + TokMetaType::mt_attribute;
+const UINT16 nTok_mt_constants = 300 + TokMetaType::mt_constants;
+const UINT16 nTok_mt_enum = 300 + TokMetaType::mt_enum;
+const UINT16 nTok_mt_exception = 300 + TokMetaType::mt_exception;
+const UINT16 nTok_mt_ident = 300 + TokMetaType::mt_ident;
+const UINT16 nTok_mt_interface = 300 + TokMetaType::mt_interface;
+const UINT16 nTok_mt_module = 300 + TokMetaType::mt_module;
+const UINT16 nTok_mt_property = 300 + TokMetaType::mt_property;
+const UINT16 nTok_mt_service = 300 + TokMetaType::mt_service;
+const UINT16 nTok_mt_singleton = 300 + TokMetaType::mt_singleton;
+const UINT16 nTok_mt_struct = 300 + TokMetaType::mt_struct;
+const UINT16 nTok_mt_typedef = 300 + TokMetaType::mt_typedef;
+const UINT16 nTok_mt_uik = 300 + TokMetaType::mt_uik;
+
+const UINT16 nTok_ste_bound = 400 + TokStereotype::ste_bound;
+const UINT16 nTok_ste_constrained = 400 + TokStereotype::ste_constrained;
+const UINT16 nTok_ste_const = 400 + TokStereotype::ste_const;
+const UINT16 nTok_ste_maybeambiguous = 400 + TokStereotype::ste_maybeambiguous;
+const UINT16 nTok_ste_maybedefault = 400 + TokStereotype::ste_maybedefault;
+const UINT16 nTok_ste_maybevoid = 400 + TokStereotype::ste_maybevoid;
+const UINT16 nTok_ste_oneway = 400 + TokStereotype::ste_oneway;
+const UINT16 nTok_ste_optional = 400 + TokStereotype::ste_optional;
+const UINT16 nTok_ste_readonly = 400 + TokStereotype::ste_readonly;
+const UINT16 nTok_ste_removable = 400 + TokStereotype::ste_removable;
+const UINT16 nTok_ste_virtual = 400 + TokStereotype::ste_virtual;
+const UINT16 nTok_ste_transient = 400 + TokStereotype::ste_transient;
+const UINT16 nTok_ste_published = 400 + TokStereotype::ste_published;
+
+const UINT16 nTok_raises = 501;
+const UINT16 nTok_needs = 502;
+const UINT16 nTok_observes = 503;
+
+const UINT16 nTok_assignment = 550;
+
+const UINT16 nTok_ignore = 600;
+const UINT16 nTok_none_MLCommentBegin = 601;
+const UINT16 nTok_none_SLCommentBegin = 602;
+const UINT16 nTok_none_MLDocuBegin = 603;
+const UINT16 nTok_none_SLDocuBegin = 604;
+const UINT16 nTok_none_PraeprocessorBegin = 605;
+
+
+const UINT16 nTok_punct_BracketOpen = 700 + TokPunctuation::BracketOpen;
+const UINT16 nTok_punct_BracketClose = 700 + TokPunctuation::BracketClose;
+const UINT16 nTok_punct_ArrayBracketOpen = 700 + TokPunctuation::ArrayBracketOpen;
+const UINT16 nTok_punct_ArrayBracketClose = 700 + TokPunctuation::ArrayBracketClose;
+const UINT16 nTok_punct_CurledBracketOpen = 700 + TokPunctuation::CurledBracketOpen;
+const UINT16 nTok_punct_CurledBracketClose = 700 + TokPunctuation::CurledBracketClose;
+const UINT16 nTok_punct_Semicolon = 700 + TokPunctuation::Semicolon;
+const UINT16 nTok_punct_Colon = 700 + TokPunctuation::Colon;
+const UINT16 nTok_punct_DoubleColon = 700 + TokPunctuation::DoubleColon;
+const UINT16 nTok_punct_Comma = 700 + TokPunctuation::Comma;
+const UINT16 nTok_punct_Minus = 700 + TokPunctuation::Minus;
+const UINT16 nTok_punct_Fullstop = 700 + TokPunctuation::Fullstop;
+const UINT16 nTok_punct_Lesser = 700 + TokPunctuation::Lesser;
+const UINT16 nTok_punct_Greater = 700 + TokPunctuation::Greater;
+
+const UINT16 nTok_EOL = 801;
+const UINT16 nTok_EOF = 802;
+
+
+
+Context_UidlCode::Context_UidlCode( Token_Receiver &     o_rReceiver,
+                                    DYN TkpDocuContext & let_drContext_Docu )
+    :   aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati),
+        pReceiver(&o_rReceiver),
+        pDocuContext(&let_drContext_Docu),
+        dpContext_MLComment(0),
+        dpContext_SLComment(0),
+        dpContext_Preprocessor(0),
+        dpContext_Assignment(0),
+        pNewToken(0),
+        pFollowUpContext(0)
+{
+    dpContext_MLComment = new Context_MLComment(o_rReceiver,*this),
+    dpContext_SLComment = new Context_SLComment(o_rReceiver,*this),
+    dpContext_Preprocessor = new Context_Praeprocessor(o_rReceiver,*this),
+    dpContext_Assignment = new Context_Assignment(o_rReceiver,*this),
+
+    pDocuContext->SetParentContext(*this,"*/");
+    SetupStateMachine();
+}
+
+Context_UidlCode::~Context_UidlCode()
+{
+}
+
+void
+Context_UidlCode::ReadCharChain( CharacterSource & io_rText )
+{
+    pNewToken = 0;
+
+    UINT16 nTokenId = 0;
+    StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    pFollowUpContext = rBound.FollowUpContext();
+    PerformStatusFunction(rBound.StatusFunctionNr(), nTokenId, io_rText);
+}
+
+bool
+Context_UidlCode::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pReceiver->Receive(*pNewToken.Release());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Context_UidlCode::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_UidlCode::PerformStatusFunction( uintt              i_nStatusSignal,
+                                         UINT16             i_nTokenId,
+                                         CharacterSource &  io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_Error:
+            // KORR_FUTURE
+            throw X_AutodocParser(X_AutodocParser::x_InvalidChar);
+            // no break, because of throw
+        case nF_fin_Ignore:
+            pNewToken = 0;
+            io_rText.CutToken();
+            break;
+        case nF_fin_Identifier:
+            pNewToken = new TokIdentifier(io_rText.CutToken());
+            break;
+        case nF_fin_Keyword:
+            io_rText.CutToken();
+            switch ( i_nTokenId / 50 )
+            {
+                case 2:
+                    pNewToken = new TokBuiltInType(i_nTokenId - 100);
+                    break;
+                case 4:
+                    pNewToken = new TokTypeModifier(i_nTokenId - 200);
+                    break;
+                case 5:
+                    pNewToken = new TokParameterHandling(i_nTokenId - 250);
+                    break;
+                case 6:
+                    pNewToken = new TokMetaType(i_nTokenId - 300);
+                    break;
+                case 8:
+                    pNewToken = new TokStereotype(i_nTokenId - 400);
+                    break;
+                case 10:
+                    switch (i_nTokenId-500)
+                    {
+                        case 1:
+                            pNewToken = new TokRaises;
+                            break;
+                        case 2:
+                            pNewToken = new TokNeeds;
+                            break;
+                        case 3:
+                            pNewToken = new TokObserves;
+                            break;
+                        default:
+                            csv_assert(false);
+                    }
+                    break;
+                default:
+                    csv_assert(false);
+            }   // end switch ( i_nTokenId / 50 )
+            break;
+        case nF_fin_Punctuation:
+            io_rText.CutToken();
+            if (i_nTokenId == nTok_punct_DoubleColon)
+                pNewToken = new TokNameSeparator;
+            else
+                pNewToken = new TokPunctuation(i_nTokenId - 700);
+            break;
+        case nF_fin_EOL:
+            io_rText.CutToken();
+            pNewToken = new Tok_EOL;
+            pReceiver->Increment_CurLine();
+            break;
+        case nF_fin_EOF:
+            pNewToken = new Tok_EOF;
+            break;
+        case nF_goto_MLDocu:
+            while ( io_rText.CurChar() == '*')
+                io_rText.MoveOn();
+            io_rText.CutToken();
+            pDocuContext->SetMode_IsMultiLine(true);
+            break;
+        case nF_goto_SLDocu:
+            io_rText.CutToken();
+            pDocuContext->SetMode_IsMultiLine(false);
+            break;
+        case nF_goto_MLComment:
+            break;
+        case nF_goto_SLComment:
+            break;
+        case nF_goto_Praeprocessor:
+            break;
+        case nF_goto_Assignment:
+            break;
+        default:
+            csv_assert(false);
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_UidlCode::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 top = 0;        // Top-Status
+    const INT16 wht = 1;        // Whitespace-�berlese-Status
+    const INT16 bez = 2;        // Bezeichner-lese-Status
+
+    // Tokenfinish-Stati:
+    const INT16 finErr = 3;
+    const INT16 finIgn = 4;
+    const INT16 finBez = 5;
+    const INT16 finKeyw = 6;
+    const INT16 finPunct = 7;
+    const INT16 finEOL = 8;
+    const INT16 finEOF = 9;
+
+    // Kontextwechsel-Stati:
+    const INT16 gotoMld = 10;
+    const INT16 gotoSld = 11;
+    const INT16 gotoMlc = 12;
+    const INT16 gotoSlc = 13;
+    const INT16 gotoPrp = 14;
+    const INT16 gotoAsg = 15;
+
+    // Konstanten zur Benutzung in der Tabelle:
+    const INT16 err = finErr;
+    const INT16 fbz = finBez;
+    const INT16 fig = finIgn;
+    const INT16 fof = finEOF;
+//  const INT16 fkw = finKeyw;
+//  const INT16 fpc = finPunct;
+
+    /// Die '0'en werden spaeter durch AddToken() ersetzt.
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,err,wht,  0,err,err,err,err,  0,  0,err,err,  0,  0,  0,err,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,err,err,err,err,err,err, // 48 ...
+     err,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,err,  0,err,bez, // 80 ...
+     err,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,err,  0,err,err, // 112 ...
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fig,wht,wht,fig,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,fig,wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 48 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 80 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,err  // 112 ...
+    };
+
+    const INT16 A_nBezeichnerStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err  // 112 ...
+    };
+
+    const INT16 A_nPunctDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err  // 112 ...
+    };
+
+    const INT16 A_nKeywordDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err  // 112 ...
+    };
+
+    DYN StmArrayStatu2 * dpStatusTop
+            = new StmArrayStatu2( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusWhite
+            = new StmArrayStatu2( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusBez
+            = new StmArrayStatu2( C_nStatusSize, A_nBezeichnerStatus, 0, true);
+
+    DYN StmBoundsStatu2 *   dpBst_finErr
+            = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true );
+    DYN StmBoundsStatu2 *   dpBst_finIgn
+            = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true );
+    DYN StmBoundsStatu2 *   dpBst_finBez
+            = new StmBoundsStatu2( *this, *this, nF_fin_Identifier, true );
+    DYN StmBoundsStatu2 *   dpBst_finKeyw
+            = new StmBoundsStatu2( *this, *this, nF_fin_Keyword, false );
+    DYN StmBoundsStatu2 *   dpBst_finPunct
+            = new StmBoundsStatu2( *this, *this, nF_fin_Punctuation, false );
+    DYN StmBoundsStatu2 *   dpBst_finEOL
+            = new StmBoundsStatu2( *this, *this, nF_fin_EOL, false );
+    DYN StmBoundsStatu2 *   dpBst_finEOF
+            = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_EOF, false );
+
+    DYN StmBoundsStatu2 *   dpBst_gotoMld
+            = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_MLDocu, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoSld
+            = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_SLDocu, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoMlc
+            = new StmBoundsStatu2( *this, *dpContext_MLComment, nF_goto_MLComment, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoSlc
+            = new StmBoundsStatu2( *this, *dpContext_SLComment, nF_goto_SLComment, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoPrp
+            = new StmBoundsStatu2( *this, *dpContext_Preprocessor, nF_goto_Praeprocessor, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoAsg
+            = new StmBoundsStatu2( *this, *dpContext_Assignment, nF_goto_Assignment, false );
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusBez);
+
+    aStateMachine.AddStatus(dpBst_finErr);
+    aStateMachine.AddStatus(dpBst_finIgn);
+    aStateMachine.AddStatus(dpBst_finBez);
+    aStateMachine.AddStatus(dpBst_finKeyw);
+    aStateMachine.AddStatus(dpBst_finPunct);
+    aStateMachine.AddStatus(dpBst_finEOL);
+    aStateMachine.AddStatus(dpBst_finEOF);
+
+    aStateMachine.AddStatus(dpBst_gotoMld);
+    aStateMachine.AddStatus(dpBst_gotoSld);
+    aStateMachine.AddStatus(dpBst_gotoMlc);
+    aStateMachine.AddStatus(dpBst_gotoSlc);
+    aStateMachine.AddStatus(dpBst_gotoPrp);
+    aStateMachine.AddStatus(dpBst_gotoAsg);
+
+    aStateMachine.AddToken("any",       nTok_bty_any,           A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("attribute", nTok_mt_attribute,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("boolean",   nTok_bty_boolean,       A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("bound",     nTok_ste_bound,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("byte",      nTok_bty_byte,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("char",      nTok_bty_char,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("const",     nTok_ste_const,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("constants", nTok_mt_constants,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("constrained",
+                                        nTok_ste_constrained,   A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("double",    nTok_bty_double,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("enum",      nTok_mt_enum,           A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("exception", nTok_mt_exception,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("hyper",     nTok_bty_hyper,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("ident",     nTok_mt_ident,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("in",        nTok_ph_in,             A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("inout",     nTok_ph_inout,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("interface", nTok_mt_interface,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("long",      nTok_bty_long,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("maybeambiguous",
+                                        nTok_ste_maybeambiguous,A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("maybedefault",
+                                        nTok_ste_maybedefault,  A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("maybevoid", nTok_ste_maybevoid,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("module",    nTok_mt_module,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("needs",     nTok_needs,             A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("observes",  nTok_observes,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("oneway",    nTok_ste_oneway,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("optional",  nTok_ste_optional,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("out",       nTok_ph_out,            A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("property",  nTok_mt_property,       A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("published", nTok_ste_published,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("raises",    nTok_raises,            A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("readonly",  nTok_ste_readonly,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("removable", nTok_ste_removable,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("sequence",  nTok_tmod_sequence,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("service",   nTok_mt_service,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("short",     nTok_bty_short,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("singleton", nTok_mt_singleton,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("string",    nTok_bty_string,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("struct",    nTok_mt_struct,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("transient", nTok_ste_transient,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("typedef",   nTok_mt_typedef,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("uik",       nTok_mt_uik,            A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("unsigned",  nTok_tmod_unsigned,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("virtual",   nTok_ste_virtual,       A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("void",      nTok_bty_void,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("...",       nTok_bty_ellipse,       A_nPunctDefStatus,      finKeyw);
+
+    aStateMachine.AddToken("=",         nTok_assignment,        A_nPunctDefStatus,      gotoAsg);
+
+    aStateMachine.AddToken("(",         nTok_punct_BracketOpen, A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(")",         nTok_punct_BracketClose,A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("[",         nTok_punct_ArrayBracketOpen,
+                                                                A_nPunctDefStatus,      finIgn);
+    aStateMachine.AddToken("]",         nTok_punct_ArrayBracketClose,
+                                                                A_nPunctDefStatus,      finIgn);
+    aStateMachine.AddToken("{",         nTok_punct_CurledBracketOpen,
+                                                                A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("}",         nTok_punct_CurledBracketClose,
+                                                                A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("<",         nTok_punct_Lesser,      A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(">",         nTok_punct_Greater,     A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(";",         nTok_punct_Semicolon,   A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(":",         nTok_punct_Colon,       A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("::",        nTok_punct_DoubleColon, A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(",",         nTok_punct_Comma,       A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("-",         nTok_punct_Minus,       A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(".",         nTok_punct_Fullstop,    A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("/**",       nTok_none_MLDocuBegin,  A_nPunctDefStatus,      gotoMld);
+    aStateMachine.AddToken("///",       nTok_none_SLDocuBegin,  A_nPunctDefStatus,      gotoSld);
+    aStateMachine.AddToken("/*",        nTok_none_MLCommentBegin,
+                                                                A_nPunctDefStatus,      gotoMlc);
+    aStateMachine.AddToken("//",        nTok_none_SLCommentBegin,
+                                                                A_nPunctDefStatus,      gotoSlc);
+    aStateMachine.AddToken("/**/",      nTok_ignore,            A_nPunctDefStatus,      finIgn);
+    aStateMachine.AddToken("#",         nTok_none_PraeprocessorBegin,
+                                                                A_nPunctDefStatus,      gotoPrp);
+    aStateMachine.AddToken("\r\n",      nTok_EOL,               A_nPunctDefStatus,      finEOL);
+    aStateMachine.AddToken("\r",        nTok_EOL,               A_nPunctDefStatus,      finEOL);
+    aStateMachine.AddToken("\n",        nTok_EOL,               A_nPunctDefStatus,      finEOL);
+    aStateMachine.AddToken("\n\r",      nTok_EOL,               A_nPunctDefStatus,      finEOL);
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/cx_sub.cxx b/autodoc/source/parser_i/idl/cx_sub.cxx
new file mode 100644
index 000000000000..146be0cf9c62
--- /dev/null
+++ b/autodoc/source/parser_i/idl/cx_sub.cxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/cx_sub.hxx>
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokrecv.hxx>
+#include <../../parser/inc/tokens/parseinc.hxx>
+#include <x_parse2.hxx>
+#include <s2_luidl/tk_const.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+bool
+Cx_Base::PassNewToken()
+{
+    if (pNewToken)
+    {
+        rReceiver.Receive(*pNewToken.Release());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_Base::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_MLComment::ReadCharChain( CharacterSource & io_rText )
+{
+    char cNext = NULCH;
+
+    do {
+        do {
+            cNext = jumpTo(io_rText,'*','\n');
+            if (cNext == '\n')
+            {
+                Receiver().Increment_CurLine();
+                cNext = io_rText.MoveOn();
+            }
+            else if (cNext == NULCH)
+                throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        } while (cNext != '*');
+
+        cNext = jumpOver(io_rText,'*');
+        if (cNext == NULCH)
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+    } while (cNext != '/');
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(0);
+}
+
+void
+Context_SLComment::ReadCharChain( CharacterSource & io_rText )
+{
+    jumpToEol(io_rText);
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    io_rText.CutToken();
+    SetToken(0);
+
+    Receiver().Increment_CurLine();
+}
+
+void
+Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText )
+{
+    jumpToEol(io_rText);
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    io_rText.CutToken();
+    SetToken(0);
+
+    Receiver().Increment_CurLine();
+}
+
+void
+Context_Assignment::ReadCharChain( CharacterSource &    io_rText )
+{
+    // KORR_FUTURE
+    // How to handle new lines within this, so he y get realised by
+    //  ParserInfo?
+
+    char cNext = NULCH;
+    do {
+        if ( (cNext = jumpTo(io_rText,';',',','"','}')) == NULCH )
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        if (cNext == '"')
+        {
+            cNext = io_rText.MoveOn();
+            while (cNext != '"')
+            {
+                if ( (cNext = jumpTo(io_rText,'"','\\')) == NULCH )
+                    throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+                if (cNext == '\\')
+                    io_rText.MoveOn();
+            }
+            cNext = io_rText.MoveOn();
+        }   // endif (cNext == '"')
+    } while (cNext != ';' AND cNext != ',' AND cNext != '}');
+
+    if (cNext == ',' OR cNext == ';')
+        io_rText.MoveOn();
+    SetToken(new TokAssignment(io_rText.CutToken()));
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx
new file mode 100644
index 000000000000..55e6fc6d0e79
--- /dev/null
+++ b/autodoc/source/parser_i/idl/distrib.cxx
@@ -0,0 +1,264 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/distrib.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/doc/d_oldidldocu.hxx>
+#include <parser/parserinfo.hxx>
+#include <s2_luidl/tkp_uidl.hxx>
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_dsapi/docu_pe2.hxx>
+#include <adc_cl.hxx>
+#include <x_parse2.hxx>
+
+
+
+const uintt C_nNO_TRY = uintt(-1);
+
+
+namespace csi
+{
+namespace uidl
+{
+
+TokenDistributor::TokenDistributor( ary::Repository & io_rRepository,
+                                    ParserInfo &      io_rParserInfo )
+    :   pTokenSource(0),
+        aDocumentation(io_rParserInfo),
+        aProcessingData( io_rRepository, aDocumentation, io_rParserInfo )
+{
+}
+
+TokenDistributor::~TokenDistributor()
+{
+}
+
+void
+TokenDistributor::TradeToken()
+{
+    bool bGoon = true;
+    while (bGoon AND NOT aProcessingData.NextTokenExists())
+    {
+        bGoon = pTokenSource->GetNextToken();
+    }
+    if (bGoon)
+        aProcessingData.ProcessCurToken();
+}
+
+TokenDistributor::ProcessingData::ProcessingData(
+                                        ary::Repository &   io_rRepository,
+                                        Documentation &         i_rDocuProcessor,
+                                        ParserInfo &            io_rParserInfo )
+    :   // aEnvironments
+        // aTokenQueue
+        // itCurToken
+        // aCurResult
+        nTryCount(0),
+        bFinished(false),
+        rRepository(io_rRepository),
+        rParserInfo(io_rParserInfo),
+        pDocuProcessor(&i_rDocuProcessor),
+        bPublishedRecentlyOn(false)
+{
+    itCurToken = aTokenQueue.end();
+}
+
+TokenDistributor::ProcessingData::~ProcessingData()
+{
+}
+
+void
+TokenDistributor::ProcessingData::SetTopParseEnvironment( UnoIDL_PE & io_pTopParseEnvironment )
+{
+    csv::erase_container(aEnvironments);
+    aEnvironments.push_back( EnvironmentInfo( &io_pTopParseEnvironment, 0 ) );
+    io_pTopParseEnvironment.EstablishContacts(0,rRepository,aCurResult);
+}
+
+void
+TokenDistributor::ProcessingData::Receive( DYN csi::uidl::Token & let_drToken )
+{
+    aTokenQueue.push_back( &let_drToken );
+    itCurToken = aTokenQueue.end()-1;
+}
+
+void
+TokenDistributor::ProcessingData::Increment_CurLine()
+{
+    rParserInfo.Increment_CurLine();
+}
+
+void
+TokenDistributor::ProcessingData::ProcessCurToken()
+{
+
+if (DEBUG_ShowTokens())
+{
+    Cout() << (*itCurToken)->Text() << Endl();
+}
+
+    aCurResult.reset();
+
+    CurEnvironment().ProcessToken( CurToken() );
+    AcknowledgeResult();
+}
+
+
+UnoIDL_PE &
+TokenDistributor::ProcessingData::CurEnvironment() const
+{
+    csv_assert(aEnvironments.size() > 0);
+    csv_assert(aEnvironments.back().first != 0);
+
+    return *aEnvironments.back().first;
+}
+
+bool
+TokenDistributor::ProcessingData::NextTokenExists() const
+{
+    return itCurToken != aTokenQueue.end();
+}
+
+void
+TokenDistributor::ProcessingData::AcknowledgeResult()
+{
+    if (aCurResult.eDone == done)
+        ++itCurToken;
+
+    switch ( aCurResult.eStackAction )
+    {
+        case stay:
+                if (aCurResult.eDone != done)
+                {
+                    csv_assert(false);
+                }
+                break;
+        case push_sure:
+                CurEnv().Leave(push_sure);
+                aEnvironments.push_back( EnvironmentInfo(&PushEnv(), C_nNO_TRY) );
+                PushEnv().Enter(push_sure);
+                PushEnv().SetDocu(pDocuProcessor->ReleaseLastParsedDocu());
+                if (bPublishedRecentlyOn)
+                {
+                    PushEnv().SetPublished();
+                    bPublishedRecentlyOn = false;
+                }
+
+                break;
+        case push_try:
+                Cout() << "TestInfo: Environment tried." << Endl();
+                CurEnv().Leave(push_try);
+                aEnvironments.push_back( EnvironmentInfo(&PushEnv(), CurTokenPosition()) );
+                nTryCount++;
+                PushEnv().Enter(push_try);
+                break;
+        case pop_success:
+                CurEnv().Leave(pop_success);
+                if ( CurEnv_TriedTokenPosition() > 0 )
+                    DecrementTryCount();
+                aEnvironments.pop_back();
+                CurEnv().Enter(pop_success);
+                break;
+        case pop_failure:
+        {
+                CurEnv().Leave(pop_failure);
+                if (aCurResult.eDone == done)
+                {
+                    csv_assert(false);
+                }
+
+                if ( CurEnv_TriedTokenPosition() == C_nNO_TRY )
+                    throw X_AutodocParser( X_AutodocParser::x_UnexpectedToken, (*itCurToken)->Text() );
+
+                itCurToken = aTokenQueue.begin() + CurEnv_TriedTokenPosition();
+                DecrementTryCount();
+                aEnvironments.pop_back();
+                CurEnv().Enter(pop_failure);
+        }       break;
+        default:
+            csv_assert(false);
+    }   // end switch(aCurResult.eStackAction)
+}
+
+void
+TokenDistributor::ProcessingData::DecrementTryCount()
+{
+    nTryCount--;
+    if (nTryCount == 0)
+    {
+        aTokenQueue.erase(aTokenQueue.begin(), itCurToken);
+        itCurToken = aTokenQueue.begin();
+    }
+}
+
+TokenDistributor::
+Documentation::Documentation(ParserInfo & io_rParserInfo)
+    :   pDocuParseEnv(new csi::dsapi::SapiDocu_PE(io_rParserInfo)),
+        rParserInfo(io_rParserInfo),
+        pMostRecentDocu(0),
+        bIsPassedFirstDocu(false)
+{
+}
+
+TokenDistributor::
+Documentation::~Documentation()
+{
+}
+
+void
+TokenDistributor::
+Documentation::Receive( DYN csi::dsapi::Token & let_drToken )
+{
+    csv_assert(pDocuParseEnv);
+
+    pDocuParseEnv->ProcessToken(let_drToken);
+    if ( pDocuParseEnv->IsComplete() )
+    {
+        pMostRecentDocu = pDocuParseEnv->ReleaseJustParsedDocu();
+        if (NOT bIsPassedFirstDocu)
+        {
+            pMostRecentDocu = 0;            // Deletes the most recent docu.
+            bIsPassedFirstDocu = true;
+        }
+    }
+}
+
+void
+TokenDistributor::
+Documentation::Increment_CurLine()
+{
+    rParserInfo.Increment_CurLine();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/makefile.mk b/autodoc/source/parser_i/idl/makefile.mk
new file mode 100644
index 000000000000..7449548742b6
--- /dev/null
+++ b/autodoc/source/parser_i/idl/makefile.mk
@@ -0,0 +1,84 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser2_s2_luidl
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/cx_idlco.obj		\
+    $(OBJ)$/cx_sub.obj		    \
+    $(OBJ)$/distrib.obj		    \
+    $(OBJ)$/parsenv2.obj		\
+    $(OBJ)$/pe_attri.obj	    \
+    $(OBJ)$/pe_const.obj	    \
+    $(OBJ)$/pe_enum2.obj    	\
+    $(OBJ)$/pe_evalu.obj	    \
+    $(OBJ)$/pe_excp.obj		    \
+    $(OBJ)$/pe_file2.obj	    \
+    $(OBJ)$/pe_func2.obj	    \
+    $(OBJ)$/pe_iface.obj	    \
+    $(OBJ)$/pe_property.obj	    \
+    $(OBJ)$/pe_selem.obj	    \
+    $(OBJ)$/pe_servi.obj	    \
+    $(OBJ)$/pe_singl.obj	    \
+    $(OBJ)$/pe_struc.obj 	    \
+    $(OBJ)$/pe_tydf2.obj 	    \
+    $(OBJ)$/pe_type2.obj 	    \
+    $(OBJ)$/pe_vari2.obj 	    \
+    $(OBJ)$/pestate.obj 	    \
+    $(OBJ)$/semnode.obj		    \
+    $(OBJ)$/tk_const.obj		\
+    $(OBJ)$/tk_ident.obj		\
+    $(OBJ)$/tk_keyw.obj			\
+    $(OBJ)$/tk_punct.obj		\
+    $(OBJ)$/tkp_uidl.obj		\
+    $(OBJ)$/unoidl.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser_i/idl/parsenv2.cxx b/autodoc/source/parser_i/idl/parsenv2.cxx
new file mode 100644
index 000000000000..026eb3fa4b31
--- /dev/null
+++ b/autodoc/source/parser_i/idl/parsenv2.cxx
@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/parsenv2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <ary/getncast.hxx>
+#include <ary/qualiname.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <parser/parserinfo.hxx>
+#include <adc_msg.hxx>
+#include <s2_luidl/uidl_tok.hxx>
+#include <x_parse2.hxx>
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+UnoIDL_PE::~UnoIDL_PE()
+{
+}
+
+void
+UnoIDL_PE::EstablishContacts( UnoIDL_PE *               io_pParentPE,
+                              ary::Repository &         io_rRepository,
+                              TokenProcessing_Result &  o_rResult )
+{
+    pRepository = &io_rRepository;
+    aMyNode.EstablishContacts(io_pParentPE, io_rRepository.Gate_Idl(), o_rResult);
+}
+
+//void
+//UnoIDL_PE::EstablishContacts( UnoIDL_PE *             io_pParentPE,
+//                            ary::idl::Gate &          io_rGate,
+//                            TokenProcessing_Result &  o_rResult )
+//{
+//  aMyNode.EstablishContacts(io_pParentPE, io_rGate, o_rResult);
+//}
+
+void
+UnoIDL_PE::Enter( E_EnvStackAction  i_eWayOfEntering )
+{
+    switch (i_eWayOfEntering)
+    {
+        case push_sure:
+                InitData();
+                break;
+        case push_try:
+                csv_assert(false);
+                break;
+        case pop_success:
+                ReceiveData();
+                break;
+        case pop_failure:
+                throw X_AutodocParser(X_AutodocParser::x_Any);
+                // no break because of throw
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+UnoIDL_PE::Leave( E_EnvStackAction  i_eWayOfLeaving )
+{
+    switch (i_eWayOfLeaving)
+    {
+        case push_sure:
+                break;
+        case push_try:
+                csv_assert(false);
+                break;
+        case pop_success:
+                TransferData();
+                break;
+        case pop_failure:
+                throw X_AutodocParser(X_AutodocParser::x_Any);
+                // no break because of throw
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+UnoIDL_PE::SetDocu( DYN ary::doc::OldIdlDocu * let_dpDocu )
+{
+    pDocu = let_dpDocu;
+}
+
+void
+UnoIDL_PE::SetPublished()
+{
+    if (NOT pDocu)
+    {
+        pDocu = new ary::doc::OldIdlDocu;
+    }
+    pDocu->SetPublished();
+}
+
+void
+UnoIDL_PE::SetOptional()
+{
+    if (NOT pDocu)
+    {
+        pDocu = new ary::doc::OldIdlDocu;
+    }
+    pDocu->SetOptional();
+}
+
+void
+UnoIDL_PE::PassDocuAt( ary::idl::CodeEntity & io_rCe )
+{
+    if (pDocu)
+    {
+        io_rCe.Set_Docu(*pDocu.Release());
+    }
+    else if // KORR_FUTURE
+            // Re-enable doc-warning for Enum Values, as soon as there is a
+            //   @option -no-doc-for-enumvalues.
+            (     NOT ary::is_type<ary::idl::Module>(io_rCe)
+              AND NOT ary::is_type<ary::idl::Enum>(io_rCe)  )
+    {
+        TheMessages().Out_MissingDoc(
+                        io_rCe.LocalName(),
+                        ParseInfo().CurFile(),
+                        ParseInfo().CurLine() );
+    }
+}
+
+void
+UnoIDL_PE::InitData()
+{
+    // Needs not anything to do.
+}
+
+void
+UnoIDL_PE::ReceiveData()
+{
+    // Needs not anything to do.
+}
+
+const ary::idl::Module &
+UnoIDL_PE::CurNamespace() const
+{
+    if ( Parent() != 0 )
+        return Parent()->CurNamespace();
+    else
+    {
+        csv_assert(false);
+        return *(const ary::idl::Module*)0;
+    }
+}
+
+const ParserInfo &
+UnoIDL_PE::ParseInfo() const
+{
+    if ( Parent() != 0 )
+        return Parent()->ParseInfo();
+    else
+    {
+        csv_assert(false);
+        return *(const ParserInfo*)0;
+    }
+}
+
+UnoIDL_PE::UnoIDL_PE()
+    :   aMyNode(),
+        pDocu(),
+        pRepository(0)
+{
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_attri.cxx b/autodoc/source/parser_i/idl/pe_attri.cxx
new file mode 100644
index 000000000000..3ea90dac747c
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_attri.cxx
@@ -0,0 +1,294 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_attri.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_attribute.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_vari2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+PE_Attribute::PE_Attribute( const Ce_id & i_rCurOwner )
+    :   eState(e_none),
+        pCurOwner(&i_rCurOwner),
+        pPE_Variable(0),
+        pPE_Exception(0),
+        pCurAttribute(0),
+        nCurParsedType(0),
+        sCurParsedName(),
+        bReadOnly(false),
+        bBound(false)
+{
+    pPE_Variable    = new PE_Variable(nCurParsedType, sCurParsedName);
+    pPE_Exception   = new PE_Type(nCurParsedType);
+}
+
+void
+PE_Attribute::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                 ary::Repository &      io_rRepository,
+                                 TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Exception->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Attribute::~PE_Attribute()
+{
+}
+
+void
+PE_Attribute::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Attribute::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+            SetResult(not_done, push_sure, pPE_Variable.Ptr());
+            eState = in_variable;
+            break;
+        case in_raise_std:
+            if (strcmp(i_rToken.Text(),"get") == 0)
+            {
+                SetResult(done, stay);
+                eState = in_get;
+            }
+            else if (strcmp(i_rToken.Text(),"set") == 0)
+            {
+                SetResult(done, stay);
+                eState = in_set;
+            }
+            else
+            {
+                SetResult(not_done, pop_failure);
+                eState = e_none;
+            }
+            break;
+        case in_get:
+        case in_set:
+            SetResult(not_done, push_sure, pPE_Exception.Ptr());
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+    }   // end switch
+}
+
+void
+PE_Attribute::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (eState != e_start)
+    {
+        SetResult(not_done, pop_failure);
+        eState = e_none;
+        return;
+    }
+
+    switch (i_rToken.Id())
+    {
+        case TokStereotype::ste_readonly:
+            bReadOnly = true;
+            break;
+        case TokStereotype::ste_bound:
+            bBound = true;
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+            return;
+    }   // end switch
+
+    SetResult(done, stay);
+}
+
+void
+PE_Attribute::Process_MetaType( const TokMetaType & i_rToken )
+{
+    if (eState != e_start OR i_rToken.Id() != TokMetaType::mt_attribute)
+    {
+        SetResult(not_done, pop_failure);
+        eState = e_none;
+        return;
+    }
+
+    SetResult(done, stay);
+}
+
+void
+PE_Attribute::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+            SetResult(done, stay);
+            break;
+        case expect_end:
+            switch(i_rToken.Id())
+            {
+                case TokPunctuation::Semicolon:
+                    SetResult(done, pop_success);
+                    eState = e_none;
+                    break;
+                case TokPunctuation::Comma:
+                    SetResult(not_done, pop_failure);
+                    Cerr() << "Autodoc does not support comma separated attributes, because those are discouraged by IDL policies." << Endl();
+                    break;
+                case TokPunctuation::CurledBracketOpen:
+                    SetResult(done, stay);
+                    eState = in_raise_std;
+                    break;
+                default:
+                    SetResult(not_done, pop_failure);
+            }   // end switch
+            break;
+        case in_raise_std:
+            SetResult(done, stay);
+            if (i_rToken.Id() == TokPunctuation::CurledBracketClose)
+            {
+                eState = expect_end;
+            }
+            break;
+        case in_get:
+        case in_set:
+            SetResult(done, stay);
+            if (i_rToken.Id() == TokPunctuation::Semicolon)
+            {
+                eState = in_raise_std;
+            }
+            break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_Attribute::Process_Raises()
+{
+    if (eState == in_get OR eState == in_set)
+    {
+        SetResult(done, stay);
+    }
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Attribute::Process_Default()
+{
+    if (eState == e_start)
+    {
+        SetResult(not_done, push_sure, pPE_Variable.Ptr());
+        eState = in_variable;
+    }
+    else if (eState == in_get OR eState == in_set)
+        SetResult(not_done, push_sure, pPE_Exception.Ptr());
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Attribute::InitData()
+{
+    eState = e_start;
+
+    pCurAttribute = 0;
+    nCurParsedType = 0;
+    sCurParsedName = "";
+    bReadOnly = false;
+    bBound = false;
+}
+
+void
+PE_Attribute::TransferData()
+{
+    eState = e_none;
+}
+
+void
+PE_Attribute::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_variable:
+            csv_assert(pCurOwner->IsValid());
+            pCurAttribute = &Gate().Ces().Store_Attribute(
+                                                    *pCurOwner,
+                                                    sCurParsedName,
+                                                    nCurParsedType,
+                                                    bReadOnly,
+                                                    bBound );
+            PassDocuAt(*pCurAttribute);
+            nCurParsedType = 0;
+            eState = expect_end;
+            break;
+        case in_get:
+            csv_assert(pCurAttribute != 0);
+            pCurAttribute->Add_GetException(nCurParsedType);
+            nCurParsedType = 0;
+            break;
+        case in_set:
+            csv_assert(pCurAttribute != 0);
+            pCurAttribute->Add_SetException(nCurParsedType);
+            nCurParsedType = 0;
+            break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+
+UnoIDL_PE &
+PE_Attribute::MyPE()
+{
+    return *this;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_const.cxx b/autodoc/source/parser_i/idl/pe_const.cxx
new file mode 100644
index 000000000000..d75272c9b06a
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_const.cxx
@@ -0,0 +1,280 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_const.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_constant.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_evalu.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Constant::On_Default
+
+PE_Constant::F_TOK
+PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] =
+        {   { DF, DF, DF },  // e_none
+            { DF, &PE_Constant::On_expect_name_Identifier,
+                      DF },  // expect_name
+            { DF, DF, &PE_Constant::On_expect_curl_bracket_open_Punctuation },  // expect_curl_bracket_open
+            { &PE_Constant::On_expect_const_Stereotype,
+                  DF, &PE_Constant::On_expect_const_Punctuation },  // expect_const
+            { DF, &PE_Constant::On_expect_value_Identifier,
+                      DF },  // expect_value
+            { DF, DF, &PE_Constant::On_expect_finish_Punctuation }  // expect_finish
+        };
+
+
+
+inline void
+PE_Constant::CallHandler( const char *      i_sTokenText,
+                          E_TokenType       i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+PE_Constant::PE_Constant()
+    :   eState(e_none),
+        sData_Name(),
+        nDataId(0),
+        pPE_Type(0),
+        nType(0),
+        pPE_Value(0),
+        sName(),
+        sAssignment()
+{
+    pPE_Type = new PE_Type(nType);
+    pPE_Value = new PE_Value(sName, sAssignment, true);
+}
+
+void
+PE_Constant::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                                ary::Repository &       io_rRepository,
+                                TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Value->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Constant::~PE_Constant()
+{
+}
+
+void
+PE_Constant::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Constant::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Constant::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Constant::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_stereotype);
+}
+
+void
+PE_Constant::On_expect_name_Identifier(const char * i_sText)
+{
+    sName = i_sText;
+
+    SetResult(done,stay);
+    eState = expect_curl_bracket_open;
+}
+
+void
+PE_Constant::On_expect_curl_bracket_open_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '{')
+    {
+        sData_Name = sName;
+
+        ary::idl::ConstantsGroup &
+        rCe = Gate().Ces().
+                    Store_ConstantsGroup(CurNamespace().CeId(),sData_Name);
+        PassDocuAt(rCe);
+        nDataId = rCe.CeId();
+
+        SetResult(done,stay);
+        eState = expect_const;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Constant::On_expect_const_Stereotype(const char *)
+{
+    SetResult( done, push_sure, pPE_Type.Ptr() );
+}
+
+void
+PE_Constant::On_expect_const_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '}')
+    {
+        SetResult(done,stay);
+        eState = expect_finish;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Constant::On_expect_value_Identifier(const char *)
+{
+    SetResult( not_done, push_sure, pPE_Value.Ptr() );
+}
+
+void
+PE_Constant::On_expect_finish_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == ';')
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Constant::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+    eState = e_none;
+}
+
+void
+PE_Constant::EmptySingleConstData()
+{
+    nType = 0;
+    sName = "";
+    sAssignment = "";
+}
+
+void
+PE_Constant::CreateSingleConstant()
+{
+    ary::idl::Constant &
+        rCe = Gate().Ces().Store_Constant( nDataId,
+                                           sName,
+                                           nType,
+                                           sAssignment );
+    pPE_Type->PassDocuAt(rCe);
+}
+
+void
+PE_Constant::InitData()
+{
+    eState = expect_name;
+
+    sData_Name.clear();
+    nDataId = 0;
+
+    EmptySingleConstData();
+}
+
+void
+PE_Constant::ReceiveData()
+{
+    switch (eState)
+    {
+        case expect_const:
+                    eState = expect_value;
+                    break;
+        case expect_value:
+        {
+                    if (sName.length() == 0 OR sAssignment.length() == 0 OR NOT nType.IsValid())
+                    {
+                        Cerr() << "Constant without value found." << Endl();
+                        eState = expect_const;
+                        break;
+                    }
+
+                    CreateSingleConstant();
+                    EmptySingleConstData();
+                    eState = expect_const;
+        }           break;
+        default:
+                    SetResult(not_done, pop_failure);
+                    eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Constant::TransferData()
+{
+    csv_assert(nDataId.IsValid());
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Constant::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pe_enum2.cxx b/autodoc/source/parser_i/idl/pe_enum2.cxx
new file mode 100644
index 000000000000..afd3c86627d8
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_enum2.cxx
@@ -0,0 +1,251 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_enum2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_evalu.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Enum::On_Default
+
+PE_Enum::F_TOK
+PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] =
+        {   {  DF, DF },  // e_none
+            {  &PE_Enum::On_expect_name_Identifier,
+                   DF },  // expect_name
+            {  DF, &PE_Enum::On_expect_curl_bracket_open_Punctuation },  // expect_curl_bracket_open
+            {  &PE_Enum::On_expect_value_Identifier,
+                   &PE_Enum::On_expect_value_Punctuation },  // expect_value
+            {  DF, &PE_Enum::On_expect_finish_Punctuation }  // expect_finish
+        };
+
+
+
+inline void
+PE_Enum::CallHandler( const char *      i_sTokenText,
+                          E_TokenType       i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+PE_Enum::PE_Enum()
+    :   eState(e_none),
+        sData_Name(),
+        nDataId(0),
+        pPE_Value(0),
+        sName(),
+        sAssignment()
+{
+    pPE_Value = new PE_Value(sName, sAssignment, false);
+}
+
+void
+PE_Enum::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                            ary::Repository &       io_rRepository,
+                            TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Value->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Enum::~PE_Enum()
+{
+}
+
+void
+PE_Enum::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Enum::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Enum::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Enum::On_expect_name_Identifier(const char * i_sText)
+{
+    sName = i_sText;
+
+    SetResult(done,stay);
+    eState = expect_curl_bracket_open;
+}
+
+void
+PE_Enum::On_expect_curl_bracket_open_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '{')
+    {
+        sData_Name = sName;
+        ary::idl::Enum &
+            rCe = Gate().Ces().Store_Enum(CurNamespace().CeId(), sData_Name);
+        PassDocuAt(rCe);
+        nDataId = rCe.CeId();
+
+        SetResult(done,stay);
+        eState = expect_value;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Enum::On_expect_value_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '}' )
+    {
+        SetResult(done,stay);
+        eState = expect_finish;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Enum::On_expect_value_Identifier(const char *)
+{
+    SetResult( not_done, push_sure, pPE_Value.Ptr() );
+}
+
+void
+PE_Enum::On_expect_finish_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == ';')
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Enum::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+    eState = e_none;
+}
+
+void
+PE_Enum::EmptySingleValueData()
+{
+    sName = "";
+    sAssignment = "";
+}
+
+void
+PE_Enum::CreateSingleValue()
+{
+    ary::idl::EnumValue &
+        rCe = Gate().Ces().Store_EnumValue( nDataId, sName, sAssignment );
+    pPE_Value->PassDocuAt(rCe);
+}
+
+void
+PE_Enum::InitData()
+{
+    eState = expect_name;
+
+    sData_Name.clear();
+    nDataId = 0;
+
+    EmptySingleValueData();
+}
+
+void
+PE_Enum::ReceiveData()
+{
+    switch (eState)
+    {
+        case expect_value:
+        {
+                    if (sName.length() == 0)
+                    {
+                        On_Default("");
+                        break;
+                    }
+
+                    CreateSingleValue();
+                    EmptySingleValueData();
+        }           break;
+        default:
+                    SetResult(not_done, pop_failure);
+                    eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Enum::TransferData()
+{
+    csv_assert(sData_Name.length() > 0);
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Enum::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx
new file mode 100644
index 000000000000..14bcfd024e32
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_evalu.cxx
@@ -0,0 +1,182 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_evalu.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_const.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Value::On_Default
+
+PE_Value::F_TOK
+PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] =
+        {   { DF, DF, DF },  // e_none
+            { &PE_Value::On_expect_name_Identifier,
+                  DF, DF },  // expect_name
+            { DF, &PE_Value::On_got_name_Punctuation,
+                      &PE_Value::On_got_name_Assignment }  // got_name
+        };
+
+
+
+inline void
+PE_Value::CallHandler( const char *     i_sTokenText,
+                       E_TokenType      i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+
+PE_Value::PE_Value( String  &   o_rName,
+                    String  &   o_rAssignment,
+                    bool        i_bIsConst )
+    :   eState(e_none),
+        pName(&o_rName),
+        pAssignment(&o_rAssignment),
+        bIsConst(i_bIsConst)
+{
+}
+
+void
+PE_Value::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                             ary::Repository &          io_rRepository,
+                             TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+}
+
+PE_Value::~PE_Value()
+{
+}
+
+void
+PE_Value::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Value::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Value::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Value::Process_Assignment( const TokAssignment & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_assignment);
+}
+
+void
+PE_Value::On_expect_name_Identifier(const char * i_sText)
+{
+    *pName = i_sText;
+    SetResult(done,stay);
+    eState = got_name;
+}
+
+void
+PE_Value::On_got_name_Punctuation(const char * i_sText)
+{
+    if ( (i_sText[0] == ',' AND NOT IsConst())
+         OR (i_sText[0] == ';' AND IsConst()) )
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else if (i_sText[0] == '}' AND NOT IsConst())
+    {
+        SetResult(not_done,pop_success);
+        eState = e_none;
+    }
+    else
+        On_Default(i_sText);
+}
+
+void
+PE_Value::On_got_name_Assignment(const char * i_sText)
+{
+    *pAssignment = i_sText;
+    SetResult(done,pop_success);
+    eState = e_none;
+}
+
+void
+PE_Value::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+}
+
+void
+PE_Value::InitData()
+{
+    eState = expect_name;
+
+    *pName = "";
+    *pAssignment = "";
+}
+
+void
+PE_Value::TransferData()
+{
+    csv_assert(pName->length() > 0);
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Value::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pe_excp.cxx b/autodoc/source/parser_i/idl/pe_excp.cxx
new file mode 100644
index 000000000000..8b09f4a03ba4
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_excp.cxx
@@ -0,0 +1,298 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_excp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_selem.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Exception::PE_Exception()
+    // :    aWork,
+    //      pStati
+{
+    pStati = new S_Stati(*this);
+}
+
+void
+PE_Exception::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                              ary::Repository &         io_rRepository,
+                              TokenProcessing_Result &  o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult);
+    Work().pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Exception::~PE_Exception()
+{
+}
+
+void
+PE_Exception::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*Stati().pCurStatus);
+}
+
+
+void
+PE_Exception::InitData()
+{
+    Work().InitData();
+    Stati().pCurStatus = &Stati().aWaitForName;
+}
+
+void
+PE_Exception::TransferData()
+{
+    if (NOT Work().bIsPreDeclaration)
+    {
+        csv_assert(Work().sData_Name.size() > 0);
+        csv_assert(Work().nCurStruct.IsValid());
+    }
+    Stati().pCurStatus = &Stati().aNone;
+}
+
+void
+PE_Exception::ReceiveData()
+{
+    Stati().pCurStatus->On_SubPE_Left();
+}
+
+PE_Exception::S_Work::S_Work()
+    :   sData_Name(),
+        bIsPreDeclaration(false),
+        nCurStruct(0),
+        pPE_Element(0),
+        nCurParsed_ElementRef(0),
+        pPE_Type(0),
+        nCurParsed_Base(0)
+
+{
+    pPE_Element = new PE_StructElement(nCurParsed_ElementRef,nCurStruct);
+    pPE_Type = new PE_Type(nCurParsed_Base);
+}
+
+void
+PE_Exception::S_Work::InitData()
+{
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    nCurStruct = 0;
+
+    nCurParsed_ElementRef = 0;
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Exception::S_Work::Prepare_PE_QualifiedName()
+{
+    nCurParsed_ElementRef = 0;
+}
+
+void
+PE_Exception::S_Work::Prepare_PE_Element()
+{
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Exception::S_Work::Data_Set_Name( const char * i_sName )
+{
+    sData_Name = i_sName;
+}
+
+PE_Exception::S_Stati::S_Stati(PE_Exception & io_rStruct)
+    :   aNone(io_rStruct),
+        aWaitForName(io_rStruct),
+        aGotName(io_rStruct),
+        aWaitForBase(io_rStruct),
+        aGotBase(io_rStruct),
+        aWaitForElement(io_rStruct),
+        aWaitForFinish(io_rStruct),
+        pCurStatus(0)
+{
+    pCurStatus = &aNone;
+}
+
+
+//***********************       Stati       ***************************//
+
+
+UnoIDL_PE &
+PE_Exception::PE_StructState::MyPE()
+{
+    return rStruct;
+}
+
+
+void
+PE_Exception::State_WaitForName::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    Work().Data_Set_Name(i_rToken.Text());
+    MoveState( Stati().aGotName );
+    SetResult(done,stay);
+}
+
+void
+PE_Exception::State_GotName::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() != TokPunctuation::Semicolon )
+    {
+        switch (i_rToken.Id())
+        {
+            case TokPunctuation::Colon:
+                MoveState( Stati().aWaitForBase );
+                SetResult(done,push_sure,Work().pPE_Type.Ptr());
+                Work().Prepare_PE_QualifiedName();
+                break;
+            case TokPunctuation::CurledBracketOpen:
+                PE().store_Exception();
+                MoveState( Stati().aWaitForElement );
+                SetResult(done,stay);
+                break;
+            default:
+                SetResult(not_done,pop_failure);
+        }   // end switch
+    }
+    else
+    {
+        Work().sData_Name.clear();
+        SetResult(done,pop_success);
+    }
+}
+
+void
+PE_Exception::State_WaitForBase::On_SubPE_Left()
+{
+    MoveState(Stati().aGotBase);
+}
+
+void
+PE_Exception::State_GotBase::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketOpen )
+    {
+        PE().store_Exception();
+        MoveState( Stati().aWaitForElement );
+        SetResult(done,stay);
+    }
+    else
+    {
+        SetResult(not_done,pop_failure);
+    }
+}
+
+void
+PE_Exception::State_WaitForElement::Process_Identifier( const TokIdentifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr() );
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_NameSeparator()
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_BuiltInType( const TokBuiltInType & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_TypeModifier(const TokTypeModifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketClose )
+    {
+        MoveState( Stati().aWaitForFinish );
+        SetResult( done, stay );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Exception::State_WaitForFinish::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if (i_rToken.Id() == TokPunctuation::Semicolon)
+    {
+        MoveState( Stati().aNone );
+        SetResult( done, pop_success );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Exception::store_Exception()
+{
+    ary::idl::Exception &
+        rCe = Gate().Ces().Store_Exception(
+                            CurNamespace().CeId(),
+                            Work().sData_Name,
+                            Work().nCurParsed_Base );
+    PassDocuAt(rCe);
+    Work().nCurStruct = rCe.Id();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_file2.cxx b/autodoc/source/parser_i/idl/pe_file2.cxx
new file mode 100644
index 000000000000..872e5550201a
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_file2.cxx
@@ -0,0 +1,318 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_file2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/distrib.hxx>
+#include <s2_luidl/pe_servi.hxx>
+#include <s2_luidl/pe_iface.hxx>
+#include <s2_luidl/pe_singl.hxx>
+#include <s2_luidl/pe_struc.hxx>
+#include <s2_luidl/pe_excp.hxx>
+#include <s2_luidl/pe_const.hxx>
+#include <s2_luidl/pe_enum2.hxx>
+#include <s2_luidl/pe_tydf2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_File::PE_File( TokenDistributor & i_rTokenAdmin,
+                  const ParserInfo & i_parseInfo )
+    :   pTokenAdmin(&i_rTokenAdmin),
+        pPE_Service(new PE_Service),
+        pPE_Singleton(new PE_Singleton),
+        pPE_Interface(new PE_Interface),
+        pPE_Struct(new PE_Struct),
+        pPE_Exception(new PE_Exception),
+        pPE_Constant(new PE_Constant),
+        pPE_Enum(new PE_Enum),
+        pPE_Typedef(new PE_Typedef),
+        pCurNamespace(0),
+        pParseInfo(&i_parseInfo),
+        eState(e_none),
+        nBracketCount_inDefMode(0)
+{
+}
+
+void
+PE_File::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                            ary::Repository &       io_rRepository,
+                            TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Service->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Singleton->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Interface->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Struct->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Exception->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Constant->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Enum->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Typedef->EstablishContacts(this,io_rRepository,o_rResult);
+
+    pCurNamespace = &Gate().Ces().GlobalNamespace();
+}
+
+PE_File::~PE_File()
+{
+}
+
+void
+PE_File::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_File::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    switch (eState)
+    {
+        case wait_for_module:
+        {
+                csv_assert(pCurNamespace != 0);
+
+                ary::idl::Module & rCe = Gate().Ces().CheckIn_Module(pCurNamespace->CeId(), i_rToken.Text());
+                pCurNamespace = &rCe;
+
+                // Get docu out of normal:
+                SetDocu(pTokenAdmin->ReleaseLastParsedDocu());
+                PassDocuAt(rCe);
+
+                csv_assert(pCurNamespace != 0);
+
+                SetResult(done, stay);
+                eState = wait_for_module_bracket;
+        }       break;
+        case on_default:
+                SetResult(done, stay);
+                break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_File::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_std:
+                if (i_rToken.Id() == TokPunctuation::CurledBracketClose)
+                {
+                    csv_assert(pCurNamespace != 0);
+
+                    pCurNamespace = &Gate().Ces().Find_Module(pCurNamespace->Owner());
+
+                    SetResult(done, stay);
+                    eState = wait_for_module_semicolon;
+                }
+                else
+                {
+                    csv_assert(false);
+                }
+                break;
+        case wait_for_module_bracket:
+                if (i_rToken.Id() == TokPunctuation::CurledBracketOpen)
+                {
+                    SetResult(done, stay);
+                    eState = e_std;
+                }
+                else
+                {
+                    csv_assert(false);
+                }
+                break;
+        case wait_for_module_semicolon:
+                if (i_rToken.Id() == TokPunctuation::Semicolon)
+                {
+                    SetResult(done, stay);
+                    eState = e_std;
+                }
+                else
+                {
+                    csv_assert(false);
+                }
+                break;
+        case on_default:
+                if (i_rToken.Id() == TokPunctuation::CurledBracketClose)
+                {
+                    nBracketCount_inDefMode--;
+                }
+                else if (i_rToken.Id() == TokPunctuation::CurledBracketOpen)
+                {
+                    nBracketCount_inDefMode++;
+                }
+                else if (i_rToken.Id() == TokPunctuation::Semicolon)
+                {
+                    if (nBracketCount_inDefMode <= 0)
+                    {
+                        eState = e_std;
+                    }
+                }
+                SetResult(done, stay);
+                break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_File::Process_MetaType( const TokMetaType &  i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokMetaType::mt_service:
+                eState = in_sub_pe;
+                SetResult( not_done, push_sure, pPE_Service.Ptr());
+                break;
+        case TokMetaType::mt_singleton:
+                eState = in_sub_pe;
+                SetResult( not_done, push_sure, pPE_Singleton.Ptr());
+                break;
+        case TokMetaType::mt_uik:
+                Cerr() << "Syntax error: [uik ....] is obsolete now." << Endl();
+                SetResult( not_done, pop_failure);
+                break;
+        case TokMetaType::mt_interface:
+                eState = in_sub_pe;
+                SetResult( not_done, push_sure, pPE_Interface.Ptr());
+                break;
+        case TokMetaType::mt_module:
+                eState = wait_for_module;
+                SetResult( done, stay );
+                break;
+        case TokMetaType::mt_struct:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Struct.Ptr());
+                break;
+        case TokMetaType::mt_exception:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Exception.Ptr());
+                break;
+        case TokMetaType::mt_constants:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Constant.Ptr());
+                break;
+        case TokMetaType::mt_enum:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Enum.Ptr());
+                break;
+        case TokMetaType::mt_typedef:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Typedef.Ptr());
+                break;
+
+        default:
+                Process_Default();
+    }   // end switch
+}
+
+void
+PE_File::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (i_rToken.Id() == TokStereotype::ste_published)
+    {
+        pTokenAdmin->Set_PublishedOn();
+
+        SetResult(done, stay);
+    }
+    else
+    {
+        Process_Default();
+    }
+}
+
+void
+PE_File::Process_Default()
+{
+    if (eState != on_default)
+    {
+        eState = on_default;
+        nBracketCount_inDefMode = 0;
+    }
+    SetResult(done, stay);
+}
+
+const ary::idl::Module &
+PE_File::CurNamespace() const
+{
+    csv_assert(pCurNamespace);
+    return *pCurNamespace;
+}
+
+const ParserInfo &
+PE_File::ParseInfo() const
+{
+    csv_assert(pParseInfo);
+    return *pParseInfo;
+}
+
+void
+PE_File::InitData()
+{
+    eState = e_std;
+}
+
+void
+PE_File::TransferData()
+{
+    eState = e_none;
+}
+
+void
+PE_File::ReceiveData()
+{
+    eState = e_std;
+}
+
+
+UnoIDL_PE &
+PE_File::MyPE()
+{
+     return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+
diff --git a/autodoc/source/parser_i/idl/pe_func2.cxx b/autodoc/source/parser_i/idl/pe_func2.cxx
new file mode 100644
index 000000000000..ed25be5f763d
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_func2.cxx
@@ -0,0 +1,445 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_func2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_function.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_vari2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <x_parse2.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Function::PE_Function( const RParent &       i_rCurInterface )
+    :   eState(e_none),
+        sData_Name(),
+        nData_ReturnType(0),
+        bData_Oneway(false),
+        pCurFunction(0),
+        pCurParent(&i_rCurInterface),
+        pPE_Type(0),
+        nCurParsedType(0),
+        sName(),
+        pPE_Variable(0),
+        eCurParsedParam_Direction(ary::idl::param_in),
+        nCurParsedParam_Type(0),
+        sCurParsedParam_Name(),
+        bIsForConstructors(false)
+{
+    pPE_Type        = new PE_Type(nCurParsedType);
+    pPE_Variable    = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name);
+}
+
+PE_Function::PE_Function( const RParent &     i_rCurService,
+                          E_Constructor        )
+    :   eState(expect_name),
+        sData_Name(),
+        nData_ReturnType(0),
+        bData_Oneway(false),
+        pCurFunction(0),
+        pCurParent(&i_rCurService),
+        pPE_Type(0),
+        nCurParsedType(0),
+        sName(),
+        pPE_Variable(0),
+        eCurParsedParam_Direction(ary::idl::param_in),
+        nCurParsedParam_Type(0),
+        sCurParsedParam_Name(),
+        bIsForConstructors(true)
+{
+    pPE_Type        = new PE_Type(nCurParsedType);
+    pPE_Variable    = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name);
+}
+
+void
+PE_Function::EstablishContacts( UnoIDL_PE *              io_pParentPE,
+                                ary::Repository &        io_rRepository,
+                                TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Function::~PE_Function()
+{
+}
+
+void
+PE_Function::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Function::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (eState == e_start)
+    {
+        switch (i_rToken.Id())
+        {
+            case TokStereotype::ste_oneway:
+                        bData_Oneway = true;
+                        SetResult(done, stay);
+                        break;
+            default:
+                        OnDefault();
+        }   // end switch
+    }
+    else
+        OnDefault();
+}
+
+void
+PE_Function::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+                    GoIntoReturnType();
+                    break;
+        case expect_name:
+                    sData_Name = i_rToken.Text();
+                    SetResult(done,stay);
+                    eState = expect_params_list;
+
+                    if (NOT bIsForConstructors)
+                    {
+                        pCurFunction = &Gate().Ces().Store_Function(
+                                                        *pCurParent,
+                                                        sData_Name,
+                                                        nData_ReturnType,
+                                                        bData_Oneway );
+                    }
+                    else
+                    {
+                        pCurFunction = &Gate().Ces().Store_ServiceConstructor(
+                                                        *pCurParent,
+                                                        sData_Name );
+                    }
+                    PassDocuAt(*pCurFunction);
+                    break;
+        case expect_parameter_variable:
+                    GoIntoParameterVariable();
+                    break;
+        case expect_exception:
+                    GoIntoException();
+                    break;
+        default:
+                    OnDefault();
+    }
+}
+
+void
+PE_Function::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+                    SetResult(done,stay);
+                    break;
+        case expect_params_list:
+                    if (i_rToken.Id() != TokPunctuation::BracketOpen)
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    SetResult(done,stay);
+                    eState = expect_parameter;
+                    break;
+        case expect_parameter:
+                    if (i_rToken.Id() == TokPunctuation::BracketClose)
+                    {
+                        SetResult(done,stay);
+                        eState = params_finished;
+                    }
+                    else
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    break;
+        case expect_parameter_separator:
+                    if (i_rToken.Id() == TokPunctuation::Comma)
+                    {
+                        SetResult(done,stay);
+                        eState = expect_parameter;
+                    }
+                    else if (i_rToken.Id() == TokPunctuation::BracketClose)
+                    {
+                        SetResult(done,stay);
+                        eState = params_finished;
+                    }
+                    else
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    break;
+        case params_finished:
+        case exceptions_finished:
+                    if (i_rToken.Id() != TokPunctuation::Semicolon)
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    SetResult(done,pop_success);
+                    eState = e_none;
+                    break;
+        case expect_exceptions_list:
+                    if (i_rToken.Id() != TokPunctuation::BracketOpen)
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    SetResult(done,stay);
+                    eState = expect_exception;
+                    break;
+        case expect_exception_separator:
+                    if (i_rToken.Id() == TokPunctuation::Comma)
+                    {
+                        SetResult(done,stay);
+                        eState = expect_exception;
+                    }
+                    else if (i_rToken.Id() == TokPunctuation::BracketClose)
+                    {
+                        SetResult(done,stay);
+                        eState = exceptions_finished;
+                    }
+                    else
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    break;
+        default:
+                    OnDefault();
+    }
+}
+
+void
+PE_Function::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+                GoIntoReturnType();
+                break;
+        case expect_parameter_variable:
+                   GoIntoParameterVariable();
+                break;
+        case expect_parameter_separator:
+                if (i_rToken.Id() != TokBuiltInType::bty_ellipse)
+                {
+                    OnDefault();
+                }
+                else
+                {
+                    pCurFunction->Set_Ellipse();
+                       SetResult(done,stay);
+                    // eState stays the same, because we wait for the closing ")" now.
+                }
+                break;
+        case expect_exception:
+                GoIntoException();
+                break;
+        default:
+            OnDefault();
+    }   // end switch
+}
+
+void
+PE_Function::Process_ParameterHandling( const TokParameterHandling & i_rToken )
+{
+    if (eState != expect_parameter)
+    {
+        OnDefault();
+        return;
+    }
+
+    switch (i_rToken.Id())
+    {
+        case TokParameterHandling::ph_in:
+                    eCurParsedParam_Direction = ary::idl::param_in;
+                    break;
+        case TokParameterHandling::ph_out:
+                    eCurParsedParam_Direction = ary::idl::param_out;
+                    break;
+        case TokParameterHandling::ph_inout:
+                    eCurParsedParam_Direction = ary::idl::param_inout;
+                    break;
+        default:
+                    csv_assert(false);
+    }
+    SetResult(done,stay);
+    eState = expect_parameter_variable;
+}
+
+void
+PE_Function::Process_Raises()
+{
+    if (eState != params_finished)
+    {
+        OnDefault();
+        return;
+    }
+    SetResult(done,stay);
+    eState = expect_exceptions_list;
+}
+
+void
+PE_Function::Process_Default()
+{
+    switch (eState)
+    {
+        case e_start:
+                GoIntoReturnType();
+                break;
+        case expect_parameter_variable:
+                GoIntoParameterVariable();
+                break;
+        case expect_exception:
+                GoIntoException();
+                break;
+        default:
+            OnDefault();
+    }   // end switch
+}
+
+void
+PE_Function::GoIntoReturnType()
+{
+    SetResult(not_done, push_sure, pPE_Type.Ptr());
+    eState = in_return_type;
+}
+
+void
+PE_Function::GoIntoParameterVariable()
+{
+    SetResult(not_done, push_sure, pPE_Variable.Ptr());
+    eState = in_parameter_variable;
+}
+
+void
+PE_Function::GoIntoException()
+{
+    SetResult(not_done, push_sure, pPE_Type.Ptr());
+    eState = in_exception;
+}
+
+void
+PE_Function::OnDefault()
+{
+    throw X_AutodocParser(X_AutodocParser::x_Any);
+}
+
+void
+PE_Function::InitData()
+{
+    eState = e_start;
+
+    sData_Name.clear();
+    nData_ReturnType = 0;
+    bData_Oneway = false;
+    pCurFunction = 0;
+
+    nCurParsedType = 0;
+    eCurParsedParam_Direction = ary::idl::param_in;
+    nCurParsedParam_Type = 0;
+    sCurParsedParam_Name.clear();
+
+    if (bIsForConstructors)
+    {
+        eState = expect_name;
+    }
+}
+
+void
+PE_Function::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_return_type:
+                nData_ReturnType = nCurParsedType;
+                nCurParsedType = 0;
+                eState = expect_name;
+                break;
+        case in_parameter_variable:
+                csv_assert(pCurFunction != 0);
+                pCurFunction->Add_Parameter(
+                                    sCurParsedParam_Name,
+                                    nCurParsedParam_Type,
+                                    eCurParsedParam_Direction );
+                sCurParsedParam_Name = "";
+                nCurParsedParam_Type = 0;
+                eCurParsedParam_Direction = ary::idl::param_in;
+                eState = expect_parameter_separator;
+                break;
+        case in_exception:
+                csv_assert(pCurFunction != 0);
+                pCurFunction->Add_Exception(nCurParsedType);
+                eState = expect_exception_separator;
+                break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+PE_Function::TransferData()
+{
+    pCurFunction = 0;
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Function::MyPE()
+{
+    return *this;
+}
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx
new file mode 100644
index 000000000000..789af536cb3a
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_iface.cxx
@@ -0,0 +1,467 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_iface.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_func2.hxx>
+#include <s2_luidl/pe_attri.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <adc_cl.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Interface::On_Default
+
+PE_Interface::F_TOK
+PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] =
+        {   { DF, DF, DF, DF, DF },  // e_none
+            { &PE_Interface::On_need_uik_MetaType,
+                 DF, DF, DF, DF },  // need_uik
+            { DF, &PE_Interface::On_uik_Identifier,
+                     &PE_Interface::On_uik_Punctuation,
+                         DF, DF },  // uik
+            { &PE_Interface::On_need_ident_MetaType,
+                 DF, DF, DF, DF },  // need_ident
+            { DF, &PE_Interface::On_ident_Identifier,
+                     &PE_Interface::On_ident_Punctuation,
+                         DF, DF },  // ident
+            { &PE_Interface::On_need_interface_MetaType,
+                 DF, DF, DF, DF },  // need_interface
+            { DF, &PE_Interface::On_need_name_Identifer,
+                    DF, DF, DF },  // need_name
+            { DF, DF, &PE_Interface::On_wait_for_base_Punctuation,
+                        DF, DF },  // wait_for_base
+            { DF, DF, DF, DF, DF },  // in_base
+            { DF, DF, &PE_Interface::On_need_curlbr_open_Punctuation,
+                          DF, DF },  // need_curlbr_open
+            { &PE_Interface::On_std_Metatype,
+                  &PE_Interface::On_std_GotoFunction,
+                      &PE_Interface::On_std_Punctuation,
+                          &PE_Interface::On_std_GotoFunction,
+                              &PE_Interface::On_std_Stereotype },  // e_std
+            { DF, DF, DF, DF, DF },  // in_function
+            { DF, DF, DF, DF, DF },  // in_attribute
+            { DF, DF, &PE_Interface::On_need_finish_Punctuation,
+                          DF, DF },  // need_finish
+            { DF, DF, DF, DF, DF }   // in_base_interface
+        };
+
+
+
+inline void
+PE_Interface::CallHandler( const char *     i_sTokenText,
+                           E_TokenType      i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+PE_Interface::PE_Interface()
+    :   eState(e_none),
+        sData_Name(),
+        bIsPreDeclaration(false),
+        pCurInterface(0),
+        nCurInterface(0),
+        pPE_Function(0),
+        pPE_Attribute(0),
+        pPE_Type(0),
+        nCurParsed_Base(0),
+        bOptionalMember(false)
+{
+    pPE_Function    = new PE_Function(nCurInterface);
+    pPE_Type        = new PE_Type(nCurParsed_Base);
+    pPE_Attribute   = new PE_Attribute(nCurInterface);
+}
+
+void
+PE_Interface::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                 ary::Repository &      io_rRepository,
+                                 TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Function->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Attribute->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Interface::~PE_Interface()
+{
+}
+
+void
+PE_Interface::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Interface::Process_MetaType( const TokMetaType & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_metatype );
+}
+
+void
+PE_Interface::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_identifier );
+}
+
+void
+PE_Interface::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_punctuation );
+}
+
+void
+PE_Interface::Process_NameSeparator()
+{
+    CallHandler( "", tt_startoftype );
+}
+
+void
+PE_Interface::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_startoftype );
+}
+
+void
+PE_Interface::Process_TypeModifier( const TokTypeModifier & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_startoftype );
+}
+
+void
+PE_Interface::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_stereotype );
+}
+
+void
+PE_Interface::Process_Default()
+{
+    SetResult(done, stay);
+}
+
+
+void
+PE_Interface::On_need_uik_MetaType(const char *)
+{
+    // Deprecated, data will be ignored
+    SetResult(done, stay);
+    eState = uik;
+}
+
+void
+PE_Interface::On_uik_Identifier(const char *)
+{
+    // Deprecated, data will be ignored
+    SetResult(done, stay);
+}
+
+void
+PE_Interface::On_uik_Punctuation(const char * i_sText)
+{
+    // Deprecated, data will be ignored
+    SetResult(done, stay);
+    if (strcmp(",",i_sText) == 0)
+    {
+        eState = need_ident;
+    }
+}
+
+void
+PE_Interface::On_need_ident_MetaType(const char *)
+{
+    SetResult(done, stay);
+    eState = ident;
+}
+
+void
+PE_Interface::On_ident_Identifier(const char *)
+{
+    SetResult(done, stay);
+}
+
+void
+PE_Interface::On_ident_Punctuation(const char * i_sText)
+{
+    SetResult(done, stay);
+    if (strcmp(")",i_sText) == 0)
+    {
+        eState = need_interface;
+    }
+}
+
+void
+PE_Interface::On_need_interface_MetaType(const char *)
+{
+    SetResult(done, stay);
+    eState = need_name;
+}
+
+void
+PE_Interface::On_need_name_Identifer(const char * i_sText)
+{
+    SetResult(done, stay);
+    sData_Name = i_sText;
+    eState = wait_for_base;
+}
+
+void
+PE_Interface::On_wait_for_base_Punctuation(const char * i_sText)
+{
+    if (i_sText[0] != ';')
+    {
+        switch (i_sText[0])
+        {
+            case ':':
+                SetResult(done, push_sure, pPE_Type.Ptr());
+                eState = in_base;
+                break;
+            case '{':
+                store_Interface();
+
+                SetResult(done,stay);
+                eState = e_std;
+                break;
+            default:
+                SetResult(not_done, pop_failure);
+                eState = e_none;
+        }   // end switch
+    }
+    else
+    {
+        bIsPreDeclaration = true;
+        SetResult(done, pop_success);
+        eState = e_none;
+    }
+}
+
+void
+PE_Interface::On_need_curlbr_open_Punctuation(const char * i_sText)
+{
+    if (i_sText[0] == '{')
+    {
+        store_Interface();
+
+        SetResult(done, stay);
+        eState = e_std;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+
+void
+PE_Interface::On_std_Metatype(const char * i_sText)
+{
+    if (strcmp(i_sText,"attribute") ==  0)
+        On_std_GotoAttribute(i_sText);
+    else if (strcmp(i_sText,"interface") ==  0)
+        On_std_GotoBaseInterface(i_sText);
+    else
+        On_std_GotoFunction(i_sText);
+}
+
+void
+PE_Interface::On_std_Punctuation(const char * i_sText)
+{
+    switch (i_sText[0])
+    {
+        case '}':
+            SetResult(done, stay);
+            eState = need_finish;
+            break;
+        case ';':   // Appears after base interface declarations.
+            SetResult(done, stay);
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Interface::On_std_Stereotype(const char * i_sText)
+{
+    if (strcmp(i_sText,"oneway") ==  0)
+        On_std_GotoFunction(i_sText);
+    else if (    strcmp(i_sText,"readonly") ==  0
+              OR strcmp(i_sText,"bound") ==  0 )
+        On_std_GotoAttribute(i_sText);
+    else if (strcmp(i_sText,"optional") ==  0)
+    {
+        bOptionalMember = true;
+        SetResult(done, stay);
+    }
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Interface::On_std_GotoFunction(const char * )
+{
+    SetResult(not_done, push_sure, pPE_Function.Ptr());
+    eState = in_function;
+}
+
+void
+PE_Interface::On_std_GotoAttribute(const char * )
+{
+        SetResult(not_done, push_sure, pPE_Attribute.Ptr());
+        eState = in_attribute;
+}
+
+void
+PE_Interface::On_std_GotoBaseInterface(const char * )
+{
+       SetResult(done, push_sure, pPE_Type.Ptr());
+    eState = in_base_interface;
+}
+
+void
+PE_Interface::On_need_finish_Punctuation(const char * i_sText)
+{
+    switch (i_sText[0])
+    {
+        case ';':
+            SetResult(done, pop_success);
+            eState = e_none;
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Interface::On_Default(const char *)
+{
+    SetResult(not_done, pop_failure);
+}
+
+void
+PE_Interface::InitData()
+{
+    eState = need_interface;
+
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    pCurInterface = 0;
+    nCurInterface = 0;
+    nCurParsed_Base = 0;
+    bOptionalMember = false;
+}
+
+void
+PE_Interface::TransferData()
+{
+    if (NOT bIsPreDeclaration)
+    {
+        csv_assert(sData_Name.size() > 0);
+        csv_assert(nCurInterface.IsValid());
+    }
+    else
+    {
+         sData_Name.clear();
+         pCurInterface = 0;
+        nCurInterface = 0;
+    }
+
+    eState = e_none;
+}
+
+void
+PE_Interface::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_base:
+                eState = need_curlbr_open;
+                break;
+        case in_function:
+                eState = e_std;
+                break;
+        case in_attribute:
+                eState = e_std;
+                break;
+        case in_base_interface:
+                if (bOptionalMember)
+                {
+                    pPE_Type->SetOptional();
+                    bOptionalMember = false;
+                }
+                pCurInterface->Add_Base(
+                                    nCurParsed_Base,
+                                    pPE_Type->ReleaseDocu());
+                nCurParsed_Base = 0;
+                eState = e_std;
+                break;
+        default:
+            csv_assert(false);
+    }
+}
+
+UnoIDL_PE &
+PE_Interface::MyPE()
+{
+     return *this;
+}
+
+void
+PE_Interface::store_Interface()
+{
+    pCurInterface = & Gate().Ces().Store_Interface(
+                                        CurNamespace().CeId(),
+                                        sData_Name,
+                                        nCurParsed_Base );
+    nCurInterface = pCurInterface->CeId();
+    PassDocuAt(*pCurInterface);
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_property.cxx b/autodoc/source/parser_i/idl/pe_property.cxx
new file mode 100644
index 000000000000..0e585b27e9a7
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_property.cxx
@@ -0,0 +1,238 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_property.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_vari2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+PE_Property::PE_Property( const Ce_id & i_rCurOwner )
+    :   eState(e_none),
+        pCurOwner(&i_rCurOwner),
+        pPE_Variable(0),
+        nCurParsedType(0),
+        sCurParsedName(),
+        bIsOptional(false),
+        aStereotypes()
+{
+    pPE_Variable    = new PE_Variable(nCurParsedType, sCurParsedName);
+}
+
+void
+PE_Property::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                ary::Repository &       io_rRepository,
+                                TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Property::~PE_Property()
+{
+}
+
+void
+PE_Property::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Property::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokStereotype::ste_optional:
+            bIsOptional = true;
+            break;
+        case TokStereotype::ste_readonly:
+            aStereotypes.Set_Flag(Stereotypes::readonly);
+            break;
+        case TokStereotype::ste_bound:
+            aStereotypes.Set_Flag(Stereotypes::bound);
+            break;
+        case TokStereotype::ste_constrained:
+            aStereotypes.Set_Flag(Stereotypes::constrained);
+            break;
+        case TokStereotype::ste_maybeambiguous:
+            aStereotypes.Set_Flag(Stereotypes::maybeambiguous);
+            break;
+        case TokStereotype::ste_maybedefault:
+            aStereotypes.Set_Flag(Stereotypes::maybedefault);
+            break;
+        case TokStereotype::ste_maybevoid:
+            aStereotypes.Set_Flag(Stereotypes::maybevoid);
+            break;
+        case TokStereotype::ste_removable:
+            aStereotypes.Set_Flag(Stereotypes::removable);
+            break;
+        case TokStereotype::ste_transient:
+            aStereotypes.Set_Flag(Stereotypes::transient);
+            break;
+
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+            return;
+    }
+
+    SetResult(done, stay);
+}
+
+void
+PE_Property::Process_MetaType( const TokMetaType & i_rToken )
+{
+    if (eState == e_start)
+    {
+        if ( i_rToken.Id() == TokMetaType::mt_property )
+        {
+            SetResult(done, stay);
+            eState = expect_variable;
+            return;
+        }
+    }   // endif (eState == e_start)
+
+    SetResult(not_done, pop_failure);
+    eState = e_none;
+}
+
+void
+PE_Property::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+            SetResult(done, stay);
+            break;
+        case expect_variable:
+            if (i_rToken.Id() == TokPunctuation::Semicolon)
+            {
+                SetResult(done, pop_success);
+                eState = e_none;
+            }
+            else if (i_rToken.Id() == TokPunctuation::Comma)
+                SetResult(done, stay);
+            else
+                SetResult(not_done, pop_failure);
+            break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_Property::Process_Default()
+{
+    if (eState == expect_variable)
+    {
+        SetResult(not_done, push_sure, pPE_Variable.Ptr());
+        eState = in_variable;
+    }
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Property::InitData()
+{
+    eState = e_start;
+
+    nCurParsedType = 0;
+    sCurParsedName = "";
+
+    // bIsOptional and
+    // aStereotypes
+    //   may be preset by the PE_Service-(or PE_Interface-)parent
+    //   with PresetOptional() or
+    //   PresetStereotype()
+    //   - therefore it must not be set here!
+}
+
+void
+PE_Property::TransferData()
+{
+    if (bIsOptional)
+    {
+        SetOptional();
+        bIsOptional = false;
+    }
+
+    ary::idl::CodeEntity *
+        pCe = 0;
+    csv_assert(pCurOwner->IsValid());
+
+    pCe = &Gate().Ces().Store_Property( *pCurOwner,
+                                        sCurParsedName,
+                                        nCurParsedType,
+                                        aStereotypes );
+
+    csv_assert(pCe != 0);
+    PassDocuAt(*pCe);
+
+    nCurParsedType = 0;
+    sCurParsedName.clear();
+    aStereotypes = Stereotypes();
+
+    eState = e_none;
+}
+
+void
+PE_Property::ReceiveData()
+{
+    eState = expect_variable;
+}
+
+
+UnoIDL_PE &
+PE_Property::MyPE()
+{
+    return *this;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pe_selem.cxx b/autodoc/source/parser_i/idl/pe_selem.cxx
new file mode 100644
index 000000000000..40d052b8b267
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_selem.cxx
@@ -0,0 +1,205 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_selem.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+namespace
+{
+    const String  C_sNone;
+}
+
+PE_StructElement::PE_StructElement( RStructElement &    o_rResult,
+                                    const RStruct &     i_rCurStruct,
+                                    const String &      i_rCurStructTemplateParam )
+    :   eState(e_none),
+        pResult(&o_rResult),
+        pCurStruct(&i_rCurStruct),
+        bIsExceptionElement(false),
+        pPE_Type(0),
+        nType(0),
+        sName(),
+        pCurStructTemplateParam(&i_rCurStructTemplateParam)
+{
+    pPE_Type = new PE_Type(nType);
+}
+
+PE_StructElement::PE_StructElement( RStructElement &    o_rResult,
+                                    const RStruct &     i_rCurExc )
+    :   eState(e_none),
+        pResult(&o_rResult),
+        pCurStruct(&i_rCurExc),
+        bIsExceptionElement(true),
+        pPE_Type(0),
+        nType(0),
+        sName(),
+        pCurStructTemplateParam(&C_sNone)
+{
+    pPE_Type = new PE_Type(nType);
+}
+
+void
+PE_StructElement::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                     ary::Repository &      io_rRepository,
+                                     TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_StructElement::~PE_StructElement()
+{
+}
+
+void
+PE_StructElement::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_StructElement::Process_Default()
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+        eState = expect_name;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_StructElement::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    csv_assert(*i_rToken.Text() != 0);
+
+    if (eState == expect_type)
+    {
+        if ( *pCurStructTemplateParam == i_rToken.Text() )
+        {
+            nType = lhf_FindTemplateParamType();
+               SetResult( done, stay );
+            eState = expect_name;
+        }
+        else    // No template parameter type existing, or not matching:
+        {
+               SetResult( not_done, push_sure, pPE_Type.Ptr() );
+            eState = expect_name;
+        }
+    }
+    else if (eState == expect_name)
+    {
+        sName = i_rToken.Text();
+        SetResult( done, stay );
+        eState = expect_finish;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_StructElement::Process_Punctuation( const TokPunctuation &)
+{
+    csv_assert(eState == expect_finish);
+
+    SetResult( done, pop_success );
+}
+
+void
+PE_StructElement::InitData()
+{
+    eState = expect_type;
+
+    nType = 0;
+    sName = "";
+}
+
+void
+PE_StructElement::TransferData()
+{
+    csv_assert(pResult != 0 AND pCurStruct != 0);
+
+    ary::idl::StructElement *
+        pCe = 0;
+    if (bIsExceptionElement)
+    {
+        pCe = & Gate().Ces().Store_ExceptionMember(
+                                            *pCurStruct,
+                                            sName,
+                                            nType );
+    }
+    else
+    {
+        pCe = & Gate().Ces().Store_StructMember(
+                                            *pCurStruct,
+                                            sName,
+                                            nType );
+    }
+    *pResult = pCe->CeId();
+    PassDocuAt(*pCe);
+
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_StructElement::MyPE()
+{
+    return *this;
+}
+
+ary::idl::Type_id
+PE_StructElement::lhf_FindTemplateParamType() const
+{
+    const ary::idl::CodeEntity &
+        rCe = Gate().Ces().Find_Ce(*pCurStruct);
+    const ary::idl::Struct &
+        rStruct = static_cast< const ary::idl::Struct& >(rCe);
+    return rStruct.TemplateParameterType();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_servi.cxx b/autodoc/source/parser_i/idl/pe_servi.cxx
new file mode 100644
index 000000000000..eb8bf0f7ede4
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_servi.cxx
@@ -0,0 +1,393 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_servi.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_func2.hxx>
+#include <s2_luidl/pe_property.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+PE_Service::PE_Service()
+    :   eState(e_none),
+        sData_Name(),
+        bIsPreDeclaration(false),
+        pCurService(0),
+        pCurSiService(0),
+        nCurService(0),
+        pPE_Property(0),
+        nCurParsed_Property(0),
+        pPE_Type(0),
+        nCurParsed_Type(0),
+        pPE_Constructor(0),
+        bOptionalMember(false)
+{
+    pPE_Property    = new PE_Property(nCurService);
+    pPE_Type        = new PE_Type(nCurParsed_Type);
+    pPE_Constructor = new PE_Function(nCurService, PE_Function::constructor);
+}
+
+void
+PE_Service::EstablishContacts( UnoIDL_PE *              io_pParentPE,
+                               ary::Repository &        io_rRepository,
+                               TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Property->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Constructor->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Service::~PE_Service()
+{
+}
+
+void
+PE_Service::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Service::Process_MetaType( const TokMetaType &   i_rToken )
+{
+    switch ( i_rToken.Id() )
+    {
+        case TokMetaType::mt_service:
+                    if (eState == need_name)
+                        SetResult(done, stay );
+                    else if (eState == e_std)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_service_type;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokMetaType::mt_interface:
+                    if (eState == e_std)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_ifc_type;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokMetaType::mt_property:
+                    if (eState == e_std)
+                    {
+                        StartProperty();
+                    }
+                    else
+                        On_Default();
+                    break;
+        default:
+            // KORR_FUTURE:
+            // Should throw syntax error warning.
+                    ;
+    }   // end switch
+}
+
+void
+PE_Service::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == need_name)
+    {
+        sData_Name = i_rToken.Text();
+        SetResult(done, stay);
+        eState = need_curlbr_open;
+    }
+    else if (eState == e_std_sib)
+    {
+        SetResult(not_done, push_sure, pPE_Constructor.Ptr());
+    }
+    else
+        On_Default();
+}
+
+void
+PE_Service::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokPunctuation::Colon:
+                    if (eState == need_curlbr_open)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = need_base_interface;
+                    }
+                    else
+                        On_Default();
+                    break;
+
+        case TokPunctuation::CurledBracketOpen:
+                    if (eState == need_curlbr_open)
+                    {
+                        pCurService = &Gate().Ces().Store_Service(
+                                                        CurNamespace().CeId(),
+                                                        sData_Name );
+                        nCurService = pCurService->CeId();
+                        PassDocuAt(*pCurService);
+                        SetResult(done, stay);
+                        eState = e_std;
+                    }
+                    else if (eState == need_curlbr_open_sib)
+                    {
+                        SetResult(done, stay);
+                        eState = e_std_sib;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::CurledBracketClose:
+                    if (eState == e_std OR eState == e_std_sib)
+                    {
+                        SetResult(done, stay);
+                        eState = need_finish;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::Comma:
+                    if (eState == expect_ifc_separator)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_ifc_type;
+                    }
+                    else if (eState == expect_service_separator)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_service_type;
+                    }
+                    else if (eState == e_std)
+                    {
+                        SetResult(done, stay);
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::Semicolon:
+                    switch (eState)
+                    {
+                       case need_curlbr_open:
+                                    sData_Name.clear();
+                                    bIsPreDeclaration = true;
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       case need_curlbr_open_sib:
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       case expect_ifc_separator:
+                       case expect_service_separator:
+                                    SetResult(done, stay);
+                                    eState = e_std;
+                                    break;
+                       case need_finish:
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       case at_ignore:
+                                    SetResult(done, stay);
+                                    eState = e_std;
+                                    break;
+                       default:
+                                    On_Default();
+                    }   // end switch
+                    break;
+        default:
+                    On_Default();
+    }   // end switch
+}
+
+void
+PE_Service::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (i_rToken.Id() == TokStereotype::ste_optional)
+    {
+        bOptionalMember = true;
+        SetResult(done, stay);
+    }
+    else if ( eState == e_std )
+    {
+        StartProperty();
+    }
+    else
+        On_Default();
+}
+
+void
+PE_Service::Process_Needs()
+{
+    SetResult(done,stay);
+    eState = at_ignore;
+}
+
+void
+PE_Service::Process_Observes()
+{
+    SetResult(done,stay);
+    eState = at_ignore;
+}
+
+void
+PE_Service::Process_Default()
+{
+    On_Default();
+}
+
+
+void
+PE_Service::On_Default()
+{
+    if (eState == at_ignore)
+        SetResult(done, stay);
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Service::InitData()
+{
+    eState = need_name;
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    pCurService = 0;
+    pCurSiService = 0;
+    nCurService = 0;
+    nCurParsed_Property = 0;
+    nCurParsed_Type = 0;
+    bOptionalMember = false;
+}
+
+void
+PE_Service::TransferData()
+{
+    if (NOT bIsPreDeclaration)
+    {
+        csv_assert(sData_Name.size() > 0);
+        csv_assert( (pCurService != 0) != (pCurSiService != 0) );
+    }
+
+    eState = e_none;
+}
+
+void
+PE_Service::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_property:
+                eState = e_std;
+                break;
+        case in_ifc_type:
+                if (bOptionalMember)
+                {
+                    pPE_Type->SetOptional();
+                }
+                pCurService->AddRef_SupportedInterface(
+                                    nCurParsed_Type,
+                                    pPE_Type->ReleaseDocu());
+                nCurParsed_Type = 0;
+                eState = expect_ifc_separator;
+                break;
+        case in_service_type:
+                if (bOptionalMember)
+                {
+                    pPE_Type->SetOptional();
+                }
+                pCurService->AddRef_IncludedService(
+                                    nCurParsed_Type,
+                                    pPE_Type->ReleaseDocu());
+                nCurParsed_Type = 0;
+                eState = expect_service_separator;
+                break;
+        case need_base_interface:
+                pCurSiService = &Gate().Ces().Store_SglIfcService(
+                                                CurNamespace().CeId(),
+                                                sData_Name,
+                                                nCurParsed_Type );
+                nCurService = pCurSiService->CeId();
+                PassDocuAt(*pCurSiService);
+
+                nCurParsed_Type = 0;
+                eState = need_curlbr_open_sib;
+                break;
+        case e_std_sib:
+                break;
+        default:
+            csv_assert(false);
+    }
+
+    bOptionalMember = false;
+}
+
+
+UnoIDL_PE &
+PE_Service::MyPE()
+{
+    return *this;
+}
+
+void
+PE_Service::StartProperty()
+{
+    SetResult(not_done, push_sure, pPE_Property.Ptr());
+    eState = in_property;
+
+    if (bOptionalMember)
+    {
+        pPE_Property->PresetOptional();
+        bOptionalMember = false;
+    }
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pe_singl.cxx b/autodoc/source/parser_i/idl/pe_singl.cxx
new file mode 100644
index 000000000000..f41d938f915f
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_singl.cxx
@@ -0,0 +1,272 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_singl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+#if 0
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Singleton::On_Default
+
+
+PE_Singleton::F_TOK
+PE_Singleton::aDispatcher[PE_Singleton::e_STATES_MAX][PE_Singleton::tt_MAX] =
+        {   { DF, DF, DF },  // e_none
+            { DF, &PE_Singleton::On_need_name_Identifer,
+                      DF },  // need_name
+            { DF, DF, &PE_Singleton::On_need_curlbr_open_Punctuation,
+                         },  // need_curlbr_open
+            { &PE_Singleton::On_std_GotoService,
+                  DF, &PE_Singleton::On_std_Punctuation,
+                         },  // e_std
+            { DF, DF, DF },  // in_service
+            { DF, DF, &PE_Interface::On_need_finish_Punctuation,
+                         }   // need_finish
+        };
+#endif // 0
+
+
+PE_Singleton::PE_Singleton()
+    :   eState(e_none),
+        sData_Name(),
+        bIsPreDeclaration(false),
+        pCurSingleton(0),
+        pCurSiSingleton(0),
+        pPE_Type(0),
+        nCurParsed_Type(0)
+{
+    pPE_Type        = new PE_Type(nCurParsed_Type);
+}
+
+void
+PE_Singleton::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                               ary::Repository &        io_rRepository,
+                               TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Singleton::~PE_Singleton()
+{
+}
+
+void
+PE_Singleton::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Singleton::Process_MetaType( const TokMetaType & i_rToken )
+{
+    switch ( i_rToken.Id() )
+    {
+        case TokMetaType::mt_service:
+                    if (eState == e_std)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_service;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokMetaType::mt_singleton:
+                    if (eState == need_name)
+                        SetResult(done, stay);
+                    else
+                        On_Default();
+                    break;
+        default:
+            // KORR_FUTURE
+            // Should throw syntax error warning
+                    ;
+
+    }   // end switch
+}
+
+void
+PE_Singleton::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == need_name)
+    {
+        sData_Name = i_rToken.Text();
+        SetResult(done, stay);
+        eState = need_curlbr_open;
+    }
+    else
+        On_Default();
+}
+
+void
+PE_Singleton::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokPunctuation::CurledBracketOpen:
+                    if (eState == need_curlbr_open)
+                    {
+                        pCurSingleton = &Gate().Ces().Store_Singleton(
+                                                        CurNamespace().CeId(),
+                                                        sData_Name );
+                        PassDocuAt(*pCurSingleton);
+                        SetResult(done, stay);
+                        eState = e_std;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::CurledBracketClose:
+                    if (eState == e_std)
+                    {
+                        SetResult(done, stay);
+                        eState = need_finish;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::Semicolon:
+                    switch (eState)
+                    {
+                       case e_std:  SetResult(done, stay);
+                                    break;
+                       case need_finish:
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       default:
+                                    On_Default();
+                    }   // end switch
+                    break;
+        case TokPunctuation::Colon:
+                    switch (eState)
+                    {
+                       case need_curlbr_open:
+                                    SetResult(done, push_sure, pPE_Type.Ptr());
+                                    eState = in_base_interface;
+                                    break;
+                       default:
+                                    On_Default();
+                    }   // end switch
+                    break;
+        default:
+                    On_Default();
+    }   // end switch
+}
+
+void
+PE_Singleton::Process_Default()
+{
+    On_Default();
+}
+
+
+void
+PE_Singleton::On_Default()
+{
+    SetResult(not_done, pop_failure);
+}
+
+void
+PE_Singleton::InitData()
+{
+    eState = need_name;
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    pCurSingleton = 0;
+    pCurSiSingleton = 0;
+    nCurParsed_Type = 0;
+}
+
+void
+PE_Singleton::TransferData()
+{
+    if (NOT bIsPreDeclaration)
+    {
+        csv_assert(sData_Name.size() > 0);
+        csv_assert( (pCurSingleton != 0) != (pCurSiSingleton != 0) );
+    }
+
+    eState = e_none;
+}
+
+void
+PE_Singleton::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_service:
+                    pCurSingleton->Set_Service(nCurParsed_Type);
+                    nCurParsed_Type = 0;
+                    eState = e_std;
+                    break;
+        case in_base_interface:
+                    pCurSiSingleton = &Gate().Ces().Store_SglIfcSingleton(
+                                                    CurNamespace().CeId(),
+                                                    sData_Name,
+                                                    nCurParsed_Type );
+                    PassDocuAt(*pCurSiSingleton);
+                    nCurParsed_Type = 0;
+                    eState = need_finish;
+                    break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+UnoIDL_PE &
+PE_Singleton::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_struc.cxx b/autodoc/source/parser_i/idl/pe_struc.cxx
new file mode 100644
index 000000000000..23e44643ff47
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_struc.cxx
@@ -0,0 +1,327 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_struc.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_selem.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Struct::PE_Struct()
+    // :    aWork,
+    //      pStati
+{
+    pStati = new S_Stati(*this);
+}
+
+void
+PE_Struct::EstablishContacts( UnoIDL_PE *               io_pParentPE,
+                              ary::Repository &         io_rRepository,
+                              TokenProcessing_Result &  o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult);
+    Work().pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Struct::~PE_Struct()
+{
+}
+
+void
+PE_Struct::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*Stati().pCurStatus);
+}
+
+
+void
+PE_Struct::InitData()
+{
+    Work().InitData();
+    Stati().pCurStatus = &Stati().aWaitForName;
+}
+
+void
+PE_Struct::TransferData()
+{
+    if (NOT Work().bIsPreDeclaration)
+    {
+        csv_assert(Work().sData_Name.size() > 0);
+        csv_assert(Work().nCurStruct.IsValid());
+    }
+    Stati().pCurStatus = &Stati().aNone;
+}
+
+void
+PE_Struct::ReceiveData()
+{
+    Stati().pCurStatus->On_SubPE_Left();
+}
+
+PE_Struct::S_Work::S_Work()
+    :   sData_Name(),
+        sData_TemplateParam(),
+        bIsPreDeclaration(false),
+        nCurStruct(0),
+        pPE_Element(0),
+        nCurParsed_ElementRef(0),
+        pPE_Type(0),
+        nCurParsed_Base(0)
+
+{
+    pPE_Element = new PE_StructElement(nCurParsed_ElementRef,nCurStruct,sData_TemplateParam);
+    pPE_Type = new PE_Type(nCurParsed_Base);
+}
+
+void
+PE_Struct::S_Work::InitData()
+{
+    sData_Name.clear();
+    sData_TemplateParam.clear();
+    bIsPreDeclaration = false;
+    nCurStruct = 0;
+    nCurParsed_ElementRef = 0;
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Struct::S_Work::Prepare_PE_QualifiedName()
+{
+    nCurParsed_ElementRef = 0;
+}
+
+void
+PE_Struct::S_Work::Prepare_PE_Element()
+{
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Struct::S_Work::Data_Set_Name( const char * i_sName )
+{
+    sData_Name = i_sName;
+}
+
+void
+PE_Struct::S_Work::Data_Set_TemplateParam( const char * i_sTemplateParam )
+{
+    sData_TemplateParam = i_sTemplateParam;
+}
+
+PE_Struct::S_Stati::S_Stati(PE_Struct & io_rStruct)
+    :   aNone(io_rStruct),
+        aWaitForName(io_rStruct),
+        aGotName(io_rStruct),
+        aWaitForTemplateParam(io_rStruct),
+        aWaitForTemplateEnd(io_rStruct),
+        aWaitForBase(io_rStruct),
+        aGotBase(io_rStruct),
+        aWaitForElement(io_rStruct),
+        aWaitForFinish(io_rStruct),
+        pCurStatus(0)
+{
+    pCurStatus = &aNone;
+}
+
+
+//***********************       Stati       ***************************//
+
+
+UnoIDL_PE &
+PE_Struct::PE_StructState::MyPE()
+{
+    return rStruct;
+}
+
+
+void
+PE_Struct::State_WaitForName::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    Work().Data_Set_Name(i_rToken.Text());
+    MoveState( Stati().aGotName );
+    SetResult(done,stay);
+}
+
+void
+PE_Struct::State_GotName::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() != TokPunctuation::Semicolon )
+    {
+        switch (i_rToken.Id())
+        {
+            case TokPunctuation::Colon:
+                MoveState( Stati().aWaitForBase );
+                SetResult(done,push_sure,Work().pPE_Type.Ptr());
+                Work().Prepare_PE_QualifiedName();
+                break;
+            case TokPunctuation::CurledBracketOpen:
+                PE().store_Struct();
+                MoveState( Stati().aWaitForElement );
+                SetResult(done,stay);
+                break;
+            case TokPunctuation::Lesser:
+                MoveState( Stati().aWaitForTemplateParam );
+                SetResult(done,stay);
+                break;
+            default:
+                SetResult(not_done,pop_failure);
+        }   // end switch
+    }
+    else
+    {
+        Work().sData_Name.clear();
+        SetResult(done,pop_success);
+    }
+}
+
+void
+PE_Struct::State_WaitForTemplateParam::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    Work().Data_Set_TemplateParam(i_rToken.Text());
+    MoveState( Stati().aWaitForTemplateEnd );
+    SetResult(done,stay);
+}
+
+void
+PE_Struct::State_WaitForTemplateEnd::Process_Punctuation( const TokPunctuation & )
+{
+    // Assume:  TokPunctuation::Greater
+    MoveState( Stati().aGotName );
+    SetResult(done,stay);
+}
+
+void
+PE_Struct::State_WaitForBase::On_SubPE_Left()
+{
+    MoveState(Stati().aGotBase);
+}
+
+void
+PE_Struct::State_GotBase::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketOpen )
+    {
+        PE().store_Struct();
+        MoveState( Stati().aWaitForElement );
+        SetResult(done,stay);
+    }
+    else
+    {
+        SetResult(not_done,pop_failure);
+    }
+}
+
+void
+PE_Struct::State_WaitForElement::Process_Identifier( const TokIdentifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr() );
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_NameSeparator()
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_BuiltInType( const TokBuiltInType & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_TypeModifier(const TokTypeModifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketClose )
+    {
+        MoveState( Stati().aWaitForFinish );
+        SetResult( done, stay );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Struct::State_WaitForFinish::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if (i_rToken.Id() == TokPunctuation::Semicolon)
+    {
+        MoveState( Stati().aNone );
+        SetResult( done, pop_success );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Struct::store_Struct()
+{
+    ary::idl::Struct &
+        rCe = Gate().Ces().Store_Struct(
+                        CurNamespace().CeId(),
+                        Work().sData_Name,
+                        Work().nCurParsed_Base,
+                        Work().sData_TemplateParam );
+    PassDocuAt(rCe);
+    Work().nCurStruct = rCe.CeId();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_tydf2.cxx b/autodoc/source/parser_i/idl/pe_tydf2.cxx
new file mode 100644
index 000000000000..e7b7b117ba9f
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_tydf2.cxx
@@ -0,0 +1,184 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_tydf2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_const.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Typedef::On_Default
+
+PE_Typedef::F_TOK
+PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] =
+        {   { DF, DF, DF },  // e_none
+            { &PE_Typedef::On_expect_description_Any,
+                  &PE_Typedef::On_expect_description_Any,
+                      DF },  // expect_description
+            { DF, &PE_Typedef::On_expect_name_Identifier,
+                      DF },  // expect_name
+            { DF, DF, &PE_Typedef::On_got_name_Punctuation }  // got_name
+        };
+
+
+
+inline void
+PE_Typedef::CallHandler( const char *       i_sTokenText,
+                         E_TokenType        i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+
+PE_Typedef::PE_Typedef()
+    :   eState(e_none),
+        pPE_Type(0),
+        nType(0),
+        sName()
+{
+    pPE_Type = new PE_Type(nType);
+}
+
+void
+PE_Typedef::EstablishContacts( UnoIDL_PE *              io_pParentPE,
+                               ary::Repository &    io_rRepository,
+                               TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Typedef::~PE_Typedef()
+{
+}
+
+void
+PE_Typedef::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Typedef::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Typedef::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Typedef::Process_Default()
+{
+    CallHandler("", tt_any);
+}
+
+void
+PE_Typedef::On_expect_description_Any(const char *)
+{
+    SetResult(not_done,push_sure, pPE_Type.Ptr());
+}
+
+void
+PE_Typedef::On_expect_name_Identifier(const char * i_sText)
+{
+    sName = i_sText;
+    SetResult(done,stay);
+    eState = got_name;
+}
+
+void
+PE_Typedef::On_got_name_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == ';' )
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else
+        On_Default(i_sText);
+}
+
+void
+PE_Typedef::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+}
+
+void
+PE_Typedef::InitData()
+{
+    eState = expect_description;
+    nType = 0;
+    sName = "";
+}
+
+void
+PE_Typedef::ReceiveData()
+{
+    eState = expect_name;
+}
+
+void
+PE_Typedef::TransferData()
+{
+    ary::idl::Typedef &
+        rCe = Gate().Ces().Store_Typedef(CurNamespace().CeId(), sName, nType);
+    PassDocuAt(rCe);
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Typedef::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pe_type2.cxx b/autodoc/source/parser_i/idl/pe_type2.cxx
new file mode 100644
index 000000000000..9ceb955576ec
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_type2.cxx
@@ -0,0 +1,314 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_type2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/uidl_tok.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+/** Implementation Concept for Parsing a Type
+
+Example Type:
+    sequence < ::abc::TName< TplType > >  AnyName;
+
+Status Changes:
+
+expect_type:
+    sequence        -> expect_type
+    <               -> expect_type
+    ::              -> expect_quname_part
+    abc             -> expect_quname_separator
+    ::              -> expect_quname_part
+    TName           -> expect_quname_separator
+    <               -> in_template_type (process in nested PE_Type instance)
+
+        expect_type:
+            TplType         ->expect_quname_separator
+            >               -> e_none (finish, '>' not handled)
+
+    >               -> expect_quname_separator
+    >               -> expect_quname_separator (not finish, because sequencecounter > 0)
+    AnyName         -> e_none  (finish)
+*/
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Type::PE_Type( ary::idl::Type_id & o_rResult )
+    :   pResult(&o_rResult),
+        nIsSequenceCounter(0),
+        nSequenceDownCounter(0),
+        bIsUnsigned(false),
+        sFullType(),
+        eState(e_none),
+        sLastPart(),
+        pPE_TemplateType(0), // @attention Recursion, only initiate, if needed!
+        nTemplateType(0),
+        aTemplateParameters()
+{
+}
+
+PE_Type::~PE_Type()
+{
+}
+
+void
+PE_Type::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Type::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_part)
+    {
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        Finish();
+    }
+}
+
+void
+PE_Type::Process_NameSeparator()
+{
+    if (eState == expect_type)
+    {
+        sFullType.Init(true);
+        eState = expect_quname_part;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        sFullType += sLastPart;
+        eState = expect_quname_part;
+        SetResult(done, stay);
+    }
+}
+
+void
+PE_Type::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        csv_assert(i_rToken.Id() == TokPunctuation::Lesser);
+           SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        switch (i_rToken.Id())
+        {
+            case TokPunctuation::Lesser:
+                eState = in_template_type;
+                SetResult( done, push_sure, &MyTemplateType() );
+                break;
+
+            case TokPunctuation::Greater:
+                if (nSequenceDownCounter > 0)
+                {
+                    nSequenceDownCounter--;
+                    SetResult(done, stay);
+                }
+                else
+                {
+                    Finish();
+                }
+                break;
+
+            default:
+                Finish();
+        }   // end switch
+    }
+    else if (eState == in_template_type)
+    {
+        aTemplateParameters.push_back(nTemplateType);
+        nTemplateType = 0;
+
+        if (i_rToken.Id() == TokPunctuation::Greater)
+        {
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+        else if (i_rToken.Id() == TokPunctuation::Comma)
+        {
+              SetResult(done, push_sure, &MyTemplateType());
+        }
+        else
+        {
+            csv_assert(false);
+            Finish();
+        }
+    }
+}
+
+void
+PE_Type::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_part)
+    {
+        // Can this happen?
+
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        // Can this happen?
+
+        Finish();
+    }
+}
+
+void
+PE_Type::Process_TypeModifier( const TokTypeModifier & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        switch ( i_rToken.Id() )
+        {
+            case TokTypeModifier::tmod_unsigned:
+                    bIsUnsigned = true;
+                    break;
+            case TokTypeModifier::tmod_sequence:
+                    nIsSequenceCounter++;
+                    nSequenceDownCounter++;
+                    break;
+            default:
+                csv_assert(false);
+        }
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        // Can this happen?
+
+        Finish();
+    }
+}
+
+void
+PE_Type::Process_Default()
+{
+    Finish();
+}
+
+void
+PE_Type::Finish()
+{
+    csv_assert(nSequenceDownCounter == 0);
+
+    sFullType.SetLocalName(sLastPart);
+    SetResult(not_done, pop_success);
+}
+
+PE_Type &
+PE_Type::MyTemplateType()
+{
+    if (NOT pPE_TemplateType)
+    {
+        pPE_TemplateType = new PE_Type(nTemplateType);
+        pPE_TemplateType->EstablishContacts( this,
+                                             MyRepository(),
+                                             TokenResult() );
+    }
+    return *pPE_TemplateType;
+}
+
+void
+PE_Type::InitData()
+{
+    eState = expect_type;
+
+    nIsSequenceCounter = 0;
+    nSequenceDownCounter = 0;
+    bIsUnsigned = false;
+    sFullType.Empty();
+    sLastPart.clear();
+    nTemplateType = 0;
+    csv::erase_container(aTemplateParameters);
+}
+
+void
+PE_Type::TransferData()
+{
+    if (bIsUnsigned)
+    {
+        StreamLock sl(40);
+        String sName( sl() << "unsigned " << sFullType.LocalName() << c_str );
+        sFullType.SetLocalName(sName);
+    }
+
+    const ary::idl::Type &
+        result = Gate().Types().CheckIn_Type( sFullType,
+                                              nIsSequenceCounter,
+                                              CurNamespace().CeId(),
+                                              &aTemplateParameters );
+    *pResult = result.TypeId();
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Type::MyPE()
+{
+     return *this;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/pe_vari2.cxx b/autodoc/source/parser_i/idl/pe_vari2.cxx
new file mode 100644
index 000000000000..c294da7f507b
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_vari2.cxx
@@ -0,0 +1,173 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_vari2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Variable::PE_Variable( ary::idl::Type_id &   i_rResult_Type,
+                          String &              i_rResult_Name )
+    :   eState(e_none),
+        pResult_Type(&i_rResult_Type),
+        pResult_Name(&i_rResult_Name),
+        pPE_Type(0)
+{
+    pPE_Type = new PE_Type(i_rResult_Type);
+}
+
+void
+PE_Variable::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                                ary::Repository &           io_rRepository,
+                                TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Variable::~PE_Variable()
+{
+}
+
+void
+PE_Variable::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Variable::Process_Default()
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+    }
+    else{
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+    }
+    else if (eState == expect_name)
+    {
+        *pResult_Name = i_rToken.Text();
+        SetResult( done, stay );
+        eState = expect_finish;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::Process_Punctuation( const TokPunctuation & )
+{
+    if (eState == expect_finish)
+    {
+        SetResult( not_done, pop_success );
+        eState = e_none;
+    }
+    else if (eState == expect_name)
+    {
+        SetResult( not_done, pop_success );
+        eState = e_none;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+    }
+    else if (eState == expect_name AND i_rToken.Id() == TokBuiltInType::bty_ellipse)
+    {
+        SetResult( not_done, pop_success );
+        eState = e_none;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::InitData()
+{
+    eState = expect_type;
+
+    *pResult_Type = 0;
+    *pResult_Name = "";
+}
+
+void
+PE_Variable::ReceiveData()
+{
+    eState = expect_name;
+}
+
+void
+PE_Variable::TransferData()
+{
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Variable::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/pestate.cxx b/autodoc/source/parser_i/idl/pestate.cxx
new file mode 100644
index 000000000000..9a80b8c4a0d4
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pestate.cxx
@@ -0,0 +1,140 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pestate.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/parsenv2.hxx>
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+ParseEnvState::Process_Identifier( const TokIdentifier & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_NameSeparator()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Punctuation( const TokPunctuation & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_BuiltInType( const TokBuiltInType & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_TypeModifier( const TokTypeModifier & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_MetaType( const TokMetaType &    )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Stereotype( const TokStereotype & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_ParameterHandling( const TokParameterHandling & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Raises()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Needs()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Observes()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Assignment( const TokAssignment & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_EOL()
+{
+    MyPE().SetResult(done,stay);
+}
+
+
+void
+ParseEnvState::On_SubPE_Left()
+{
+}
+
+void
+ParseEnvState::Process_Default()
+{
+    if (bDefaultIsError)
+        MyPE().SetResult(not_done, pop_failure);
+    else    // ignore:
+        MyPE().SetResult(done, stay);
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/semnode.cxx b/autodoc/source/parser_i/idl/semnode.cxx
new file mode 100644
index 000000000000..1549d5eb0f24
--- /dev/null
+++ b/autodoc/source/parser_i/idl/semnode.cxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/semnode.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/parsenv2.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+SemanticNode::SemanticNode()
+    :   pParentPE(0),
+        pAryGate(0),
+        pTokenResult(0)
+{
+}
+
+void
+SemanticNode::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                 ary::idl::Gate &           io_rGate,
+                                 TokenProcessing_Result &   o_rResult )
+{
+    pParentPE       =  io_pParentPE;
+    pAryGate        = &io_rGate;
+    pTokenResult    = &o_rResult;
+}
+
+SemanticNode::~SemanticNode()
+{
+}
+
+void
+SemanticNode::SetTokenResult( E_TokenDone       i_eDone,
+                              E_EnvStackAction  i_eWhat2DoWithEnvStack,
+                              UnoIDL_PE *       i_pParseEnv2Push )
+{
+    csv_assert(pTokenResult != 0);
+
+    pTokenResult->eDone         = i_eDone;
+    pTokenResult->eStackAction  = i_eWhat2DoWithEnvStack;
+    pTokenResult->pEnv2Push     = i_pParseEnv2Push;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/tk_const.cxx b/autodoc/source/parser_i/idl/tk_const.cxx
new file mode 100644
index 000000000000..d342ffc1f847
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_const.cxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/tk_const.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+void
+TokAssignment::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Assignment(*this);
+}
+
+const char *
+TokAssignment::Text() const
+{
+    return sText;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/tk_ident.cxx b/autodoc/source/parser_i/idl/tk_ident.cxx
new file mode 100644
index 000000000000..2a284b701e55
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_ident.cxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/tk_ident.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+TokIdentifier::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Identifier(*this);
+}
+
+const char *
+TokIdentifier::Text() const
+{
+    return sText;
+}
+
+void
+TokNameSeparator::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_NameSeparator();
+}
+
+const char *
+TokNameSeparator::Text() const
+{
+    return "::";
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/tk_keyw.cxx b/autodoc/source/parser_i/idl/tk_keyw.cxx
new file mode 100644
index 000000000000..1e8076a515f2
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_keyw.cxx
@@ -0,0 +1,225 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/tk_keyw.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokintpr.hxx>
+
+
+using csi::uidl::TokBuiltInType;
+using csi::uidl::TokTypeModifier;
+using csi::uidl::TokMetaType;
+using csi::uidl::TokStereotype;
+using csi::uidl::TokParameterHandling;
+
+
+lux::EnumValueMap           G_aTokBuiltInType_EV_TokenId_Values;
+TokBuiltInType::EV_TokenId  ev_bty_none(TokBuiltInType::e_none,"");
+TokBuiltInType::EV_TokenId  ev_bty_any(TokBuiltInType::bty_any,"any");
+TokBuiltInType::EV_TokenId  ev_bty_boolean(TokBuiltInType::bty_boolean,"boolean");
+TokBuiltInType::EV_TokenId  ev_bty_byte(TokBuiltInType::bty_byte,"byte");
+TokBuiltInType::EV_TokenId  ev_bty_char(TokBuiltInType::bty_char,"char");
+TokBuiltInType::EV_TokenId  ev_bty_double(TokBuiltInType::bty_double,"double");
+TokBuiltInType::EV_TokenId  ev_bty_hyper(TokBuiltInType::bty_hyper,"hyper");
+TokBuiltInType::EV_TokenId  ev_bty_long(TokBuiltInType::bty_long,"long");
+TokBuiltInType::EV_TokenId  ev_bty_short(TokBuiltInType::bty_short,"short");
+TokBuiltInType::EV_TokenId  ev_bty_string(TokBuiltInType::bty_string,"string");
+TokBuiltInType::EV_TokenId  ev_bty_void(TokBuiltInType::bty_void,"void");
+TokBuiltInType::EV_TokenId  ev_bty_ellipse(TokBuiltInType::bty_ellipse,"...");
+
+
+lux::EnumValueMap           G_aTokTypeModifier_EV_TokenId_Values;
+TokTypeModifier::EV_TokenId ev_tmod_none(TokTypeModifier::e_none,"");
+TokTypeModifier::EV_TokenId ev_tmod_unsigned(TokTypeModifier::tmod_unsigned,"unsigned");
+TokTypeModifier::EV_TokenId ev_tmod_sequence(TokTypeModifier::tmod_sequence,"sequence");
+
+
+lux::EnumValueMap           G_aTokMetaType_EV_TokenId_Values;
+TokMetaType::EV_TokenId     ev_mt_none(TokMetaType::e_none,"");
+TokMetaType::EV_TokenId     ev_mt_attribute(TokMetaType::mt_attribute,"attribute");
+TokMetaType::EV_TokenId     ev_mt_constants(TokMetaType::mt_constants,"constants");
+TokMetaType::EV_TokenId     ev_mt_enum(TokMetaType::mt_enum,"enum");
+TokMetaType::EV_TokenId     ev_mt_exception(TokMetaType::mt_exception,"exception");
+TokMetaType::EV_TokenId     ev_mt_ident(TokMetaType::mt_ident,"ident");
+TokMetaType::EV_TokenId     ev_mt_interface(TokMetaType::mt_interface,"interface");
+TokMetaType::EV_TokenId     ev_mt_module(TokMetaType::mt_module,"module");
+TokMetaType::EV_TokenId     ev_mt_property(TokMetaType::mt_property,"property");
+TokMetaType::EV_TokenId     ev_mt_service(TokMetaType::mt_service,"service");
+TokMetaType::EV_TokenId     ev_mt_singleton(TokMetaType::mt_singleton,"singleton");
+TokMetaType::EV_TokenId     ev_mt_struct(TokMetaType::mt_struct,"struct");
+TokMetaType::EV_TokenId     ev_mt_typedef(TokMetaType::mt_typedef,"typedef");
+TokMetaType::EV_TokenId     ev_mt_uik(TokMetaType::mt_uik,"uik");
+
+
+lux::EnumValueMap           G_aTokStereotype_EV_TokenId_Values;
+TokStereotype::EV_TokenId   ev_ste_none(TokStereotype::e_none,"");
+TokStereotype::EV_TokenId   ev_ste_bound(TokStereotype::ste_bound,"bound");
+TokStereotype::EV_TokenId   ev_ste_const(TokStereotype::ste_const,"const");
+TokStereotype::EV_TokenId   ev_ste_constrained(TokStereotype::ste_constrained,"constrained");
+TokStereotype::EV_TokenId   ev_ste_maybeambiguous(TokStereotype::ste_maybeambiguous,"maybeambiguous");
+TokStereotype::EV_TokenId   ev_ste_maybedefault(TokStereotype::ste_maybedefault,"maybedefault");
+TokStereotype::EV_TokenId   ev_ste_maybevoid(TokStereotype::ste_maybevoid,"maybevoid");
+TokStereotype::EV_TokenId   ev_ste_oneway(TokStereotype::ste_oneway,"oneway");
+TokStereotype::EV_TokenId   ev_ste_optional(TokStereotype::ste_optional,"optional");
+TokStereotype::EV_TokenId   ev_ste_readonly(TokStereotype::ste_readonly,"readonly");
+TokStereotype::EV_TokenId   ev_ste_removable(TokStereotype::ste_removable,"removable");
+TokStereotype::EV_TokenId   ev_ste_virtual(TokStereotype::ste_virtual,"virtual");
+TokStereotype::EV_TokenId   ev_ste_transient(TokStereotype::ste_transient,"transient");
+TokStereotype::EV_TokenId   ev_ste_published(TokStereotype::ste_published,"published");
+
+
+lux::EnumValueMap                   G_aTokParameterHandling_EV_TokenId_Values;
+TokParameterHandling::EV_TokenId    ev_ph_none(TokParameterHandling::e_none,"");
+TokParameterHandling::EV_TokenId    ev_ph_in(TokParameterHandling::ph_in,"in");
+TokParameterHandling::EV_TokenId    ev_ph_out(TokParameterHandling::ph_out,"out");
+TokParameterHandling::EV_TokenId    ev_ph_inout(TokParameterHandling::ph_inout,"inout");
+
+
+namespace lux
+{
+
+template<> EnumValueMap &
+TokBuiltInType::EV_TokenId::Values_()       { return G_aTokBuiltInType_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokTypeModifier::EV_TokenId::Values_()      { return G_aTokTypeModifier_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokMetaType::EV_TokenId::Values_()          { return G_aTokMetaType_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokStereotype::EV_TokenId::Values_()        { return G_aTokStereotype_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; }
+
+}   // namespace lux
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+TokBuiltInType::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_BuiltInType(*this);
+}
+
+const char *
+TokBuiltInType::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokTypeModifier::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_TypeModifier(*this);
+}
+
+const char *
+TokTypeModifier::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokMetaType::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_MetaType(*this);
+}
+
+const char *
+TokMetaType::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokStereotype::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Stereotype(*this);
+}
+
+const char *
+TokStereotype::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokParameterHandling::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_ParameterHandling(*this);
+}
+
+const char *
+TokParameterHandling::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokRaises::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Raises();
+}
+
+const char *
+TokRaises::Text() const
+{
+    return "raises";
+}
+
+void
+TokNeeds::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Needs();
+}
+
+const char *
+TokNeeds::Text() const
+{
+    return "needs";
+}
+void
+TokObserves::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Observes();
+}
+
+const char *
+TokObserves::Text() const
+{
+    return "observes";
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/tk_punct.cxx b/autodoc/source/parser_i/idl/tk_punct.cxx
new file mode 100644
index 000000000000..40627196f89e
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_punct.cxx
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/tk_punct.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <parser/parserinfo.hxx>
+#include <s2_luidl/tokintpr.hxx>
+
+
+using csi::uidl::TokPunctuation;
+
+
+lux::EnumValueMap           G_aTokPunctuation_EV_TokenId_Values;
+TokPunctuation::EV_TokenId  ev_none(TokPunctuation::e_none,"");
+TokPunctuation::EV_TokenId  BracketOpen(TokPunctuation::BracketOpen,"(");
+TokPunctuation::EV_TokenId  BracketClose(TokPunctuation::BracketClose,")");
+TokPunctuation::EV_TokenId  ArrayBracketOpen(TokPunctuation::ArrayBracketOpen,"[");
+TokPunctuation::EV_TokenId  ArrayBracketClose(TokPunctuation::ArrayBracketClose,"]");
+TokPunctuation::EV_TokenId  CurledBracketOpen(TokPunctuation::CurledBracketOpen,"{");
+TokPunctuation::EV_TokenId  CurledBracketClose(TokPunctuation::CurledBracketClose,"}");
+TokPunctuation::EV_TokenId  Semicolon(TokPunctuation::Semicolon,";");
+TokPunctuation::EV_TokenId  Colon(TokPunctuation::Colon,":");
+TokPunctuation::EV_TokenId  DoubleColon(TokPunctuation::DoubleColon,"::");
+TokPunctuation::EV_TokenId  Comma(TokPunctuation::Comma,",");
+TokPunctuation::EV_TokenId  Minus(TokPunctuation::Minus,"-");
+TokPunctuation::EV_TokenId  Fullstop(TokPunctuation::Fullstop,".");
+TokPunctuation::EV_TokenId  Lesser(TokPunctuation::Lesser,"<");
+TokPunctuation::EV_TokenId  Greater(TokPunctuation::Greater,">");
+
+
+
+
+namespace lux
+{
+template<> EnumValueMap &
+TokPunctuation::EV_TokenId::Values_()       { return G_aTokPunctuation_EV_TokenId_Values; }
+}
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+TokPunctuation::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Punctuation(*this);
+}
+
+const char *
+TokPunctuation::Text() const
+{
+    return eTag.Text();
+}
+
+void
+Tok_EOL::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_EOL();
+}
+
+const char *
+Tok_EOL::Text() const
+{
+    return "\r\n";
+}
+
+void
+Tok_EOF::Trigger( TokenInterpreter & ) const
+{
+    csv_assert(false);
+//  io_rInterpreter.Process_EOF();
+}
+
+const char *
+Tok_EOF::Text() const
+{
+    return "";
+}
+
+
+}   // namespace uidl
+}   // namespace csi
diff --git a/autodoc/source/parser_i/idl/tkp_uidl.cxx b/autodoc/source/parser_i/idl/tkp_uidl.cxx
new file mode 100644
index 000000000000..9969e9b34364
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tkp_uidl.cxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/tkp_uidl.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/cx_idlco.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+TokenParser_Uidl::TokenParser_Uidl( Token_Receiver &        o_rUidlReceiver,
+                                    DYN ::TkpDocuContext &  let_drDocuContext )
+    :   pBaseContext(new Context_UidlCode(o_rUidlReceiver, let_drDocuContext)),
+        pCurContext(0)
+{
+    SetStartContext();
+}
+
+TokenParser_Uidl::~TokenParser_Uidl()
+{
+}
+
+void
+TokenParser_Uidl::SetStartContext()
+{
+    pCurContext = pBaseContext.Ptr();
+}
+
+void
+TokenParser_Uidl::SetCurrentContext( TkpContext & io_rContext )
+{
+    pCurContext = &io_rContext;
+}
+
+TkpContext &
+TokenParser_Uidl::CurrentContext()
+{
+    return *pCurContext;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx
new file mode 100644
index 000000000000..34ad8064e3a9
--- /dev/null
+++ b/autodoc/source/parser_i/idl/unoidl.cxx
@@ -0,0 +1,176 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <parser/unoidl.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <stdlib.h>
+#include <cosv/file.hxx>
+#include <ary/ary.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <../parser/inc/x_docu.hxx>
+#include <parser/parserinfo.hxx>
+#include <tools/filecoll.hxx>
+#include <tools/tkpchars.hxx>
+#include <s2_luidl/tkp_uidl.hxx>
+#include <s2_luidl/distrib.hxx>
+#include <s2_luidl/pe_file2.hxx>
+#include <s2_dsapi/cx_dsapi.hxx>
+#include <adc_msg.hxx>
+#include <x_parse2.hxx>
+
+
+
+namespace autodoc
+{
+
+
+class FileParsePerformers
+{
+  public:
+                        FileParsePerformers(
+                            ary::Repository &
+                                                io_rRepository,
+                            ParserInfo &        io_rParserInfo );
+
+    void                ParseFile(
+                            const char *        i_sFullPath );
+
+    void                ConnectLinks();
+
+  private:
+    CharacterSource     aFileLoader;
+    Dyn<csi::uidl::TokenParser_Uidl>
+                        pTokens;
+    csi::uidl::TokenDistributor
+                        aDistributor;
+    Dyn<csi::uidl::PE_File>
+                        pFileParseEnvironment;
+    ary::Repository &
+                        rRepository;
+    ParserInfo &        rParserInfo;
+};
+
+
+IdlParser::IdlParser( ary::Repository & io_rRepository )
+    :   pRepository(&io_rRepository)
+{
+}
+
+void
+IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles )
+{
+    Dyn<FileParsePerformers>
+        pFileParsePerformers(
+            new FileParsePerformers(*pRepository,
+                                    static_cast< ParserInfo& >(*this)) );
+
+    FileCollector::const_iterator iEnd = i_rFiles.End();
+    for ( FileCollector::const_iterator iter = i_rFiles.Begin();
+          iter != iEnd;
+          ++iter )
+    {
+        Cout() << (*iter) << " ..."<< Endl();
+
+        try
+        {
+            pFileParsePerformers->ParseFile(*iter);
+        }
+        catch (X_AutodocParser &)
+        {
+            /// Ignore and goon
+            TheMessages().Out_ParseError(CurFile(), CurLine());
+            pFileParsePerformers
+                = new FileParsePerformers(*pRepository,
+                                          static_cast< ParserInfo& >(*this));
+        }
+        catch (X_Docu & xd)
+        {
+            // Currently thic catches only wrong since tags, while since tags are
+            // transformed. In this case the program shall be terminated.
+            Cerr() << xd << Endl();
+            exit(1);
+        }
+        catch (...)
+        {
+            Cout() << "Unknown error." << Endl();
+            exit(0);
+//          pFileParsePerformers = new FileParsePerformers( *pRepository );
+        }
+    }
+
+    pFileParsePerformers->ConnectLinks();
+}
+
+FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository,
+                                          ParserInfo &           io_rParserInfo )
+    :   pTokens(0),
+        aDistributor(io_rRepository, io_rParserInfo),
+        rRepository( io_rRepository ),
+        rParserInfo(io_rParserInfo)
+{
+    DYN csi::dsapi::Context_Docu *
+        dpDocuContext
+            = new csi::dsapi::Context_Docu( aDistributor.DocuTokens_Receiver() );
+    pTokens = new csi::uidl::TokenParser_Uidl( aDistributor.CodeTokens_Receiver(), *dpDocuContext );
+    pFileParseEnvironment
+            = new csi::uidl::PE_File(aDistributor,rParserInfo);
+
+    aDistributor.SetTokenProvider(*pTokens);
+    aDistributor.SetTopParseEnvironment(*pFileParseEnvironment);
+}
+
+void
+FileParsePerformers::ParseFile( const char * i_sFullPath )
+{
+    csv::File aFile(i_sFullPath);
+
+    aFile.open( csv::CFM_READ );
+    csv_assert( aFile.is_open() );
+    aFileLoader.LoadText(aFile);
+    aFile.close();
+
+    rParserInfo.Set_CurFile(i_sFullPath, true); // true = count lines
+    pTokens->Start(aFileLoader);
+    aDistributor.Reset();
+
+    do {
+        aDistributor.TradeToken();
+    } while ( NOT aFileLoader.IsFinished() );
+}
+
+void
+FileParsePerformers::ConnectLinks()
+{
+    // KORR_FUTURE ?
+//  rRepository.RwGate_Idl().ConnectAdditionalLinks();
+}
+
+}   // namespace autodoc
diff --git a/autodoc/source/parser_i/idoc/cx_docu2.cxx b/autodoc/source/parser_i/idoc/cx_docu2.cxx
new file mode 100644
index 000000000000..9cd8eddd0b76
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/cx_docu2.cxx
@@ -0,0 +1,267 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/cx_docu2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <../../parser/inc/tokens/parseinc.hxx>
+#include <s2_dsapi/tokrecv.hxx>
+#include <s2_dsapi/tk_html.hxx>
+#include <s2_dsapi/tk_xml.hxx>
+#include <s2_dsapi/tk_docw2.hxx>
+#include <x_parse2.hxx>
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+
+bool
+Cx_Base::PassNewToken()
+{
+    if (pNewToken)
+    {
+        rReceiver.Receive(*pNewToken.Release());
+
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_Base::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Cx_Base::Handle_DocuSyntaxError( CharacterSource & io_rText )
+{
+    // KORR_FUTURE
+    // Put this into Error Log File
+
+    Cerr() << "Error:  Syntax error in documentation within "
+              << "this text:\n\""
+              << io_rText.CutToken()
+              << "\"."
+              << Endl();
+    SetToken( new Tok_Word(io_rText.CurToken()) );
+}
+
+void
+Cx_EoHtml::ReadCharChain( CharacterSource & io_rText )
+{
+    if ( NULCH == jumpTo(io_rText,'>') )
+        throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+    io_rText.MoveOn();
+    SetToken(new Tok_HtmlTag(io_rText.CutToken(),bToken_IsStartOfParagraph));
+}
+
+void
+Cx_EoXmlConst::ReadCharChain( CharacterSource & io_rText )
+{
+    char c = jumpTo(io_rText,'>','*');
+    if ( NULCH == c OR '*' == c )
+    {
+        Handle_DocuSyntaxError(io_rText);
+        return;
+    }
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlConst(eTokenId));
+}
+
+void
+Cx_EoXmlLink_BeginTag::ReadCharChain( CharacterSource & io_rText )
+{
+    String  sScope;
+    String  sDim;
+
+    do {
+        char cReached = jumpTo(io_rText,'"','>','*');
+        switch (cReached)
+        {
+            case '"':
+            {
+                io_rText.MoveOn();
+                io_rText.CutToken();
+                char c = jumpTo(io_rText,'"','*', '>');
+                if ( NULCH == c OR '*' == c OR '>' == c)
+                {
+                    if ( '>' == c )
+                        io_rText.MoveOn();
+                    Handle_DocuSyntaxError(io_rText);
+                    return;
+                }
+
+                const char * pAttribute = io_rText.CutToken();
+                if ( *pAttribute != '[' )
+                    sScope = pAttribute;
+                else
+                    sDim = pAttribute;
+
+                io_rText.MoveOn();
+                break;
+            }
+            case '>':
+                break;
+            case '*':
+                Handle_DocuSyntaxError(io_rText);
+                return;
+            default:
+                throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        }   // end switch
+    }   while ( io_rText.CurChar() != '>' );
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken( new Tok_XmlLink_BeginTag(eTokenId, sScope.c_str(), sDim.c_str()) );
+}
+
+void
+Cx_EoXmlLink_EndTag::ReadCharChain( CharacterSource & io_rText )
+{
+    char c = jumpTo(io_rText,'>','*');
+    if ( NULCH == c OR '*' == c )
+    {
+        Handle_DocuSyntaxError(io_rText);
+        return;
+    }
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlLink_EndTag(eTokenId));
+}
+
+void
+Cx_EoXmlFormat_BeginTag::ReadCharChain( CharacterSource & io_rText )
+{
+    String  sDim;
+
+    char cReached = jumpTo(io_rText,'"','>','*');
+    switch (cReached)
+    {
+        case '"':
+        {
+            io_rText.MoveOn();
+            io_rText.CutToken();
+
+            char c = jumpTo(io_rText,'"','*','>');
+            if ( NULCH == c OR '*' == c OR '>' == c )
+            {
+                if ('>' == c )
+                    io_rText.MoveOn();
+                Handle_DocuSyntaxError(io_rText);
+                return;
+            }
+
+            sDim = io_rText.CutToken();
+
+            c = jumpTo(io_rText,'>','*');
+            if ( NULCH == c OR '*' == c )
+            {
+                Handle_DocuSyntaxError(io_rText);
+                return;
+            }
+            break;
+        }
+        case '>':
+               break;
+        case '*':
+            Handle_DocuSyntaxError(io_rText);
+            return;
+        default:
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+    }   // end switch
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlFormat_BeginTag(eTokenId, sDim));
+}
+
+void
+Cx_EoXmlFormat_EndTag::ReadCharChain( CharacterSource & io_rText )
+{
+    char c = jumpTo(io_rText,'>','*');
+    if ( NULCH == c OR '*' == c )
+    {
+        Handle_DocuSyntaxError(io_rText);
+        return;
+    }
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlFormat_EndTag(eTokenId));
+}
+
+void
+Cx_CheckStar::ReadCharChain( CharacterSource & io_rText )
+{
+    bEndTokenFound = false;
+    if (bIsEnd)
+    {
+        char cNext = jumpOver(io_rText,'*');
+        if ( NULCH == cNext )
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        if (cNext == '/')
+        {
+            io_rText.MoveOn();
+            SetToken(new Tok_DocuEnd);
+            bEndTokenFound = true;
+        }
+        else
+        {
+            SetToken( new Tok_Word(io_rText.CutToken()) );
+        }
+    }
+    else
+    {
+        jumpToWhite(io_rText);
+        SetToken( new Tok_Word(io_rText.CutToken()) );
+    }
+}
+
+TkpContext &
+Cx_CheckStar::FollowUpContext()
+{
+    if (bEndTokenFound)
+        return *pEnd_FollowUpContext;
+    else
+        return Cx_Base::FollowUpContext();
+}
+
+}   // namespace dsapi
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
new file mode 100644
index 000000000000..a4d845bb0088
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
@@ -0,0 +1,533 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/cx_dsapi.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <x_parse2.hxx>
+#include <tools/tkpchars.hxx>
+#include <s2_dsapi/tk_atag2.hxx>
+#include <s2_dsapi/tk_docw2.hxx>
+#include <s2_dsapi/tk_xml.hxx>
+#include <s2_dsapi/cx_docu2.hxx>
+#include <s2_dsapi/tokrecv.hxx>
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+const intt C_nStatusSize = 128;
+const intt C_nCppInitialNrOfStati = 400;
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_Ignore = 2;
+const uintt nF_fin_Eof = 3;
+const uintt nF_fin_AnyWord = 4;
+const uintt nF_fin_AtTag = 5;
+const uintt nF_fin_EndSign = 6;
+const uintt nF_goto_EoHtml = 7;
+const uintt nF_goto_EoXmlConst = 8;
+const uintt nF_goto_EoXmlLink_BeginTag = 9;
+const uintt nF_goto_EoXmlLink_EndTag = 10;
+const uintt nF_goto_EoXmlFormat_BeginTag = 11;
+const uintt nF_goto_EoXmlFormat_EndTag = 12;
+const uintt nF_goto_CheckStar = 13;
+const uintt nF_fin_Comma = 14;
+const uintt nF_fin_White = 15;
+
+const UINT16 nTok_at_author = 100 + Tok_AtTag::author;
+const UINT16 nTok_at_see = 100 + Tok_AtTag::see;
+const UINT16 nTok_at_param = 100 + Tok_AtTag::param;
+const UINT16 nTok_at_return = 100 + Tok_AtTag::e_return;
+const UINT16 nTok_at_throws = 100 + Tok_AtTag::e_throw;
+const UINT16 nTok_at_example = 100 + Tok_AtTag::example;
+const UINT16 nTok_at_deprecated = 100 + Tok_AtTag::deprecated;
+const UINT16 nTok_at_suspicious = 100 + Tok_AtTag::suspicious;
+const UINT16 nTok_at_missing = 100 + Tok_AtTag::missing;
+const UINT16 nTok_at_incomplete = 100 + Tok_AtTag::incomplete;
+const UINT16 nTok_at_version = 100 + Tok_AtTag::version;
+const UINT16 nTok_at_guarantees = 100 + Tok_AtTag::guarantees;
+const UINT16 nTok_at_exception = 100 + Tok_AtTag::exception;
+const UINT16 nTok_at_since = 100 + Tok_AtTag::since;
+
+const UINT16 nTok_const_TRUE = 200 + Tok_XmlConst::e_true;
+const UINT16 nTok_const_FALSE = 200 + Tok_XmlConst::e_false;
+const UINT16 nTok_const_NULL = 200 + Tok_XmlConst::e_null;
+const UINT16 nTok_const_void = 200 + Tok_XmlConst::e_void;
+
+const UINT16 nTok_link_typeB = 300 + Tok_XmlLink_BeginTag::type;
+const UINT16 nTok_link_typeE = 325 + Tok_XmlLink_EndTag::type;
+const UINT16 nTok_link_memberB = 300 + Tok_XmlLink_BeginTag::member;
+const UINT16 nTok_link_membeE = 325 + Tok_XmlLink_EndTag::member;
+const UINT16 nTok_link_constB = 300 + Tok_XmlLink_BeginTag::e_const;
+const UINT16 nTok_link_constE = 325 + Tok_XmlLink_EndTag::e_const;
+
+const UINT16 nTok_format_listingB = 350 + Tok_XmlFormat_BeginTag::listing;
+const UINT16 nTok_format_listingE = 375 + Tok_XmlFormat_EndTag::listing;
+const UINT16 nTok_format_codeB = 350 + Tok_XmlFormat_BeginTag::code;
+const UINT16 nTok_format_codeE = 375 + Tok_XmlFormat_EndTag::code;
+const UINT16 nTok_format_atomB = 350 + Tok_XmlFormat_BeginTag::atom;
+const UINT16 nTok_format_atomE = 375 + Tok_XmlFormat_EndTag::atom;
+
+
+const UINT16 nTok_html_parastart = 400;
+
+const UINT16 nTok_MLDocuEnd = 501;
+const UINT16 nTok_EOL = 502;
+
+
+Context_Docu::Context_Docu( Token_Receiver & o_rReceiver )
+    :   aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati),
+        pReceiver(&o_rReceiver),
+        pParentContext(0),
+        pCx_EoHtml(0),
+        pCx_EoXmlConst(0),
+        pCx_EoXmlLink_BeginTag(0),
+        pCx_EoXmlLink_EndTag(0),
+        pCx_EoXmlFormat_BeginTag(0),
+        pCx_EoXmlFormat_EndTag(0),
+        pCx_CheckStar(0),
+        pNewToken(0),
+        pFollowUpContext(0),
+        bIsMultiline(false)
+{
+    pCx_EoHtml = new Cx_EoHtml(o_rReceiver, *this);
+    pCx_EoXmlConst = new Cx_EoXmlConst(o_rReceiver, *this);
+    pCx_EoXmlLink_BeginTag = new Cx_EoXmlLink_BeginTag(o_rReceiver, *this);
+    pCx_EoXmlLink_EndTag = new Cx_EoXmlLink_EndTag(o_rReceiver, *this);
+    pCx_EoXmlFormat_BeginTag = new Cx_EoXmlFormat_BeginTag(o_rReceiver, *this);
+    pCx_EoXmlFormat_EndTag = new Cx_EoXmlFormat_EndTag(o_rReceiver, *this);
+    pCx_CheckStar = new Cx_CheckStar(*pReceiver,*this);
+
+    SetupStateMachine();
+}
+
+void
+Context_Docu::SetParentContext( TkpContext & io_rParentContext,
+                                const char * )
+{
+    pFollowUpContext = pParentContext = &io_rParentContext;
+    pCx_CheckStar->Set_End_FolloUpContext(io_rParentContext);
+}
+
+Context_Docu::~Context_Docu()
+{
+}
+
+void
+Context_Docu::ReadCharChain( CharacterSource & io_rText )
+{
+    csv_assert(pParentContext != 0);
+
+    pNewToken = 0;
+
+    UINT16 nTokenId = 0;
+    StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    pFollowUpContext = rBound.FollowUpContext();
+    PerformStatusFunction(rBound.StatusFunctionNr(), nTokenId, io_rText);
+}
+
+bool
+Context_Docu::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pReceiver->Receive(*pNewToken.Release());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Context_Docu::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_Docu::PerformStatusFunction( uintt              i_nStatusSignal,
+                                     UINT16             i_nTokenId,
+                                     CharacterSource &  io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_White:
+            io_rText.CutToken();
+            pNewToken = new Tok_White;
+            break;
+        case nF_fin_Error:
+            throw X_AutodocParser(X_AutodocParser::x_InvalidChar);
+            // no break because of throw
+        case nF_fin_Ignore:
+            pNewToken = 0;
+            io_rText.CutToken();
+            break;
+        case nF_fin_Eof:
+            if (bIsMultiline)
+                throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+            else
+                io_rText.CutToken();
+                pNewToken = new Tok_EOF;
+            break;
+        case nF_fin_AnyWord:
+            pNewToken = new Tok_Word(io_rText.CutToken());
+            break;
+        case nF_fin_AtTag:
+            io_rText.CutToken();
+            pNewToken = new Tok_AtTag( i_nTokenId - 100 );
+            break;
+        case nF_fin_Comma:
+            io_rText.CutToken();
+            pNewToken = new Tok_Comma;
+            break;
+        case nF_fin_EndSign:
+            io_rText.CutToken();
+            switch (i_nTokenId)
+            {
+                case nTok_MLDocuEnd:
+                    if (bIsMultiline)
+                    {
+                        pNewToken = new Tok_DocuEnd;
+                        pFollowUpContext = pParentContext;
+                    }
+                    else
+                    {
+                        pNewToken = new Tok_Word(io_rText.CutToken());
+                        pFollowUpContext = this;
+                    }
+                    break;
+                case nTok_EOL:
+                    if (bIsMultiline)
+                    {
+                        pNewToken = new Tok_EOL;
+                        pFollowUpContext = this;
+                    }
+                    else
+                    {
+                        pNewToken = new Tok_DocuEnd;
+                        pFollowUpContext = pParentContext;
+                    }
+                    pReceiver->Increment_CurLine();
+                    break;
+                default:
+                    csv_assert(false);
+            }
+            break;
+        case nF_goto_EoHtml:
+            pCx_EoHtml->SetIfIsStartOfParagraph(i_nTokenId == nTok_html_parastart);
+            break;
+        case nF_goto_EoXmlConst:
+            pCx_EoXmlConst->SetTokenId(i_nTokenId - 200);
+            break;
+        case nF_goto_EoXmlLink_BeginTag:
+            pCx_EoXmlLink_BeginTag->SetTokenId(i_nTokenId - 300);
+            break;
+        case nF_goto_EoXmlLink_EndTag:
+            pCx_EoXmlLink_EndTag->SetTokenId(i_nTokenId - 325);
+            break;
+        case nF_goto_EoXmlFormat_BeginTag:
+            pCx_EoXmlFormat_BeginTag->SetTokenId(i_nTokenId - 350);
+            break;
+        case nF_goto_EoXmlFormat_EndTag:
+            pCx_EoXmlFormat_EndTag->SetTokenId(i_nTokenId - 375);
+            break;
+        case nF_goto_CheckStar:
+            pCx_CheckStar->SetIsEnd( bIsMultiline );
+            break;
+        default:
+            csv_assert(false);
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_Docu::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 bas = 0;        // Base-Status
+    const INT16 wht = 1;        // Whitespace-overlook-Status
+    const INT16 awd = 2;        // Any-Word-Read-Status
+
+    // Kontextwechsel-Stati:
+    const INT16 goto_EoHtml = 3;
+    const INT16 goto_EoXmlConst = 4;
+    const INT16 goto_EoXmlLink_BeginTag = 5;
+    const INT16 goto_EoXmlLink_EndTag = 6;
+    const INT16 goto_EoXmlFormat_BeginTag = 7;
+    const INT16 goto_EoXmlFormat_EndTag = 8;
+    const INT16 goto_CheckStar = 9;
+
+    // Tokenfinish-Stati:
+    const INT16 finError = 10;
+//  const INT16 finIgnore = 11;
+    const INT16 finEof = 12;
+    const INT16 finAnyWord = 13;
+    const INT16 finAtTag = 14;
+    const INT16 finEndSign = 15;
+//  const INT16 finComma = 16;
+    const INT16 finWhite = 17;
+
+    // Konstanten zur Benutzung in der Tabelle:
+    const INT16 ght = goto_EoHtml;
+/*
+    const INT16 gxc = goto_EoXmlConst;
+    const INT16 glb = goto_EoXmlLink_TagBegin;
+    const INT16 gle = goto_EoXmlLink_TagEnd;
+    const INT16 gfb = goto_EoXmlFormat_TagBegin;
+    const INT16 gfe = goto_EoXmlFormat_TagEnd;
+*/
+    const INT16 err = finError;
+    const INT16 faw = finAnyWord;
+//  const INT16 fig = finIgnore;
+//  const INT16 fes = finEndSign;
+    const INT16 fof = finEof;
+//  const INT16 fat = finAtTag;
+    const INT16 fwh = finWhite;
+
+    /// The '0's  will be replaced by calls of AddToken().
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,awd,awd,awd,awd,awd,awd,awd,awd,awd,  0,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,  0,awd,awd,awd, // ... 63
+       0,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+  //   0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fwh,wht,wht,fwh,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 63
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 95
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh  // ... 127
+    };
+
+    const INT16 A_nWordStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd, // ... 63
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nAtTagDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,faw,awd,awd,awd, // ... 63
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nHtmlDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {ght,err,err,err,err,err,err,err,err,ght,ght,ght,ght,ght,err,err,
+     err,err,err,err,err,err,err,err,err,err,ght,err,err,err,err,err, // ... 31
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght, // ... 63
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght, // ... 95
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght  // ... 127
+    };
+
+    const INT16 A_nPunctDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err  // 112 ...
+    };
+
+    DYN StmArrayStatu2 * dpStatusTop
+            = new StmArrayStatu2( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusWhite
+            = new StmArrayStatu2( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusWord
+            = new StmArrayStatu2( C_nStatusSize, A_nWordStatus, 0, true);
+
+    DYN StmBoundsStatu2 *   dpBst_goto_EoHtml
+            = new StmBoundsStatu2( *this, *pCx_EoHtml, nF_goto_EoHtml, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlConst
+            = new StmBoundsStatu2( *this, *pCx_EoXmlConst, nF_goto_EoXmlConst, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlLink_BeginTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlLink_EndTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlFormat_BeginTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlFormat_EndTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_CheckStar
+            = new StmBoundsStatu2( *this, *pCx_CheckStar, nF_goto_CheckStar, true );
+
+
+    DYN StmBoundsStatu2 *   dpBst_finError
+            = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true );
+    DYN StmBoundsStatu2 *   dpBst_finIgnore
+            = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true);
+    DYN StmBoundsStatu2 *   dpBst_finEof
+            = new StmBoundsStatu2(  *this, TkpContext_Null2_(), nF_fin_Eof, false);
+    DYN StmBoundsStatu2 *   dpBst_finAnyWord
+            = new StmBoundsStatu2( *this, *this, nF_fin_AnyWord, true);
+    DYN StmBoundsStatu2 *   dpBst_finAtTag
+            = new StmBoundsStatu2( *this, *this, nF_fin_AtTag, false);
+    DYN StmBoundsStatu2 *   dpBst_finEndSign
+            = new StmBoundsStatu2( *this, *pParentContext, nF_fin_EndSign, false);
+    DYN StmBoundsStatu2 *   dpBst_fin_Comma
+            = new StmBoundsStatu2( *this, *this, nF_fin_Comma, false );
+    DYN StmBoundsStatu2 *   dpBst_finWhite
+            = new StmBoundsStatu2( *this, *this, nF_fin_White, false);
+
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusWord);
+
+    aStateMachine.AddStatus(dpBst_goto_EoHtml);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlConst);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlLink_BeginTag);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlLink_EndTag);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlFormat_BeginTag);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlFormat_EndTag);
+    aStateMachine.AddStatus(dpBst_goto_CheckStar);
+
+    aStateMachine.AddStatus(dpBst_finError);
+    aStateMachine.AddStatus(dpBst_finIgnore);
+    aStateMachine.AddStatus(dpBst_finEof);
+    aStateMachine.AddStatus(dpBst_finAnyWord);
+    aStateMachine.AddStatus(dpBst_finAtTag);
+    aStateMachine.AddStatus(dpBst_finEndSign);
+    aStateMachine.AddStatus(dpBst_fin_Comma);
+    aStateMachine.AddStatus(dpBst_finWhite);
+
+
+    aStateMachine.AddToken( "@author",  nTok_at_author,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@param",   nTok_at_param,       A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@throws",  nTok_at_throws,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@see",     nTok_at_see,         A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@since",   nTok_at_since,       A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@example", nTok_at_example,     A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@return",  nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@returns", nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@deprecated",
+                                        nTok_at_deprecated,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@suspicious",
+                                        nTok_at_suspicious,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@missing", nTok_at_missing,     A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@incomplete",
+                                        nTok_at_incomplete,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@version", nTok_at_version,     A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@guarantees",
+                                        nTok_at_guarantees,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@exception",
+                                        nTok_at_exception,   A_nAtTagDefStatus, finAtTag );
+
+    aStateMachine.AddToken( "<",        0,                   A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "*",        0,                   A_nPunctDefStatus, goto_CheckStar );
+//  aStateMachine.AddToken( ",",        0,                   A_nPunctDefStatus, finComma );
+
+    aStateMachine.AddToken( "<type",    nTok_link_typeB,     A_nHtmlDefStatus,  goto_EoXmlLink_BeginTag );
+    aStateMachine.AddToken( "</type",   nTok_link_typeE,     A_nHtmlDefStatus,  goto_EoXmlLink_EndTag );
+    aStateMachine.AddToken( "<member",  nTok_link_memberB,   A_nHtmlDefStatus,  goto_EoXmlLink_BeginTag );
+    aStateMachine.AddToken( "</member", nTok_link_membeE,    A_nHtmlDefStatus,  goto_EoXmlLink_EndTag );
+    aStateMachine.AddToken( "<const",   nTok_link_constB,    A_nHtmlDefStatus,  goto_EoXmlLink_BeginTag );
+    aStateMachine.AddToken( "</const",  nTok_link_constE,    A_nHtmlDefStatus,  goto_EoXmlLink_EndTag );
+
+    aStateMachine.AddToken( "<listing", nTok_format_listingB,A_nHtmlDefStatus,  goto_EoXmlFormat_BeginTag );
+    aStateMachine.AddToken( "</listing",nTok_format_listingE,A_nHtmlDefStatus,  goto_EoXmlFormat_EndTag );
+    aStateMachine.AddToken( "<code",    nTok_format_codeB,   A_nHtmlDefStatus,  goto_EoXmlFormat_BeginTag  );
+    aStateMachine.AddToken( "</code",   nTok_format_codeE,   A_nHtmlDefStatus,  goto_EoXmlFormat_EndTag );
+    aStateMachine.AddToken( "<atom",    nTok_format_atomB,   A_nHtmlDefStatus,  goto_EoXmlFormat_BeginTag  );
+    aStateMachine.AddToken( "</atom",   nTok_format_atomE,   A_nHtmlDefStatus,  goto_EoXmlFormat_EndTag );
+
+    aStateMachine.AddToken( "<TRUE/",   nTok_const_TRUE,     A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<true/",   nTok_const_TRUE,     A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<FALSE/",  nTok_const_FALSE,    A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<false/",  nTok_const_FALSE,    A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<NULL/",   nTok_const_NULL,     A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<void/",   nTok_const_void,     A_nHtmlDefStatus,  goto_EoXmlConst );
+
+    aStateMachine.AddToken( "<p",       nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<pre",     nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<dl",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<ul",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<ol",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<table",   nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<P",       nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<PRE",     nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<DL",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<UL",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<OL",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<TABLE",   nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+
+    aStateMachine.AddToken( "\r\n",     nTok_EOL,            A_nPunctDefStatus, finEndSign );
+    aStateMachine.AddToken( "\n",       nTok_EOL,            A_nPunctDefStatus, finEndSign );
+    aStateMachine.AddToken( "\r",       nTok_EOL,            A_nPunctDefStatus, finEndSign );
+};
+
+void
+Context_Docu::SetMode_IsMultiLine( bool i_bTrue )
+{
+    bIsMultiline = i_bTrue;
+}
+
+
+}   // namespace dsapi
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx
new file mode 100644
index 000000000000..084dbbf0660c
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/docu_pe2.cxx
@@ -0,0 +1,606 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/docu_pe2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary_i/d_token.hxx>
+#include <parser/parserinfo.hxx>
+#include <adc_cl.hxx>
+#include <adc_msg.hxx>
+#include <../parser/inc/x_docu.hxx>
+#include <s2_dsapi/dsapitok.hxx>
+#include <s2_dsapi/tk_atag2.hxx>
+#include <s2_dsapi/tk_html.hxx>
+#include <s2_dsapi/tk_docw2.hxx>
+#include <s2_dsapi/tk_xml.hxx>
+
+
+#ifdef UNX
+#define strnicmp strncasecmp
+#endif
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+const char *        AtTagTitle(
+                        const Tok_AtTag &   i_rToken );
+
+
+SapiDocu_PE::SapiDocu_PE(ParserInfo & io_rPositionInfo)
+    :   pDocu(0),
+        eState(e_none),
+        pPositionInfo(&io_rPositionInfo),
+        fCurTokenAddFunction(&SapiDocu_PE::AddDocuToken2Void),
+        pCurAtTag(0),
+        sCurDimAttribute(),
+        sCurAtSeeType_byXML(200)
+{
+}
+
+SapiDocu_PE::~SapiDocu_PE()
+{
+}
+
+void
+SapiDocu_PE::ProcessToken( DYN csi::dsapi::Token & let_drToken )
+{
+    if (IsComplete())
+    {
+        pDocu = 0;
+        eState = e_none;
+    }
+
+    if ( eState == e_none )
+    {
+        pDocu = new ary::doc::OldIdlDocu;
+        eState = st_short;
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Short;
+    }
+
+    csv_assert(pDocu);
+
+    let_drToken.Trigger(*this);
+    delete &let_drToken;
+}
+
+void
+SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken )
+{
+    if (NOT pCurAtTag)
+    {
+        eState = st_attags;
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+    }
+    else
+    {
+        csv_assert(eState == st_attags);
+        pDocu->AddAtTag(*pCurAtTag.Release());
+    }
+
+    if (i_rToken.Id() == Tok_AtTag::param)
+    {
+        pCurAtTag = new DT_ParameterAtTag;
+        fCurTokenAddFunction = &SapiDocu_PE::SetCurParameterAtTagName;
+    }
+    else if (i_rToken.Id() == Tok_AtTag::see)
+    {
+        pCurAtTag = new DT_SeeAlsoAtTag;
+        fCurTokenAddFunction = &SapiDocu_PE::SetCurSeeAlsoAtTagLinkText;
+    }
+    else if (i_rToken.Id() == Tok_AtTag::deprecated)
+    {
+        pDocu->SetDeprecated();
+        pCurAtTag = new DT_StdAtTag("");    // Dummy that will not be used.
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Deprecated;
+    }
+    else if (i_rToken.Id() == Tok_AtTag::since)
+    {
+        pCurAtTag = new DT_SinceAtTag;
+        fCurTokenAddFunction = &SapiDocu_PE::SetCurSinceAtTagVersion;
+    }
+    else
+    {
+        pCurAtTag = new DT_StdAtTag( AtTagTitle(i_rToken) );
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+    }
+}
+
+void
+SapiDocu_PE::Process_HtmlTag( const Tok_HtmlTag & i_rToken )
+{
+    if (eState == st_short AND i_rToken.IsParagraphStarter())
+    {
+        eState = st_description;
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Description;
+    }
+
+    // Workaround special for some errors in API docu:
+    if ( strnicmp("<true",i_rToken.Text(),5 ) == 0 )
+    {
+        if ( strcmp("<TRUE/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>true</b>") );
+        return;
+    }
+    else if ( strnicmp("<false",i_rToken.Text(),6 ) == 0 )
+    {
+        if ( strcmp("<FALSE/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>false</b>") );
+        return;
+    }
+    else if ( strnicmp("<NULL",i_rToken.Text(),5 ) == 0 )
+    {
+        if ( strcmp("<NULL/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>null</b>") );
+        return;
+    }
+    else if ( strnicmp("<void",i_rToken.Text(),5 ) == 0 )
+    {
+        if ( strcmp("<void/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>void</b>") );
+        return;
+    }
+
+    (this->*fCurTokenAddFunction)( *new DT_Style(i_rToken.Text(),false) );
+}
+
+void
+SapiDocu_PE::Process_XmlConst( const Tok_XmlConst & i_rToken )
+{
+    (this->*fCurTokenAddFunction)(*new DT_MupConst(i_rToken.Text()));
+}
+
+void
+SapiDocu_PE::Process_XmlLink_BeginTag( const Tok_XmlLink_BeginTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlLink_Tag::e_const:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<b>",false));
+            break;
+        case Tok_XmlLink_Tag::member:
+            (this->*fCurTokenAddFunction)(*new DT_MupMember(i_rToken.Scope()));
+            break;
+        case Tok_XmlLink_Tag::type:
+            (this->*fCurTokenAddFunction)(*new DT_MupType(i_rToken.Scope()));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+
+    if ( i_rToken.Dim().length() > 0 )
+        sCurDimAttribute = i_rToken.Dim();
+    else
+        sCurDimAttribute.clear();
+}
+
+void
+SapiDocu_PE::Process_XmlLink_EndTag( const Tok_XmlLink_EndTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlLink_Tag::e_const:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</b>",false));
+            break;
+        case Tok_XmlLink_Tag::member:
+            (this->*fCurTokenAddFunction)(*new DT_MupMember(true));
+            break;
+        case Tok_XmlLink_Tag::type:
+            (this->*fCurTokenAddFunction)(*new DT_MupType(true));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+    if ( sCurDimAttribute.length() > 0 )
+    {
+        (this->*fCurTokenAddFunction)( *new DT_TextToken(sCurDimAttribute.c_str()) );
+        sCurDimAttribute.clear();
+    }
+}
+
+void
+SapiDocu_PE::Process_XmlFormat_BeginTag( const Tok_XmlFormat_BeginTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlFormat_Tag::code:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<code>",false));
+            break;
+        case Tok_XmlFormat_Tag::listing:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<pre>",true));
+            break;
+        case Tok_XmlFormat_Tag::atom:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<code>",true));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+    if ( i_rToken.Dim().length() > 0 )
+        sCurDimAttribute = i_rToken.Dim();
+    else
+        sCurDimAttribute.clear();
+}
+
+void
+SapiDocu_PE::Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlFormat_Tag::code:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</code>",false));
+            break;
+        case Tok_XmlFormat_Tag::listing:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</pre>",true));
+            break;
+        case Tok_XmlFormat_Tag::atom:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</code>",true));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+    if ( sCurDimAttribute.length() > 0 )
+    {
+        (this->*fCurTokenAddFunction)( *new DT_TextToken(sCurDimAttribute.c_str()) );
+        sCurDimAttribute.clear();
+    }
+}
+
+void
+SapiDocu_PE::Process_Word( const Tok_Word & i_rToken )
+{
+    (this->*fCurTokenAddFunction)(*new DT_TextToken(i_rToken.Text()));
+}
+
+void
+SapiDocu_PE::Process_Comma()
+{
+    csv_assert(1==7);
+//  (this->*fCurTokenAddFunction)(*new DT_Comma(i_rToken.Text()));
+}
+
+void
+SapiDocu_PE::Process_DocuEnd()
+{
+    eState = st_complete;
+    if (pCurAtTag)
+        pDocu->AddAtTag(*pCurAtTag.Release());
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Void;
+}
+
+void
+SapiDocu_PE::Process_EOL()
+{
+    (this->*fCurTokenAddFunction)(*new DT_EOL);
+}
+
+void
+SapiDocu_PE::Process_White()
+{
+    (this->*fCurTokenAddFunction)(*new DT_White);
+}
+
+DYN ary::doc::OldIdlDocu *
+SapiDocu_PE::ReleaseJustParsedDocu()
+{
+    if (IsComplete())
+    {
+        eState = e_none;
+        return pDocu.Release();
+    }
+    return 0;
+}
+
+
+bool
+SapiDocu_PE::IsComplete() const
+{
+    return eState == st_complete;
+}
+
+void
+SapiDocu_PE::AddDocuToken2Void( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    delete &let_drNewToken;
+}
+
+void
+SapiDocu_PE::AddDocuToken2Short( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pDocu);
+    pDocu->AddToken2Short(let_drNewToken);
+}
+
+void
+SapiDocu_PE::AddDocuToken2Description( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pDocu);
+    pDocu->AddToken2Description(let_drNewToken);
+}
+
+void
+SapiDocu_PE::AddDocuToken2Deprecated( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pDocu);
+    pDocu->AddToken2DeprecatedText(let_drNewToken);
+}
+
+void
+SapiDocu_PE::AddDocuToken2CurAtTag( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+    pCurAtTag->AddToken(let_drNewToken);
+}
+
+void
+SapiDocu_PE::SetCurParameterAtTagName( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    csv_assert(pCurAtTag);
+    DT_TextToken * dpText = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (dpText != 0)
+        pCurAtTag->SetName(dpText->GetText());
+    else
+        pCurAtTag->SetName("parameter ?");
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+}
+
+void
+SapiDocu_PE::SetCurSeeAlsoAtTagLinkText( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    DT_TextToken * pText = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pText != 0)
+        pCurAtTag->SetName(pText->GetText());
+    else
+    {
+        DT_MupType *
+            pTypeBegin = dynamic_cast< DT_MupType* >(&let_drNewToken);
+        DT_MupMember *
+            pMemberBegin = dynamic_cast< DT_MupMember* >(&let_drNewToken);
+        if (pTypeBegin != 0 OR pMemberBegin != 0)
+        {
+            sCurAtSeeType_byXML.reset();
+
+            sCurAtSeeType_byXML
+                << ( pTypeBegin != 0
+                        ?   pTypeBegin->Scope()
+                        :   pMemberBegin->Scope() );
+
+            if (sCurAtSeeType_byXML.tellp() > 0)
+            {
+                sCurAtSeeType_byXML
+                    << "::";
+            }
+            delete &let_drNewToken;
+            fCurTokenAddFunction = &SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_2;
+            return;
+        }
+        else
+        {
+            pCurAtTag->SetName("? (no identifier found)");
+        }
+    }
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+}
+
+void
+SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_2( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    DT_TextToken *
+        pText = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pText != 0)
+    {
+        sCurAtSeeType_byXML
+            << pText->GetText();
+        pCurAtTag->SetName(sCurAtSeeType_byXML.c_str());
+    }
+    else
+    {
+        pCurAtTag->SetName("? (no identifier found)");
+    }
+    sCurAtSeeType_byXML.reset();
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_3;
+}
+
+void
+SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_3( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    /// Could emit warning, but don't because this parser is obsolete.
+//  Tok_XmlLink_BeginTag *
+//      pLinkEnd = dynamic_cast< Tok_XmlLink_EndTag* >(&let_drNewToken);
+//  if (pLinkEnd == 0)
+//  {
+//      warn_aboutMissingClosingTag();
+//  }
+
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+}
+
+
+
+void
+SapiDocu_PE::SetCurSinceAtTagVersion( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    DT_TextToken * pToken = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pToken == 0)
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    const String
+        sVersion(pToken->GetText());
+    const char
+        cFirst = *sVersion.begin();
+    const char
+        cCiphersend = '9' + 1;
+    const autodoc::CommandLine &
+        rCommandLine = autodoc::CommandLine::Get_();
+
+
+    if ( rCommandLine.DoesTransform_SinceTag())
+    {
+        // The @since version number shall be interpreted,
+
+        if ( NOT csv::in_range('0', cFirst, cCiphersend) )
+        {
+            // But this is a non-number-part, so we wait for
+            // the next one.
+            delete &let_drNewToken;
+            return;
+        }
+        else if (rCommandLine.DisplayOf_SinceTagValue(sVersion).empty())
+        {
+            // This is the numbered part, but we don't know it.
+            delete &let_drNewToken;
+
+            StreamLock
+                sl(200);
+            sl()
+                << "Since-value '"
+                << sVersion
+                << "' not found in translation table.";
+            throw X_Docu("since", sl().c_str());
+        }
+    }
+
+    // Either since tags are not specially interpreted, or
+    // we got a known one.
+    pCurAtTag->AddToken(let_drNewToken);
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2SinceAtTag;
+}
+
+void
+SapiDocu_PE::AddDocuToken2SinceAtTag( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+    String &
+        sValue = pCurAtTag->Access_Text().Access_TextOfFirstToken();
+    StreamLock
+        sHelp(1000);
+
+    DT_TextToken *
+        pToken = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pToken != 0)
+    {
+        sValue = sHelp() << sValue << pToken->GetText() << c_str;
+    }
+    else if (dynamic_cast< DT_White* >(&let_drNewToken) != 0)
+    {
+        sValue = sHelp() << sValue << " " << c_str;
+    }
+      delete &let_drNewToken;
+}
+
+const char *
+AtTagTitle( const Tok_AtTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_AtTag::author:     return "";
+        case Tok_AtTag::see:        return "See also";
+        case Tok_AtTag::param:      return "Parameters";
+        case Tok_AtTag::e_return:   return "Returns";
+        case Tok_AtTag::e_throw:    return "Throws";
+        case Tok_AtTag::example:    return "Example";
+        case Tok_AtTag::deprecated: return "Deprecated";
+        case Tok_AtTag::suspicious: return "";
+        case Tok_AtTag::missing:    return "";
+        case Tok_AtTag::incomplete: return "";
+        case Tok_AtTag::version:    return "";
+        case Tok_AtTag::guarantees: return "Guarantees";
+        case Tok_AtTag::exception:  return "Exception";
+        case Tok_AtTag::since:      return "Since version";
+        default:
+            //  See below.
+            ;
+    }
+    return i_rToken.Text();
+}
+
+
+
+}   // namespace dsapi
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idoc/makefile.mk b/autodoc/source/parser_i/idoc/makefile.mk
new file mode 100644
index 000000000000..c4e760bd2973
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser2_s2_dsapi
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/cx_docu2.obj	\
+    $(OBJ)$/cx_dsapi.obj	\
+    $(OBJ)$/docu_pe2.obj	\
+    $(OBJ)$/tk_atag2.obj  	\
+    $(OBJ)$/tk_docw2.obj   	\
+    $(OBJ)$/tk_html.obj   	\
+    $(OBJ)$/tk_xml.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser_i/idoc/tk_atag2.cxx b/autodoc/source/parser_i/idoc/tk_atag2.cxx
new file mode 100644
index 000000000000..5454e31ad839
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_atag2.cxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/tk_atag2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+
+
+using csi::dsapi::Tok_AtTag;
+
+lux::EnumValueMap   G_aTokAtTag_EV_TokenId_Values;
+Tok_AtTag::EV_TokenId ev_none2(Tok_AtTag::e_none,"");
+Tok_AtTag::EV_TokenId ev_author(Tok_AtTag::author,"@author");
+Tok_AtTag::EV_TokenId ev_see(Tok_AtTag::see,"@see");
+Tok_AtTag::EV_TokenId ev_param(Tok_AtTag::param,"@param");
+Tok_AtTag::EV_TokenId ev_e_return(Tok_AtTag::e_return,"@return");
+Tok_AtTag::EV_TokenId ev_e_throw(Tok_AtTag::e_throw,"@throws");
+Tok_AtTag::EV_TokenId ev_example(Tok_AtTag::example,"@example");
+Tok_AtTag::EV_TokenId ev_deprecated(Tok_AtTag::deprecated,"@deprecated");
+Tok_AtTag::EV_TokenId ev_suspicious(Tok_AtTag::suspicious,"@suspicious");
+Tok_AtTag::EV_TokenId ev_missing(Tok_AtTag::missing,"@missing");
+Tok_AtTag::EV_TokenId ev_incomplete(Tok_AtTag::incomplete,"@incomplete");
+Tok_AtTag::EV_TokenId ev_version(Tok_AtTag::version,"@version");
+Tok_AtTag::EV_TokenId ev_guarantees(Tok_AtTag::guarantees,"@guarantees");
+Tok_AtTag::EV_TokenId ev_exception(Tok_AtTag::exception,"@exception");
+Tok_AtTag::EV_TokenId ev_since(Tok_AtTag::since,"@since");
+
+
+namespace lux
+{
+template<> EnumValueMap &
+Tok_AtTag::EV_TokenId::Values_()    { return G_aTokAtTag_EV_TokenId_Values; }
+}
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_AtTag::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_AtTag(*this);
+}
+
+const char *
+Tok_AtTag::Text() const
+{
+    return eTag.Text();
+}
+
+}   // namespace dsapi
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idoc/tk_docw2.cxx b/autodoc/source/parser_i/idoc/tk_docw2.cxx
new file mode 100644
index 000000000000..56e0a935ac38
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_docw2.cxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/tk_docw2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_Word::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Word(*this);
+}
+
+const char *
+Tok_Word::Text() const
+{
+    return sText;
+}
+
+void
+Tok_Comma::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Comma();
+}
+
+const char *
+Tok_Comma::Text() const
+{
+    return ",";
+}
+
+void
+Tok_DocuEnd::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_DocuEnd();
+}
+
+const char *
+Tok_DocuEnd::Text() const
+{
+    return "*/";
+}
+
+void
+Tok_EOL::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_EOL();
+}
+
+const char *
+Tok_EOL::Text() const
+{
+    return "\r\n";
+}
+
+void
+Tok_EOF::Trigger( TokenInterpreter & ) const
+{
+    csv_assert(false);
+}
+
+const char *
+Tok_EOF::Text() const
+{
+    return "";
+}
+
+void
+Tok_White::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_White();
+}
+
+const char *
+Tok_White::Text() const
+{
+    return " ";
+}
+
+
+
+
+}   // namespace dsapi
+}   // namespace csi
+
diff --git a/autodoc/source/parser_i/idoc/tk_html.cxx b/autodoc/source/parser_i/idoc/tk_html.cxx
new file mode 100644
index 000000000000..bfb44a3789e8
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_html.cxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/tk_html.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_HtmlTag::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_HtmlTag(*this);
+}
+
+const char *
+Tok_HtmlTag::Text() const
+{
+    return sTag;
+}
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
diff --git a/autodoc/source/parser_i/idoc/tk_xml.cxx b/autodoc/source/parser_i/idoc/tk_xml.cxx
new file mode 100644
index 000000000000..9626fdb330ed
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_xml.cxx
@@ -0,0 +1,174 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/tk_xml.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+using csi::dsapi::Tok_XmlConst;
+using csi::dsapi::Tok_XmlLink_Tag;
+using csi::dsapi::Tok_XmlFormat_Tag;
+
+
+lux::EnumValueMap           G_aTok_XmlConst_EV_TokenId_Values;
+Tok_XmlConst::EV_TokenId    ev_consts_none(Tok_XmlConst::e_none,"");
+Tok_XmlConst::EV_TokenId    ev_e_true(Tok_XmlConst::e_true,"true");
+Tok_XmlConst::EV_TokenId    ev_e_false(Tok_XmlConst::e_false,"false");
+Tok_XmlConst::EV_TokenId    ev_e_null(Tok_XmlConst::e_null,"NULL");
+Tok_XmlConst::EV_TokenId    ev_e_void(Tok_XmlConst::e_void,"void");
+
+lux::EnumValueMap           G_aTok_XmlLink_Tag_EV_TokenId_Values;
+Tok_XmlLink_Tag::EV_TokenId ev_linktags_none(Tok_XmlLink_Tag::e_none,"");
+Tok_XmlLink_Tag::EV_TokenId ev_e_const(Tok_XmlLink_Tag::e_const,"const");
+Tok_XmlLink_Tag::EV_TokenId ev_member(Tok_XmlLink_Tag::member,"member");
+Tok_XmlLink_Tag::EV_TokenId ev_type(Tok_XmlLink_Tag::type,"type");
+
+lux::EnumValueMap               G_aTok_XmlFormat_Tag_EV_TokenId_Values;
+Tok_XmlFormat_Tag::EV_TokenId   ev_formattags_none(Tok_XmlFormat_Tag::e_none,"");
+Tok_XmlFormat_Tag::EV_TokenId   ev_code(Tok_XmlFormat_Tag::code,"code");
+Tok_XmlFormat_Tag::EV_TokenId   ev_listing(Tok_XmlFormat_Tag::listing,"listing");
+Tok_XmlFormat_Tag::EV_TokenId   ev_atom(Tok_XmlFormat_Tag::atom,"code");
+
+
+namespace lux
+{
+
+template<> EnumValueMap &
+Tok_XmlConst::EV_TokenId::Values_()         { return G_aTok_XmlConst_EV_TokenId_Values; }
+template<> EnumValueMap &
+Tok_XmlLink_Tag::EV_TokenId::Values_()      { return G_aTok_XmlLink_Tag_EV_TokenId_Values; }
+template<> EnumValueMap &
+Tok_XmlFormat_Tag::EV_TokenId::Values_()    { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; }
+
+}   // namespace lux
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_XmlConst::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlConst(*this);
+}
+
+const char *
+Tok_XmlConst::Text() const
+{
+    return eTag.Text();
+}
+
+void
+Tok_XmlLink_BeginTag::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlLink_BeginTag(*this);
+}
+
+const char *
+Tok_XmlLink_BeginTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    if (sScope.length() > 0)
+    {
+        ret << "<"
+            << eTag.Text()
+            << " scope=\""
+            << sScope
+            << "\">";
+    }
+    else
+    {
+        ret << "<"
+            << eTag.Text()
+            << ">";
+    }
+    return ret.c_str();
+}
+
+void
+Tok_XmlLink_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlLink_EndTag(*this);
+}
+
+const char *
+Tok_XmlLink_EndTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    ret << "</"
+        << eTag.Text()
+        << ">";
+    return ret.c_str();
+}
+
+void
+Tok_XmlFormat_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlFormat_BeginTag(*this);
+}
+
+const char *
+Tok_XmlFormat_BeginTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    ret << "<"
+        << eTag.Text()
+        << ">";
+    return ret.c_str();
+}
+
+void
+Tok_XmlFormat_EndTag::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlFormat_EndTag(*this);
+}
+
+const char *
+Tok_XmlFormat_EndTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    ret << "</"
+        << eTag.Text()
+        << ">";
+    return ret.c_str();
+}
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx
new file mode 100644
index 000000000000..e344ffca62e6
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx
@@ -0,0 +1,233 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DSAPI_CX_DOCU2_HXX
+#define DSAPI_CX_DOCU2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <s2_dsapi/tk_xml.hxx>
+
+namespace csi
+{
+namespace dsapi
+{
+
+class Token_Receiver;
+
+
+/**
+@descr
+*/
+
+class Cx_Base : public ::TkpContext
+{
+  public:
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+  protected:
+    // LIFECYCLE
+                        Cx_Base(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   rReceiver(o_rReceiver),
+                                                    pFollowUpContext(&i_rFollowUpContext)
+                                                    // pNewToken
+                                                { }
+  protected:
+    void                SetToken(
+                            DYN Token *         let_dpToken )
+                                                { pNewToken = let_dpToken; }
+    void                Handle_DocuSyntaxError(
+                            CharacterSource &   io_rText );
+
+  private:
+    // DATA
+    Token_Receiver &    rReceiver;
+    TkpContext *        pFollowUpContext;
+    Dyn<Token>          pNewToken;
+};
+
+
+class Cx_EoHtml : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoHtml(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetIfIsStartOfParagraph(
+                            bool                i_bNextTokenProperty )
+                                                { bToken_IsStartOfParagraph = i_bNextTokenProperty; }
+
+  private:
+    bool                bToken_IsStartOfParagraph;
+};
+
+class Cx_EoXmlConst : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlConst(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            lux::Enum< Tok_XmlConst::E_TokenId >
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    Tok_XmlConst::EV_TokenId
+                        eTokenId;
+};
+
+class Cx_EoXmlLink_BeginTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlLink_BeginTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            Tok_XmlLink_BeginTag::EV_TokenId
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    Tok_XmlLink_BeginTag::EV_TokenId
+                        eTokenId;
+};
+
+class Cx_EoXmlLink_EndTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlLink_EndTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            Tok_XmlLink_EndTag::EV_TokenId
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    Tok_XmlLink_EndTag::E_TokenId
+                        eTokenId;
+};
+
+class Cx_EoXmlFormat_BeginTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlFormat_BeginTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId >
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId >
+                        eTokenId;
+};
+
+class Cx_EoXmlFormat_EndTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlFormat_EndTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            lux::Enum< Tok_XmlFormat_EndTag::E_TokenId >
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    lux::Enum< Tok_XmlFormat_EndTag::E_TokenId >
+                        eTokenId;
+};
+
+class Cx_CheckStar : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_CheckStar(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext),
+                                                    bIsEnd(false), bEndTokenFound(false)
+                                                 { }
+    void                Set_End_FolloUpContext(
+                            TkpContext &        i_rEnd_FollowUpContext )
+                                                { pEnd_FollowUpContext = &i_rEnd_FollowUpContext; }
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetIsEnd(
+                            bool                i_bIsEnd  )
+                                                { bIsEnd = i_bIsEnd; }
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    TkpContext *        pEnd_FollowUpContext;
+    bool                bIsEnd;
+    bool                bEndTokenFound;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx
new file mode 100644
index 000000000000..567a7362f5a7
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_CX_DSAPI_HXX
+#define ADC_CX_DSAPI_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+#include <cosv/tpl/dyn.hxx>
+#include <tokens/tkpstam2.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+class Token_Receiver;
+class Token;
+
+class Cx_EoHtml;
+class Cx_EoXmlConst;
+class Cx_EoXmlLink_BeginTag;
+class Cx_EoXmlLink_EndTag;
+class Cx_EoXmlFormat_BeginTag;
+class Cx_EoXmlFormat_EndTag;
+class Cx_CheckStar;
+
+/**
+@descr
+*/
+class Context_Docu : public TkpDocuContext,
+                     private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_Docu(
+                            Token_Receiver &    o_rReceiver );
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken );
+
+                        ~Context_Docu();
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+
+    virtual bool        PassNewToken();
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue );
+
+    //  INQUIRY
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    //  SERVICE FUNCTIONS
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            UINT16              i_nTokenId,
+                            CharacterSource &   io_rText );
+
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachin2        aStateMachine;
+    Token_Receiver *    pReceiver;
+
+        // Contexts
+    TkpContext *        pParentContext;
+    String              sMultiLineEndToken;
+
+    Dyn<Cx_EoHtml>      pCx_EoHtml;
+    Dyn<Cx_EoXmlConst>  pCx_EoXmlConst;
+    Dyn<Cx_EoXmlLink_BeginTag>
+                        pCx_EoXmlLink_BeginTag;
+    Dyn<Cx_EoXmlLink_EndTag>
+                        pCx_EoXmlLink_EndTag;
+    Dyn<Cx_EoXmlFormat_BeginTag>
+                        pCx_EoXmlFormat_BeginTag;
+    Dyn<Cx_EoXmlFormat_EndTag>
+                        pCx_EoXmlFormat_EndTag;
+    Dyn<Cx_CheckStar>   pCx_CheckStar;
+
+        // Temporary data, used during ReadCharChain()
+    Dyn<Token>          pNewToken;
+    ::TkpContext *      pFollowUpContext;
+    bool                bIsMultiline;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx
new file mode 100644
index 000000000000..2d1757bbb308
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx
@@ -0,0 +1,174 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DSAPI_DOCU_PE2_HXX
+#define ADC_DSAPI_DOCU_PE2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/tokintpr.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+class ParserInfo;
+
+namespace ary
+{
+namespace doc
+{
+    class OldIdlDocu;
+}
+
+namespace inf
+{
+    class DocuToken;
+}   // namespace info
+}   // namespace ary
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Token;
+class DT_AtTag;
+
+class SapiDocu_PE : public TokenInterpreter
+{
+  public:
+                        SapiDocu_PE(
+                            ParserInfo &        io_rPositionInfo );
+                        ~SapiDocu_PE();
+
+    void                ProcessToken(
+                            DYN csi::dsapi::Token &
+                                                let_drToken );
+
+    virtual void        Process_AtTag(
+                            const Tok_AtTag &   i_rToken );
+    virtual void        Process_HtmlTag(
+                            const Tok_HtmlTag & i_rToken );
+    virtual void        Process_XmlConst(
+                            const Tok_XmlConst &
+                                                i_rToken );
+    virtual void        Process_XmlLink_BeginTag(
+                            const Tok_XmlLink_BeginTag &
+                                                i_rToken );
+    virtual void        Process_XmlLink_EndTag(
+                            const Tok_XmlLink_EndTag &
+                                                i_rToken );
+    virtual void        Process_XmlFormat_BeginTag(
+                            const Tok_XmlFormat_BeginTag &
+                                                i_rToken );
+    virtual void        Process_XmlFormat_EndTag(
+                            const Tok_XmlFormat_EndTag &
+                                                i_rToken );
+    virtual void        Process_Word(
+                            const Tok_Word &    i_rToken );
+    virtual void        Process_Comma();
+    virtual void        Process_DocuEnd();
+    virtual void        Process_EOL();
+    virtual void        Process_White();
+
+
+    DYN ary::doc::OldIdlDocu *
+                            ReleaseJustParsedDocu();
+
+    bool                IsComplete() const;
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        st_short,
+        st_description,
+        st_attags,
+        st_complete
+    };
+
+    typedef void ( SapiDocu_PE::*F_TokenAdder )( DYN ary::inf::DocuToken & let_drNewToken );
+
+    void                AddDocuToken2Void(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2Short(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2Description(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2Deprecated(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2CurAtTag(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurParameterAtTagName(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSeeAlsoAtTagLinkText(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSeeAlsoAtTagLinkText_2(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSeeAlsoAtTagLinkText_3(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSinceAtTagVersion(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2SinceAtTag(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+
+    // DATA
+    Dyn<ary::doc::OldIdlDocu>
+                        pDocu;
+    E_State             eState;
+    ParserInfo *        pPositionInfo;
+    F_TokenAdder        fCurTokenAddFunction;
+
+    Dyn<DT_AtTag>       pCurAtTag;
+    String              sCurDimAttribute;
+    StreamStr           sCurAtSeeType_byXML;
+};
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+// IMPLEMENTATION
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx
new file mode 100644
index 000000000000..e4311cf90e24
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DSAPI_DSAPITOK_HXX
+#define DSAPI_DSAPITOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class TokenInterpreter;
+
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx
new file mode 100644
index 000000000000..c62f78f614fd
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DSAPI_TK_ATAG2_HXX
+#define DSAPI_TK_ATAG2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <luxenum.hxx>
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_AtTag : public Token
+{
+  public:
+    // TYPE
+    enum E_TokenId
+    {
+        e_none = 0,
+        author =  1,
+        see = 2,
+        param = 3,
+        e_return = 4,
+        e_throw = 5,
+        example = 6,
+        deprecated = 7,
+        suspicious = 8,
+        missing = 9,
+        incomplete = 10,
+        version = 11,
+        guarantees = 12,
+        exception = 13,
+        since = 14
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+    // Spring and Fall
+                        Tok_AtTag(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    EV_TokenId          eTag;
+};
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx
new file mode 100644
index 000000000000..769ec51a3f90
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DSAPI_TK_DOCW2_HXX
+#define DSAPI_TK_DOCW2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_Word : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_Word(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+
+  private:
+    // DATA
+    String              sText;
+};
+
+class Tok_Comma : public Token
+{
+  public:
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_DocuEnd : public Token
+{
+  public:
+    // Spring and Fall
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_EOL : public Token
+{
+  public:
+    // Spring and Fall
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_EOF : public Token
+{
+  public:
+    // Spring and Fall
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_White : public Token
+{
+  public:
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx
new file mode 100644
index 000000000000..687a117d3b88
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DSAPI_TK_HTML_HXX
+#define DSAPI_TK_HTML_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_HtmlTag : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_HtmlTag(
+                            const char *        i_sTag,
+                            bool                i_bIsParagraphStarter )
+                                                :   sTag(i_sTag),
+                                                    bIsParagraphStarter(i_bIsParagraphStarter)
+                                                {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    bool                IsParagraphStarter() const
+                                                { return bIsParagraphStarter; }
+
+  private:
+    String              sTag;
+    bool                bIsParagraphStarter;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx
new file mode 100644
index 000000000000..08002ce9e1ad
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx
@@ -0,0 +1,201 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DSAPI_TK_XML_HXX
+#define DSAPI_TK_XML_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <luxenum.hxx>
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_XmlTag : public Token
+{
+  public:
+};
+
+class Tok_XmlConst : public Tok_XmlTag
+{
+  public:
+    // TYPE
+    enum  E_TokenId
+    {
+        e_none = 0,
+        e_true = 1,
+        e_false = 2,
+        e_null = 3,
+        e_void = 4
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+    // Spring and Fall
+                        Tok_XmlConst(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class Tok_XmlLink_Tag : public Tok_XmlTag
+{
+  public:
+    // TYPE
+    enum E_TokenId
+    {
+        e_none = 0,
+        e_const = 1,
+        member = 2,
+        type = 3
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+};
+
+class Tok_XmlLink_BeginTag : public Tok_XmlLink_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlLink_BeginTag(
+                            EV_TokenId          i_eTag,
+                            const String  &     i_sScope,
+                            const String  &     i_sDim )
+                                                :   eTag(i_eTag),
+                                                    sScope(i_sScope),
+                                                    sDim(i_sDim) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+    const String  &     Scope() const           { return sScope; }
+    const String  &     Dim() const             { return sDim; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+    String              sScope;
+    String              sDim;
+};
+
+class Tok_XmlLink_EndTag : public Tok_XmlLink_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlLink_EndTag(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class Tok_XmlFormat_Tag : public Tok_XmlTag
+{
+  public:
+    // TYPE
+    enum E_TokenId
+    {
+        e_none = 0,
+        code = 1,
+        listing = 2,
+        atom = 3
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+};
+
+class Tok_XmlFormat_BeginTag : public Tok_XmlFormat_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlFormat_BeginTag(
+                            EV_TokenId          i_eTag,
+                            const String  &     i_sDim )
+                                                :   eTag(i_eTag),
+                                                    sDim(i_sDim) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+    const String  &     Dim() const             { return sDim; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+    String              sDim;
+};
+
+class Tok_XmlFormat_EndTag : public Tok_XmlFormat_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlFormat_EndTag(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx
new file mode 100644
index 000000000000..2132f2688f31
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx
@@ -0,0 +1,94 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DSAPI_TOKINTPR_HXX
+#define ADC_DSAPI_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_AtTag;
+class Tok_XmlConst;
+class Tok_XmlLink_BeginTag;
+class Tok_XmlLink_EndTag;
+class Tok_XmlFormat_BeginTag;
+class Tok_XmlFormat_EndTag;
+class Tok_Word;
+class Tok_HtmlTag;
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+    virtual void        Process_AtTag(
+                            const Tok_AtTag &   i_rToken ) = 0;
+    virtual void        Process_HtmlTag(
+                            const Tok_HtmlTag & i_rToken ) = 0;
+    virtual void        Process_XmlConst(
+                            const Tok_XmlConst &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlLink_BeginTag(
+                            const Tok_XmlLink_BeginTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlLink_EndTag(
+                            const Tok_XmlLink_EndTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlFormat_BeginTag(
+                            const Tok_XmlFormat_BeginTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlFormat_EndTag(
+                            const Tok_XmlFormat_EndTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_Word(
+                            const Tok_Word &    i_rToken ) = 0;
+    virtual void        Process_Comma() = 0;
+    virtual void        Process_DocuEnd() = 0;
+    virtual void        Process_EOL() = 0;
+    virtual void        Process_White() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx
new file mode 100644
index 000000000000..cf9a0e7daa51
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DSAPI_TOKRECV_HXX
+#define DSAPI_TOKRECV_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Token;
+/**
+@descr
+*/
+class Token_Receiver
+{
+  public:
+      virtual               ~Token_Receiver() {}
+    virtual void        Receive(
+                              DYN Token &           let_drToken ) = 0;
+    virtual void        Increment_CurLine() = 0;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx
new file mode 100644
index 000000000000..b1871cdc62d2
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_CX_IDLCO_HXX
+#define LUIDL_CX_IDLCO_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+#include <tokens/tkpstam2.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class Token_Receiver;
+class Token;
+
+/**
+*/
+class Context_UidlCode : public TkpContext,
+                         private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_UidlCode(
+                            Token_Receiver &    o_rReceiver,
+                            DYN TkpDocuContext &
+                                                let_drContext_Docu  );
+                        ~Context_UidlCode();
+    //  OPERATORS
+
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+
+    //  INQUIRY
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    //  SERVICE FUNCTIONS
+    void                PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            UINT16              i_nTokenId,
+                            CharacterSource &   io_rText );
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachin2        aStateMachine;
+    Token_Receiver *    pReceiver;
+
+        // Contexts
+    Dyn<TkpDocuContext> pDocuContext;
+
+    Dyn<TkpContext>    dpContext_MLComment;
+    Dyn<TkpContext>    dpContext_SLComment;
+    Dyn<TkpContext>    dpContext_Preprocessor;
+    Dyn<TkpContext>    dpContext_Assignment;
+
+        // Temporary data, used during ReadCharChain()
+    Dyn<Token>          pNewToken;
+    ::TkpContext *      pFollowUpContext;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx
new file mode 100644
index 000000000000..1c16b28a83c5
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_LUIDL_CX_SUB_HXX
+#define ADC_LUIDL_CX_SUB_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+#include "uidl_tok.hxx"
+
+namespace csi
+{
+namespace uidl
+{
+
+class Token_Receiver;
+class Token;
+
+
+class Cx_Base : public ::TkpContext
+{
+  public:
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+  protected:
+    // LIFECYCLE
+                        Cx_Base(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   rReceiver(o_rReceiver),
+                                                    pFollowUpContext(&i_rFollowUpContext),
+                                                    pNewToken()
+                                                    {}
+  protected:
+    void                SetToken(
+                            DYN Token *         let_dpToken )
+                                                { pNewToken = let_dpToken; }
+    Token_Receiver &    Receiver()              { return rReceiver; }
+
+  private:
+    // DATA
+    Token_Receiver &    rReceiver;
+    TkpContext *        pFollowUpContext;
+    Dyn<Token>          pNewToken;
+};
+
+
+
+/**
+@descr
+*/
+
+class Context_MLComment : public Cx_Base
+{
+  public:
+                        Context_MLComment(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_SLComment : public Cx_Base
+{
+  public:
+                        Context_SLComment(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_Praeprocessor : public Cx_Base
+{
+  public:
+                        Context_Praeprocessor(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_Assignment : public Cx_Base
+{
+  public:
+                        Context_Assignment(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx
new file mode 100644
index 000000000000..398cfa041ca0
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx
@@ -0,0 +1,272 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_DISTRIB_HXX
+#define LUIDL_DISTRIB_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tokrecv.hxx>
+#include <s2_dsapi/tokrecv.hxx>
+#include <s2_luidl/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParserInfo;
+
+namespace ary
+{
+    class Repository;
+
+namespace doc
+{
+    class OldIdlDocu;
+}   // namespace inf
+}   // namespace ary)
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+    class Token_Receiver;
+    class SapiDocu_PE;
+}
+
+
+
+namespace uidl
+{
+
+
+typedef std::vector< DYN Token * >  TokenQueue;
+typedef TokenQueue::iterator        TokenIterator;
+
+class TokenParser_Uidl;
+class UnoIDL_PE;
+class Token;
+
+
+class TokenDistributor : private TokenProcessing_Types
+
+{
+  public:
+                        TokenDistributor(
+                            ary::Repository &   io_rRepository,
+                            ParserInfo &            io_rParserInfo );
+    void                SetTokenProvider(
+                            TokenParser_Uidl &  io_rTokenSource );
+    void                SetTopParseEnvironment(
+                            UnoIDL_PE &         io_pTopParseEnvironment );
+                        ~TokenDistributor();
+
+
+    void                Reset()                 { aDocumentation.Reset(); }
+    /** calls pTokenSource->GetNextToken() and checks the incoming tokens, until a
+        usable token is found. This token will be forwarded to
+        pTopParseEnv;
+    */
+    void                TradeToken();
+
+    csi::uidl::Token_Receiver &
+                        CodeTokens_Receiver();
+    csi::dsapi::Token_Receiver &
+                        DocuTokens_Receiver();
+
+    /** Used from PE_File, if there is a docu to get without
+        an environment to push (this is the case for modules).
+    */
+    DYN ary::doc::OldIdlDocu *
+                        ReleaseLastParsedDocu()
+                            { return aDocumentation.ReleaseLastParsedDocu(); }
+
+    /** Used from PE_File, if the term "published" was parsed.
+        The next opened parse environment will be set to be published
+        (call ->UnoIDL_PE::SetPublished()).
+    */
+    void                Set_PublishedOn()
+                            { aProcessingData.Set_PublishedOn(); }
+
+
+  private:
+    class Documentation;
+    class ProcessingData;
+    friend class ProcessingData;
+
+    class  ProcessingData : public  csi::uidl::Token_Receiver,
+                            private TokenProcessing_Types
+    {
+      public:
+                            ProcessingData(
+                                ary::Repository &   io_rRepository,
+                                Documentation &         i_rDocuProcessor,
+                                ParserInfo &            io_rParserInfo );
+                            ~ProcessingData();
+        void                SetTopParseEnvironment(
+                                UnoIDL_PE &         io_pTopParseEnvironment );
+
+
+        /** is called from pTokenSource before finishing a ::TokenParse2::GetNextToken()
+            call and passes the just parsed token to this class.
+        */
+        virtual void        Receive(
+                                DYN csi::uidl::Token &
+                                                let_drToken );
+        virtual void        Increment_CurLine();
+
+        void                ProcessCurToken();
+
+        UnoIDL_PE &         CurEnvironment() const;
+        bool                NextTokenExists() const;
+        void                Set_PublishedOn()
+                                { bPublishedRecentlyOn = true; }
+
+      private:
+        typedef uintt   TokenQ_Position;
+        typedef std::pair< UnoIDL_PE *, TokenQ_Position >   EnvironmentInfo;
+        typedef std::vector< EnvironmentInfo >              EnvironmentStack;
+
+        void                AcknowledgeResult();
+        const csi::uidl::Token &
+                            CurToken() const;
+        UnoIDL_PE &         CurEnv() const;
+        UnoIDL_PE &         PushEnv() const;
+        uintt               CurTokenPosition() const;
+        uintt               CurEnv_TriedTokenPosition() const;
+        void                DecrementTryCount();
+
+        EnvironmentStack    aEnvironments;
+        TokenQueue          aTokenQueue;
+        TokenIterator       itCurToken;
+        TokenProcessing_Result
+                            aCurResult;
+        uintt               nTryCount;
+        bool                bFinished;
+        ary::Repository &
+                            rRepository;
+        ParserInfo &        rParserInfo;
+        Documentation *     pDocuProcessor;
+        bool                bPublishedRecentlyOn;
+    };
+
+    class Documentation : public csi::dsapi::Token_Receiver
+    {
+      public:
+                            Documentation(
+                                ParserInfo &    io_rParserInfo);
+                            ~Documentation();
+
+        void                Reset()             { bIsPassedFirstDocu = false; }
+
+        virtual void        Receive(
+                                DYN csi::dsapi::Token &
+                                                let_drToken );
+        virtual void        Increment_CurLine();
+        DYN ary::doc::OldIdlDocu *
+                            ReleaseLastParsedDocu()
+                                                { return pMostRecentDocu.Release(); }
+      private:
+        Dyn<csi::dsapi::SapiDocu_PE>
+                            pDocuParseEnv;
+        ParserInfo &        rParserInfo;
+        Dyn<ary::doc::OldIdlDocu>
+                            pMostRecentDocu;
+        bool                bIsPassedFirstDocu;
+    };
+
+    // DATA
+    TokenParser_Uidl *  pTokenSource;
+    Documentation       aDocumentation;
+    ProcessingData      aProcessingData;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+TokenDistributor::SetTokenProvider( TokenParser_Uidl &  io_rTokenSource )
+    { pTokenSource = &io_rTokenSource; }
+
+inline void
+TokenDistributor::SetTopParseEnvironment( UnoIDL_PE & io_pTopParseEnvironment )
+    { aProcessingData.SetTopParseEnvironment(io_pTopParseEnvironment); }
+
+inline csi::uidl::Token_Receiver &
+TokenDistributor::CodeTokens_Receiver()
+    { return aProcessingData; }
+
+inline csi::dsapi::Token_Receiver &
+TokenDistributor::DocuTokens_Receiver()
+    { return aDocumentation; }
+
+inline const csi::uidl::Token &
+TokenDistributor::ProcessingData::CurToken() const
+{
+    csv_assert( itCurToken != aTokenQueue.end() );
+    csv_assert( *itCurToken != 0 );
+    return *(*itCurToken);
+}
+
+inline UnoIDL_PE &
+TokenDistributor::ProcessingData::CurEnv() const
+{
+    csv_assert( aEnvironments.size() > 0 );
+    csv_assert( aEnvironments.back().first != 0 );
+    return *aEnvironments.back().first;
+}
+
+inline UnoIDL_PE &
+TokenDistributor::ProcessingData::PushEnv() const
+{
+    csv_assert( aCurResult.pEnv2Push != 0 );
+    return *aCurResult.pEnv2Push;
+}
+
+inline uintt
+TokenDistributor::ProcessingData::CurTokenPosition() const
+{
+    return itCurToken - aTokenQueue.begin();
+}
+
+inline uintt
+TokenDistributor::ProcessingData::CurEnv_TriedTokenPosition() const
+{
+    csv_assert( aEnvironments.size() > 0 );
+    return aEnvironments.back().second;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx
new file mode 100644
index 000000000000..129721f0b9ff
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PARSENV2_HXX
+#define LUIDL_PARSENV2_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tokproct.hxx>
+    // COMPONENTS
+#include <s2_luidl/semnode.hxx>
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/idl/i_module.hxx>
+
+
+
+class ParserInfo;
+
+namespace ary
+{
+    class QualifiedName;
+    class Repository;
+
+namespace doc
+{
+    class OldIdlDocu;
+}
+
+namespace idl
+{
+    class CodeEntity;
+}
+}
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Token;
+class SemanticNode;
+
+
+class UnoIDL_PE : virtual protected TokenProcessing_Types
+{
+  public:
+    virtual             ~UnoIDL_PE();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+//  virtual void        EstablishContacts(
+//                          UnoIDL_PE *         io_pParentPE,
+//                          ary::idl::Gate &
+//                                                io_rGate,
+//                          TokenProcessing_Result &
+//                                              o_rResult );
+    virtual void        Enter(
+                            E_EnvStackAction    i_eWayOfEntering );
+    virtual void        Leave(
+                            E_EnvStackAction    i_eWayOfLeaving );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken ) = 0;
+
+    void                SetDocu(
+                            DYN ary::doc::OldIdlDocu *
+                                                let_dpDocu );
+    void                SetPublished();
+    void                SetOptional();
+    void                PassDocuAt(
+                            ary::idl::CodeEntity &
+                                                io_rCe );
+
+    UnoIDL_PE *         Parent() const          { return aMyNode.Parent(); }
+
+    void                SetResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            UnoIDL_PE *         i_pParseEnv2Push = 0 )
+                                                { aMyNode.SetTokenResult( i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push ); }
+    virtual const ary::idl::Module &
+                        CurNamespace() const;
+    virtual const ParserInfo &
+                        ParseInfo() const;
+    ary::idl::Gate &    Gate() const            { return aMyNode.AryGate(); }
+    TokenProcessing_Result &
+                        TokenResult() const     { return aMyNode.TokenResult(); }
+    DYN ary::doc::OldIdlDocu *
+                        ReleaseDocu()           { return pDocu.Release(); }
+  protected:
+                        UnoIDL_PE();
+    ary::Repository &   MyRepository()          { csv_assert(pRepository != 0);
+                                                  return *pRepository;  }
+  private:
+    virtual void        InitData();
+    virtual void        TransferData() = 0;
+    virtual void        ReceiveData();
+
+    SemanticNode        aMyNode;
+    Dyn<ary::doc::OldIdlDocu>
+                        pDocu;
+    ary::Repository *   pRepository;
+};
+
+
+
+
+}   // namespace uidl
+}   // namespace csi
+#endif
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx
new file mode 100644
index 000000000000..069919562b2e
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx
@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_PE_ATTRI_HXX
+#define ADC_UIDL_PE_ATTRI_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <ary/idl/i_property.hxx>
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+namespace ary
+{
+     namespace idl
+    {
+         class Attribute;
+    }
+}
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Variable;
+class PE_Type;
+
+class PE_Attribute : public UnoIDL_PE,
+                     public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id                     Ce_id;
+    typedef ary::idl::Type_id                   Type_id;
+
+                        PE_Attribute(
+                            const Ce_id &       i_rCurOwner );
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Attribute();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Raises();
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none,
+        e_start,
+        in_variable,
+        expect_end,
+        in_raise_std,   /// before 'get', 'set', ';' or '}'
+        in_get,
+        in_set
+    };
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+    const Ce_id *       pCurOwner;
+
+    Dyn<PE_Variable>    pPE_Variable;
+    Dyn<PE_Type>        pPE_Exception;
+
+        // object-data
+    ary::idl::Attribute *
+                        pCurAttribute;
+    Type_id             nCurParsedType;
+    String              sCurParsedName;
+    bool                bReadOnly;
+    bool                bBound;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx
new file mode 100644
index 000000000000..dea5edfa4e98
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx
@@ -0,0 +1,145 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_CONST_HXX
+#define LUIDL_PE_CONST_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace udm {
+class Agent_Struct;
+}   // namespace udm
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class ConstantsGroup;
+
+class PE_Type;
+class PE_Value;
+
+class PE_Constant : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+                        PE_Constant();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Constant();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_name,
+        expect_curl_bracket_open,
+        expect_const,
+        expect_value,
+        expect_finish,
+        e_STATES_MAX
+    };
+    enum E_TokenType
+    {
+        tt_stereotype,
+        tt_identifier,
+        tt_punctuation,
+        tt_MAX
+    };
+    typedef void (PE_Constant::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_expect_curl_bracket_open_Punctuation(const char * i_sText);
+    void                On_expect_const_Stereotype(const char * i_sText);
+    void                On_expect_const_Punctuation(const char * i_sText);
+    void                On_expect_value_Identifier(const char * i_sText);
+    void                On_expect_finish_Punctuation(const char * i_sText);
+    void                On_Default(const char * );
+
+    void                EmptySingleConstData();
+    void                CreateSingleConstant();
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+  // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+
+    String              sData_Name;
+    ary::idl::Ce_id     nDataId;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nType;
+
+    Dyn<PE_Value>       pPE_Value;
+    String              sName;
+    String              sAssignment;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx
new file mode 100644
index 000000000000..1706f7edb9c6
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_PE_ENUM2_HXX
+#define ADC_UIDL_PE_ENUM2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+// class Enum;
+
+class PE_Value;
+
+class PE_Enum : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+                        PE_Enum();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Enum();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_name,
+        expect_curl_bracket_open,
+        expect_value,
+        expect_finish,
+        e_STATES_MAX
+    };
+    enum E_TokenType
+    {
+        tt_identifier,
+        tt_punctuation,
+        tt_MAX
+    };
+    typedef void (PE_Enum::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_expect_curl_bracket_open_Punctuation(const char * i_sText);
+    void                On_expect_value_Punctuation(const char * i_sText);
+    void                On_expect_value_Identifier(const char * i_sText);
+    void                On_expect_finish_Punctuation(const char * i_sText);
+    void                On_Default(const char * );
+
+    void                EmptySingleValueData();
+    void                CreateSingleValue();
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+  // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+
+    String              sData_Name;
+    ary::idl::Ce_id     nDataId;
+
+    Dyn<PE_Value>       pPE_Value;
+    String              sName;
+    String              sAssignment;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx
new file mode 100644
index 000000000000..510df9ac5da1
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_EVALU_HXX
+#define LUIDL_PE_EVALU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace udm {
+class Agent_Struct;
+}   // namespace udm
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Value : public UnoIDL_PE,
+                 public ParseEnvState
+{
+  public:
+                        PE_Value(
+                            String &            o_rName,
+                            String &            o_rAssignment,
+                            bool                i_bIsConst );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Value();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Assignment(
+                            const TokAssignment &
+                                                i_rToken );
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        expect_name,
+        got_name,
+        e_STATES_MAX
+    };
+    enum E_TokenType    /// @ATTENTION  Do not change existing values (except of tt_MAX) !!! Else array-indices will break.
+    {
+        tt_identifier = 0,
+        tt_punctuation = 1,
+        tt_assignment = 2,
+        tt_MAX
+    };
+    typedef void (PE_Value::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_got_name_Punctuation(const char * i_sText);
+    void                On_got_name_Assignment(const char * i_sText);
+    void                On_Default(const char * );
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    bool                IsConst() const         { return bIsConst; }
+
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    String  *           pName;
+    String  *           pAssignment;
+    bool                bIsConst;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx
new file mode 100644
index 000000000000..a0e7fa62d8f2
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx
@@ -0,0 +1,259 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_EXCP_HXX
+#define LUIDL_PE_EXCP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <s2_luidl/semnode.hxx>
+#include <ary/qualiname.hxx>
+    // PARAMETERS
+
+
+
+namespace csi
+{
+namespace prl
+{
+    class TNamespace;
+}
+}
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Exception;
+class StructElement;
+class PE_StructElement;
+class PE_Type;
+
+
+class PE_Exception : public UnoIDL_PE
+{
+  public:
+                        PE_Exception();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Exception();
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+  private:
+    struct S_Work
+    {
+                            S_Work();
+
+        void                InitData();
+        void                Prepare_PE_QualifiedName();
+        void                Prepare_PE_Element();
+        void                Data_Set_Name(
+                                const char *        i_sName );
+        // DATA
+        String              sData_Name;
+        bool                bIsPreDeclaration;
+        ary::idl::Ce_id     nCurStruct;
+
+        Dyn<PE_StructElement>
+                            pPE_Element;
+        ary::idl::Ce_id     nCurParsed_ElementRef;
+        Dyn<PE_Type>        pPE_Type;
+        ary::idl::Type_id   nCurParsed_Base;
+    };
+
+    struct S_Stati;
+    class PE_StructState;
+    friend struct S_Stati;
+    friend class PE_StructState;
+
+
+    class PE_StructState : public ParseEnvState
+    {
+      public:
+
+      protected:
+                            PE_StructState(
+                                PE_Exception &          i_rStruct )
+                                                    :   rStruct(i_rStruct) {}
+        void                MoveState(
+                                ParseEnvState &     i_rState ) const;
+        void                SetResult(
+                                E_TokenDone         i_eDone,
+                                E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                                UnoIDL_PE *         i_pParseEnv2Push = 0 ) const
+                                                    { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); }
+
+        S_Stati &           Stati() const           { return *rStruct.pStati; }
+        S_Work &            Work() const            { return rStruct.aWork; }
+        PE_Exception &      PE() const              { return rStruct; }
+
+      private:
+        virtual UnoIDL_PE & MyPE();
+        // DATA
+        PE_Exception &          rStruct;
+    };
+
+    class State_None : public PE_StructState
+    {
+        public:
+                            State_None(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+    };
+    class State_WaitForName : public PE_StructState
+    {   // -> Name
+      public:
+                            State_WaitForName(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+    };
+    class State_GotName : public PE_StructState
+    {   // -> : { ;
+      public:
+                            State_GotName(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForBase : public PE_StructState
+    {   // -> Base
+      public:
+                            State_WaitForBase(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        On_SubPE_Left();
+    };
+    class State_GotBase : public PE_StructState
+    {   // -> {
+      public:
+                            State_GotBase(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForElement : public PE_StructState
+    {   // -> Typ }
+      public:
+                            State_WaitForElement(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                i_rToken );
+        virtual void        Process_NameSeparator();
+        virtual void        Process_BuiltInType(
+                                const TokBuiltInType &
+                                                i_rToken );
+        virtual void        Process_TypeModifier(
+                                const TokTypeModifier &
+                                                    i_rToken );
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+//      virtual void        On_SubPE_Left();
+    };
+    class State_WaitForFinish : public PE_StructState
+    { // -> ;
+      public:
+                            State_WaitForFinish(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+
+    struct S_Stati
+    {
+                            S_Stati(
+                                PE_Exception &          io_rStruct );
+        void                SetState(
+                                ParseEnvState &     i_rNextState )
+                                                    { pCurStatus = &i_rNextState; }
+
+        State_None          aNone;
+        State_WaitForName   aWaitForName;
+        State_GotName       aGotName;
+        State_WaitForBase   aWaitForBase;
+        State_GotBase       aGotBase;
+        State_WaitForElement
+                            aWaitForElement;
+        State_WaitForFinish aWaitForFinish;
+
+        ParseEnvState *     pCurStatus;
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+
+    public:
+
+    void        store_Exception();
+
+    private:
+
+    S_Stati &           Stati()                 { return *pStati; }
+    S_Work &            Work()                  { return aWork; }
+
+    // DATA
+    S_Work              aWork;
+    Dyn<S_Stati>        pStati;
+};
+
+
+inline void
+PE_Exception::PE_StructState::MoveState(
+                                ParseEnvState &     i_rState ) const
+                                                    { rStruct.Stati().SetState(i_rState); }
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx
new file mode 100644
index 000000000000..970f57b94573
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx
@@ -0,0 +1,140 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_FILE2_HXX
+#define LUIDL_PE_FILE2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+class Module;
+}   // namespace idl
+}   // namespace ary
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class TokenDistributor;
+class PE_Service;
+class PE_Singleton;
+class PE_Interface;
+class PE_Struct;
+class PE_Exception;
+class PE_Constant;
+class PE_Enum;
+class PE_Typedef;
+
+
+class PE_File : public UnoIDL_PE,
+                public ParseEnvState
+{
+  public:
+                        PE_File(
+                            TokenDistributor &  i_rTokenAdmin,
+                            const ParserInfo &  i_parseInfo );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_File();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none,
+        e_std,
+        wait_for_module,
+        wait_for_module_bracket,
+        wait_for_module_semicolon,
+        in_sub_pe,
+        on_default
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+    virtual const ary::idl::Module &
+                        CurNamespace() const;
+    virtual const ParserInfo &
+                        ParseInfo() const;
+    // DATA
+    TokenDistributor *  pTokenAdmin;
+    Dyn<PE_Service>     pPE_Service;
+    Dyn<PE_Singleton>   pPE_Singleton;
+    Dyn<PE_Interface>   pPE_Interface;
+    Dyn<PE_Struct>      pPE_Struct;
+    Dyn<PE_Exception>   pPE_Exception;
+    Dyn<PE_Constant>    pPE_Constant;
+    Dyn<PE_Enum>        pPE_Enum;
+    Dyn<PE_Typedef>     pPE_Typedef;
+
+    const ary::idl::Module *
+                        pCurNamespace;
+    const ParserInfo *  pParseInfo;
+
+    E_State             eState;
+    uintt               nBracketCount_inDefMode;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx
new file mode 100644
index 000000000000..8ea280c7ee01
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx
@@ -0,0 +1,167 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_PE_FUNC2_HXX
+#define ADC_UIDL_PE_FUNC2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+// #include <ary/idl/i_gate.hxx>
+// #include <ary/idl/ip_ce.hxx>
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <ary/idl/i_param.hxx>
+    // PARAMETERS
+
+namespace ary
+{
+     namespace idl
+    {
+         class Function;
+    }
+}
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+class PE_Variable;
+
+class PE_Function : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id     RParent;
+    typedef ary::idl::Ce_id     RFunction;
+
+    enum E_Constructor { constructor };
+
+    /// Constructor for interfaces.
+                        PE_Function(
+                            const RParent &     i_rCurInterface );
+
+    /// Constructor for single interface based services.
+                        PE_Function(
+                            const RParent &     i_rCurService,
+                            E_Constructor       i_eCtorMarker );
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Function();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_ParameterHandling(
+                            const TokParameterHandling &
+                                                i_rToken );
+    virtual void        Process_Raises();
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none,
+        e_start,
+        in_return_type,
+        expect_name,
+        expect_params_list,
+        expect_parameter,
+        expect_parameter_variable,
+        in_parameter_variable,
+        expect_parameter_separator,
+        params_finished,
+        expect_exceptions_list,
+        expect_exception,
+        in_exception,
+        expect_exception_separator,
+        exceptions_finished
+    };
+
+    void                GoIntoReturnType();
+    void                GoIntoParameterVariable();
+    void                GoIntoException();
+    void                OnDefault();
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+
+    String              sData_Name;
+    ary::idl::Type_id   nData_ReturnType;
+    bool                bData_Oneway;
+    ary::idl::Function *
+                        pCurFunction;
+
+    const RParent *     pCurParent;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsedType;     // ReturnType or Exception
+
+    String              sName;
+
+    Dyn<PE_Variable>    pPE_Variable;
+    ary::idl::E_ParameterDirection
+                        eCurParsedParam_Direction;
+    ary::idl::Type_id   nCurParsedParam_Type;
+    String              sCurParsedParam_Name;
+    bool                bIsForConstructors;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx
new file mode 100644
index 000000000000..83a441eebbc4
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx
@@ -0,0 +1,184 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_PE_IFACE_HXX
+#define ADC_UIDL_PE_IFACE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace idl
+{
+    class Interface;
+}
+}
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+class PE_Function;
+class PE_Attribute;
+class PE_Type;
+
+class PE_Interface : public UnoIDL_PE,
+                     public ParseEnvState
+{
+  public:
+                        PE_Interface();
+    virtual             ~PE_Interface();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_NameSeparator();
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State        /// @ATTENTION  Do not change existing values (except of e_STATES_MAX) !!! Else array-indices will break.
+    {
+        e_none = 0,
+        need_uik,
+        uik,
+        need_ident,
+        ident,
+        need_interface,
+        need_name,
+        wait_for_base,
+        in_base,            // in header, after ":"
+        need_curlbr_open,
+        e_std,
+        in_function,
+        in_attribute,
+        need_finish,
+        in_base_interface,  // in body, after "interface"
+        e_STATES_MAX
+    };
+    enum E_TokenType    /// @ATTENTION  Do not change existing values (except of tt_MAX) !!! Else array-indices will break.
+    {
+        tt_metatype = 0,
+        tt_identifier = 1,
+        tt_punctuation = 2,
+        tt_startoftype = 3,
+        tt_stereotype = 4,
+        tt_MAX
+    };
+    typedef void (PE_Interface::*F_TOK)(const char *);
+
+
+    void                On_need_uik_MetaType(const char * i_sText);
+    void                On_uik_Identifier(const char * i_sText);
+    void                On_uik_Punctuation(const char * i_sText);
+    void                On_need_ident_MetaType(const char * i_sText);
+    void                On_ident_Identifier(const char * i_sText);
+    void                On_ident_Punctuation(const char * i_sText);
+    void                On_need_interface_MetaType(const char * i_sText);
+    void                On_need_name_Identifer(const char * i_sText);
+    void                On_wait_for_base_Punctuation(const char * i_sText);
+    void                On_need_curlbr_open_Punctuation(const char * i_sText);
+    void                On_std_Metatype(const char * i_sText);
+    void                On_std_Punctuation(const char * i_sText);
+    void                On_std_Stereotype(const char * i_sText);
+    void                On_std_GotoFunction(const char * i_sText);
+    void                On_std_GotoAttribute(const char * i_sText);
+    void                On_std_GotoBaseInterface(const char * i_sText);
+    void                On_need_finish_Punctuation(const char * i_sText);
+    void                On_Default(const char * i_sText);
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+
+    void                store_Interface();
+
+    // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    String              sData_Name;
+    bool                bIsPreDeclaration;
+    ary::idl::Interface *
+                        pCurInterface;
+    ary::idl::Ce_id     nCurInterface;
+
+    Dyn<PE_Function>    pPE_Function;
+    Dyn<PE_Attribute>   pPE_Attribute;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsed_Base;
+    bool                bOptionalMember;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx
new file mode 100644
index 000000000000..00bc7bcaa5be
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_MODUL_HXX
+#define LUIDL_PE_MODUL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <semantic/semnode.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+class PE_Module : public ::ParseEnvironment
+{
+  public:
+
+    virtual void        Enter(
+                            E_EnvStackAction    i_eWayOfEntering );
+    virtual void        Leave(
+                            E_EnvStackAction    i_eWayOfLeaving );
+
+  private:
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx
new file mode 100644
index 000000000000..b5969d471a0f
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_PE_PROPERTY_HXX
+#define ADC_UIDL_PE_PROPERTY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <ary/idl/i_property.hxx>
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Variable;
+
+class PE_Property : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id                     Ce_id;
+    typedef ary::idl::Type_id                   Type_id;
+    typedef ary::idl::Property::Stereotypes     Stereotypes;
+
+
+                        PE_Property(
+                            const Ce_id &       i_rCurOwner );
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Property();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+    void                PresetOptional()        { bIsOptional = true; }
+    void                PresetStereotypes(
+                            Stereotypes::E_Flags
+                                                i_eFlag )
+                                                { aStereotypes.Set_Flag(i_eFlag); }
+  private:
+    enum E_State
+    {
+        e_none,
+        e_start,
+        expect_variable,
+        in_variable
+    };
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+    const Ce_id *       pCurOwner;
+
+    Dyn<PE_Variable>    pPE_Variable;
+
+        // object-data
+    Type_id             nCurParsedType;
+    String              sCurParsedName;
+    bool                bIsOptional;
+    Stereotypes         aStereotypes;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx
new file mode 100644
index 000000000000..792d6940b327
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_SELEM_HXX
+#define LUIDL_PE_SELEM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+namespace udm {
+class Agent_Struct;
+}   // namespace udm
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+class StructElement;
+class Struct;
+
+class PE_StructElement : public UnoIDL_PE,
+                         public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id       RStructElement;
+    typedef ary::idl::Ce_id       RStruct;
+
+                        PE_StructElement(       /// Use for Struct-elements
+                            RStructElement &    o_rResult,
+                            const RStruct &     i_rCurStruct,
+                            const String &      i_rCurStructTemplateParam );
+                        PE_StructElement(       /// Use for Exception-elements
+                            RStructElement &    o_rResult,
+                            const RStruct &     i_rCurExc );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_StructElement();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Default();
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_type,
+        expect_name,
+        expect_finish
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    ary::idl::Type_id   lhf_FindTemplateParamType() const;
+
+    // DATA
+    E_State             eState;
+    RStructElement *    pResult;
+    const RStruct *     pCurStruct;
+    bool                bIsExceptionElement;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nType;
+    String              sName;
+    const String *      pCurStructTemplateParam;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx
new file mode 100644
index 000000000000..2b0ebf25a0ed
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx
@@ -0,0 +1,149 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_PE_SERVI_HXX
+#define ADC_UIDL_PE_SERVI_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+     namespace idl
+    {
+         class Service;
+         class SglIfcService;
+    }
+}
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Property;
+class PE_Type;
+class PE_Function;
+
+
+class PE_Service : public UnoIDL_PE,
+                   public ParseEnvState
+{
+  public:
+                        PE_Service();
+    virtual             ~PE_Service();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Needs();
+    virtual void        Process_Observes();
+    virtual void        Process_Default();
+
+  private:
+    void                On_Default();
+
+    enum E_State
+    {
+        e_none = 0,
+        need_name,
+        need_curlbr_open,
+        e_std,
+        in_property,
+        in_ifc_type,
+        in_service_type,
+        expect_ifc_separator,
+        expect_service_separator,
+        at_ignore,
+        need_finish,
+        need_base_interface,    /// After ":".
+        need_curlbr_open_sib,   /// After base interface in single interface based service.
+        e_std_sib,              /// Standard in single interface based service.
+        e_STATES_MAX
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+
+    void                StartProperty();
+
+
+    // DATA
+    E_State             eState;
+    String              sData_Name;
+    bool                bIsPreDeclaration;
+    ary::idl::Service * pCurService;
+    ary::idl::SglIfcService *
+                        pCurSiService;
+    ary::idl::Ce_id     nCurService;  // Needed for PE_Attribute.
+
+    Dyn<PE_Property>    pPE_Property;
+    ary::idl::Ce_id     nCurParsed_Property;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsed_Type;
+
+    Dyn<PE_Function>    pPE_Constructor;
+
+    bool                bOptionalMember;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx
new file mode 100644
index 000000000000..5b1507d9e8ca
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx
@@ -0,0 +1,150 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_SINGL_HXX
+#define LUIDL_PE_SINGL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+    namespace idl
+    {
+        class Singleton;
+        class SglIfcSingleton;
+    }
+}
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+
+
+class PE_Singleton : public UnoIDL_PE,
+                     public ParseEnvState
+{
+  public:
+                        PE_Singleton();
+    virtual             ~PE_Singleton();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        need_name,
+        need_curlbr_open,
+        e_std,
+        in_service,
+        need_finish,
+        in_base_interface,
+        e_STATES_MAX
+    };
+
+
+#if 0
+    enum E_TokenType    /// @ATTENTION  Do not change existing values (except of tt_MAX) !!! Else array-indices will break.
+    {
+        tt_metatype = 0,
+        tt_identifier = 1,
+        tt_punctuation = 2,
+        tt_startoftype = 3,
+        tt_MAX
+    };
+    typedef void (PE_Singleton::*F_TOK)(const char *);
+
+
+    void                On_need_singleton_MetaType(const char * i_sText);
+    void                On_need_name_Identifer(const char * i_sText);
+    void                On_need_curlbr_open_Punctuation(const char * i_sText);
+    void                On_std_GotoService(const char * i_sText);
+    void                On_std_Punctuation(const char * i_sText);
+    void                On_need_finish_Punctuation(const char * i_sText);
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+#endif // 0
+
+    void                On_Default();
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+//  static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    String              sData_Name;
+    bool                bIsPreDeclaration;
+    ary::idl::Singleton *
+                        pCurSingleton;
+    ary::idl::SglIfcSingleton *
+                        pCurSiSingleton;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsed_Type;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx
new file mode 100644
index 000000000000..7fefde39dd0a
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx
@@ -0,0 +1,285 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_STRUC_HXX
+#define LUIDL_PE_STRUC_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <s2_luidl/semnode.hxx>
+#include <ary/qualiname.hxx>
+    // PARAMETERS
+
+
+
+namespace csi
+{
+namespace prl
+{
+    class TNamespace;
+}
+}
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Struct;
+class StructElement;
+class PE_StructElement;
+class PE_Type;
+
+
+class PE_Struct : public UnoIDL_PE
+{
+  public:
+                        PE_Struct();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Struct();
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+  private:
+    struct S_Work
+    {
+                            S_Work();
+
+        void                InitData();
+        void                Prepare_PE_QualifiedName();
+        void                Prepare_PE_Element();
+        void                Data_Set_Name(
+                                const char *        i_sName );
+        void                Data_Set_TemplateParam(
+                                const char *        i_sTemplateParam );
+
+        String              sData_Name;
+        String              sData_TemplateParam;
+        bool                bIsPreDeclaration;
+        ary::idl::Ce_id     nCurStruct;
+
+        Dyn<PE_StructElement>
+                            pPE_Element;
+        ary::idl::Ce_id     nCurParsed_ElementRef;
+        Dyn<PE_Type>        pPE_Type;
+        ary::idl::Type_id   nCurParsed_Base;
+    };
+
+    struct S_Stati;
+    class PE_StructState;
+    friend struct S_Stati;
+    friend class PE_StructState;
+
+
+    class PE_StructState : public ParseEnvState
+    {
+      public:
+
+      protected:
+                            PE_StructState(
+                                PE_Struct &         i_rStruct )
+                                                    :   rStruct(i_rStruct) {}
+        void                MoveState(
+                                ParseEnvState &     i_rState ) const;
+        void                SetResult(
+                                E_TokenDone         i_eDone,
+                                E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                                UnoIDL_PE *         i_pParseEnv2Push = 0 ) const
+                                                    { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); }
+
+        S_Stati &           Stati() const           { return *rStruct.pStati; }
+        S_Work &            Work() const            { return rStruct.aWork; }
+        PE_Struct &         PE() const              { return rStruct; }
+
+      private:
+        virtual UnoIDL_PE & MyPE();
+        // DATA
+        PE_Struct &         rStruct;
+    };
+
+    class State_None : public PE_StructState
+    {
+        public:
+                            State_None(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+    };
+    class State_WaitForName : public PE_StructState
+    {   // -> Name
+      public:
+                            State_WaitForName(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+    };
+    class State_GotName : public PE_StructState
+    {   // -> : { ; <
+      public:
+                            State_GotName(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForTemplateParam : public PE_StructState
+    {   // -> Template parameter identifier
+      public:
+                            State_WaitForTemplateParam(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+    };
+    class State_WaitForTemplateEnd : public PE_StructState
+    {   // -> >
+      public:
+                            State_WaitForTemplateEnd(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForBase : public PE_StructState
+    {   // -> Base
+      public:
+                            State_WaitForBase(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        On_SubPE_Left();
+    };
+    class State_GotBase : public PE_StructState
+    {   // -> {
+      public:
+                            State_GotBase(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForElement : public PE_StructState
+    {   // -> Typ }
+      public:
+                            State_WaitForElement(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+        virtual void        Process_NameSeparator();
+        virtual void        Process_BuiltInType(
+                                const TokBuiltInType &
+                                                    i_rToken );
+        virtual void        Process_TypeModifier(
+                                const TokTypeModifier &
+                                                    i_rToken );
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForFinish : public PE_StructState
+    { // -> ;
+      public:
+                            State_WaitForFinish(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+
+    struct S_Stati
+    {
+                            S_Stati(
+                                PE_Struct &         io_rStruct );
+        void                SetState(
+                                ParseEnvState &     i_rNextState )
+                                                    { pCurStatus = &i_rNextState; }
+
+        State_None          aNone;
+        State_WaitForName   aWaitForName;
+        State_GotName       aGotName;
+        State_WaitForTemplateParam
+                            aWaitForTemplateParam;
+        State_WaitForTemplateEnd
+                            aWaitForTemplateEnd;
+        State_WaitForBase   aWaitForBase;
+        State_GotBase       aGotBase;
+        State_WaitForElement
+                            aWaitForElement;
+        State_WaitForFinish aWaitForFinish;
+
+        ParseEnvState *     pCurStatus;
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+
+    public:
+
+    void        store_Struct();
+
+    private:
+
+    S_Stati &           Stati()                 { return *pStati; }
+    S_Work &            Work()                  { return aWork; }
+
+    // DATA
+    S_Work              aWork;
+    Dyn<S_Stati>        pStati;
+};
+
+
+inline void
+PE_Struct::PE_StructState::MoveState(
+                                ParseEnvState &     i_rState ) const
+                                                    { rStruct.Stati().SetState(i_rState); }
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx
new file mode 100644
index 000000000000..8f3e247ac289
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_PE_TYDF2_HXX
+#define LUIDL_PE_TYDF2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+
+
+class PE_Typedef : public UnoIDL_PE,
+                   public ParseEnvState
+{
+  public:
+                        PE_Typedef();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Typedef();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        expect_description,
+        expect_name,
+        got_name,
+        e_STATES_MAX
+    };
+    enum E_TokenType    /// @ATTENTION  Do not change existing values (except of tt_MAX) !!! Else array-indices will break.
+    {
+        tt_any = 0,
+        tt_identifier,
+        tt_punctuation,
+        tt_MAX
+    };
+    typedef void (PE_Typedef::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_description_Any(const char * i_sText);
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_got_name_Punctuation(const char * i_sText);
+    void                On_Default(const char * );
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nType;
+    String              sName;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx
new file mode 100644
index 000000000000..f5af7cd3f75c
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PE_TYPE2_HXX
+#define ADC_PE_TYPE2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include<s2_luidl/parsenv2.hxx>
+#include<s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include<ary/qualiname.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Type : public UnoIDL_PE,
+                public ParseEnvState
+{
+  public:
+                         PE_Type(
+                            ary::idl::Type_id & o_rResult );
+    virtual             ~PE_Type();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_NameSeparator();
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        expect_type,
+        expect_quname_part,
+        expect_quname_separator,
+        in_template_type
+    };
+
+    void                Finish();
+    PE_Type &           MyTemplateType();
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    ary::idl::Type_id * pResult;
+
+    uintt               nIsSequenceCounter;
+    uintt               nSequenceDownCounter;
+    bool                bIsUnsigned;
+    ary::QualifiedName  sFullType;
+
+    E_State             eState;
+    String              sLastPart;
+
+    Dyn<PE_Type>        pPE_TemplateType;   /// @attention Recursion, only initiate, if needed!
+    ary::idl::Type_id   nTemplateType;
+    std::vector<ary::idl::Type_id>
+                        aTemplateParameters;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx
new file mode 100644
index 000000000000..8c186b7c685b
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_PE_VARI2_HXX
+#define ADC_UIDL_PE_VARI2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Type;
+
+
+class PE_Variable : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+                        PE_Variable(
+                            ary::idl::Type_id & i_rResult_Type,
+                            String &            i_rResult_Name );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Variable();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Default();
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_type,
+        expect_name,
+        expect_finish
+    };
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+    ary::idl::Type_id * pResult_Type;
+    String *            pResult_Name;
+
+    Dyn<PE_Type>        pPE_Type;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx
new file mode 100644
index 000000000000..6aa929fbd488
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PESTATE_HXX
+#define ADC_PESTATE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include<s2_luidl/tokintpr.hxx>
+#include<s2_luidl/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokIdentifier;
+class TokBuiltInType;
+class TokPunctuation;
+class Tok_Documentation;
+
+class ParseEnvState : public    TokenInterpreter,
+                      virtual protected TokenProcessing_Types
+{
+  public:
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_NameSeparator();
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_ParameterHandling(
+                            const TokParameterHandling &
+                                                i_rToken );
+    virtual void        Process_Raises();
+    virtual void        Process_Needs();
+    virtual void        Process_Observes();
+    virtual void        Process_Assignment(
+                            const TokAssignment &
+                                                i_rToken );
+    virtual void        Process_EOL();
+
+    virtual void        On_SubPE_Left();
+
+    virtual void        Process_Default();
+
+  protected:
+                        ParseEnvState()         :   bDefaultIsError(true) {}
+    void                SetDefault2Ignore()     { bDefaultIsError = false; }
+
+  private:
+    virtual UnoIDL_PE & MyPE() = 0;
+    bool                bDefaultIsError;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx
new file mode 100644
index 000000000000..f551ad1e8575
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx
@@ -0,0 +1,132 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_SEMNODE_HXX
+#define ADC_SEMNODE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/qualiname.hxx>
+// #include <udm/ref.hxx>
+
+
+namespace ary
+{
+    class QualifiedName;
+    class Repository;
+
+namespace idl
+{
+    class Gate;
+    class Module;
+}   // namespace idl
+}   // namespace ary
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Struct;
+class Token;
+
+
+/** is an implementation class for UnoIDL_PE s
+*/
+class SemanticNode : private TokenProcessing_Types
+{
+  public:
+                        SemanticNode();
+    void                EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::idl::Gate &    io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~SemanticNode();
+
+    void                SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            UnoIDL_PE *         i_pParseEnv2Push = 0 );
+    UnoIDL_PE *         Parent() const          { return pParentPE; }
+    ary::idl::Gate &    AryGate() const         { return *pAryGate; }
+    TokenProcessing_Result &
+                        TokenResult() const     { return *pTokenResult; }
+
+  private:
+    // DATA
+    UnoIDL_PE *         pParentPE;
+    ary::idl::Gate *    pAryGate;
+    TokenProcessing_Result *
+                        pTokenResult;
+};
+
+
+/*
+class Trying_PE
+{
+  public:
+   virtual              ~Trying_PE() {}
+
+  protected:
+                        Trying_PE();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    void                StartTry(
+                            UnoIDL_PE &         i_rFirstTry );
+    void                Add2Try(
+                            UnoIDL_PE &         i_rTry );
+    bool                AmITrying() const;
+    UnoIDL_PE *         NextTry() const;
+    void                FinishTry();
+
+  private:
+    std::vector<UnoIDL_PE*>
+                        aTryableSubEnvironments;
+    uintt               nTryCounter;
+};
+
+*/
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx
new file mode 100644
index 000000000000..255bf244cd9c
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_SMP_HXX
+#define ADC_SMP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tok_recv.hxx>
+#include <s2_dsapi/tok_recv.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+/** is an implementation class for ParseEnvironment
+*/
+class SemanticParser : public csi::uidl::Token_Receiver,
+                       public csi::dsapi::Token_Receiver
+{
+  public:
+  typedef std::deque< DYN TextToken * > TokenQueue;
+
+                        ~SemanticParser();
+
+
+    void                Receive(
+                            DYN csi::uidl::Token &
+                                                let_drToken );
+    void                Receive(
+                            DYN csi::dsapi::Token &
+                                                let_drToken );
+
+  private:
+    // DATA
+    TokenQueue          aTokenQueue;
+
+
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx
new file mode 100644
index 000000000000..44db10611d82
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_TK_CONST_HXX
+#define ADC_UIDL_TK_CONST_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokAssignment : public Token
+{
+  public:
+                        TokAssignment(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+  private:
+    // DATA
+    String              sText;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx
new file mode 100644
index 000000000000..ba46da292512
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_TK_IDENT_HXX
+#define ADC_UIDL_TK_IDENT_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokIdentifier : public Token
+{
+  public:
+                        TokIdentifier(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+  private:
+    // DATA
+    String              sText;
+};
+
+class TokNameSeparator : public Token
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx
new file mode 100644
index 000000000000..f8e4268e9f3b
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx
@@ -0,0 +1,251 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_TK_KEYW_HXX
+#define ADC_UIDL_TK_KEYW_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+#include <luxenum.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokKeyword : public Token
+{
+};
+
+
+class TokBuiltInType : public TokKeyword
+{
+  public:
+    enum E_TokenId
+    {
+        e_none = 0,
+        bty_any = 1,
+        bty_boolean = 2,
+        bty_byte = 3,
+        bty_char = 4,
+        bty_double = 5,
+        bty_hyper = 6,
+        bty_long = 7,
+        bty_short = 8,
+        bty_string = 9,
+        bty_void = 10,
+        bty_ellipse = 11
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokBuiltInType(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+
+class TokTypeModifier : public TokKeyword
+{
+  public:
+    enum E_TokenId
+    {
+        e_none = 0,
+        tmod_unsigned = 1,
+        tmod_sequence
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokTypeModifier(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokMetaType : public TokKeyword
+{
+  public:
+    enum E_TokenId
+    {
+        e_none = 0,
+        mt_attribute = 1,
+        mt_constants,
+        mt_enum,
+        mt_exception,
+        mt_ident,
+        mt_interface,
+        mt_module,
+        mt_property,
+        mt_service,
+        mt_singleton,
+        mt_struct,
+        mt_typedef,
+        mt_uik
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokMetaType(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokStereotype : public TokKeyword
+{
+  public:
+    // TYPES
+    enum E_TokenId
+    {
+        e_none = 0,
+        ste_bound = 1,
+        ste_const,
+        ste_constrained,
+        ste_maybeambiguous,
+        ste_maybedefault,
+        ste_maybevoid,
+        ste_oneway,
+        ste_optional,
+        ste_readonly,
+        ste_removable,
+        ste_virtual,
+        ste_transient,
+        ste_published
+    };
+
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokStereotype(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokParameterHandling : public TokKeyword
+{
+  public:
+    // TYPES
+    enum E_TokenId
+    {
+        e_none = 0,
+        ph_in,
+        ph_out,
+        ph_inout
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokParameterHandling(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokRaises : public TokKeyword
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+class TokNeeds : public TokKeyword
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+class TokObserves : public TokKeyword
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx
new file mode 100644
index 000000000000..f0e777e447b6
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_TK_PUNCT_HXX
+#define ADC_UIDL_TK_PUNCT_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+#include <luxenum.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokPunctuation : public Token
+{
+  public:
+    // TYPES
+    enum E_TokenId
+    {
+        e_none = 0,
+        BracketOpen =  1,           // (
+        BracketClose = 2,           // )
+        ArrayBracketOpen = 3,       // [
+        ArrayBracketClose = 4,      // ]
+        CurledBracketOpen = 5,      // {
+        CurledBracketClose = 6,     // }
+        Semicolon = 7,              // ;
+        Colon = 8,                  // :
+        DoubleColon = 9,            // ::
+        Comma = 10,                 // ,
+        Minus = 11,                 // -
+        Fullstop = 12,              // .
+        Lesser = 13,                // <
+        Greater = 14                // >
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+
+                        TokPunctuation(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+    EV_TokenId          Id() const              { return eTag; }
+
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class Tok_EOL : public Token
+{
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+};
+
+class Tok_EOF : public Token
+{
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx
new file mode 100644
index 000000000000..2a25820bf248
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKP_UIDL_HXX
+#define ADC_TKP_UIDL_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkp2.hxx>
+    // COMPONENTS
+    // PARAMETRS
+
+class TkpDocuContext;
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+class Token_Receiver;
+class Context_UidlCode;
+
+
+/** This is a TokenParser which is able to parse tokens from
+    C++ source code.
+*/
+class TokenParser_Uidl : public TokenParse2
+{
+  public:
+    // LIFECYCLE
+                        TokenParser_Uidl(
+                            Token_Receiver &    o_rUidlReceiver,
+                            DYN TkpDocuContext &
+                                                let_drDocuContext );
+    virtual             ~TokenParser_Uidl();
+
+    // OPERATIONS
+  private:
+    virtual ::TkpContext &
+                        CurrentContext();
+
+    virtual void        SetStartContext();
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext );
+    // DATA
+    Dyn<Context_UidlCode>
+                        pBaseContext;
+    ::TkpContext *      pCurContext;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx
new file mode 100644
index 000000000000..110bf59b8fb5
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_LUIDL_TOKINTPR_HXX
+#define ADC_LUIDL_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokIdentifier;
+class TokPunctuation;
+class TokBuiltInType;
+class TokTypeModifier;
+class TokMetaType;
+class TokStereotype;
+class TokParameterHandling;
+class TokAssignment;
+class Tok_Documentation;
+
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken ) = 0;
+    virtual void        Process_NameSeparator() = 0;      // ::
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken ) = 0;
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken ) = 0;
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken ) = 0;
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken ) = 0;
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken ) = 0;
+    virtual void        Process_ParameterHandling(
+                            const TokParameterHandling &
+                                                i_rToken ) = 0;
+    virtual void        Process_Raises() = 0;
+    virtual void        Process_Needs() = 0;
+    virtual void        Process_Observes() = 0;
+    virtual void        Process_Assignment(
+                            const TokAssignment &
+                                                i_rToken ) = 0;
+    virtual void        Process_EOL() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx
new file mode 100644
index 000000000000..fa31d63db7ca
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx
@@ -0,0 +1,93 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TOKPROCT_HXX
+#define ADC_TOKPROCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class UnoIDL_PE;
+
+
+/** is a parent class for classes, which take part in parsing tokens semantically.
+    It provides some types for them.
+*/
+class TokenProcessing_Types
+{
+  public:
+    enum E_TokenDone
+    {
+        not_done = 0,
+        done = 1
+    };
+
+    enum E_EnvStackAction
+    {
+        stay,           // same parse environment
+        push_sure,      // push sub environment, which must be the correct one
+        push_try,       // push sub environment, which is tried, if it may be the right one
+        pop_success,    // return to parent environment, parsing was successful
+        pop_failure     // return to parent environment, but an error occured.
+    };
+
+    struct TokenProcessing_Result
+    {
+        E_TokenDone         eDone;
+        E_EnvStackAction    eStackAction;
+        UnoIDL_PE *         pEnv2Push;
+
+                            TokenProcessing_Result()
+                                                : eDone(not_done), eStackAction(stay), pEnv2Push(0) {}
+        void                reset()             { eDone = not_done; eStackAction = stay; pEnv2Push = 0; }
+    };
+
+    enum E_ParseResult
+    {
+        res_error,
+        res_complete,
+        res_predeclaration
+    };
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx
new file mode 100644
index 000000000000..e1ed8bddeeef
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef LUIDL_TOKRECV_HXX
+#define LUIDL_TOKRECV_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Token;
+
+/**
+@descr
+*/
+class Token_Receiver
+{
+  public:
+    virtual             ~Token_Receiver() {}
+    virtual void        Receive(
+                            DYN Token &         let_drToken ) = 0;
+    virtual void        Increment_CurLine() = 0;
+};
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx
new file mode 100644
index 000000000000..d2b613710b20
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_UIDL_TOK_HXX
+#define ADC_UIDL_TOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParserInfo;
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokenInterpreter;
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx
new file mode 100644
index 000000000000..c13b58f5f89d
--- /dev/null
+++ b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_PARSEENV2_HXX
+#define ADC_PARSEENV2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <queue>
+
+
+
+class ParseEnvironment
+{
+  public:
+    virtual             ~ParseEnvironment();
+
+    virtual void        Enter() = 0;
+};
+
+
+#endif
+
diff --git a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx
new file mode 100644
index 000000000000..9e248a3538a8
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_STMSTAR2_HXX
+#define ADC_STMSTAR2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstat2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+    // SERVICES
+
+
+class StmArrayStatu2 : public StmStatu2
+{
+  public:
+    // LIFECYCLE
+                        StmArrayStatu2(
+                            intt            i_nStatusSize,
+                            const INT16 *   in_aArrayModel,
+                            uintt           i_nTokenId,
+                            bool            in_bIsDefault );
+                        ~StmArrayStatu2();
+
+    // INQUIRY
+    StmStatu2::Branch   NextBy(
+                            intt            in_nFollowersIndex) const;
+    UINT16              TokenId() const     { return nTokenId; }
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmArrayStatu2 *
+                        AsArray();
+    bool                SetBranch(
+                            intt            in_nBranchIx,
+                            StmStatu2::Branch
+                                            in_nBranch );
+    void                SetTokenId(
+                            UINT16          in_nTokenId );
+  private:
+    StmStatu2::Branch * dpBranches;
+    intt                nNrOfBranches;
+    UINT16              nTokenId;
+    bool                bIsADefault;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+StmArrayStatu2::SetTokenId( UINT16 in_nTokenId )
+    { nTokenId = in_nTokenId; }
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx
new file mode 100644
index 000000000000..7117d7202df4
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_STMSTAT2_HXX
+#define ADC_STMSTAT2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+class StmArrayStatu2;
+class StmBoundsStatu2;
+
+/** A StmStatu2 is a state within a StateMachin2.
+    There are two kinds of it.  Either its an array of pointers to
+    other states within the state machine - an ArrayStatus.
+
+    Or it is a BoundsStatus, which shows, the token cannot be
+    followed further within the StateMachin2.
+**/
+class StmStatu2 // := "State machine status"
+{
+  public:
+    typedef intt        Branch;         /// Values >= 0 give a next #Status' ID.
+                                        /// Values <= 0 tell, that a token is finished.
+                                        /// a value < 0 returns the status back to an upper level state machine.
+        // LIFECYCLE
+    virtual             ~StmStatu2() {}
+
+        // OPERATIONS
+    virtual StmArrayStatu2 *
+                        AsArray();
+    virtual StmBoundsStatu2 *
+                        AsBounds();
+
+        // INQUIRY
+    virtual bool        IsADefault() const = 0;
+};
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx
new file mode 100644
index 000000000000..dc50159ff0cf
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_STMSTFI2_HXX
+#define ADC_STMSTFI2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstat2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class TkpContext;
+class StateMachineContext;
+
+/**
+**/
+class StmBoundsStatu2 : public StmStatu2
+{
+  public:
+    // LIFECYCLE
+                        StmBoundsStatu2(
+                            StateMachineContext &
+                                                o_rOwner,
+                            TkpContext &        i_rFollowUpContext,
+                            uintt               i_nStatusFunctionNr,
+                            bool                i_bIsDefault  );
+    // INQUIRY
+    TkpContext *        FollowUpContext();
+    uintt               StatusFunctionNr() const;
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmBoundsStatu2 *
+                        AsBounds();
+
+  private:
+    StateMachineContext *
+                        pOwner;
+    TkpContext *        pFollowUpContext;
+    uintt               nStatusFunctionNr;
+    bool                bIsDefault;
+};
+
+inline TkpContext *
+StmBoundsStatu2::FollowUpContext()
+    { return pFollowUpContext; }
+inline uintt
+StmBoundsStatu2::StatusFunctionNr() const
+    { return nStatusFunctionNr; }
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/tokens/tkp2.hxx b/autodoc/source/parser_i/inc/tokens/tkp2.hxx
new file mode 100644
index 000000000000..5f3be22d0147
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/tkp2.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKP2_HXX
+#define ADC_TKP2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+class CharacterSource;
+class TkpContext;
+    // PARAMETRS
+
+
+
+/** This is the interface for parser classes, which get a sequence of Token s from
+    a text.
+
+    Start() starts to parse the text from the given i_rSource.
+    GetNextToken() returns a Token on the heap as long as there are
+    still characters in the text left. The last time GetNextToken()
+    returns NULL.
+
+    The algorithms for parsing tokens from the text are an issue of
+    the derived classes.
+*/
+class TokenParse2
+{
+  public:
+    // LIFECYCLE
+                        TokenParse2();
+    virtual             ~TokenParse2() {}
+
+    // OPERATIONS
+    virtual void        Start(
+                            CharacterSource &
+                                            i_rSource );
+
+    /** @short  Gets the next identifiable token out of the
+        source code.
+        @return true, if there was passed a valid token.
+                false, if the parsed stream is finished or
+                       an error occured.
+    */
+    bool                GetNextToken();
+
+  private:
+    virtual void        SetStartContext() = 0;
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext ) = 0;
+    virtual TkpContext &
+                        CurrentContext() = 0;
+    // DATA
+    CharacterSource *   pChars;
+};
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx
new file mode 100644
index 000000000000..96f92030b9de
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKPCONT2_HXX
+#define ADC_TKPCONT2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+class CharacterSource;
+class TkpNullContext;
+class TkpNullContex2;
+
+/** @task
+    Specifies a context within which tokens are interpreted in a special
+    way. For example in parsing C++ there could be a context for code,
+    one for comments and a third one for preprocessor statements, because
+    each of these would give the same token different meanings.
+**/
+class TkpContext
+{
+  public:
+    // LIFECYCLE
+    virtual                 ~TkpContext() {}
+
+    // OPERATIONS
+    /** @descr
+        The functions starts to parse with the CurToken() of io_rText.
+        It leaves io_rText at the first char of the following Token or
+        the following Context.
+
+        This function returns, when a context has parsed some characterss
+        and completed a token OR left the context.
+        If the token is to be ignored, PassNewToken() returns false
+        and cuts the token from io_rText.
+        If the token is to be parsed further in a different context,
+        PassNewToken() returns false, but the token is
+        NOT cut from io_rText.
+
+        If the function has found a valid and complete token, PassNewToken()
+        passes the parsed token to the internally known receiver and
+        returns true. The token is cut from io_rText.
+    **/
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText ) = 0;
+    /** Has to pass the parsed token to a known receiver.
+        @return true, if a token was passed.
+                false, if no token was parsed complete by this context.
+    */
+    virtual bool        PassNewToken() = 0;
+    virtual TkpContext &
+                        FollowUpContext() = 0;
+
+    static TkpNullContext &
+                        Null_();
+};
+
+TkpNullContex2 &    TkpContext_Null2_();
+
+class StateMachineContext
+{
+  public:
+    virtual ~StateMachineContext() {}
+
+    /// Is used by StmBoundsStatu2 only.
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            UINT16              i_nTokenId,
+                            CharacterSource &   io_rText ) = 0;
+};
+
+class TkpNullContex2 : public TkpContext
+{
+  public:
+                        ~TkpNullContex2();
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+};
+
+class TkpDocuContext : public TkpContext
+{
+  public:
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken ) = 0;
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue ) = 0;
+};
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx
new file mode 100644
index 000000000000..e6f76f7ee552
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx
@@ -0,0 +1,121 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKPSTAM2_HXX
+#define ADC_TKPSTAM2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+#include <tokens/stmstar2.hxx>
+#include <tokens/stmstfi2.hxx>
+
+/** @descr
+    This state-machine models state transitions from one state to another
+    per indices of branches. If the indices represent ascii-char-values,
+    the state-machine can be used for recognising tokens of text.
+
+    The state-machine can be a status itself.
+
+    StateMachin2 needs the array-size of all stati as a guess, how many stati
+    the state machine will contain, when at work.
+
+
+**/
+class StateMachin2
+{
+    public:
+        // Types
+        typedef StmStatu2::Branch   Branch;
+        typedef StmStatu2 * *       StatusList;
+
+    //# Interface self
+        // LIFECYCLE
+                        StateMachin2(
+                            intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize );   /// The user of the constructor should guess
+                                                                            ///   the approximate number of stati here to
+                                                                            ///   avoid multiple reallocations.
+        /// @#AddStatus
+        intt            AddStatus(      /// @return the new #Status' ID
+                            DYN StmStatu2 * let_dpStatus);
+        /// @#AddToken
+        void            AddToken(
+                            const char *        in_sToken,
+                            UINT16              in_nTokenId,
+                            const INT16 *       in_aBranches,
+                            INT16               in_nBoundsStatus );
+                        ~StateMachin2();
+
+        // OPERATIONS
+        StmBoundsStatu2 &
+                        GetCharChain(
+                            UINT16 &            o_nTokenId,
+                            CharacterSource &   io_rText );
+    private:
+        // SERVICE FUNCTIONS
+        StmStatu2 &     Status(
+                            intt            in_nStatusNr) const;
+        StmArrayStatu2 &
+                        CurrentStatus() const;
+        StmBoundsStatu2 *
+                        BoundsStatus() const;
+
+        /// Sets the PeekedStatus.
+        void            Peek(
+                            intt            in_nBranch);
+
+        void            ResizeStati();      // Adds space for 32 stati.
+
+        // DATA
+        StatusList      pStati;             /// List of Status, implemented as simple C-array of length #nStatiSpace
+                                            /// with nStatiLength valid members (beginning from zero).
+        intt            nCurrentStatus;
+        intt            nPeekedStatus;
+
+        intt            nStatusSize;        /// Size of the branch array of a single status.
+
+        intt            nNrofStati;         /// Nr of Stati so far.
+        intt            nStatiSpace;        /// Size of allocated array for #pStati (size in items).
+};
+
+
+
+/** @#AddToken
+    @descr
+    Adds a token, which will be recogniszeds by the
+    statemachine.
+
+
+**/
+
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/tokens/token2.hxx b/autodoc/source/parser_i/inc/tokens/token2.hxx
new file mode 100644
index 000000000000..a980d28e8c93
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/token2.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TOKEN2_HXX
+#define ADC_TOKEN2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETRS
+
+
+
+/** This is the interface for parser classes, which get a sequence of Token s from
+    a text.
+
+    Start() starts to parse the text from the given i_rSource.
+    GetNextToken() returns a Token on the heap as long as there are
+    still characters in the text left. The last time GetNextToken()
+    returns NULL.
+
+    The algorithms for parsing tokens from the text are an issue of
+    the derived classes.
+*/
+class TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~TextToken() {}
+
+
+    // INQUIRY
+    virtual const char* Text() const = 0;
+};
+
+
+#endif
+
+
diff --git a/autodoc/source/parser_i/inc/x_parse2.hxx b/autodoc/source/parser_i/inc/x_parse2.hxx
new file mode 100644
index 000000000000..2cbb1a92ee20
--- /dev/null
+++ b/autodoc/source/parser_i/inc/x_parse2.hxx
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_X_PARSE2_HXX
+#define ADC_X_PARSE2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/x.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class X_AutodocParser : public csv::Exception
+{
+  public:
+    // TYPES
+    enum E_Type
+    {
+        x_Any                       = 0,
+        x_InvalidChar,
+        x_UnexpectedToken,
+        x_UnexpectedEOF
+    };
+    // LIFECYCLE
+                        X_AutodocParser(
+                            E_Type              i_eType,
+                            const char *        i_sName = "" )
+                                                :   eType(i_eType), sName(i_sName) {}
+    // INQUIRY
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const;
+
+  private:
+    E_Type              eType;
+    String              sName;
+
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/parser_i/tokens/makefile.mk b/autodoc/source/parser_i/tokens/makefile.mk
new file mode 100644
index 000000000000..9674e6684827
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=garden
+TARGET=parser2_tokens
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/stmstar2.obj	\
+    $(OBJ)$/stmstat2.obj	\
+    $(OBJ)$/stmstfi2.obj	\
+    $(OBJ)$/tkpstam2.obj	\
+    $(OBJ)$/tkp2.obj  		\
+    $(OBJ)$/tkpcont2.obj	\
+    $(OBJ)$/x_parse2.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser_i/tokens/stmstar2.cxx b/autodoc/source/parser_i/tokens/stmstar2.cxx
new file mode 100644
index 000000000000..dcc2220ae7f0
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/stmstar2.cxx
@@ -0,0 +1,102 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/stmstar2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <x_parse2.hxx>
+
+
+
+StmArrayStatu2::StmArrayStatu2( intt            i_nStatusSize,
+                                const INT16 *   in_aArrayModel,
+                                uintt           i_nTokenId,
+                                bool            in_bIsDefault )
+    :   dpBranches(new StmStatu2::Branch[i_nStatusSize]),
+        nNrOfBranches(i_nStatusSize),
+        nTokenId(UINT16(i_nTokenId)),
+        bIsADefault(in_bIsDefault)
+{
+    // KORR_FUTURE: Interface of StmArrayStatu2() has to be changed.
+    csv_assert(i_nTokenId < 64536);
+
+    if (in_aArrayModel != 0)
+    {
+        intt count = 0;
+        for (const INT16 * get = in_aArrayModel; count < nNrOfBranches; count++, get++)
+            dpBranches[count] = *get;
+    }
+    else //
+    {
+        memset(dpBranches, 0, nNrOfBranches);
+    }  // endif
+}
+
+StmArrayStatu2::~StmArrayStatu2()
+{
+    delete [] dpBranches;
+}
+
+bool
+StmArrayStatu2::SetBranch( intt              in_nBranchIx,
+                           StmStatu2::Branch in_nBranch )
+{
+    if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) )
+    {
+        dpBranches[in_nBranchIx] = in_nBranch;
+        return true;
+    }
+    return false;
+}
+
+
+StmStatu2::Branch
+StmArrayStatu2::NextBy(intt in_nIndex) const
+{
+    if (in_nIndex < 0)
+        throw X_AutodocParser(X_AutodocParser::x_InvalidChar);
+
+    return in_nIndex < nNrOfBranches
+                ?   dpBranches[in_nIndex]
+                :   dpBranches[nNrOfBranches - 1];
+}
+
+
+bool
+StmArrayStatu2::IsADefault() const
+{
+    return bIsADefault;
+}
+
+StmArrayStatu2 *
+StmArrayStatu2::AsArray()
+{
+    return this;
+}
+
diff --git a/autodoc/source/parser_i/tokens/stmstat2.cxx b/autodoc/source/parser_i/tokens/stmstat2.cxx
new file mode 100644
index 000000000000..a97891c42b39
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/stmstat2.cxx
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/stmstat2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+StmArrayStatu2 *
+StmStatu2::AsArray()
+{
+    return 0;
+}
+
+StmBoundsStatu2 *
+StmStatu2::AsBounds()
+{
+    return 0;
+}
+
+
diff --git a/autodoc/source/parser_i/tokens/stmstfi2.cxx b/autodoc/source/parser_i/tokens/stmstfi2.cxx
new file mode 100644
index 000000000000..c583f36ea246
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/stmstfi2.cxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/stmstfi2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/tkpcont2.hxx>
+
+
+StmBoundsStatu2::StmBoundsStatu2( StateMachineContext &
+                                                    o_rOwner,
+                                  TkpContext &      i_rFollowUpContext,
+                                  uintt             i_nStatusFunctionNr,
+                                  bool              i_bIsDefault )
+    :   pOwner(&o_rOwner),
+        pFollowUpContext(&i_rFollowUpContext),
+        nStatusFunctionNr(i_nStatusFunctionNr),
+        bIsDefault(i_bIsDefault)
+{
+}
+
+bool
+StmBoundsStatu2::IsADefault() const
+{
+    return bIsDefault;
+}
+
+StmBoundsStatu2 *
+StmBoundsStatu2::AsBounds()
+{
+    return this;
+}
+
+
+
diff --git a/autodoc/source/parser_i/tokens/tkp2.cxx b/autodoc/source/parser_i/tokens/tkp2.cxx
new file mode 100644
index 000000000000..beeb46d237c0
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/tkp2.cxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkp2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpcont2.hxx>
+
+TokenParse2::TokenParse2()
+    :   pChars(0)
+{
+}
+
+void
+TokenParse2::Start( CharacterSource & i_rSource )
+{
+    pChars = &i_rSource;
+    SetStartContext();
+}
+
+bool
+TokenParse2::GetNextToken()
+{
+    csv_assert(pChars != 0);
+
+    bool bDone = false;
+    while ( NOT bDone AND NOT pChars->IsFinished() )
+    {
+        CurrentContext().ReadCharChain(*pChars);
+        bDone = CurrentContext().PassNewToken();
+        SetCurrentContext(CurrentContext().FollowUpContext());
+    }
+    return bDone;
+}
+
+
diff --git a/autodoc/source/parser_i/tokens/tkpcont2.cxx b/autodoc/source/parser_i/tokens/tkpcont2.cxx
new file mode 100644
index 000000000000..44502fc296a2
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/tkpcont2.cxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkpcont2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+TkpNullContex2 G_aNullContex2;
+
+TkpNullContex2 &
+TkpContext_Null2_()
+{
+    return G_aNullContex2;
+}
+
+TkpNullContex2::~TkpNullContex2()
+{
+}
+
+void
+TkpNullContex2::ReadCharChain( CharacterSource & )
+{
+}
+
+bool
+TkpNullContex2::PassNewToken()
+{
+    return false;
+}
+
+TkpContext &
+TkpNullContex2::FollowUpContext()
+{
+     return *this;
+}
+
+
+
diff --git a/autodoc/source/parser_i/tokens/tkpstam2.cxx b/autodoc/source/parser_i/tokens/tkpstam2.cxx
new file mode 100644
index 000000000000..0edc9070b385
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/tkpstam2.cxx
@@ -0,0 +1,174 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkpstam2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/stmstar2.hxx>
+#include <tools/tkpchars.hxx>
+
+
+const intt  C_nStatuslistResizeValue = 32;
+const intt  C_nTopStatus = 0;
+
+StateMachin2::StateMachin2( intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize )
+    :   pStati(new StmStatu2*[in_nInitial_StatusListSize]),
+        nCurrentStatus(C_nTopStatus),
+        nPeekedStatus(C_nTopStatus),
+        nStatusSize(in_nStatusSize),
+        nNrofStati(0),
+        nStatiSpace(in_nInitial_StatusListSize)
+{
+    csv_assert(in_nStatusSize > 0);
+    csv_assert(in_nInitial_StatusListSize > 0);
+
+    memset(pStati, 0, sizeof(StmStatu2*) * nStatiSpace);
+}
+
+intt
+StateMachin2::AddStatus(StmStatu2 * let_dpStatus)
+{
+    if (nNrofStati == nStatiSpace)
+    {
+        ResizeStati();
+    }
+    pStati[nNrofStati] = let_dpStatus;
+    return nNrofStati++;
+}
+
+void
+StateMachin2::AddToken( const char *        in_sToken,
+                        UINT16              in_nTokenId,
+                        const INT16 *       in_aBranches,
+                        INT16               in_nBoundsStatus )
+{
+    if (csv::no_str(in_sToken))
+        return;
+
+    // Durch existierende Stati durchhangeln:
+    nCurrentStatus = 0;
+    nPeekedStatus = 0;
+
+    for ( const char * pChar = in_sToken;
+          *pChar != NULCH;
+          ++pChar )
+    {
+        Peek(*pChar);
+        StmStatu2 & rPst = Status(nPeekedStatus);
+        if ( rPst.IsADefault() OR rPst.AsBounds() != 0 )
+        {
+            nPeekedStatus = AddStatus( new StmArrayStatu2(nStatusSize, in_aBranches, 0, false ) );
+            CurrentStatus().SetBranch( *pChar, nPeekedStatus );
+        }
+        nCurrentStatus = nPeekedStatus;
+    }   // end for
+    StmArrayStatu2 & rLastStatus = CurrentStatus();
+    rLastStatus.SetTokenId(in_nTokenId);
+    for (intt i = 0; i < nStatusSize; i++)
+    {
+        if (Status(rLastStatus.NextBy(i)).AsBounds() != 0)
+            rLastStatus.SetBranch(i,in_nBoundsStatus);
+    }   // end for
+}
+
+StateMachin2::~StateMachin2()
+{
+    for (intt i = 0; i < nNrofStati; i++)
+    {
+        delete pStati[i];
+    }
+    delete [] pStati;
+}
+
+StmBoundsStatu2 &
+StateMachin2::GetCharChain( UINT16 &           o_nTokenId,
+                            CharacterSource &  io_rText )
+{
+    nCurrentStatus = C_nTopStatus;
+    Peek(io_rText.CurChar());
+    while (BoundsStatus() == 0)
+    {
+        nCurrentStatus = nPeekedStatus;
+        Peek(io_rText.MoveOn());
+    }
+    o_nTokenId = CurrentStatus().TokenId();
+
+    return *BoundsStatus();
+}
+
+void
+StateMachin2::ResizeStati()
+{
+    intt nNewSize = nStatiSpace + C_nStatuslistResizeValue;
+    intt i = 0;
+    StatusList pNewStati = new StmStatu2*[nNewSize];
+
+    for ( ; i < nNrofStati; i++)
+    {
+        pNewStati[i] = pStati[i];
+    }
+    memset( pNewStati+i,
+            0,
+            (nNewSize-i) * sizeof(StmStatu2*) );
+
+    delete [] pStati;
+    pStati = pNewStati;
+    nStatiSpace = nNewSize;
+}
+
+StmStatu2 &
+StateMachin2::Status(intt in_nStatusNr) const
+{
+    csv_assert( csv::in_range(intt(0), in_nStatusNr, intt(nNrofStati)) );
+    return *pStati[in_nStatusNr];
+}
+
+StmArrayStatu2 &
+StateMachin2::CurrentStatus() const
+{
+    StmArrayStatu2 * pCurSt = Status(nCurrentStatus).AsArray();
+    if (pCurSt == 0)
+    {
+        csv_assert(false);
+    }
+    return *pCurSt;
+}
+
+StmBoundsStatu2 *
+StateMachin2::BoundsStatus() const
+{
+    return Status(nPeekedStatus).AsBounds();
+}
+
+void
+StateMachin2::Peek(intt in_nBranch)
+{
+    StmArrayStatu2 & rSt = CurrentStatus();
+    nPeekedStatus = rSt.NextBy(in_nBranch);
+}
diff --git a/autodoc/source/parser_i/tokens/x_parse2.cxx b/autodoc/source/parser_i/tokens/x_parse2.cxx
new file mode 100644
index 000000000000..6bdf7f352d9e
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/x_parse2.cxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <x_parse2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+    enum E_Type
+    {
+        x_Any                       = 0,
+        x_InvalidChar,
+        x_UnexpectedEOF
+    };
+void
+X_AutodocParser::GetInfo( std::ostream &        o_rOutputMedium ) const
+{
+    switch (eType)
+    {
+        case x_Any:
+            o_rOutputMedium << "Unspecified parsing exception ." << Endl();
+            break;
+        case x_InvalidChar:
+            o_rOutputMedium << "Unknown character during parsing." << Endl();
+            break;
+        case x_UnexpectedToken:
+            o_rOutputMedium << "Unexpected token " << sName << " found." << Endl();
+            break;
+        case x_UnexpectedEOF:
+            o_rOutputMedium << "Unexpected end of file found." << Endl();
+            break;
+        default:
+            o_rOutputMedium << "Unknown exception during parsing." << Endl();
+    }
+}
+
+
diff --git a/autodoc/source/tools/filecoll.cxx b/autodoc/source/tools/filecoll.cxx
new file mode 100644
index 000000000000..5c2286a18b1e
--- /dev/null
+++ b/autodoc/source/tools/filecoll.cxx
@@ -0,0 +1,132 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tools/filecoll.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+
+#include <stdio.h>
+
+
+FileCollector::FileCollector( uintt i_nRoughNrOfFiles )
+    // :    aFoundFiles
+{
+    if (i_nRoughNrOfFiles > 0)
+        aFoundFiles.reserve(i_nRoughNrOfFiles);
+}
+
+uintt
+FileCollector::AddFilesFrom( const char *                 i_sRootDir,
+                             const char *                 i_sFilter,
+                             E_SearchMode                 i_eSearchMode )
+{
+    uintt nSizeAtStart = aFoundFiles.size();
+
+    if (csv::no_str(i_sFilter) OR csv::no_str(i_sRootDir))
+    {
+        Cout() << "Warning: The filter contains no files." <<  Endl();
+        return 0;
+    }
+
+    csv::ploc::Directory aDir(i_sRootDir);
+    if (NOT aDir.Exists())
+    {
+        Cerr() << "Warning: The path for the files to be parsed could not be found:\n"
+               << i_sRootDir
+               << Endl();
+        return 0;
+    }
+
+    Cout() << "." << Flush();
+    aDir.GetContainedFiles(aFoundFiles, i_sFilter);
+
+    if (i_eSearchMode == recursive)
+    {
+        StreamStr aPath(1020);
+        aPath << i_sRootDir << csv::ploc::Delimiter();
+        uintt nSubDirStart = aPath.tellp();
+
+        StringVector aSubDirs;
+        aDir.GetContainedDirectories(aSubDirs);
+
+        for ( const_iterator iter = aSubDirs.begin();
+              iter != aSubDirs.end();
+              ++iter )
+        {
+            aPath.seekp(nSubDirStart);
+            aPath << (*iter);
+            AddFilesFrom( aPath.c_str(), i_sFilter, i_eSearchMode );
+        }
+    }
+
+    return aFoundFiles.size() - nSizeAtStart;
+}
+
+uintt
+FileCollector::AddFile( const char * i_sFilePath )
+{
+    FILE * pFile = fopen( i_sFilePath, "r" );
+    if ( pFile == 0 )
+    {
+        Cerr() << "Warning: The path for the file to be parsed could not be found:\n"
+               << i_sFilePath
+               << Endl();
+        return 0;
+    }
+
+    fclose(pFile);
+    aFoundFiles.push_back(i_sFilePath);
+    return 1;
+}
+
+void
+FileCollector::EraseAll()
+{
+    csv::erase_container(aFoundFiles);
+}
+
+FileCollector::const_iterator
+FileCollector::Begin() const
+{
+    return aFoundFiles.begin();
+}
+
+FileCollector::const_iterator
+FileCollector::End() const
+{
+    return aFoundFiles.end();
+}
+
+uintt
+FileCollector::Size() const
+{
+    return aFoundFiles.size();
+}
+
diff --git a/autodoc/source/tools/makefile.mk b/autodoc/source/tools/makefile.mk
new file mode 100644
index 000000000000..31d48edc0898
--- /dev/null
+++ b/autodoc/source/tools/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=autodoc
+TARGET=autodoc_tools
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/filecoll.obj	\
+    $(OBJ)$/tkpchars.obj 
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx
new file mode 100644
index 000000000000..4538edf1a311
--- /dev/null
+++ b/autodoc/source/tools/tkpchars.cxx
@@ -0,0 +1,159 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tools/tkpchars.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/bstream.hxx>
+#include <cosv/x.hxx>
+
+
+
+CharacterSource::CharacterSource()
+    :   dpSource(new char[2]),
+        nSourceSize(0),
+        nCurPos(0),
+        nLastCut(0),
+        nLastTokenStart(0),
+        cCharAtLastCut(0)
+{
+    dpSource[nSourceSize] = NULCH;
+    dpSource[nSourceSize+1] = NULCH;
+}
+
+CharacterSource::~CharacterSource()
+{
+    delete [] dpSource;
+}
+
+void
+CharacterSource::LoadText(csv::bstream & io_rSource)
+{
+    if (dpSource != 0)
+        delete [] dpSource;
+
+    io_rSource.seek(0, csv::end);
+    nSourceSize = intt(io_rSource.position());
+    io_rSource.seek(0);
+
+    dpSource = new char[nSourceSize+1];
+
+    intt nCount = (intt) io_rSource.read(dpSource,nSourceSize);
+    if (nCount != nSourceSize)
+        throw csv::X_Default("IO-Error: Could not load file completely.");
+
+    dpSource[nSourceSize] = NULCH;
+
+    BeginSource();
+}
+
+///  KORR_FUTURE:  So far, this works only when tokens do not cross inserted text boundaries.
+void
+CharacterSource::InsertTextAtCurPos( const char * i_sText2Insert )
+{
+    if ( i_sText2Insert == 0 ? true : strlen(i_sText2Insert) == 0 )
+        return;
+
+    aSourcesStack.push( S_SourceState(
+                            dpSource,
+                            nSourceSize,
+                            nCurPos,
+                            nLastCut,
+                            nLastTokenStart,
+                            cCharAtLastCut ) );
+
+    nSourceSize = strlen(i_sText2Insert);
+    dpSource = new char[nSourceSize+1];
+    strcpy( dpSource,  i_sText2Insert);     // SAFE STRCPY (#100211# - checked)
+
+    BeginSource();
+}
+
+const char *
+CharacterSource::CutToken()
+{
+    dpSource[nLastCut] = cCharAtLastCut;
+    nLastTokenStart = nLastCut;
+    nLastCut = CurPos();
+    cCharAtLastCut = dpSource[nLastCut];
+    dpSource[nLastCut] = NULCH;
+
+    return &dpSource[nLastTokenStart];
+}
+
+void
+CharacterSource::BeginSource()
+{
+    nCurPos = 0;
+    nLastCut = 0;
+    nLastTokenStart = 0;
+    cCharAtLastCut = dpSource[nLastCut];
+    dpSource[nLastCut] = NULCH;
+}
+
+//  KORR_FUTURE:  So far, this works only when tokens do not cross inserted text boundaries.
+char
+CharacterSource::MoveOn_OverStack()
+{
+    while ( aSourcesStack.size() > 0 AND nCurPos >= nSourceSize-1 )
+    {
+        S_SourceState & aState = aSourcesStack.top();
+        delete [] dpSource;
+
+        dpSource = aState.dpSource;
+        nSourceSize = aState.nSourceSize;
+        nCurPos = aState.nCurPos;
+        nLastCut = aState.nLastCut;
+        nLastTokenStart = aState.nLastTokenStart;
+        cCharAtLastCut = aState.cCharAtLastCut;
+
+        aSourcesStack.pop();
+    }
+
+    if ( nLastCut < nCurPos )
+        CutToken();
+
+    return CurChar();
+}
+
+CharacterSource::
+S_SourceState::S_SourceState( DYN char *    dpSource_,
+                              intt          nSourceSize_,
+                              intt          nCurPos_,
+                              intt          nLastCut_,
+                              intt          nLastTokenStart_,
+                              char          cCharAtLastCut_ )
+    :   dpSource(dpSource_),
+        nSourceSize(nSourceSize_),
+        nCurPos(nCurPos_),
+        nLastCut(nLastCut_),
+        nLastTokenStart(nLastTokenStart_),
+        cCharAtLastCut(cCharAtLastCut_)
+{
+}
+
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
new file mode 100644
index 000000000000..5fe0fede94ff
--- /dev/null
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIAITEM_HXX
+#define _AVMEDIA_MEDIAITEM_HXX
+
+#include <tools/rtti.hxx>
+#ifndef _POOLITEM_HXX
+#include <svl/poolitem.hxx>
+#endif
+#include <com/sun/star/media/ZoomLevel.hpp>
+
+#define AVMEDIA_SETMASK_NONE        ((sal_uInt32)(0x00000000))
+#define AVMEDIA_SETMASK_STATE       ((sal_uInt32)(0x00000001))
+#define AVMEDIA_SETMASK_DURATION    ((sal_uInt32)(0x00000002))
+#define AVMEDIA_SETMASK_TIME        ((sal_uInt32)(0x00000004))
+#define AVMEDIA_SETMASK_LOOP        ((sal_uInt32)(0x00000008))
+#define AVMEDIA_SETMASK_MUTE        ((sal_uInt32)(0x00000010))
+#define AVMEDIA_SETMASK_VOLUMEDB    ((sal_uInt32)(0x00000020))
+#define AVMEDIA_SETMASK_ZOOM        ((sal_uInt32)(0x00000040))
+#define AVMEDIA_SETMASK_URL         ((sal_uInt32)(0x00000080))
+#define AVMEDIA_SETMASK_ALL         ((sal_uInt32)(0xffffffff))
+
+class SvStream;
+
+namespace avmedia
+{
+
+//---------------
+// - MediaState -
+// --------------
+
+enum MediaState
+{
+    MEDIASTATE_STOP = 0,
+    MEDIASTATE_PLAY = 1,
+    MEDIASTATE_PLAYFFW = 2,
+    MEDIASTATE_PAUSE = 3
+};
+
+// -------------
+// - MediaItem -
+// -------------
+
+class MediaItem : public SfxPoolItem
+{
+public:
+                            TYPEINFO();
+
+                            MediaItem( USHORT nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
+                            MediaItem( const MediaItem& rMediaItem );
+    virtual                 ~MediaItem();
+
+    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
+    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+                                                 SfxMapUnit eCoreUnit,
+                                                 SfxMapUnit ePresUnit,
+                                                 XubString& rText,
+                                                 const IntlWrapper *pIntl ) const;
+    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual BOOL            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+
+    void                    merge( const MediaItem& rMediaItem );
+
+    sal_uInt32              getMaskSet() const;
+
+    void                    setState( MediaState eState );
+    MediaState              getState() const;
+
+    void                    setDuration( double fDuration );
+    double                  getDuration() const;
+
+    void                    setTime( double fTime );
+    double                  getTime() const;
+
+    void                    setLoop( sal_Bool bLoop );
+    sal_Bool                isLoop() const;
+
+    void                    setMute( sal_Bool bMute );
+    sal_Bool                isMute() const;
+
+    void                    setVolumeDB( sal_Int16 nDB );
+    sal_Int16               getVolumeDB() const;
+
+    void                    setZoom( ::com::sun::star::media::ZoomLevel eZoom );
+    ::com::sun::star::media::ZoomLevel  getZoom() const;
+
+    void                    setURL( const ::rtl::OUString& rURL );
+    const ::rtl::OUString&  getURL() const;
+
+private:
+
+    ::rtl::OUString         maURL;
+    sal_uInt32              mnMaskSet;
+    MediaState              meState;
+    double                  mfTime;
+    double                  mfDuration;
+    sal_Int16               mnVolumeDB;
+    sal_Bool                mbLoop;
+    sal_Bool                mbMute;
+    ::com::sun::star::media::ZoomLevel meZoom;
+};
+
+typedef ::avmedia::MediaItem avmedia_MediaItem;
+
+}
+
+#endif
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
new file mode 100644
index 000000000000..ad60b1bdebf3
--- /dev/null
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIACHILD_HXX
+#define _AVMEDIA_MEDIACHILD_HXX
+
+#include <sfx2/ctrlitem.hxx>
+#include <sfx2/dockwin.hxx>
+#include <tools/urlobj.hxx>
+
+// -----------
+// - Defines -
+// -----------
+
+#define AVMEDIA_MEDIAWINDOW()                                                                                           \
+(static_cast< ::avmedia::MediaFloater* >( (                                                                             \
+SfxViewFrame::Current() && SfxViewFrame::Current()->GetChildWindow(::avmedia::MediaPlayer::GetChildWindowId())) ?   \
+SfxViewFrame::Current()->GetChildWindow(::avmedia::MediaPlayer::GetChildWindowId())->GetWindow() :              \
+NULL))
+
+namespace avmedia
+{
+
+// ---------------
+// - MediaPlayer -
+// ---------------
+
+class MediaPlayer : public SfxChildWindow
+{
+public:
+                        MediaPlayer( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+                        ~MediaPlayer();
+
+                        SFX_DECL_CHILDWINDOW( MediaPlayer );
+};
+
+// ----------------
+// - MediaFloater -
+// ----------------
+
+class MediaWindow;
+
+class MediaFloater : public SfxDockingWindow
+{
+public:
+
+                            MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent );
+                            ~MediaFloater();
+
+    void                    setURL( const ::rtl::OUString& rURL, bool bPlayImmediately );
+    const ::rtl::OUString&  getURL() const;
+
+    void                    dispatchCurrentURL();
+
+protected:
+
+    virtual void            Resize();
+    virtual void            ToggleFloatingMode();
+
+private:
+
+    MediaWindow*            mpMediaWindow;
+    Size                    maLastSize;
+    long                    mnDummy1;
+    long                    mnDummy2;
+
+    void                    implInit();
+};
+
+}
+
+#endif
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
new file mode 100644
index 000000000000..890fffaf0340
--- /dev/null
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIATOOLBOX_HXX
+#define _AVMEDIA_MEDIATOOLBOX_HXX
+
+#include <svl/lstner.hxx>
+#include <sfx2/tbxctrl.hxx>
+
+namespace avmedia
+{
+
+// -------------------------------
+// - SvxGrafFilterToolBoxControl -
+// -------------------------------
+
+class MediaItem;
+
+class MediaToolBoxControl : public SfxToolBoxControl
+{
+     friend class MediaToolBoxControl_Impl;
+
+public:
+
+                                SFX_DECL_TOOLBOX_CONTROL();
+
+                                MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbX );
+                                ~MediaToolBoxControl();
+
+    virtual void                StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual Window*             CreateItemWindow( Window* pParent );
+
+private:
+
+    void                        implUpdateMediaControl();
+    void                        implExecuteMediaControl( const MediaItem& rItem );
+};
+
+}
+
+#endif // _AVMEDIA_MEDIATOOLBOX_HXX
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
new file mode 100644
index 000000000000..b5e114bedb34
--- /dev/null
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -0,0 +1,170 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIAWINDOW_HXX
+#define _AVMEDIA_MEDIAWINDOW_HXX
+
+#include <memory>
+#include <vector>
+#include <tools/gen.hxx>
+#include <com/sun/star/media/ZoomLevel.hpp>
+#include <com/sun/star/media/XPlayer.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+// -----------
+// - Defines -
+// -----------
+
+#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0
+
+// ------------------------
+// - Forward Declarations -
+// ------------------------
+
+class Window;
+class KeyEvent;
+class MouseEvent;
+class CommandEvent;
+class PopupMenu;
+class Pointer;
+struct AcceptDropEvent;
+struct ExecuteDropEvent;
+
+namespace rtl { class OUString; }
+
+/* Declaration of MediaWindow class */
+
+namespace avmedia
+{
+    typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > FilterNameVector;
+
+    class MediaItem;
+
+    namespace priv { class MediaWindowImpl; }
+
+    // ---------------
+    // - MediaWindow -
+    // ---------------
+
+    class MediaWindow
+    {
+    public:
+                            MediaWindow( Window* parent, bool bInternalMediaControl );
+        virtual             ~MediaWindow();
+
+        void                setURL( const ::rtl::OUString& rURL );
+        const ::rtl::OUString&  getURL() const;
+
+        bool                isValid() const;
+//
+        bool                hasPreferredSize() const;
+        Size                getPreferredSize() const;
+
+        Window*             getWindow() const;
+
+        void                setPosSize( const Rectangle& rNewRect );
+        Rectangle           getPosSize() const;
+
+        void                setPointer( const Pointer& rPointer );
+        const Pointer&      getPointer() const;
+
+        bool                setZoom( ::com::sun::star::media::ZoomLevel eLevel );
+        ::com::sun::star::media::ZoomLevel  getZoom() const;
+
+        bool                start();
+        void                stop();
+
+        bool                isPlaying() const;
+
+        double              getDuration() const;
+
+        void                setMediaTime( double fTime );
+        double              getMediaTime() const;
+
+        void                setStopTime( double fTime );
+        double              getStopTime() const;
+
+        void                setRate( double fRate );
+        double              getRate() const;
+
+        void                setPlaybackLoop( bool bSet );
+        bool                isPlaybackLoop() const;
+
+        void                setMute( bool bSet );
+        bool                isMute() const;
+
+        void                updateMediaItem( MediaItem& rItem ) const;
+        void                executeMediaItem( const MediaItem& rItem );
+
+        void                show();
+        void                hide();
+
+        void                enable();
+        void                disable();
+
+    public:
+
+        virtual void        MouseMove( const MouseEvent& rMEvt );
+        virtual void        MouseButtonDown( const MouseEvent& rMEvt );
+        virtual void        MouseButtonUp( const MouseEvent& rMEvt );
+
+        virtual void        KeyInput( const KeyEvent& rKEvt );
+        virtual void        KeyUp( const KeyEvent& rKEvt );
+
+        virtual void        Command( const CommandEvent& rCEvt );
+
+        virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
+        virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
+
+        virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+
+    public:
+
+        static void         getMediaFilters( FilterNameVector& rFilterNameVector );
+        static bool         executeMediaURLDialog( Window* pParent, ::rtl::OUString& rURL, bool bInsertDialog = true );
+        static void         executeFormatErrorBox( Window* pParent );
+        static bool         isMediaURL( const ::rtl::OUString& rURL, bool bDeep = false, Size* pPreferredSizePixel = NULL );
+
+        static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+
+        static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const ::rtl::OUString& rURL,
+                                                                                                  bool bAllowToCreateReplacementGraphic = false,
+                                                                                                  double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME );
+
+    private:
+
+                    // default: disabled copy/assignment
+        MediaWindow(const MediaWindow&);
+        MediaWindow& operator =( const MediaWindow& );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   mxIFace;
+        priv::MediaWindowImpl*                                                  mpImpl;
+    };
+}
+
+#endif // _AVMEDIA_MEDIAWINDOW_HXX
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
new file mode 100644
index 000000000000..2d7ccd764762
--- /dev/null
+++ b/avmedia/inc/helpids.hrc
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_HELPIDS_HRC
+#define _AVMEDIA_HELPIDS_HRC
+
+#include <svl/solar.hrc>
+
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY    (HID_AVMEDIA_START+0)
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE   (HID_AVMEDIA_START+1)
+#define HID_AVMEDIA_TOOLBOXITEM_STOP    (HID_AVMEDIA_START+2)
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE    (HID_AVMEDIA_START+3)
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP    (HID_AVMEDIA_START+4)
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN    (HID_AVMEDIA_START+5)
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT  (HID_AVMEDIA_START+6)
+#define HID_AVMEDIA_ZOOMLISTBOX         (HID_AVMEDIA_START+7)
+#define HID_AVMEDIA_TIMESLIDER          (HID_AVMEDIA_START+8)
+#define HID_AVMEDIA_TIMEEDIT            (HID_AVMEDIA_START+9)
+#define HID_AVMEDIA_VOLUMESLIDER        (HID_AVMEDIA_START+10)
+#define HID_AVMEDIA_PLAYERWINDOW        (HID_AVMEDIA_START+11)
+
+#endif // _AVMEDIA_HELPIDS_HRC
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
new file mode 100644
index 000000000000..e778c0d1b21e
--- /dev/null
+++ b/avmedia/inc/mediacontrol.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIACONTROL_HXX
+#define _AVMEDIA_MEDIACONTROL_HXX
+
+#include <avmedia/mediaitem.hxx>
+
+#include <vcl/timer.hxx>
+#include <vcl/slider.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/image.hxx>
+
+#define AVMEDIA_CONTROLOFFSET 6
+
+class ListBox;
+
+namespace avmedia
+{
+
+// ---------------------
+// - MediaControlStyle -
+// ---------------------
+
+enum MediaControlStyle
+{
+    MEDIACONTROLSTYLE_SINGLELINE = 0,
+    MEDIACONTROLSTYLE_MULTILINE = 1
+};
+
+// ----------------
+// - MediaControl -
+// ---------------
+
+class MediaItem;
+
+class MediaControl : public Control
+{
+public:
+
+                        MediaControl( Window* pParent, MediaControlStyle eControlStyle );
+    virtual             ~MediaControl();
+
+    const Size&         getMinSizePixel() const;
+
+    void                setState( const MediaItem& rItem );
+    void                getState( MediaItem& rItem ) const;
+
+protected:
+
+    virtual void        update() = 0;
+    virtual void        execute( const MediaItem& rItem ) = 0;
+
+    virtual void        Resize();
+
+private:
+
+    void                implUpdateToolboxes();
+    void                implUpdateTimeSlider();
+    void                implUpdateVolumeSlider();
+    void                implUpdateTimeField( double fCurTime );
+    Image               implGetImage( sal_Int32 nImageId ) const;
+
+                        DECL_LINK( implTimeHdl, Slider* );
+                        DECL_LINK( implTimeEndHdl, Slider* );
+                        DECL_LINK( implVolumeHdl, Slider* );
+                        DECL_LINK( implVolumeEndHdl, Slider* );
+                        DECL_LINK( implSelectHdl, ToolBox* );
+                        DECL_LINK( implZoomSelectHdl, ListBox* );
+                        DECL_LINK( implTimeoutHdl, Timer* );
+
+    ImageList           maImageList;
+    Timer               maTimer;
+    MediaItem           maItem;
+    ToolBox             maPlayToolBox;
+    Slider              maTimeSlider;
+    ToolBox             maMuteToolBox;
+    Slider              maVolumeSlider;
+    ToolBox             maZoomToolBox;
+    ListBox*            mpZoomListBox;
+    Edit                maTimeEdit;
+    Size                maMinSize;
+    MediaControlStyle   meControlStyle;
+    bool                mbLocked;
+};
+
+}
+
+#endif
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
new file mode 100644
index 000000000000..1ef04ca0f7d5
--- /dev/null
+++ b/avmedia/prj/build.lst
@@ -0,0 +1,11 @@
+av	avmedia	:    l10n tools sfx2 NULL
+av	avmedia                 	usr1	-	all	av_mkout												NULL
+av	avmedia\prj					get		-	all	av_prj													NULL
+av	avmedia\inc					get		-	all	av_inv													NULL
+av  avmedia\source\viewer		nmake	-	all	av_viewer	        									NULL
+av  avmedia\source\framework	nmake	-	all	av_framework	        								NULL
+av  avmedia\source\win	    	nmake	-	all	av_win	            									NULL
+av	avmedia\source\java			nmake	-	all	av_java	            									NULL
+av	avmedia\source\xine			nmake	-	all	av_xine	            									NULL
+av	avmedia\source\quicktime	nmake	-	all	av_quicktime											NULL
+av	avmedia\util				nmake	-	all	av_util av_viewer av_framework av_win av_java av_quicktime av_xine	NULL
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
new file mode 100644
index 000000000000..c82db252aab8
--- /dev/null
+++ b/avmedia/prj/d.lst
@@ -0,0 +1,18 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\bin\avmedia*.dll %_DEST%\bin%_EXT%\avmedia*.dll
+..\source\java\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
+..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
+..\%__SRC%\bin\avmedia*.res %_DEST%\bin%_EXT%\avmedia*.res
+
+mkdir: %_DEST%\inc%_EXT%\avmedia
+
+..\inc\avmedia\mediawindow.hxx %_DEST%\inc%_EXT%\avmedia\mediawindow.hxx
+..\inc\avmedia\mediaitem.hxx %_DEST%\inc%_EXT%\avmedia\mediaitem.hxx
+..\inc\avmedia\mediaplayer.hxx %_DEST%\inc%_EXT%\avmedia\mediaplayer.hxx
+..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
+
+..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
new file mode 100644
index 000000000000..34669d3e9f8a
--- /dev/null
+++ b/avmedia/source/framework/makefile.mk
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=framework
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Resources ---------------------------------
+
+SRS1NAME=$(TARGET)
+SRC1FILES =\
+        mediacontrol.src
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+        $(SLO)$/mediaitem.obj	 \
+        $(SLO)$/mediamisc.obj 	 \
+        $(SLO)$/mediacontrol.obj \
+        $(SLO)$/mediatoolbox.obj \
+        $(SLO)$/mediaplayer.obj  \
+        $(SLO)$/soundhandler.obj  
+
+EXCEPTIONSFILES = \
+        $(SLO)$/soundhandler.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
new file mode 100644
index 000000000000..a71b5268abd7
--- /dev/null
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -0,0 +1,635 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediacontrol.hxx"
+#include "mediacontrol.hrc"
+#include "mediamisc.hxx"
+#include <avmedia/mediawindow.hxx>
+#include <avmedia/mediaplayer.hxx>
+#include "helpids.hrc"
+#include <tools/time.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/lstbox.hxx>
+#include <unotools/syslocale.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <math.h>
+#include <algorithm>
+
+#define AVMEDIA_TIMEOUT             100
+#define AVMEDIA_TIME_RANGE          2048
+#define AVMEDIA_DB_RANGE            -40
+#define AVMEDIA_LINEINCREMENT       1.0
+#define AVMEDIA_PAGEINCREMENT       10.0
+
+#define AVMEDIA_TOOLBOXITEM_PLAY    0x0001
+#define AVMEDIA_TOOLBOXITEM_PLAYFFW 0x0002
+#define AVMEDIA_TOOLBOXITEM_PAUSE   0x0004
+#define AVMEDIA_TOOLBOXITEM_STOP    0x0008
+#define AVMEDIA_TOOLBOXITEM_MUTE    0x0010
+#define AVMEDIA_TOOLBOXITEM_LOOP    0x0011
+#define AVMEDIA_TOOLBOXITEM_ZOOM    0x0012
+#define AVMEDIA_TOOLBOXITEM_OPEN    0x0014
+#define AVMEDIA_TOOLBOXITEM_INSERT  0x0018
+
+#define AVMEDIA_ZOOMLEVEL_50        0
+#define AVMEDIA_ZOOMLEVEL_100       1
+#define AVMEDIA_ZOOMLEVEL_200       2
+#define AVMEDIA_ZOOMLEVEL_FIT       3
+#define AVMEDIA_ZOOMLEVEL_SCALED    4
+#define AVMEDIA_ZOOMLEVEL_INVALID   65535
+
+namespace avmedia
+{
+
+// ----------------
+// - MediaControl -
+// ---------------
+
+MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
+    Control( pParent ),
+    maImageList( AVMEDIA_RESID( AVMEDIA_IMGLST ) ),
+    maItem( 0, AVMEDIA_SETMASK_ALL ),
+    maPlayToolBox( this, WB_3DLOOK ),
+    maTimeSlider( this, WB_HORZ | WB_DRAG | WB_3DLOOK | WB_SLIDERSET ),
+    maMuteToolBox( this, WB_3DLOOK ),
+    maVolumeSlider( this, WB_HORZ | WB_DRAG | WB_SLIDERSET ),
+    maZoomToolBox( this, WB_3DLOOK ),
+    mpZoomListBox( new ListBox( &maZoomToolBox, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_3DLOOK ) ),
+    maTimeEdit( this, WB_CENTER | WB_READONLY | WB_BORDER | WB_3DLOOK | WB_READONLY ),
+    meControlStyle( eControlStyle ),
+    mbLocked( false )
+{
+    const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
+
+    SetBackground();
+    SetPaintTransparent( TRUE );
+    SetParentClipMode( PARENTCLIPMODE_NOCLIP );
+
+    if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
+    {
+
+
+        maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
+        maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
+
+        maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage( AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) );
+        maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT );
+
+        maPlayToolBox.InsertSeparator();
+    }
+    else
+    {
+        maTimeSlider.SetBackground();
+        maVolumeSlider.SetBackground();
+        mpZoomListBox->SetBackground();
+
+        maZoomToolBox.SetBackground();
+        maZoomToolBox.SetPaintTransparent( TRUE );
+        maPlayToolBox.SetBackground();
+        maPlayToolBox.SetPaintTransparent( TRUE );
+        maMuteToolBox.SetBackground();
+        maMuteToolBox.SetPaintTransparent( TRUE );
+
+    }
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, HID_AVMEDIA_TOOLBOXITEM_PLAY );
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage( AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), TIB_CHECKABLE );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, HID_AVMEDIA_TOOLBOXITEM_PAUSE );
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage( AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, HID_AVMEDIA_TOOLBOXITEM_STOP );
+
+    maPlayToolBox.InsertSeparator();
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage( AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP );
+
+    if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+        maPlayToolBox.InsertSeparator();
+
+    maPlayToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
+    maPlayToolBox.SetSizePixel( maPlayToolBox.CalcWindowSizePixel() );
+    maPlayToolBox.Show();
+    maMinSize = maPlayToolBox.GetSizePixel();
+
+    maTimeSlider.SetSlideHdl( LINK( this, MediaControl, implTimeHdl ) );
+    maTimeSlider.SetEndSlideHdl( LINK( this, MediaControl, implTimeEndHdl ) );
+    maTimeSlider.SetRange( Range( 0, AVMEDIA_TIME_RANGE ) );
+    maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER );
+    maTimeSlider.SetUpdateMode( true );
+    maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) );
+    maTimeSlider.Show();
+    maMinSize.Width() += maTimeSlider.GetSizePixel().Width();
+
+    maTimeEdit.SetText( aTimeText );
+    maTimeEdit.SetUpdateMode( true );
+    maTimeEdit.SetSizePixel( Size( maTimeEdit.GetTextWidth( aTimeText ) + 8, maPlayToolBox.GetSizePixel().Height() ) );
+    maTimeEdit.SetControlBackground( Application::GetSettings().GetStyleSettings().GetWindowColor() );
+    maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT );
+    maTimeEdit.Disable();
+    maTimeEdit.Show();
+    maMinSize.Width() += maTimeEdit.GetSizePixel().Width();
+
+    if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+        maMuteToolBox.InsertSeparator();
+
+    maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
+       maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE );
+
+    maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
+    maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() );
+    maMuteToolBox.Show();
+    maMinSize.Width() += maMuteToolBox.GetSizePixel().Width();
+
+    maVolumeSlider.SetSlideHdl( LINK( this, MediaControl, implVolumeHdl ) );
+    maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) );
+    maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) );
+    maVolumeSlider.SetUpdateMode( true );
+    maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER );
+    maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) );
+    maVolumeSlider.Show();
+    maMinSize.Width() += maVolumeSlider.GetSizePixel().Width();
+
+    mpZoomListBox->SetSizePixel( Size( maTimeEdit.GetSizePixel().Width(), 260 ) );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 ) ), AVMEDIA_ZOOMLEVEL_50 );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_100 ) ), AVMEDIA_ZOOMLEVEL_100 );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT );
+    mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) );
+    mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX );
+
+    maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) );
+    maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX );
+
+    maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox );
+    maZoomToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
+    maZoomToolBox.SetSizePixel( maZoomToolBox.CalcWindowSizePixel() );
+    maZoomToolBox.Show();
+    maMinSize.Width() += maZoomToolBox.GetSizePixel().Width();
+
+    if( MEDIACONTROLSTYLE_MULTILINE == meControlStyle )
+    {
+        maMinSize.Width() = 256;
+        maMinSize.Height() = ( maMinSize.Height() << 1 ) + AVMEDIA_CONTROLOFFSET;
+    }
+
+    maTimer.SetTimeout( AVMEDIA_TIMEOUT );
+    maTimer.SetTimeoutHdl( LINK( this, MediaControl, implTimeoutHdl ) );
+    maTimer.Start();
+}
+
+// ------------------------------------------------------------------------------
+
+MediaControl::~MediaControl()
+{
+    maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL );
+    delete mpZoomListBox;
+}
+
+// ------------------------------------------------------------------------------
+
+const Size& MediaControl::getMinSizePixel() const
+{
+    return maMinSize;
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::Resize()
+{
+    Point           aPos( 0, 0 );
+    const sal_Int32 nPlayToolBoxWidth = maPlayToolBox.GetSizePixel().Width();
+    const sal_Int32 nMuteToolBoxWidth = maMuteToolBox.GetSizePixel().Width();
+    const sal_Int32 nVolumeSliderWidth = maVolumeSlider.GetSizePixel().Width();
+    const sal_Int32 nZoomToolBoxWidth = maZoomToolBox.GetSizePixel().Width();
+    const sal_Int32 nTimeEditWidth = maTimeEdit.GetSizePixel().Width();
+    const sal_Int32 nTimeSliderHeight = maTimeSlider.GetSizePixel().Height();
+
+    if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+    {
+        const sal_Int32 nTimeSliderWidth = GetSizePixel().Width() - ( AVMEDIA_CONTROLOFFSET * 3 ) -
+                                           nPlayToolBoxWidth - nMuteToolBoxWidth - nVolumeSliderWidth - nTimeEditWidth - nZoomToolBoxWidth;
+
+        maPlayToolBox.SetPosSizePixel( aPos, maPlayToolBox.GetSizePixel() );
+
+        aPos.X() += nPlayToolBoxWidth;
+        maTimeSlider.SetPosSizePixel( aPos, Size( nTimeSliderWidth, nTimeSliderHeight ) );
+
+        aPos.X() += nTimeSliderWidth + AVMEDIA_CONTROLOFFSET;
+        maTimeEdit.SetPosSizePixel( aPos, maTimeEdit.GetSizePixel() );
+
+        aPos.X() += nTimeEditWidth + AVMEDIA_CONTROLOFFSET;
+        maMuteToolBox.SetPosSizePixel( aPos, maMuteToolBox.GetSizePixel() );
+
+        aPos.X() += nMuteToolBoxWidth;
+        maVolumeSlider.SetPosSizePixel( aPos, maVolumeSlider.GetSizePixel() );
+
+        aPos.X() += nVolumeSliderWidth + AVMEDIA_CONTROLOFFSET;
+        maZoomToolBox.SetPosSizePixel( aPos, maZoomToolBox.GetSizePixel() );
+    }
+    else
+    {
+        const sal_Int32 nTimeSliderWidth = GetSizePixel().Width() - AVMEDIA_CONTROLOFFSET - nTimeEditWidth;
+
+        maTimeSlider.SetPosSizePixel( aPos, Size( nTimeSliderWidth, nTimeSliderHeight ) );
+
+        aPos.X() += nTimeSliderWidth + AVMEDIA_CONTROLOFFSET;
+        maTimeEdit.SetPosSizePixel( aPos, maTimeEdit.GetSizePixel() );
+
+        aPos.X() = 0;
+        aPos.Y() += nTimeSliderHeight + AVMEDIA_CONTROLOFFSET;
+        maPlayToolBox.SetPosSizePixel( aPos, maPlayToolBox.GetSizePixel() );
+
+        aPos.X() = GetSizePixel().Width() - nVolumeSliderWidth - nMuteToolBoxWidth - nZoomToolBoxWidth - AVMEDIA_CONTROLOFFSET;
+        maMuteToolBox.SetPosSizePixel( aPos, maMuteToolBox.GetSizePixel() );
+
+        aPos.X() += nMuteToolBoxWidth;
+        maVolumeSlider.SetPosSizePixel( aPos, maVolumeSlider.GetSizePixel() );
+
+        aPos.X() = GetSizePixel().Width() - nZoomToolBoxWidth;
+        maZoomToolBox.SetPosSizePixel( aPos, maZoomToolBox.GetSizePixel() );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::setState( const MediaItem& rItem )
+{
+    if( !mbLocked )
+    {
+        maItem.merge( rItem );
+
+        implUpdateToolboxes();
+        implUpdateTimeSlider();
+        implUpdateVolumeSlider();
+        implUpdateTimeField( maItem.getTime() );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::getState( MediaItem& rItem ) const
+{
+    rItem.merge( maItem );
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::update()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::execute( const MediaItem& )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateToolboxes()
+{
+    const bool bValidURL = ( maItem.getURL().getLength() > 0 );
+
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PAUSE, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_STOP, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_LOOP, bValidURL );
+    maMuteToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_MUTE, bValidURL );
+
+    if( !bValidURL || !IsEnabled() )
+    {
+        mpZoomListBox->Disable();
+
+        if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+            maPlayToolBox.Disable();
+
+        maMuteToolBox.Disable();
+    }
+    else
+    {
+        maPlayToolBox.Enable();
+        maMuteToolBox.Enable();
+
+        if( MEDIASTATE_PLAY == maItem.getState() || MEDIASTATE_PLAYFFW == maItem.getState() )
+        {
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, true );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, MEDIASTATE_PLAYFFW == maItem.getState() );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false );
+        }
+        else if( maItem.getTime() > 0.0 && ( maItem.getTime() < maItem.getDuration() ) )
+        {
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, true );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false );
+        }
+        else
+        {
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, true );
+        }
+
+        maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_LOOP, maItem.isLoop() );
+        maMuteToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_MUTE, maItem.isMute() );
+
+        if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
+        {
+            USHORT nSelectEntryPos ;
+
+            switch( maItem.getZoom() )
+            {
+                case( ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break;
+                case( ::com::sun::star::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break;
+                case( ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break;
+                case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break;
+                case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break;
+
+                default: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_INVALID; break;
+            }
+
+            if( nSelectEntryPos != AVMEDIA_ZOOMLEVEL_INVALID )
+            {
+                mpZoomListBox->Enable();
+                mpZoomListBox->SelectEntryPos( nSelectEntryPos );
+            }
+            else
+                mpZoomListBox->Disable();
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateTimeSlider()
+{
+    if( !maItem.getURL().getLength() || !IsEnabled() )
+        maTimeSlider.Disable();
+    else
+    {
+        maTimeSlider.Enable();
+
+        const double fDuration = maItem.getDuration();
+
+        if( fDuration > 0.0 )
+        {
+            const double fTime = ::std::min( maItem.getTime(), fDuration );
+
+            if( !maTimeSlider.GetLineSize() )
+                maTimeSlider.SetLineSize( static_cast< sal_uInt32 >( AVMEDIA_TIME_RANGE * AVMEDIA_LINEINCREMENT / fDuration ) );
+
+            if( !maTimeSlider.GetPageSize() )
+                maTimeSlider.SetPageSize( static_cast< sal_uInt32 >( AVMEDIA_TIME_RANGE * AVMEDIA_PAGEINCREMENT / fDuration ) );
+
+            maTimeSlider.SetThumbPos( static_cast< sal_Int32 >( fTime / fDuration * AVMEDIA_TIME_RANGE ) );
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateVolumeSlider()
+{
+    if( !maItem.getURL().getLength() || !IsEnabled() )
+        maVolumeSlider.Disable();
+    else
+    {
+        maVolumeSlider.Enable();
+
+        const sal_Int32 nVolumeDB = maItem.getVolumeDB();
+
+        maVolumeSlider.SetThumbPos( ::std::min( ::std::max( nVolumeDB, static_cast< sal_Int32 >( AVMEDIA_DB_RANGE ) ),
+                                                static_cast< sal_Int32 >( 0 ) ) );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateTimeField( double fCurTime )
+{
+    if( maItem.getURL().getLength() > 0 )
+    {
+        String              aTimeString;
+
+        SvtSysLocale aSysLocale;
+        const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
+
+        aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) );
+        aTimeString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " ));
+        aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) );
+
+        if( maTimeEdit.GetText() != aTimeString )
+            maTimeEdit.SetText( aTimeString );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+Image MediaControl::implGetImage( sal_Int32 nImageId ) const
+{
+    return maImageList.GetImage( static_cast< USHORT >( nImageId ) );
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implTimeHdl, Slider*, p )
+{
+    mbLocked = true;
+    maTimer.Stop();
+    implUpdateTimeField( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE );
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p )
+{
+    MediaItem aExecItem;
+
+    aExecItem.setTime( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE );
+    execute( aExecItem );
+    update();
+    maTimer.Start();
+    mbLocked = false;
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p )
+{
+    MediaItem aExecItem;
+
+    aExecItem.setVolumeDB( static_cast< sal_Int16 >( p->GetThumbPos() ) );
+    execute( aExecItem );
+    update();
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implVolumeEndHdl, Slider*, EMPTYARG )
+{
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
+{
+    if( p )
+    {
+        MediaItem aExecItem;
+
+        switch( p->GetCurItemId() )
+        {
+            case( AVMEDIA_TOOLBOXITEM_OPEN ):
+            {
+                ::rtl::OUString aURL;
+
+                 if( ::avmedia::MediaWindow::executeMediaURLDialog( GetParent(), aURL, false ) )
+                 {
+                     if( !::avmedia::MediaWindow::isMediaURL( aURL, true ) )
+                        ::avmedia::MediaWindow::executeFormatErrorBox( this );
+                    else
+                    {
+                        aExecItem.setURL( aURL );
+                        aExecItem.setState( MEDIASTATE_PLAY );
+                    }
+                }
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_INSERT ):
+            {
+                MediaFloater* pFloater = AVMEDIA_MEDIAWINDOW();
+
+                if( pFloater )
+                    pFloater->dispatchCurrentURL();
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_PLAY ):
+            case( AVMEDIA_TOOLBOXITEM_PLAYFFW ):
+            {
+                aExecItem.setState( ( AVMEDIA_TOOLBOXITEM_PLAYFFW == p->GetCurItemId() ) ? MEDIASTATE_PLAYFFW : MEDIASTATE_PLAY );
+
+                if( maItem.getTime() == maItem.getDuration() )
+                    aExecItem.setTime( 0.0 );
+                else
+                    aExecItem.setTime( maItem.getTime() );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_PAUSE ):
+            {
+                aExecItem.setState( MEDIASTATE_PAUSE );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_STOP ):
+            {
+                aExecItem.setState( MEDIASTATE_STOP );
+                aExecItem.setTime( 0.0 );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_MUTE ):
+            {
+                aExecItem.setMute( !maMuteToolBox.IsItemChecked( AVMEDIA_TOOLBOXITEM_MUTE ) );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_LOOP ):
+            {
+                aExecItem.setLoop( !maPlayToolBox.IsItemChecked( AVMEDIA_TOOLBOXITEM_LOOP ) );
+            }
+            break;
+
+            default:
+            break;
+        }
+
+        if( aExecItem.getMaskSet() != AVMEDIA_SETMASK_NONE )
+            execute( aExecItem );
+    }
+
+    update();
+    p->Invalidate( INVALIDATE_UPDATE );
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
+{
+    if( p )
+    {
+        MediaItem aExecItem;
+        ::com::sun::star::media::ZoomLevel eLevel;
+
+        switch( p->GetSelectEntryPos() )
+        {
+            case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2; break;
+            case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = ::com::sun::star::media::ZoomLevel_ORIGINAL; break;
+            case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1; break;
+            case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
+            case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW; break;
+
+            default: eLevel = ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE; break;
+        }
+
+        aExecItem.setZoom( eLevel );
+        execute( aExecItem );
+        update();
+    }
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implTimeoutHdl, Timer*, EMPTYARG )
+{
+    update();
+    maTimer.Start();
+
+    return 0;
+}
+
+}
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
new file mode 100644
index 000000000000..081958ccd42c
--- /dev/null
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -0,0 +1,53 @@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#define AVMEDIA_STR_PLAY        1024
+#define AVMEDIA_STR_PAUSE       1025
+#define AVMEDIA_STR_STOP        1026
+#define AVMEDIA_STR_ENDLESS     1027
+#define AVMEDIA_STR_ZOOM        1028
+#define AVMEDIA_STR_ZOOM_50     1029
+#define AVMEDIA_STR_ZOOM_100    1030
+#define AVMEDIA_STR_ZOOM_200    1031
+#define AVMEDIA_STR_ZOOM_FIT    1032
+#define AVMEDIA_STR_MUTE        1033
+#define AVMEDIA_STR_OPEN        1034
+#define AVMEDIA_STR_INSERT      1035
+#define AVMEDIA_STR_MEDIAPLAYER 1036
+
+#define AVMEDIA_IMG_OPEN        2048
+#define AVMEDIA_IMG_PLAY        2049
+#define AVMEDIA_IMG_PAUSE       2050
+#define AVMEDIA_IMG_STOP        2051
+#define AVMEDIA_IMG_ENDLESS     2052
+#define AVMEDIA_IMG_INSERT      2053
+#define AVMEDIA_IMG_MUTE        2054
+
+#define AVMEDIA_IMGLST          3072
+#define AVMEDIA_IMGLST_HC       3073
+#define AVMEDIA_IMGLST_L        3074
+#define AVMEDIA_IMGLST_L_HC     3075
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
new file mode 100644
index 000000000000..2ad203e2c34f
--- /dev/null
+++ b/avmedia/source/framework/mediacontrol.src
@@ -0,0 +1,193 @@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediacontrol.hrc"
+
+String AVMEDIA_STR_OPEN
+{
+    Text[en-US] = "Open";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_INSERT
+{
+    Text [ en-US ] = "Apply" ;
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_PLAY
+{
+    Text[en-US] = "Play";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_PAUSE
+{
+    Text[en-US] = "Pause";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_STOP
+{
+    Text[en-US] = "Stop";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ENDLESS
+{
+    Text[en-US] = "Repeat";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_MUTE
+{
+    Text[en-US] = "Mute";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ZOOM
+{
+    Text[en-US] = "View";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ZOOM_50
+{
+    Text[en-US] = "50%";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ZOOM_100
+{
+    Text[en-US] = "100%";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ZOOM_200
+{
+    Text[en-US] = "200%";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ZOOM_FIT
+{
+    Text[en-US] = "Scaled";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_MEDIAPLAYER
+{
+    Text[en-US] = "Media Player";
+};
+
+// ------------------------------------------------------------------------------
+
+ImageList AVMEDIA_IMGLST
+{
+    Prefix = "av";
+    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
+    IdList =
+    {
+        AVMEDIA_IMG_OPEN;
+        AVMEDIA_IMG_PLAY;
+        AVMEDIA_IMG_PAUSE;
+        AVMEDIA_IMG_STOP;
+        AVMEDIA_IMG_ENDLESS;
+        AVMEDIA_IMG_INSERT;
+        AVMEDIA_IMG_MUTE;
+    };
+    IdCount = 7;
+};
+
+// ------------------------------------------------------------------------------
+
+ImageList AVMEDIA_IMGLST_L
+{
+    Prefix = "avl";
+    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
+    IdList =
+    {
+        AVMEDIA_IMG_OPEN;
+        AVMEDIA_IMG_PLAY;
+        AVMEDIA_IMG_PAUSE;
+        AVMEDIA_IMG_STOP;
+        AVMEDIA_IMG_ENDLESS;
+        AVMEDIA_IMG_INSERT;
+        AVMEDIA_IMG_MUTE;
+    };
+    IdCount = 7;
+};
+
+// ------------------------------------------------------------------------------
+
+ImageList AVMEDIA_IMGLST_HC
+{
+    Prefix = "avh";
+    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
+    IdList =
+    {
+        AVMEDIA_IMG_OPEN;
+        AVMEDIA_IMG_PLAY;
+        AVMEDIA_IMG_PAUSE;
+        AVMEDIA_IMG_STOP;
+        AVMEDIA_IMG_ENDLESS;
+        AVMEDIA_IMG_INSERT;
+        AVMEDIA_IMG_MUTE;
+    };
+    IdCount = 7;
+};
+
+// ------------------------------------------------------------------------------
+
+ImageList AVMEDIA_IMGLST_L_HC
+{
+    Prefix = "avlh";
+    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
+    IdList =
+    {
+        AVMEDIA_IMG_OPEN;
+        AVMEDIA_IMG_PLAY;
+        AVMEDIA_IMG_PAUSE;
+        AVMEDIA_IMG_STOP;
+        AVMEDIA_IMG_ENDLESS;
+        AVMEDIA_IMG_INSERT;
+        AVMEDIA_IMG_MUTE;
+    };
+    IdCount = 7;
+};
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
new file mode 100644
index 000000000000..f9f85eb1ee66
--- /dev/null
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -0,0 +1,329 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <avmedia/mediaitem.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+
+// -------------
+// - MediaItem -
+// -------------
+
+TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
+    ::rtl::OUString         maURL;
+    sal_uInt32              mnMaskSet;
+    MediaState              meState;
+    double                  mfTime;
+    double                  mfDuration;
+    sal_Int16               mnVolumeDB;
+    sal_Bool                mbLoop;
+    sal_Bool                mbMute;
+    ::com::sun::star::media::ZoomLevel meZoom;
+
+// ------------------------------------------------------------------------------
+
+MediaItem::MediaItem( USHORT _nWhich, sal_uInt32 nMaskSet ) :
+    SfxPoolItem( _nWhich ),
+    mnMaskSet( nMaskSet ),
+    meState( MEDIASTATE_STOP ),
+    mfTime( 0.0 ),
+    mfDuration( 0.0 ),
+    mnVolumeDB( 0 ),
+    mbLoop( false ),
+    mbMute( false ),
+    meZoom( ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+MediaItem::MediaItem( const MediaItem& rItem ) :
+    SfxPoolItem( rItem ),
+    maURL( rItem.maURL ),
+    mnMaskSet( rItem.mnMaskSet ),
+    meState( rItem.meState ),
+    mfTime( rItem.mfTime ),
+    mfDuration( rItem.mfDuration ),
+    mnVolumeDB( rItem.mnVolumeDB ),
+    mbLoop( rItem.mbLoop ),
+    mbMute( rItem.mbMute ),
+    meZoom( rItem.meZoom )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+MediaItem::~MediaItem()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+int MediaItem::operator==( const SfxPoolItem& rItem ) const
+{
+    DBG_ASSERT( SfxPoolItem::operator==(rItem), "unequal types" );
+    return( mnMaskSet == static_cast< const MediaItem& >( rItem ).mnMaskSet &&
+            maURL == static_cast< const MediaItem& >( rItem ).maURL &&
+            meState == static_cast< const MediaItem& >( rItem ).meState &&
+            mfDuration == static_cast< const MediaItem& >( rItem ).mfDuration &&
+            mfTime == static_cast< const MediaItem& >( rItem ).mfTime &&
+            mnVolumeDB == static_cast< const MediaItem& >( rItem ).mnVolumeDB &&
+            mbLoop == static_cast< const MediaItem& >( rItem ).mbLoop &&
+            mbMute == static_cast< const MediaItem& >( rItem ).mbMute &&
+            meZoom == static_cast< const MediaItem& >( rItem ).meZoom );
+}
+
+// ------------------------------------------------------------------------------
+
+SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
+{
+    return new MediaItem( *this );
+}
+
+//------------------------------------------------------------------------
+
+SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
+                                                  SfxMapUnit,
+                                                  SfxMapUnit,
+                                                  XubString& rText,
+                                                  const IntlWrapper * ) const
+{
+    rText.Erase();
+    return SFX_ITEM_PRESENTATION_NONE;
+}
+
+//------------------------------------------------------------------------
+
+BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+{
+    uno::Sequence< uno::Any > aSeq( 9 );
+
+    aSeq[ 0 ] <<= maURL;
+    aSeq[ 1 ] <<= mnMaskSet;
+    aSeq[ 2 ] <<= static_cast< sal_Int32 >( meState );
+    aSeq[ 3 ] <<= mfTime;
+    aSeq[ 4 ] <<= mfDuration;
+    aSeq[ 5 ] <<= mnVolumeDB;
+    aSeq[ 6 ] <<= mbLoop;
+    aSeq[ 7 ] <<= mbMute;
+    aSeq[ 8 ] <<= meZoom;
+
+    rVal <<= aSeq;
+
+    return true;
+}
+
+//------------------------------------------------------------------------
+
+BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+{
+    uno::Sequence< uno::Any >   aSeq;
+    BOOL                        bRet = false;
+
+    if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) )
+    {
+        sal_Int32 nInt32 = 0;
+
+        aSeq[ 0 ] >>= maURL;
+        aSeq[ 1 ] >>= mnMaskSet;
+        aSeq[ 2 ] >>= nInt32; meState = static_cast< MediaState >( nInt32 );
+        aSeq[ 3 ] >>= mfTime;
+        aSeq[ 4 ] >>= mfDuration;
+        aSeq[ 5 ] >>= mnVolumeDB;
+        aSeq[ 6 ] >>= mbLoop;
+        aSeq[ 7 ] >>= mbMute;
+        aSeq[ 8 ] >>= meZoom;
+
+        bRet = true;
+    }
+
+    return bRet;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::merge( const MediaItem& rMediaItem )
+{
+    const sal_uInt32 nMaskSet = rMediaItem.getMaskSet();
+
+    if( AVMEDIA_SETMASK_URL & nMaskSet )
+        setURL( rMediaItem.getURL() );
+
+    if( AVMEDIA_SETMASK_STATE & nMaskSet )
+        setState( rMediaItem.getState() );
+
+    if( AVMEDIA_SETMASK_DURATION & nMaskSet )
+        setDuration( rMediaItem.getDuration() );
+
+    if( AVMEDIA_SETMASK_TIME & nMaskSet )
+        setTime( rMediaItem.getTime() );
+
+    if( AVMEDIA_SETMASK_LOOP & nMaskSet )
+        setLoop( rMediaItem.isLoop() );
+
+    if( AVMEDIA_SETMASK_MUTE & nMaskSet )
+        setMute( rMediaItem.isMute() );
+
+    if( AVMEDIA_SETMASK_VOLUMEDB & nMaskSet )
+        setVolumeDB( rMediaItem.getVolumeDB() );
+
+    if( AVMEDIA_SETMASK_ZOOM & nMaskSet )
+        setZoom( rMediaItem.getZoom() );
+}
+
+//------------------------------------------------------------------------
+
+sal_uInt32 MediaItem::getMaskSet() const
+{
+    return mnMaskSet;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setURL( const ::rtl::OUString& rURL )
+{
+    maURL = rURL;
+    mnMaskSet |= AVMEDIA_SETMASK_URL;
+}
+
+//------------------------------------------------------------------------
+
+const ::rtl::OUString& MediaItem::getURL() const
+{
+    return maURL;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setState( MediaState eState )
+{
+    meState = eState;
+    mnMaskSet |= AVMEDIA_SETMASK_STATE;
+}
+
+//------------------------------------------------------------------------
+
+MediaState MediaItem::getState() const
+{
+    return meState;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setDuration( double fDuration )
+{
+    mfDuration = fDuration;
+    mnMaskSet |= AVMEDIA_SETMASK_DURATION;
+}
+
+//------------------------------------------------------------------------
+
+double MediaItem::getDuration() const
+{
+    return mfDuration;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setTime( double fTime )
+{
+    mfTime = fTime;
+    mnMaskSet |= AVMEDIA_SETMASK_TIME;
+}
+
+//------------------------------------------------------------------------
+
+double MediaItem::getTime() const
+{
+    return mfTime;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setLoop( sal_Bool bLoop )
+{
+    mbLoop = bLoop;
+    mnMaskSet |= AVMEDIA_SETMASK_LOOP;
+}
+
+//------------------------------------------------------------------------
+
+sal_Bool MediaItem::isLoop() const
+{
+    return mbLoop;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setMute( sal_Bool bMute )
+{
+    mbMute = bMute;
+    mnMaskSet |= AVMEDIA_SETMASK_MUTE;
+}
+
+//------------------------------------------------------------------------
+
+sal_Bool MediaItem::isMute() const
+{
+    return mbMute;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setVolumeDB( sal_Int16 nDB )
+{
+    mnVolumeDB = nDB;
+    mnMaskSet |= AVMEDIA_SETMASK_VOLUMEDB;
+}
+
+//------------------------------------------------------------------------
+
+sal_Int16 MediaItem::getVolumeDB() const
+{
+    return mnVolumeDB;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
+{
+    meZoom = eZoom;
+    mnMaskSet |= AVMEDIA_SETMASK_ZOOM;
+}
+
+//------------------------------------------------------------------------
+
+::com::sun::star::media::ZoomLevel MediaItem::getZoom() const
+{
+    return meZoom;
+}
+
+}
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
new file mode 100644
index 000000000000..b7807e767c6d
--- /dev/null
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <tools/resmgr.hxx>
+#include <svl/solar.hrc>
+#include <vcl/svapp.hxx>
+
+namespace avmedia {
+
+ResMgr* GetResMgr()
+{
+    static ResMgr* pResMgr = NULL;
+
+    if( !pResMgr )
+    {
+        ByteString aResMgrName( "avmedia" );
+
+        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
+    }
+
+    return pResMgr;
+}
+
+} // namespace avemdia
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
new file mode 100644
index 000000000000..caab783c6a7c
--- /dev/null
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -0,0 +1,166 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <avmedia/mediaplayer.hxx>
+#include <avmedia/mediawindow.hxx>
+#include <avmedia/mediaitem.hxx>
+#include "mediamisc.hxx"
+#include "mediacontrol.hrc"
+#include "helpids.hrc"
+
+#include <svl/stritem.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+
+namespace avmedia
+{
+
+// ---------------
+// - MediaPlayer -
+// ---------------
+
+MediaPlayer::MediaPlayer( Window* _pParent, USHORT nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
+    SfxChildWindow( _pParent, nId )
+{
+    pWindow = new MediaFloater( _pBindings, this, _pParent );
+    eChildAlignment = SFX_ALIGN_NOALIGNMENT;
+    static_cast< MediaFloater* >( pWindow )->Initialize( pInfo );
+};
+
+// -----------------------------------------------------------------------------
+
+MediaPlayer::~MediaPlayer()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+SFX_IMPL_DOCKINGWINDOW( MediaPlayer, SID_AVMEDIA_PLAYER )
+
+// ----------------
+// - MediaFloater -
+// ----------------
+
+MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window* pParent ) :
+    SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
+    mpMediaWindow( new MediaWindow( this, true ) )
+{
+    const Size aSize( 378, 256 );
+
+    SetPosSizePixel( Point( 0, 0 ), aSize );
+    SetMinOutputSizePixel( aSize );
+    SetText( String( AVMEDIA_RESID( AVMEDIA_STR_MEDIAPLAYER ) ) );
+    implInit();
+    mpMediaWindow->show();
+}
+
+// -----------------------------------------------------------------------------
+
+MediaFloater::~MediaFloater()
+{
+    delete mpMediaWindow;
+    mpMediaWindow = NULL;
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::implInit()
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaFloater::Resize()
+{
+    SfxDockingWindow::Resize();
+
+    if( mpMediaWindow )
+        mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::ToggleFloatingMode()
+{
+    ::avmedia::MediaItem aRestoreItem;
+
+    mpMediaWindow->updateMediaItem( aRestoreItem );
+    delete mpMediaWindow;
+    mpMediaWindow = NULL;
+
+    SfxDockingWindow::ToggleFloatingMode();
+
+    mpMediaWindow = new MediaWindow( this, true );
+
+    mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+    mpMediaWindow->executeMediaItem( aRestoreItem );
+
+    Window* pWindow = mpMediaWindow->getWindow();
+
+    if( pWindow )
+        pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
+
+    mpMediaWindow->show();
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::setURL( const ::rtl::OUString& rURL, bool bPlayImmediately )
+{
+    if( mpMediaWindow )
+    {
+        mpMediaWindow->setURL( rURL );
+
+        if( mpMediaWindow->isValid() && bPlayImmediately )
+            mpMediaWindow->start();
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+const ::rtl::OUString& MediaFloater::getURL() const
+{
+    static const ::rtl::OUString aEmptyStr;
+    return( mpMediaWindow ? mpMediaWindow->getURL() : aEmptyStr );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::dispatchCurrentURL()
+{
+    SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
+
+    if( pDispatcher )
+    {
+        const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, getURL() );
+        pDispatcher->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_RECORD, &aMediaURLItem, 0L );
+    }
+}
+
+}
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
new file mode 100644
index 000000000000..2da70b056bfc
--- /dev/null
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -0,0 +1,168 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <avmedia/mediatoolbox.hxx>
+#include <avmedia/mediaitem.hxx>
+#include "mediacontrol.hxx"
+
+#include <sfx2/app.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/sfxsids.hrc>
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+
+// -----------------------
+// - MediaToolboxControl -
+// -----------------------
+
+class MediaToolBoxControl_Impl : public MediaControl
+{
+public:
+
+                            MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl );
+                            ~MediaToolBoxControl_Impl();
+
+    void                    update();
+    void                    execute( const MediaItem& rItem );
+
+private:
+
+    MediaToolBoxControl*    mpToolBoxControl;
+};
+
+// ---------------------------------------------------------------------
+
+MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl ) :
+    MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
+    mpToolBoxControl( &rControl )
+{
+    SetSizePixel( getMinSizePixel() );
+}
+
+// ---------------------------------------------------------------------
+
+MediaToolBoxControl_Impl::~MediaToolBoxControl_Impl()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaToolBoxControl_Impl::update()
+{
+    mpToolBoxControl->implUpdateMediaControl();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaToolBoxControl_Impl::execute( const MediaItem& rItem )
+{
+    mpToolBoxControl->implExecuteMediaControl( rItem );
+}
+
+// -----------------------
+// - MediaToolBoxControl -
+// -----------------------
+
+SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem );
+
+// -----------------------------------------------------------------------------
+
+MediaToolBoxControl::MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+    SfxToolBoxControl( nSlotId, nId, rTbx )
+{
+        rTbx.Invalidate();
+}
+
+// -----------------------------------------------------------------------------
+
+MediaToolBoxControl::~MediaToolBoxControl()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaToolBoxControl::StateChanged( USHORT /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
+
+{
+    MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
+
+    DBG_ASSERT( pCtrl, "MediaToolBoxControl::StateChanged: media control not found" );
+
+    if( eState == SFX_ITEM_DISABLED )
+    {
+        pCtrl->Enable( false, false );
+        pCtrl->SetText( String() );
+
+        const MediaItem aEmptyMediaItem( 0, AVMEDIA_SETMASK_ALL );
+        pCtrl->setState( aEmptyMediaItem );
+    }
+    else
+    {
+        pCtrl->Enable( true, false );
+
+        const MediaItem* pMediaItem = PTR_CAST( MediaItem, pState );
+
+        if( pMediaItem && ( SFX_ITEM_AVAILABLE == eState ) )
+            pCtrl->setState( *pMediaItem );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+Window* MediaToolBoxControl::CreateItemWindow( Window *pParent )
+{
+    return( pParent ? new MediaToolBoxControl_Impl( *pParent, *this ) : NULL );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaToolBoxControl::implUpdateMediaControl()
+{
+    updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AVMediaToolBox" ) ) );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
+{
+    MediaItem                               aExecItem( SID_AVMEDIA_TOOLBOX );
+    uno::Sequence< beans::PropertyValue >   aArgs( 1 );
+    uno::Any                                aAny;
+
+    aExecItem.merge( rItem );
+    aExecItem.QueryValue( aAny );
+    aArgs[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AVMediaToolBox" ) );
+    aArgs[ 0 ].Value = aAny;
+
+    Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AVMediaToolBox" ) ), aArgs );
+}
+
+}
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
new file mode 100644
index 000000000000..d24ae795fd76
--- /dev/null
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -0,0 +1,563 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+//_________________________________________________________________________________________________________________
+//  my own includes
+//_________________________________________________________________________________________________________________
+
+#ifndef __FRAMEWORK_DISPATCH_SOUNDHANDLER_HXX_
+#include "soundhandler.hxx"
+#endif
+
+#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_
+#include <comphelper/mediadescriptor.hxx>
+#endif
+
+//_________________________________________________________________________________________________________________
+//  interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/frame/DispatchResultState.hpp>
+
+//_________________________________________________________________________________________________________________
+//  includes of other projects
+//_________________________________________________________________________________________________________________
+#include <comphelper/sequenceashashmap.hxx>
+#include <rtl/ustrbuf.hxx>
+
+#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/factory.hxx>
+
+//_________________________________________________________________________________________________________________
+//  namespace
+//_________________________________________________________________________________________________________________
+
+namespace avmedia{
+
+//_________________________________________________________________________________________________________________
+//  non exported const
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//  non exported definitions
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//  declarations
+//_________________________________________________________________________________________________________________
+
+//*****************************************************************************************************************
+//  XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+
+void SAL_CALL SoundHandler::acquire() throw()
+{
+       /* Don't use mutex in methods of XInterface! */
+       OWeakObject::acquire();
+}
+
+void SAL_CALL SoundHandler::release() throw()
+{
+       /* Don't use mutex in methods of XInterface! */
+       OWeakObject::release();
+}
+
+css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException )
+{
+       /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface.     */
+        /* Ask for my own supported interfaces ...*/
+       css::uno::Any aReturn( ::cppu::queryInterface( aType,
+               static_cast< css::lang::XTypeProvider* >(this),
+               static_cast< css::lang::XServiceInfo* >(this),
+               static_cast< css::frame::XNotifyingDispatch* >(this),
+               static_cast< css::frame::XDispatch* >(this),
+               static_cast< css::document::XExtendedFilterDetection* >(this)));
+       /* If searched interface not supported by this class ... */
+       if ( aReturn.hasValue() == sal_False )
+       {
+               /* ... ask baseclass for interfaces! */
+               aReturn = OWeakObject::queryInterface( aType );
+       }
+        /* Return result of this search. */
+       return aReturn;
+}
+
+css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() throw( css::uno::RuntimeException )
+{
+    /* Create one Id for all instances of this class.                                               */
+    /* Use ethernet address to do this! (sal_True)                                                  */
+    /* Optimize this method                                                                         */
+    /* We initialize a static variable only one time. And we don't must use a mutex at every call!  */
+    /* For the first call; pID is NULL - for the second call pID is different from NULL!            */
+    static ::cppu::OImplementationId* pID = NULL ;
+    if ( pID == NULL )
+    {
+        /* Ready for multithreading; get global mutex for first call of this method only! see before   */
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        /* Control these pointer again ... it can be, that another instance will be faster then these! */
+        if ( pID == NULL )
+        {
+            /* Create a new static ID ... */
+            static ::cppu::OImplementationId aID( sal_False );
+            /* ... and set his address to static pointer! */
+            pID = &aID ;
+        }
+    }
+    return pID->getImplementationId();
+}
+
+css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException )
+{
+    /* Optimize this method !                                       */
+    /* We initialize a static variable only one time.               */
+    /* And we don't must use a mutex at every call!                 */
+    /* For the first call; pTypeCollection is NULL -                */
+    /* for the second call pTypeCollection is different from NULL!  */
+    static ::cppu::OTypeCollection* pTypeCollection = NULL ;
+    if ( pTypeCollection == NULL )
+    {
+        /* Ready for multithreading; get global mutex for first call of this method only! see before   */
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        /* Control these pointer again ... it can be, that another instance will be faster then these! */
+        if ( pTypeCollection == NULL )
+        {
+            /* Create a static typecollection ...           */
+            static ::cppu::OTypeCollection aTypeCollection
+                (
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XTypeProvider >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XNotifyingDispatch >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::document::XExtendedFilterDetection >*)NULL )
+                );
+            /* ... and set his address to static pointer! */
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+    return pTypeCollection->getTypes();
+}
+
+#define DECLARE_ASCII( SASCIIVALUE ) \
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
+
+#define IMPLEMENTATIONNAME_SOUNDHANDLER DECLARE_ASCII("com.sun.star.comp.framework.SoundHandler")
+#define SERVICENAME_CONTENTHANDLER DECLARE_ASCII("com.sun.star.frame.ContentHandler")
+
+/*===========================================================================================================*/
+/* XServiceInfo */
+/*===========================================================================================================*/
+::rtl::OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException )
+{
+    return impl_getStaticImplementationName();
+}
+
+/*===========================================================================================================*/
+/* XServiceInfo */
+/*===========================================================================================================*/
+sal_Bool SAL_CALL SoundHandler::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException )
+{
+    /* Set default return value. */
+    sal_Bool bReturn = sal_False ;
+    /* Get names of all supported servicenames. */
+    css::uno::Sequence< ::rtl::OUString >  seqServiceNames =   getSupportedServiceNames();
+    const ::rtl::OUString*                 pArray          =   seqServiceNames.getConstArray();
+    sal_Int32                              nCounter        =   0;
+    sal_Int32                              nLength         =   seqServiceNames.getLength();
+    /* Search for right name in list. */
+    while   (
+              ( nCounter      <       nLength         )       &&
+              ( bReturn       ==      sal_False       )
+            )
+    {
+        /* Is name was found, say "YES, SERVICE IS SUPPORTED." and break loop. */
+        if ( pArray[nCounter] == sServiceName )
+        {
+            bReturn = sal_True ;
+        }
+        /* Else step to next element in list. */
+        ++nCounter;
+    }
+    /* Return state of search. */
+    return bReturn;
+}
+
+/*===========================================================================================================*/
+/* XServiceInfo */
+/*===========================================================================================================*/
+css::uno::Sequence< ::rtl::OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException )
+{
+    return impl_getStaticSupportedServiceNames();
+}
+
+/*===========================================================================================================*/
+/* Helper for XServiceInfo                                                                                   */
+/*===========================================================================================================*/
+css::uno::Sequence< ::rtl::OUString > SoundHandler::impl_getStaticSupportedServiceNames()
+{
+    css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 );
+    seqServiceNames.getArray() [0] = SERVICENAME_CONTENTHANDLER;
+    return seqServiceNames;
+}
+
+/*===========================================================================================================*/
+/* Helper for XServiceInfo */
+/*===========================================================================================================*/
+::rtl::OUString SoundHandler::impl_getStaticImplementationName()
+{
+    return IMPLEMENTATIONNAME_SOUNDHANDLER;
+}
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SoundHandler::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception )
+{
+    /* create new instance of service */
+    SoundHandler* pClass = new SoundHandler( xServiceManager );
+    /* hold it alive by increasing his ref count!!! */
+    css::uno::Reference< css::uno::XInterface > xService( static_cast< ::cppu::OWeakObject* >(pClass), css::uno::UNO_QUERY );
+    /* initialize new service instance ... he can use his own refcount ... we hold it! */
+    pClass->impl_initService();
+    /* return new created service as reference */
+    return xService;
+}
+
+css::uno::Reference< css::lang::XSingleServiceFactory > SoundHandler::impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )
+{
+    css::uno::Reference< css::lang::XSingleServiceFactory > xReturn ( cppu::createSingleFactory (
+       xServiceManager,
+        SoundHandler::impl_getStaticImplementationName(),
+        SoundHandler::impl_createInstance,
+        SoundHandler::impl_getStaticSupportedServiceNames()
+        )
+    );
+    return xReturn;
+}
+
+void SAL_CALL SoundHandler::impl_initService()
+{
+}
+
+
+/*-************************************************************************************************************//**
+    @short      standard ctor
+    @descr      These initialize a new instance of this class with needed informations for work.
+
+    @seealso    using at owner
+
+    @param      "xFactory", reference to service manager for creation of new services
+    @return     -
+
+    @onerror    Show an assertion and do nothing else.
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+SoundHandler::SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+        //  Init baseclasses first
+        :   ThreadHelpBase      (          )
+        ,   ::cppu::OWeakObject (          )
+        // Init member
+    ,   m_bError        ( false    )
+        ,   m_xFactory          ( xFactory )
+{
+    m_aUpdateTimer.SetTimeoutHdl(LINK(this, SoundHandler, implts_PlayerNotify));
+}
+
+/*-************************************************************************************************************//**
+    @short      standard dtor
+    @descr      -
+
+    @seealso    -
+
+    @param      -
+    @return     -
+
+    @onerror    -
+    @threadsafe -
+*//*-*************************************************************************************************************/
+SoundHandler::~SoundHandler()
+{
+    if (m_xListener.is())
+    {
+        css::frame::DispatchResultEvent aEvent;
+        aEvent.State = css::frame::DispatchResultState::FAILURE;
+        m_xListener->dispatchFinished(aEvent);
+        m_xListener = css::uno::Reference< css::frame::XDispatchResultListener >();
+    }
+}
+
+/*-************************************************************************************************************//**
+    @interface  ::com::sun::star::frame::XDispatch
+
+    @short      try to load audio file
+    @descr      This method try to load given audio file by URL and play it. We use vcl/Sound class to do that.
+                Playing of sound is asynchron everytime.
+
+    @attention  We must hold us alive by ourself ... because we use async. vcl sound player ... but playing is started
+                in async interface call "dispatch()" too. And caller forget us imediatly. But then our uno ref count
+                will decreased to 0 and will die. The only solution is to use own reference to our implementation.
+                But we do it for realy started jobs only and release it during call back of vcl.
+
+    @seealso    class vcl/Sound
+    @seealso    method implts_PlayerNotify()
+
+    @param      "aURL"      , URL to dispatch.
+    @param      "lArguments", list of optional arguments.
+    @return     -
+
+    @onerror    We do nothing.
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&                                             aURL      ,
+                                                     const css::uno::Sequence< css::beans::PropertyValue >&            lDescriptor,
+                                                     const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException)
+{
+    // SAFE {
+    const ::vos::OGuard aLock( m_aLock );
+
+    {
+    //close streams otherwise on windows we can't reopen the file in the
+    //media player when we pass the url to directx as it'll already be open
+        ::comphelper::MediaDescriptor aDescriptor(lDescriptor);
+
+    css::uno::Reference< css::io::XInputStream > xInputStream =
+        aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INPUTSTREAM(),
+        css::uno::Reference< css::io::XInputStream >());
+    if (xInputStream.is()) xInputStream->closeInput();
+    }
+
+    // If player currently used for other dispatch() requests ...
+    // cancel it by calling stop()!
+    m_aUpdateTimer.Stop();
+    if (m_xPlayer.is())
+    {
+        if (m_xPlayer->isPlaying())
+            m_xPlayer->stop();
+        m_xPlayer.clear();
+    }
+
+    // Try to initialize player.
+    m_xListener = xListener;
+    try
+    {
+        m_bError = false;
+        m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete ), css::uno::UNO_QUERY_THROW );
+        // OK- we can start async playing ...
+        // Count this request and initialize self-holder against dieing by uno ref count ...
+        m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
+        m_xPlayer->start();
+        m_aUpdateTimer.SetTimeout( 200 );
+        m_aUpdateTimer.Start();
+    }
+    catch( css::uno::Exception& e )
+    {
+        m_bError = true;
+        (void)e;
+        m_xPlayer.clear();
+    }
+
+    // } SAFE
+}
+
+void SAL_CALL SoundHandler::dispatch( const css::util::URL&                                  aURL       ,
+                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException )
+{
+    dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
+}
+
+/*-************************************************************************************************************//**
+    @interface  ::com::sun::star::document::XExtendedFilterDetection
+
+    @short      try to detect file (given as argument included in "lDescriptor")
+    @descr      We try to detect, if given file could be handled by this class and is a well known one.
+                If it is - we return right internal type name - otherwise we return nothing!
+                So call can search for another detect service and ask him too.
+
+    @attention  a) We don't need any mutex here ... because we don't use any member!
+                b) Dont' use internal player instance "m_pPlayer" to detect given sound file!
+                   It's not neccessary to do that ... and we can use temp. variable to do the same.
+                   This way is easy - we don't must synchronize it with currently played sounds!
+                   Another reason to do so ... We are a listener on our internal ma_Player object.
+                   If you would call "IsSoundFile()" on this instance, he would call us back and
+                   we make some uneccssary things ...
+
+    @seealso    -
+
+    @param      "lDescriptor", description of file to detect
+    @return     Internal type name which match this file ... or nothing if it is unknown.
+
+    @onerror    We return nothing.
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+::rtl::OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException )
+{
+    // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown.
+    ::rtl::OUString sTypeName;
+
+    // Analyze given descriptor to find filename or input stream or ...
+    ::comphelper::MediaDescriptor aDescriptor(lDescriptor);
+    ::rtl::OUString               sURL       = aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString());
+
+    if (
+        (sURL.getLength()           ) &&
+        (avmedia::MediaWindow::isMediaURL(sURL))
+       )
+    {
+        // If the file type is supported depends on the OS, so...
+        // I think we can the following ones:
+        //  a) look for given extension of url to map our type decision HARD CODED!!!
+        //  b) return preferred type every time... it's easy :-)
+        sTypeName = ::rtl::OUString::createFromAscii("wav_Wave_Audio_File");
+        aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
+        aDescriptor >> lDescriptor;
+    }
+
+    // Return our decision.
+    return sTypeName;
+}
+
+/*-************************************************************************************************************//**
+    @short      call back of sound player
+    @descr      Our player call us back to give us some informations.
+                We use this informations to callback our might existing listener.
+
+    @seealso    method dispatchWithNotification()
+
+    @param      -
+    @return     0 everytime ... it doesnt matter for us.
+
+    @onerror    -
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
+{
+    // SAFE {
+    ::vos::OClearableGuard aLock( m_aLock );
+
+    if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
+    {
+        m_aUpdateTimer.Start();
+        return 0L;
+    }
+    m_xPlayer.clear();
+
+    // We use m_xSelfHold to let us die ... but we must live till real finishing of this method too!!!
+    // So we SHOULD use another "self-holder" temp. to provide that ...
+    css::uno::Reference< css::uno::XInterface > xOperationHold = m_xSelfHold;
+    m_xSelfHold = css::uno::Reference< css::uno::XInterface >();
+
+    // notify might existing listener
+    // And forget this listener!
+    // Because the corresponding dispatch was finished.
+    if (m_xListener.is())
+    {
+        css::frame::DispatchResultEvent aEvent;
+        if (!m_bError)
+            aEvent.State = css::frame::DispatchResultState::SUCCESS;
+        else
+            aEvent.State = css::frame::DispatchResultState::FAILURE;
+        m_xListener->dispatchFinished(aEvent);
+        m_xListener = css::uno::Reference< css::frame::XDispatchResultListener >();
+    }
+
+    // } SAFE
+    //release aLock before end of method at which point xOperationHold goes out of scope and pThis dies
+    aLock.clear();
+    return 0;
+}
+
+} // namespace framework
+
+// ------------------------------------------
+// - component_getImplementationEnvironment -
+// ------------------------------------------
+
+extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+{
+       *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+// -----------------------
+// - component_writeInfo -
+// -----------------------
+
+extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
+{
+    sal_Bool bRet = sal_False;
+
+    if( pRegistryKey )
+    {
+       try
+       {
+           rtl::OUString sKeyName = DECLARE_ASCII( "/" );
+           sKeyName += avmedia::SoundHandler::impl_getStaticImplementationName();
+           sKeyName += DECLARE_ASCII( "/UNO/SERVICES" );
+           css::uno::Reference< css::registry::XRegistryKey > xNewKey(
+               static_cast< css::registry::XRegistryKey* >( pRegistryKey )->createKey(sKeyName));
+
+           if ( xNewKey.is() == sal_True )
+           {
+               css::uno::Sequence< ::rtl::OUString > seqServiceNames = avmedia::SoundHandler::impl_getStaticSupportedServiceNames();
+               const ::rtl::OUString* pArray = seqServiceNames.getArray();
+               sal_Int32 nLength = seqServiceNames.getLength();
+               for ( sal_Int32 nCounter = 0; nCounter < nLength; ++nCounter )
+                   xNewKey->createKey( pArray[nCounter] );
+           }
+
+           bRet = sal_True;
+       }
+       catch( css::registry::InvalidRegistryException& )
+       {
+           OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+       }
+    }
+
+    return bRet;
+}
+
+// ------------------------
+// - component_getFactory -
+// ------------------------
+
+extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
+{
+    void* pReturn = NULL;
+    if  (pServiceManager !=  NULL )
+    {
+        /* Define variables which are used in following macros. */
+        css::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory;
+        css::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager;
+            xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager )  ;
+
+        if ( avmedia::SoundHandler::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) )
+            xFactory = avmedia::SoundHandler::impl_createFactory( xServiceManager );
+
+        if ( xFactory.is() == sal_True )
+        {
+            xFactory->acquire();
+            pReturn = xFactory.get();
+        }
+    }
+    /* Return with result of this operation. */
+    return pReturn;
+}
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
new file mode 100644
index 000000000000..55d30536d8ce
--- /dev/null
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -0,0 +1,187 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+#define __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+
+//_________________________________________________________________________________________________________________
+//  interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/frame/XNotifyingDispatch.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/media/XPlayer.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/util/URL.hpp>
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+
+//_________________________________________________________________________________________________________________
+//  other includes
+//_________________________________________________________________________________________________________________
+#include <cppuhelper/weak.hxx>
+
+#include <vcl/timer.hxx>
+#include <tools/link.hxx>
+#include <avmedia/mediawindow.hxx>
+#include <vos/mutex.hxx>
+
+namespace css = ::com::sun::star;
+
+//_________________________________________________________________________________________________________________
+//  namespace
+//_________________________________________________________________________________________________________________
+
+namespace avmedia{
+
+//_________________________________________________________________________________________________________________
+//  exported const
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//  exported definitions
+//_________________________________________________________________________________________________________________
+
+struct ThreadHelpBase
+{
+    public:
+        mutable ::vos::OMutex m_aLock;
+};
+
+/*-************************************************************************************************************//**
+    @short          handler to detect and play sounds ("wav" and "au" only!)
+    @descr          Register this implementation as a content handler to detect and/or play wav- and au-sounds.
+                    It doesn't depend from the target platform. But one instance of this class
+                    can play one sound at the same time only. Means every new dispatch request will stop the
+                    might still running one. So we support one operation/one URL/one listener at the same time
+                    only.
+
+    @devstatus      ready
+    @threadsafe     yes
+*//*-*************************************************************************************************************/
+class SoundHandler  :   // interfaces
+                        public  css::lang::XTypeProvider
+                    ,   public  css::lang::XServiceInfo
+                    ,   public  css::frame::XNotifyingDispatch // => XDispatch
+                    ,   public  css::document::XExtendedFilterDetection
+                        // baseclasses
+                        // Order is neccessary for right initialization!
+                    ,   private ThreadHelpBase
+                    ,   public  ::cppu::OWeakObject
+{
+    //-------------------------------------------------------------------------------------------------------------
+    //  public methods
+    //-------------------------------------------------------------------------------------------------------------
+    public:
+
+        //---------------------------------------------------------------------------------------------------------
+        //  constructor / destructor
+        //---------------------------------------------------------------------------------------------------------
+                 SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+        virtual ~SoundHandler(                                                                        );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XInterface, XTypeProvider, XServiceInfo
+        //---------------------------------------------------------------------------------------------------------
+        virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) throw( css::uno::RuntimeException );
+        virtual void SAL_CALL acquire() throw();
+        virtual void SAL_CALL release() throw();
+        virtual css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes () throw( css::uno::RuntimeException );
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException );
+
+
+    /* interface XServiceInfo */
+       virtual ::rtl::OUString                                        SAL_CALL getImplementationName              (                                                                               ) throw( css::uno::RuntimeException );
+       virtual sal_Bool                                               SAL_CALL supportsService                    ( const ::rtl::OUString&                                        sServiceName    ) throw( css::uno::RuntimeException );
+       virtual css::uno::Sequence< ::rtl::OUString >                  SAL_CALL getSupportedServiceNames           (                                                                               ) throw( css::uno::RuntimeException );
+    /* Helper for XServiceInfo */
+       static css::uno::Sequence< ::rtl::OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                                                               );
+       static ::rtl::OUString                                         SAL_CALL impl_getStaticImplementationName   (                                                                               );
+    /* Helper for registry */
+       static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+       static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
+    /* Helper for initialization of service by using own reference! */
+       virtual void                                                   SAL_CALL impl_initService                   (                                                                               );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XNotifyingDispatch
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
+                                                       const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
+                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException);
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XDispatch
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL dispatch              (   const   css::util::URL&                                     aURL        ,
+                                                        const   css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) throw( css::uno::RuntimeException );
+        // not supported !
+        virtual void SAL_CALL addStatusListener     (   const   css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
+                                                        const   css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException ) {};
+        virtual void SAL_CALL removeStatusListener  (   const   css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
+                                                        const   css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException ) {};
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XExtendedFilterDetection
+        //---------------------------------------------------------------------------------------------------------
+        virtual ::rtl::OUString SAL_CALL detect     (           css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) throw( css::uno::RuntimeException );
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  protected methods
+    //-------------------------------------------------------------------------------------------------------------
+    protected:
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  private methods
+    //-------------------------------------------------------------------------------------------------------------
+    private:
+        DECL_LINK( implts_PlayerNotify, void* );
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  variables
+    //  (should be private everyway!)
+    //-------------------------------------------------------------------------------------------------------------
+    private:
+
+        bool m_bError;
+        css::uno::Reference< css::lang::XMultiServiceFactory >     m_xFactory          ;   /// global uno service factory to create new services
+        css::uno::Reference< css::uno::XInterface >                m_xSelfHold         ;   /// we must protect us against dieing during async(!) dispatch() call!
+        css::uno::Reference< css::media::XPlayer >                 m_xPlayer           ;   /// uses avmedia player to play sounds ...
+
+        css::uno::Reference< css::frame::XDispatchResultListener > m_xListener         ;
+        Timer m_aUpdateTimer;
+
+};      //  class SoundHandler
+
+}       //  namespace avmedia
+
+#endif  //  #ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
diff --git a/avmedia/source/framework/soundhandler.xml b/avmedia/source/framework/soundhandler.xml
new file mode 100644
index 000000000000..fceeffbde0e3
--- /dev/null
+++ b/avmedia/source/framework/soundhandler.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+
+     <module-name> avmedia </module-name>
+
+    <component-description>
+        <author> Andreas Schluens </author>
+        <name> com.sun.star.comp.framework.SoundHandler </name>
+        <description>
+            Implements a handler service to detect and/or play audio files.
+            supported formats: wav/au
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.frame.ContentHandler </supported-service>
+    </component-description>
+
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  vos         </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <project-build-dependency>  tools       </project-build-dependency>
+    <project-build-dependency>  svtools     </project-build-dependency>
+    <project-build-dependency>  toolkit     </project-build-dependency>
+    <project-build-dependency>  sv          </project-build-dependency>
+    <project-build-dependency>  comphelper  </project-build-dependency>
+    <project-build-dependency>  unotools    </project-build-dependency>
+    <project-build-dependency>  ucbhelper   </project-build-dependency>
+    <project-build-dependency>  svl         </project-build-dependency>
+    <project-build-dependency>  sot         </project-build-dependency>
+
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
+    <runtime-module-dependency> vos2$(COM)  </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <runtime-module-dependency> tl          </runtime-module-dependency>
+    <runtime-module-dependency> svt         </runtime-module-dependency>
+    <runtime-module-dependency> svl         </runtime-module-dependency>
+    <runtime-module-dependency> tk          </runtime-module-dependency>
+    <runtime-module-dependency> sv          </runtime-module-dependency>
+    <runtime-module-dependency> comphelp2   </runtime-module-dependency>
+    <runtime-module-dependency> utl         </runtime-module-dependency>
+    <runtime-module-dependency> ucb         </runtime-module-dependency>
+    <runtime-module-dependency> sot         </runtime-module-dependency>
+
+</module-description>
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
new file mode 100644
index 000000000000..fd89e9d4abde
--- /dev/null
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -0,0 +1,45 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+class ResMgr;
+
+#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
+
+#ifdef WNT
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+#else
+#ifdef QUARTZ
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+#else
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+#endif
+#endif
+
+namespace avmedia
+{
+    ResMgr* GetResMgr();
+}
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
new file mode 100644
index 000000000000..1a0deda4ce57
--- /dev/null
+++ b/avmedia/source/java/FrameGrabber.java
@@ -0,0 +1,190 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XEventListener;
+import com.sun.star.awt.*;
+import com.sun.star.media.*;
+import com.sun.star.graphic.*;
+
+// -----------------
+// - Player Window -
+// -----------------
+
+public class FrameGrabber implements com.sun.star.lang.XServiceInfo,
+                                     com.sun.star.media.XFrameGrabber
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory = null;
+    private javax.media.Player maPlayer = null;
+    private javax.media.control.FrameGrabbingControl maFrameGrabbingControl = null;
+
+    // -------------------------------------------------------------------------
+
+    public FrameGrabber( com.sun.star.lang.XMultiServiceFactory aFactory, String aURL )
+    {
+        maFactory = aFactory;
+
+        try
+        {
+            maPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
+        }
+        catch( java.net.MalformedURLException e )
+        {
+        }
+        catch( java.io.IOException e )
+        {
+        }
+        catch( javax.media.NoPlayerException e )
+        {
+        }
+        catch( javax.media.CannotRealizeException e )
+        {
+        }
+        catch( java.lang.Exception e )
+        {
+        }
+
+        if( maPlayer != null )
+        {
+            maFrameGrabbingControl = (javax.media.control.FrameGrabbingControl) maPlayer.getControl(
+                                        "javax.media.control.FrameGrabbingControl" );
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public com.sun.star.graphic.XGraphic implImageToXGraphic( java.awt.Image aImage )
+    {
+        com.sun.star.graphic.XGraphic aRet = null;
+
+        if( maFactory != null && aImage != null )
+        {
+            if( aImage instanceof java.awt.image.BufferedImage )
+            {
+                java.io.File aTempFile = null;
+
+                try
+                {
+                    aTempFile = java.io.File.createTempFile( "sv0", ".png" );
+
+                    if( aTempFile.canWrite() )
+                    {
+                        javax.imageio.ImageIO.write( (java.awt.image.BufferedImage) aImage, "png", aTempFile );
+
+                        com.sun.star.graphic.XGraphicProvider aProvider =
+                            (com.sun.star.graphic.XGraphicProvider) UnoRuntime.queryInterface(
+                                com.sun.star.graphic.XGraphicProvider.class,
+                                maFactory.createInstance("com.sun.star.graphic.GraphicProvider") );
+
+                        if( aProvider != null )
+                        {
+                            com.sun.star.beans.PropertyValue[] aArgs = new com.sun.star.beans.PropertyValue[ 1 ];
+
+                            aArgs[ 0 ] = new com.sun.star.beans.PropertyValue();
+                            aArgs[ 0 ].Name = "URL";
+                            aArgs[ 0 ].Value = "file://" + aTempFile.toString();
+
+                            aRet = aProvider.queryGraphic( aArgs );
+                        }
+                    }
+                }
+                catch( java.lang.IllegalArgumentException aExcp )
+                {
+                }
+                catch( java.io.IOException aExcp )
+                {
+                }
+                catch( com.sun.star.uno.Exception aExcp )
+                {
+                }
+
+                if( aTempFile != null )
+                    aTempFile.delete();
+            }
+        }
+
+        return aRet;
+    }
+
+    // -----------------
+    // - XFrameGrabber -
+    // -----------------
+
+    public synchronized com.sun.star.graphic.XGraphic grabFrame( double fMediaTime )
+    {
+        com.sun.star.graphic.XGraphic aRet = null;
+
+        if( maFrameGrabbingControl != null )
+        {
+            if( fMediaTime >= 0.0 && fMediaTime <= maPlayer.getDuration().getSeconds() )
+            {
+                maPlayer.setMediaTime( new javax.media.Time( fMediaTime ) );
+
+                javax.media.Buffer aBuffer = maFrameGrabbingControl.grabFrame();
+
+                if( aBuffer != null && aBuffer.getFormat() instanceof javax.media.format.VideoFormat )
+                {
+                    aRet = implImageToXGraphic( new javax.media.util.BufferToImage(
+                                                    (javax.media.format.VideoFormat) aBuffer.getFormat() ).
+                                                        createImage( aBuffer ) );
+                }
+            }
+        }
+
+        return aRet;
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.FrameGrabber_Java";
+    private static final String s_serviceName = "com.sun.star.media.FrameGrabber_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+}
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
new file mode 100644
index 000000000000..47707478fd5b
--- /dev/null
+++ b/avmedia/source/java/Manager.java
@@ -0,0 +1,148 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// UNO
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+
+// media
+import com.sun.star.media.*;
+
+public class Manager implements com.sun.star.lang.XServiceInfo,
+                                com.sun.star.lang.XTypeProvider,
+                                com.sun.star.media.XManager
+
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory;
+
+    // -------------------------------------------------------------------------
+
+    public Manager( com.sun.star.lang.XMultiServiceFactory aFactory )
+    {
+        maFactory = aFactory;
+    }
+
+    // ------------
+    // - XManager -
+    // ------------
+
+    public com.sun.star.media.XPlayer createPlayer( String aURL )
+    {
+        javax.media.Player aPlayer = null;
+
+        try
+        {
+            aPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
+        }
+        catch( java.net.MalformedURLException e )
+        {
+        }
+        catch( java.io.IOException e )
+        {
+        }
+        catch( javax.media.NoPlayerException e )
+        {
+        }
+        catch( javax.media.CannotRealizeException e )
+        {
+        }
+        catch( java.lang.Exception e )
+        {
+        }
+
+        if( aPlayer != null )
+        {
+            return new Player( maFactory, aPlayer, aURL );
+        }
+        else
+            return null;
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.media.Manager_Java";
+    private static final String s_serviceName = "com.sun.star.media.Manager_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+
+    // -----------------
+    // - XTypeProvider -
+    // -----------------
+    protected byte[] maImplementationId;
+
+    public com.sun.star.uno.Type[] getTypes()
+    {
+        com.sun.star.uno.Type[] retValue = new com.sun.star.uno.Type[ 3 ];
+
+        retValue[ 0 ]= new com.sun.star.uno.Type( com.sun.star.lang.XServiceInfo.class );
+        retValue[ 1 ]= new com.sun.star.uno.Type( com.sun.star.lang.XTypeProvider.class );
+        retValue[ 2 ]= new com.sun.star.uno.Type( com.sun.star.media.XManager.class );
+
+        return retValue;
+    }
+
+    // -------------------------------------------------------------------------
+
+    synchronized public byte[] getImplementationId()
+    {
+        if( maImplementationId == null)
+        {
+            maImplementationId = new byte[ 16 ];
+
+            int hash = hashCode();
+
+            maImplementationId[ 0 ] = (byte)(hash & 0xff);
+            maImplementationId[ 1 ] = (byte)((hash >>> 8) & 0xff);
+            maImplementationId[ 2 ] = (byte)((hash >>> 16) & 0xff);
+            maImplementationId[ 3 ] = (byte)((hash >>>24) & 0xff);
+        }
+
+        return maImplementationId;
+    }
+}
diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
new file mode 100644
index 000000000000..ca7a164586d8
--- /dev/null
+++ b/avmedia/source/java/MediaUno.java
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// UNO
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+
+public class MediaUno
+{
+    private static final String s_implName = "com.sun.star.comp.media.Manager_Java";
+    private static final String s_serviceName = "com.sun.star.media.Manager_Java";
+
+    // -------------------------------------------------------------------------
+
+    public MediaUno()
+    {
+    }
+
+    // -------------------------------------------------------------------------
+
+    public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(
+        String implName,
+        com.sun.star.lang.XMultiServiceFactory multiFactory,
+        com.sun.star.registry.XRegistryKey regKey )
+    {
+        if (implName.equals( s_implName ))
+        {
+            try
+            {
+                return com.sun.star.comp.loader.FactoryHelper.getServiceFactory(
+                    Class.forName( "Manager" ), s_serviceName, multiFactory, regKey );
+            }
+            catch( java.lang.ClassNotFoundException exception )
+            {
+            }
+        }
+
+        return null;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public static boolean __writeRegistryServiceInfo(
+        com.sun.star.registry.XRegistryKey regKey )
+    {
+        return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(
+            s_implName, s_serviceName, regKey );
+    }
+}
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
new file mode 100644
index 000000000000..be3b3d62d367
--- /dev/null
+++ b/avmedia/source/java/Player.java
@@ -0,0 +1,325 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// UNO
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+
+// awt
+import com.sun.star.awt.*;
+
+// media
+import com.sun.star.media.*;
+
+public class Player implements javax.media.ControllerListener,
+                               com.sun.star.lang.XServiceInfo,
+                               com.sun.star.media.XPlayer,
+                               com.sun.star.lang.XComponent
+
+
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory;
+    private String maURL;
+    private javax.media.Player maPlayer;
+    private javax.media.GainControl maGainControl;
+    private boolean mbStarted = false;
+    private boolean mbLooping = false;
+
+    // -------------------------------------------------------------------------
+
+    public Player( com.sun.star.lang.XMultiServiceFactory aFactory,
+                   javax.media.Player aPlayer, String aURL )
+    {
+        maFactory = aFactory;
+        maURL = aURL;
+        maPlayer = aPlayer;
+        maPlayer.addControllerListener( this );
+        maGainControl = maPlayer.getGainControl();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void controllerUpdate( javax.media.ControllerEvent aEvt )
+    {
+        if( aEvt instanceof javax.media.EndOfMediaEvent ||
+            aEvt instanceof javax.media.StopAtTimeEvent )
+        {
+            mbStarted = false;
+
+            if( mbLooping )
+            {
+                setMediaTime( 0.0 );
+                start();
+            }
+            else if( aEvt instanceof javax.media.EndOfMediaEvent )
+                setMediaTime( getDuration() );
+        }
+    }
+
+    // -----------
+    // - XPlayer -
+    // -----------
+
+    public synchronized void start()
+    {
+        if( !mbStarted )
+        {
+            maPlayer.start();
+            mbStarted = true;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void stop()
+    {
+        if( mbStarted )
+        {
+            maPlayer.stop();
+            mbStarted = false;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean isPlaying()
+    {
+        return mbStarted;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getDuration()
+    {
+        return maPlayer.getDuration().getSeconds();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setMediaTime( double fTime )
+    {
+        if( fTime >= 0.0 && fTime <= getDuration() )
+            maPlayer.setMediaTime( new javax.media.Time( fTime ) );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getMediaTime()
+    {
+        return maPlayer.getMediaTime().getSeconds();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setStopTime( double fTime )
+    {
+        boolean bOldStarted = mbStarted;
+
+        if( mbStarted )
+            stop();
+
+        maPlayer.setStopTime( new javax.media.Time( fTime ) );
+
+        if( bOldStarted )
+            start();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getStopTime()
+    {
+        return maPlayer.getStopTime().getSeconds();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setRate( double fRate )
+    {
+        boolean bOldStarted = mbStarted;
+
+        if( mbStarted )
+            stop();
+
+        maPlayer.setRate( (float) fRate );
+
+        if( bOldStarted )
+            start();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getRate()
+    {
+        return (double) maPlayer.getRate();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setPlaybackLoop( boolean bSet )
+    {
+        mbLooping = bSet;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean isPlaybackLoop()
+    {
+        return mbLooping;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setVolumeDB( short nVolumeDB )
+    {
+        if( maGainControl != null )
+            maGainControl.setDB( nVolumeDB );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized short getVolumeDB()
+    {
+        return( maGainControl != null ? (short) maGainControl.getDB() : 0 );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setMute( boolean bSet )
+    {
+        if( maGainControl != null )
+            maGainControl.setMute( bSet );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean isMute()
+    {
+        return( maGainControl != null ? maGainControl.getMute() : false );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.awt.Size getPreferredPlayerWindowSize()
+    {
+        java.awt.Component      aVisualComponent = maPlayer.getVisualComponent();
+        com.sun.star.awt.Size   aSize = new com.sun.star.awt.Size( 0, 0 );
+
+        if( aVisualComponent != null )
+        {
+            java.awt.Dimension aDim = aVisualComponent.getPreferredSize();
+
+            aSize.Width = Math.max( aDim.width, 0 );
+            aSize.Height = Math.max( aDim.height, 0 );
+        }
+
+        return aSize;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.media.XPlayerWindow createPlayerWindow( java.lang.Object[] aArgs )
+    {
+        try
+        {
+            com.sun.star.media.XPlayerWindow xPlayerWindow = ( ( ( aArgs.length > 1 ) && ( AnyConverter.toInt( aArgs[ 0 ] ) > 0 ) ) ?
+                                                             new PlayerWindow( maFactory, aArgs, maPlayer ) :
+                                                             null );
+
+            // check if it is a real player window (video window)
+            if( xPlayerWindow != null && xPlayerWindow.getZoomLevel() == com.sun.star.media.ZoomLevel.NOT_AVAILABLE )
+                xPlayerWindow = null;
+
+            return xPlayerWindow;
+        }
+        catch( com.sun.star.lang.IllegalArgumentException e )
+        {
+            return null;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.media.XFrameGrabber createFrameGrabber()
+    {
+        return( (com.sun.star.media.XFrameGrabber) new FrameGrabber( maFactory, maURL ) );
+    }
+
+    // --------------
+    // - XComponent -
+    // --------------
+
+    public synchronized void addEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void dispose()
+    {
+        if( maPlayer != null )
+        {
+            maPlayer.stop();
+            maPlayer.close();
+            maPlayer = null;
+        }
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.Player_Java";
+    private static final String s_serviceName = "com.sun.star.media.Player_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+}
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
new file mode 100644
index 000000000000..229c651d9f54
--- /dev/null
+++ b/avmedia/source/java/PlayerWindow.java
@@ -0,0 +1,602 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XEventListener;
+import com.sun.star.awt.*;
+import com.sun.star.media.*;
+
+// -----------------
+// - Player Window -
+// -----------------
+
+public class PlayerWindow implements java.awt.event.KeyListener,
+                                     java.awt.event.MouseListener,
+                                     java.awt.event.MouseMotionListener,
+                                     java.awt.event.FocusListener,
+                                     com.sun.star.lang.XServiceInfo,
+                                     com.sun.star.media.XPlayerWindow
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory;
+    private WindowAdapter maFrame;
+    private javax.media.Player maPlayer;
+    private com.sun.star.media.ZoomLevel meZoomLevel = com.sun.star.media.ZoomLevel.ORIGINAL;
+    private boolean mbShowControls = false;
+
+
+    // -------------------------------------------------------------------------
+
+    public PlayerWindow( com.sun.star.lang.XMultiServiceFactory aFactory,
+                         java.lang.Object[] aArgs, javax.media.Player aPlayer )
+    {
+        maFactory = aFactory;
+
+        try
+        {
+            if( aArgs.length > 1 )
+            {
+                com.sun.star.awt.Rectangle aBoundRect = (com.sun.star.awt.Rectangle) aArgs[ 1 ];
+
+                maFrame = new WindowAdapter( AnyConverter.toInt( aArgs[ 0 ] ) );
+                maFrame.setPosSize( aBoundRect.X, aBoundRect.Y, aBoundRect.Width, aBoundRect.Height, (short) 0 );
+
+                if( aArgs.length > 2 )
+                    mbShowControls = AnyConverter.toBoolean( aArgs[ 2 ] );
+
+                java.awt.Panel aPanel = new java.awt.Panel( new java.awt.BorderLayout() );
+
+                aPanel.setLayout( null );
+                aPanel.setBackground( java.awt.Color.black );
+                aPanel.addKeyListener( this );
+                aPanel.addMouseListener( this );
+                aPanel.addMouseMotionListener( this );
+
+                if( mbShowControls )
+                {
+                    java.awt.Component aControlComponent = aPlayer.getControlPanelComponent();
+
+                    if( aControlComponent != null )
+                        aPanel.add( aControlComponent );
+                    else
+                        mbShowControls = false;
+                }
+
+                java.awt.Component aVisualComponent = aPlayer.getVisualComponent();
+
+                if( aVisualComponent != null )
+                {
+                    aVisualComponent.addKeyListener( this );
+                    aVisualComponent.addMouseListener( this );
+                    aVisualComponent.addMouseMotionListener( this );
+                    aVisualComponent.addFocusListener( this );
+                    aPanel.add( aVisualComponent );
+                }
+                else
+                    meZoomLevel = com.sun.star.media.ZoomLevel.NOT_AVAILABLE;
+
+                if( maFrame.getJavaFrame() != null )
+                    maFrame.getJavaFrame().add( aPanel );
+
+                LayoutComponents();
+            }
+        }
+        catch( com.sun.star.lang.IllegalArgumentException e )
+        {
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    protected synchronized void LayoutComponents()
+    {
+        if( maFrame.getJavaFrame() != null )
+        {
+            java.awt.Panel  aPanel = (java.awt.Panel) maFrame.getJavaFrame().getComponent( 0 );
+            int             nW = maFrame.getJavaFrame().getWidth();
+            int             nH = maFrame.getJavaFrame().getHeight();
+            int             nControlH = 0;
+
+            aPanel.setBounds( 0, 0, nW, nH );
+
+            if( mbShowControls )
+            {
+                java.awt.Component aControlComponent = aPanel.getComponent( 0 );
+
+                if( aControlComponent != null )
+                {
+                    java.awt.Dimension aControlDimension = aControlComponent.getPreferredSize();
+
+                    nControlH = Math.min( nH, aControlDimension.height );
+                    aControlComponent.setBounds( 0, nH - nControlH, nW, nControlH );
+                }
+            }
+
+            if( com.sun.star.media.ZoomLevel.NOT_AVAILABLE != meZoomLevel )
+            {
+                java.awt.Component aVisualComponent = aPanel.getComponent( mbShowControls ? 1 : 0 );
+
+                if( aVisualComponent != null )
+                {
+                    java.awt.Dimension  aPrefDim = aVisualComponent.getPreferredSize();
+                    int                 nVideoW = nW, nVideoH = ( nH - nControlH );
+                    int                 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
+                    boolean             bDone = false, bZoom = false;
+
+                    if( com.sun.star.media.ZoomLevel.ORIGINAL == meZoomLevel )
+                    {
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_1_TO_4 == meZoomLevel )
+                    {
+                        aPrefDim.width >>= 2;
+                        aPrefDim.height >>= 2;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_1_TO_2 == meZoomLevel )
+                    {
+                        aPrefDim.width >>= 1;
+                        aPrefDim.height >>= 1;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_2_TO_1 == meZoomLevel )
+                    {
+                        aPrefDim.width <<= 1;
+                        aPrefDim.height <<= 1;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_4_TO_1 == meZoomLevel )
+                    {
+                        aPrefDim.width <<= 2;
+                        aPrefDim.height <<= 2;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.FIT_TO_WINDOW == meZoomLevel )
+                    {
+                        nWidth = nVideoW;
+                        nHeight = nVideoH;
+                        bDone = true;
+                    }
+
+                    if( bZoom )
+                    {
+                        if( ( aPrefDim.width <= nVideoW ) && ( aPrefDim.height <= nVideoH ) )
+                        {
+                            nX = ( nVideoW - aPrefDim.width ) >> 1;
+                            nY = ( nVideoH - aPrefDim.height ) >> 1;
+                            nWidth = aPrefDim.width;
+                            nHeight = aPrefDim.height;
+                            bDone = true;
+                        }
+                    }
+
+                    if( !bDone )
+                    {
+                        if( aPrefDim.width > 0 && aPrefDim.height > 0 && nVideoW > 0 && nVideoH > 0 )
+                        {
+                            double fPrefWH = (double) aPrefDim.width / aPrefDim.height;
+
+                            if( fPrefWH < ( (double) nVideoW / nVideoH ) )
+                                nVideoW = (int)( nVideoH * fPrefWH );
+                            else
+                                nVideoH = (int)( nVideoW / fPrefWH );
+
+                            nX = ( nW - nVideoW ) >> 1;
+                            nY = ( nH - nControlH - nVideoH ) >> 1;
+                            nWidth = nVideoW;
+                            nHeight = nVideoH;
+                        }
+                        else
+                            nX = nY = nWidth = nHeight = 0;
+                    }
+
+                    aVisualComponent.setBounds( nX, nY, nWidth, nHeight );
+                    aVisualComponent.requestFocus();
+                }
+                else
+                    aPanel.requestFocus();
+            }
+            else
+                aPanel.requestFocus();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    private void implFireMouseEvent( java.awt.event.MouseEvent aEvt )
+    {
+        if( aEvt.getSource() != null &&
+            aEvt.getSource() instanceof java.awt.Component )
+        {
+            aEvt.translatePoint( ( (java.awt.Component) aEvt.getSource() ).getX(),
+                                 ( (java.awt.Component) aEvt.getSource() ).getY() );
+        }
+
+        maFrame.fireMouseEvent( aEvt );
+    }
+
+    // ---------------
+    // - KeyListener -
+    // ---------------
+
+    public void keyPressed( java.awt.event.KeyEvent aEvt )
+    {
+        maFrame.fireKeyEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void keyReleased( java.awt.event.KeyEvent aEvt )
+    {
+        maFrame.fireKeyEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void keyTyped( java.awt.event.KeyEvent aEvt )
+    {
+        maFrame.fireKeyEvent( aEvt );
+    }
+
+    // -----------------
+    // - MouseListener -
+    // -----------------
+
+    public void mousePressed( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseClicked( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseEntered( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseExited( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseReleased( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -----------------------
+    // - MouseMotionListener -
+    // -----------------------
+
+    public void mouseDragged( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseMoved( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -----------------------
+    // - FocusListener -
+    // -----------------------
+
+    public void focusGained( java.awt.event.FocusEvent aEvt )
+    {
+        if( maFrame.getJavaFrame() != null )
+            maFrame.fireFocusEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void focusLost( java.awt.event.FocusEvent aEvt )
+    {
+        if( maFrame.getJavaFrame() != null )
+            maFrame.fireFocusEvent( aEvt );
+    }
+
+    // -----------------
+    // - XPlayerWindow -
+    // -----------------
+
+    public synchronized void update()
+    {
+        if( maFrame.getJavaFrame() != null )
+            maFrame.getJavaFrame().repaint();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean setZoomLevel( com.sun.star.media.ZoomLevel eZoomLevel )
+    {
+        boolean bRet = false;
+
+        if( com.sun.star.media.ZoomLevel.NOT_AVAILABLE != meZoomLevel &&
+            com.sun.star.media.ZoomLevel.NOT_AVAILABLE != eZoomLevel )
+        {
+            if( eZoomLevel != meZoomLevel )
+            {
+                meZoomLevel = eZoomLevel;
+                LayoutComponents();
+            }
+
+            bRet = true;
+        }
+
+        return bRet;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.media.ZoomLevel getZoomLevel()
+    {
+        return meZoomLevel;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setPointerType( int nPointerType )
+    {
+        if( maFrame.getJavaFrame() != null )
+        {
+            int nCursor;
+
+            switch( nPointerType )
+            {
+                case( com.sun.star.awt.SystemPointer.CROSS ): nCursor = java.awt.Cursor.CROSSHAIR_CURSOR; break;
+                case( com.sun.star.awt.SystemPointer.HAND ): nCursor = java.awt.Cursor.HAND_CURSOR; break;
+                case( com.sun.star.awt.SystemPointer.MOVE ): nCursor = java.awt.Cursor.MOVE_CURSOR; break;
+                case( com.sun.star.awt.SystemPointer.WAIT ): nCursor = java.awt.Cursor.WAIT_CURSOR; break;
+
+                default: nCursor = java.awt.Cursor.DEFAULT_CURSOR; break;
+            }
+
+            maFrame.getJavaFrame().setCursor( java.awt.Cursor.getPredefinedCursor( nCursor ) );
+        }
+    }
+
+    // --------------
+    // - XComponent -
+    // --------------
+
+    public synchronized void dispose()
+    {
+        if( maFrame != null )
+        {
+            java.awt.Panel aPanel = (java.awt.Panel) maFrame.getJavaFrame().getComponent( 0 );
+
+            if( aPanel != null && aPanel.getComponent( 0 ) != null )
+                aPanel.getComponent( 0 ).removeFocusListener( this );
+
+            if( maFrame.getJavaFrame() != null )
+                maFrame.getJavaFrame().dispose();
+
+            maFrame.fireDisposingEvent();
+        }
+
+        maFrame = null;
+    }
+
+    // -----------
+    // - XWindow -
+    // -----------
+
+    public synchronized void setPosSize( int X, int Y, int Width, int Height, short Flags )
+    {
+        if( maFrame != null )
+        {
+            maFrame.setPosSize( X, Y, Width, Height, Flags );
+            LayoutComponents();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.awt.Rectangle getPosSize()
+    {
+        return( ( maFrame != null ) ? maFrame.getPosSize() : new com.sun.star.awt.Rectangle() );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setVisible( boolean visible )
+    {
+        if( maFrame != null )
+            maFrame.setVisible( visible );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setEnable( boolean enable )
+    {
+        if( maFrame != null )
+            maFrame.setEnable( enable );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setFocus()
+    {
+        if( maFrame != null )
+            maFrame.setFocus();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addEventListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeEventListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addWindowListener( XWindowListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addWindowListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeWindowListener( XWindowListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeWindowListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addFocusListener( XFocusListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addFocusListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeFocusListener( XFocusListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeFocusListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addKeyListener( XKeyListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addKeyListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeKeyListener( XKeyListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeKeyListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addMouseListener( XMouseListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addMouseListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeMouseListener( XMouseListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeMouseListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addMouseMotionListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeMouseMotionListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addPaintListener( XPaintListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addPaintListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removePaintListener( XPaintListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removePaintListener( xListener );
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.PlayerWindow_Java";
+    private static final String s_serviceName = "com.sun.star.media.PlayerWindow_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+}
diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
new file mode 100644
index 000000000000..bd11aec5e738
--- /dev/null
+++ b/avmedia/source/java/WindowAdapter.java
@@ -0,0 +1,508 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import sun.awt.*;
+import com.sun.star.awt.*;
+import com.sun.star.lang.*;
+import java.util.*;
+import javax.swing.*;
+
+public class WindowAdapter
+{
+    private java.awt.Frame  maFrame;
+    private LinkedList      maEventListeners = new LinkedList();
+    private LinkedList      maWindowListeners = new LinkedList();
+    private LinkedList      maFocusListeners = new LinkedList();
+    private LinkedList      maKeyListeners = new LinkedList();
+    private LinkedList      maMouseListeners = new LinkedList();
+    private LinkedList      maMouseMotionListeners = new LinkedList();
+    private LinkedList      maPaintListeners = new LinkedList();
+    private boolean         mbShift = false, mbMod1 = false, mbMod2 = false;
+
+    // -----------------
+    // - WindowAdapter -
+    // -----------------
+
+    public WindowAdapter( int windowHandle )
+    {
+        maFrame = SystemWindowAdapter.createFrame( windowHandle );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public java.awt.Frame getJavaFrame()
+    {
+        return maFrame;
+    }
+
+    //----------------------------------------------------------------------------------
+
+    private short implGetUNOKeyCode( int nJavaKeyCode )
+    {
+        short nRet = 0;
+
+        switch( nJavaKeyCode )
+        {
+            case( java.awt.event.KeyEvent.VK_NUMPAD0 ):
+            case( java.awt.event.KeyEvent.VK_0 ):       nRet = com.sun.star.awt.Key.NUM0; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD1 ):
+            case( java.awt.event.KeyEvent.VK_1 ):       nRet = com.sun.star.awt.Key.NUM1; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD2 ):
+            case( java.awt.event.KeyEvent.VK_2 ):       nRet = com.sun.star.awt.Key.NUM2; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD3 ):
+            case( java.awt.event.KeyEvent.VK_3 ):       nRet = com.sun.star.awt.Key.NUM3; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD4 ):
+            case( java.awt.event.KeyEvent.VK_4 ):       nRet = com.sun.star.awt.Key.NUM4; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD5 ):
+            case( java.awt.event.KeyEvent.VK_5 ):       nRet = com.sun.star.awt.Key.NUM5; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD6 ):
+            case( java.awt.event.KeyEvent.VK_6 ):       nRet = com.sun.star.awt.Key.NUM6; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD7 ):
+            case( java.awt.event.KeyEvent.VK_7 ):       nRet = com.sun.star.awt.Key.NUM7; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD8 ):
+            case( java.awt.event.KeyEvent.VK_8 ):       nRet = com.sun.star.awt.Key.NUM8; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD9 ):
+            case( java.awt.event.KeyEvent.VK_9 ):       nRet = com.sun.star.awt.Key.NUM9; break;
+
+            case( java.awt.event.KeyEvent.VK_A ): nRet = com.sun.star.awt.Key.A; break;
+            case( java.awt.event.KeyEvent.VK_B ): nRet = com.sun.star.awt.Key.B; break;
+            case( java.awt.event.KeyEvent.VK_C ): nRet = com.sun.star.awt.Key.C; break;
+            case( java.awt.event.KeyEvent.VK_D ): nRet = com.sun.star.awt.Key.D; break;
+            case( java.awt.event.KeyEvent.VK_E ): nRet = com.sun.star.awt.Key.E; break;
+            case( java.awt.event.KeyEvent.VK_F ): nRet = com.sun.star.awt.Key.F; break;
+            case( java.awt.event.KeyEvent.VK_G ): nRet = com.sun.star.awt.Key.G; break;
+            case( java.awt.event.KeyEvent.VK_H ): nRet = com.sun.star.awt.Key.H; break;
+            case( java.awt.event.KeyEvent.VK_I ): nRet = com.sun.star.awt.Key.I; break;
+            case( java.awt.event.KeyEvent.VK_J ): nRet = com.sun.star.awt.Key.J; break;
+            case( java.awt.event.KeyEvent.VK_K ): nRet = com.sun.star.awt.Key.K; break;
+            case( java.awt.event.KeyEvent.VK_L ): nRet = com.sun.star.awt.Key.L; break;
+            case( java.awt.event.KeyEvent.VK_M ): nRet = com.sun.star.awt.Key.M; break;
+            case( java.awt.event.KeyEvent.VK_N ): nRet = com.sun.star.awt.Key.N; break;
+            case( java.awt.event.KeyEvent.VK_O ): nRet = com.sun.star.awt.Key.O; break;
+            case( java.awt.event.KeyEvent.VK_P ): nRet = com.sun.star.awt.Key.P; break;
+            case( java.awt.event.KeyEvent.VK_Q ): nRet = com.sun.star.awt.Key.Q; break;
+            case( java.awt.event.KeyEvent.VK_R ): nRet = com.sun.star.awt.Key.R; break;
+            case( java.awt.event.KeyEvent.VK_S ): nRet = com.sun.star.awt.Key.S; break;
+            case( java.awt.event.KeyEvent.VK_T ): nRet = com.sun.star.awt.Key.T; break;
+            case( java.awt.event.KeyEvent.VK_U ): nRet = com.sun.star.awt.Key.U; break;
+            case( java.awt.event.KeyEvent.VK_V ): nRet = com.sun.star.awt.Key.V; break;
+            case( java.awt.event.KeyEvent.VK_W ): nRet = com.sun.star.awt.Key.W; break;
+            case( java.awt.event.KeyEvent.VK_X ): nRet = com.sun.star.awt.Key.X; break;
+            case( java.awt.event.KeyEvent.VK_Y ): nRet = com.sun.star.awt.Key.Y; break;
+            case( java.awt.event.KeyEvent.VK_Z ): nRet = com.sun.star.awt.Key.Z; break;
+
+            case( java.awt.event.KeyEvent.VK_F1 ): nRet = com.sun.star.awt.Key.F1; break;
+            case( java.awt.event.KeyEvent.VK_F2 ): nRet = com.sun.star.awt.Key.F2; break;
+            case( java.awt.event.KeyEvent.VK_F3 ): nRet = com.sun.star.awt.Key.F3; break;
+            case( java.awt.event.KeyEvent.VK_F4 ): nRet = com.sun.star.awt.Key.F4; break;
+            case( java.awt.event.KeyEvent.VK_F5 ): nRet = com.sun.star.awt.Key.F5; break;
+            case( java.awt.event.KeyEvent.VK_F6 ): nRet = com.sun.star.awt.Key.F6; break;
+            case( java.awt.event.KeyEvent.VK_F7 ): nRet = com.sun.star.awt.Key.F7; break;
+            case( java.awt.event.KeyEvent.VK_F8 ): nRet = com.sun.star.awt.Key.F8; break;
+            case( java.awt.event.KeyEvent.VK_F9 ): nRet = com.sun.star.awt.Key.F9; break;
+            case( java.awt.event.KeyEvent.VK_F10 ): nRet = com.sun.star.awt.Key.F10; break;
+            case( java.awt.event.KeyEvent.VK_F11 ): nRet = com.sun.star.awt.Key.F11; break;
+            case( java.awt.event.KeyEvent.VK_F12 ): nRet = com.sun.star.awt.Key.F12; break;
+            case( java.awt.event.KeyEvent.VK_F13 ): nRet = com.sun.star.awt.Key.F13; break;
+            case( java.awt.event.KeyEvent.VK_F14 ): nRet = com.sun.star.awt.Key.F14; break;
+            case( java.awt.event.KeyEvent.VK_F15 ): nRet = com.sun.star.awt.Key.F15; break;
+            case( java.awt.event.KeyEvent.VK_F16 ): nRet = com.sun.star.awt.Key.F16; break;
+            case( java.awt.event.KeyEvent.VK_F17 ): nRet = com.sun.star.awt.Key.F17; break;
+            case( java.awt.event.KeyEvent.VK_F18 ): nRet = com.sun.star.awt.Key.F18; break;
+            case( java.awt.event.KeyEvent.VK_F19 ): nRet = com.sun.star.awt.Key.F19; break;
+            case( java.awt.event.KeyEvent.VK_F20 ): nRet = com.sun.star.awt.Key.F20; break;
+            case( java.awt.event.KeyEvent.VK_F21 ): nRet = com.sun.star.awt.Key.F21; break;
+            case( java.awt.event.KeyEvent.VK_F22 ): nRet = com.sun.star.awt.Key.F22; break;
+            case( java.awt.event.KeyEvent.VK_F23 ): nRet = com.sun.star.awt.Key.F23; break;
+            case( java.awt.event.KeyEvent.VK_F24 ): nRet = com.sun.star.awt.Key.F24; break;
+
+            case( java.awt.event.KeyEvent.VK_UP ):          nRet = com.sun.star.awt.Key.UP; break;
+            case( java.awt.event.KeyEvent.VK_DOWN):         nRet = com.sun.star.awt.Key.DOWN; break;
+            case( java.awt.event.KeyEvent.VK_LEFT ):        nRet = com.sun.star.awt.Key.LEFT; break;
+            case( java.awt.event.KeyEvent.VK_RIGHT ):       nRet = com.sun.star.awt.Key.RIGHT; break;
+
+            case( java.awt.event.KeyEvent.VK_HOME ):        nRet = com.sun.star.awt.Key.HOME; break;
+            case( java.awt.event.KeyEvent.VK_END ):         nRet = com.sun.star.awt.Key.END; break;
+
+            case( java.awt.event.KeyEvent.VK_PAGE_UP ):     nRet = com.sun.star.awt.Key.PAGEUP; break;
+            case( java.awt.event.KeyEvent.VK_PAGE_DOWN ):   nRet = com.sun.star.awt.Key.PAGEDOWN; break;
+
+            case( java.awt.event.KeyEvent.VK_ENTER ):       nRet = com.sun.star.awt.Key.RETURN; break;
+            case( java.awt.event.KeyEvent.VK_ESCAPE ):      nRet = com.sun.star.awt.Key.ESCAPE; break;
+
+            case( java.awt.event.KeyEvent.VK_TAB ):         nRet = com.sun.star.awt.Key.TAB; break;
+            case( java.awt.event.KeyEvent.VK_BACK_SPACE ):  nRet = com.sun.star.awt.Key.BACKSPACE; break;
+            case( java.awt.event.KeyEvent.VK_SPACE ):       nRet = com.sun.star.awt.Key.SPACE; break;
+            case( java.awt.event.KeyEvent.VK_INSERT):       nRet = com.sun.star.awt.Key.INSERT; break;
+            case( java.awt.event.KeyEvent.VK_DELETE):       nRet = com.sun.star.awt.Key.DELETE; break;
+            case( java.awt.event.KeyEvent.VK_ADD ):         nRet = com.sun.star.awt.Key.ADD; break;
+            case( java.awt.event.KeyEvent.VK_SUBTRACT ):    nRet = com.sun.star.awt.Key.SUBTRACT; break;
+            case( java.awt.event.KeyEvent.VK_MULTIPLY ):    nRet = com.sun.star.awt.Key.MULTIPLY; break;
+            case( java.awt.event.KeyEvent.VK_DIVIDE ):      nRet = com.sun.star.awt.Key.DIVIDE; break;
+            case( java.awt.event.KeyEvent.VK_DECIMAL ):     nRet = com.sun.star.awt.Key.POINT; break;
+            // case( java.awt.event.KeyEvent.VK_ COMMA; break;
+            case( java.awt.event.KeyEvent.VK_LESS ):        nRet = com.sun.star.awt.Key.LESS; break;
+            case( java.awt.event.KeyEvent.VK_GREATER ):     nRet = com.sun.star.awt.Key.GREATER; break;
+            case( java.awt.event.KeyEvent.VK_EQUALS ):      nRet = com.sun.star.awt.Key.EQUAL; break;
+            // case( java.awt.event.KeyEvent.VK_ OPEN; break;
+            // case( java.awt.event.KeyEvent.VK_ CUT; break;
+            // case( java.awt.event.KeyEvent.VK_ COPY; break;
+            // case( java.awt.event.KeyEvent.VK_ PASTE; break;
+            // case( java.awt.event.KeyEvent.VK_ UNDO; break;
+            // case( java.awt.event.KeyEvent.VK_ REPEAT; break;
+            // case( java.awt.event.KeyEvent.VK_ FIND; break;
+            // case( java.awt.event.KeyEvent.VK_ PROPERTIES; break;
+            // case( java.awt.event.KeyEvent.VK_ FRONT; break;
+            // case( java.awt.event.KeyEvent.VK_ CONTEXTMENU; break;
+            // case( java.awt.event.KeyEvent.VK_ HELP; break;
+
+            default:
+            break;
+         }
+
+         return nRet;
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireKeyEvent( java.awt.event.KeyEvent aEvt )
+    {
+        if( maKeyListeners.size() > 0 )
+        {
+            boolean bProcess = false, bPressed = false;
+
+            if( java.awt.event.KeyEvent.KEY_PRESSED == aEvt.getID() )
+            {
+                switch( aEvt.getKeyCode() )
+                {
+                    case( java.awt.event.KeyEvent.VK_SHIFT ): mbShift = true; break;
+                    case( java.awt.event.KeyEvent.VK_CONTROL ): mbMod1 = true; break;
+                    case( java.awt.event.KeyEvent.VK_ALT ): mbMod2 = true; break;
+
+                    default:
+                    {
+                        bProcess = bPressed = true;
+                    }
+                    break;
+                }
+            }
+            else if( java.awt.event.KeyEvent.KEY_RELEASED == aEvt.getID() )
+            {
+                switch( aEvt.getKeyCode() )
+                {
+                    case( java.awt.event.KeyEvent.VK_SHIFT ): mbShift = false; break;
+                    case( java.awt.event.KeyEvent.VK_CONTROL ): mbMod1 = false; break;
+                    case( java.awt.event.KeyEvent.VK_ALT ): mbMod2 = false; break;
+
+                    default:
+                    {
+                        bProcess = true;
+                    }
+                    break;
+                }
+            }
+
+            if( bProcess )
+            {
+                KeyEvent aUNOEvt = new KeyEvent();
+
+                aUNOEvt.Modifiers = 0;
+
+                if( mbShift )
+                    aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.SHIFT;
+
+                if( mbMod1 )
+                    aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD1;
+
+                if( mbMod2 )
+                    aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD2;
+
+                aUNOEvt.KeyCode = implGetUNOKeyCode( aEvt.getKeyCode() );
+                aUNOEvt.KeyChar = aEvt.getKeyChar();
+                aUNOEvt.KeyFunc = com.sun.star.awt.KeyFunction.DONTKNOW;
+
+                ListIterator aIter = maKeyListeners.listIterator( 0 );
+
+                while( aIter.hasNext() )
+                {
+                    if( bPressed )
+                        ( (XKeyListener) aIter.next() ).keyPressed( aUNOEvt );
+                    else
+                        ( (XKeyListener) aIter.next() ).keyReleased( aUNOEvt );
+                }
+            }
+        }
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireMouseEvent( java.awt.event.MouseEvent aEvt )
+    {
+        MouseEvent aUNOEvt = new MouseEvent();
+
+        aUNOEvt.Modifiers = 0;
+        aUNOEvt.Buttons = 0;
+        aUNOEvt.X = aEvt.getX();
+        aUNOEvt.Y = aEvt.getY();
+         aUNOEvt.PopupTrigger = false;
+
+        // Modifiers
+        if( aEvt.isShiftDown() )
+            aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.SHIFT;
+
+        if( aEvt.isControlDown() )
+            aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD1;
+
+        if( aEvt.isAltDown() )
+            aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD2;
+
+        // Buttons
+        if( SwingUtilities.isLeftMouseButton( aEvt ) )
+            aUNOEvt.Buttons |= com.sun.star.awt.MouseButton.LEFT;
+
+        if( SwingUtilities.isMiddleMouseButton( aEvt ) )
+            aUNOEvt.Buttons |= com.sun.star.awt.MouseButton.MIDDLE;
+
+        if( SwingUtilities.isRightMouseButton( aEvt ) )
+            aUNOEvt.Buttons |= com.sun.star.awt.MouseButton.RIGHT;
+
+        // event type
+        if( java.awt.event.MouseEvent.MOUSE_PRESSED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 1;
+
+            while( aIter.hasNext() )
+                ( (XMouseListener) aIter.next() ).mousePressed( aUNOEvt );
+        }
+        else if( java.awt.event.MouseEvent.MOUSE_RELEASED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 1;
+
+            while( aIter.hasNext() )
+                ( (XMouseListener) aIter.next() ).mouseReleased( aUNOEvt );
+        }
+        else if( java.awt.event.MouseEvent.MOUSE_DRAGGED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseMotionListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 0;
+
+            while( aIter.hasNext() )
+                ( (XMouseMotionListener) aIter.next() ).mouseDragged( aUNOEvt );
+        }
+        else if( java.awt.event.MouseEvent.MOUSE_MOVED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseMotionListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 0;
+
+            while( aIter.hasNext() )
+                ( (XMouseMotionListener) aIter.next() ).mouseMoved( aUNOEvt );
+        }
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireFocusEvent( java.awt.event.FocusEvent aEvt )
+    {
+        if( java.awt.event.FocusEvent.FOCUS_GAINED == aEvt.getID() )
+        {
+            ListIterator aIter = maFocusListeners.listIterator( 0 );
+            FocusEvent   aUNOEvt = new FocusEvent();
+
+            while( aIter.hasNext() )
+            {
+                ( (XFocusListener) aIter.next() ).focusGained( aUNOEvt );
+            }
+        }
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireDisposingEvent()
+    {
+        ListIterator aIter = maEventListeners.listIterator( 0 );
+
+        while( aIter.hasNext() )
+        {
+            ( (XEventListener) aIter.next() ).disposing( new com.sun.star.lang.EventObject() );
+        }
+    }
+
+    // --------------------
+    // - XWindow methods  -
+    // --------------------
+
+    public void setPosSize( int X, int Y, int Width, int Height, short Flags )
+    {
+        maFrame.setBounds( X, Y, Width, Height );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public com.sun.star.awt.Rectangle getPosSize(  )
+    {
+        java.awt.Rectangle bounds = maFrame.getBounds();
+        return new com.sun.star.awt.Rectangle( bounds.x, bounds.y, bounds.width, bounds.height );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void setVisible( boolean visible )
+    {
+         maFrame.setVisible( visible );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void setEnable( boolean enable )
+    {
+        maFrame.setEnabled( enable );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void setFocus()
+    {
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addEventListener( XEventListener xListener )
+    {
+        if( xListener != null )
+            maEventListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeEventListener( XEventListener xListener )
+    {
+        if( xListener != null )
+            maEventListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addWindowListener( XWindowListener xListener )
+    {
+        if( xListener != null )
+            maWindowListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeWindowListener( XWindowListener xListener )
+    {
+        if( xListener != null )
+            maWindowListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addFocusListener( XFocusListener xListener )
+    {
+        if( xListener != null )
+            maFocusListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeFocusListener( XFocusListener xListener )
+    {
+        if( xListener != null )
+            maFocusListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addKeyListener( XKeyListener xListener )
+    {
+        if( xListener != null )
+            maKeyListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeKeyListener( XKeyListener xListener )
+    {
+        if( xListener != null )
+            maKeyListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addMouseListener( XMouseListener xListener )
+    {
+        if( xListener != null )
+            maMouseListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeMouseListener( XMouseListener xListener )
+    {
+        if( xListener != null )
+            maMouseListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( xListener != null )
+            maMouseMotionListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( xListener != null )
+            maMouseMotionListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addPaintListener( XPaintListener xListener )
+    {
+        if( xListener != null )
+            maPaintListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removePaintListener( XPaintListener xListener )
+    {
+        if( xListener != null )
+            maPaintListeners.remove( xListener );
+    }
+}
diff --git a/avmedia/source/java/avmedia.jar b/avmedia/source/java/avmedia.jar
new file mode 100644
index 000000000000..55576baa5b34
--- /dev/null
+++ b/avmedia/source/java/avmedia.jar
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
new file mode 100644
index 000000000000..37c53a721164
--- /dev/null
+++ b/avmedia/source/java/makefile.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#**************************************************************************
+
+# Builds the Java Canvas implementation.
+
+PRJNAME = avmedia
+PRJ     = ..$/..
+TARGET  = avmedia
+PACKAGE = avmedia
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE: settings.mk
+
+.IF "$(GUIBASE)"=="javamedia"
+
+JAVAFILES  = \
+    Manager.java            \
+    Player.java             \
+    PlayerWindow.java       \
+    WindowAdapter.java      \
+    MediaUno.java           \
+    FrameGrabber.java       \
+    x11$/SystemWindowAdapter.java   
+
+JARFILES        = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
+JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
+
+JARTARGET               = $(TARGET).jar
+JARCOMPRESS             = TRUE
+CUSTOMMANIFESTFILE      = manifest
+
+.ENDIF     # "$(GUIBASE)"=="javamedia" 
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE: target.mk
diff --git a/avmedia/source/java/manifest b/avmedia/source/java/manifest
new file mode 100644
index 000000000000..fa9c2500d385
--- /dev/null
+++ b/avmedia/source/java/manifest
@@ -0,0 +1,2 @@
+RegistrationClassName: MediaUno
+UNO-Type-Path: 
diff --git a/avmedia/source/java/win/SystemWindowAdapter.java b/avmedia/source/java/win/SystemWindowAdapter.java
new file mode 100644
index 000000000000..ebf3cac99307
--- /dev/null
+++ b/avmedia/source/java/win/SystemWindowAdapter.java
@@ -0,0 +1,53 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import sun.awt.*;
+import com.sun.star.awt.*;
+
+public class SystemWindowAdapter
+{
+    static public java.awt.Frame createFrame( int windowHandle )
+    {
+        java.awt.Frame aFrame;
+
+        // we're initialized with the operating system window handle
+        // as the parameter. We then generate a dummy Java frame with
+        // that window as the parent, to fake a root window for the
+        // Java implementation.
+
+         // now, we're getting slightly system dependent here.
+         String os = (String) System.getProperty( "os.name" );
+
+         // create the embedded frame
+         if( os.startsWith( "Windows" ) )
+             aFrame = new sun.awt.windows.WEmbeddedFrame( windowHandle );
+         else
+             throw new com.sun.star.uno.RuntimeException();
+
+        return aFrame;
+    }
+}
diff --git a/avmedia/source/java/x11/SystemWindowAdapter.java b/avmedia/source/java/x11/SystemWindowAdapter.java
new file mode 100644
index 000000000000..4292dabe6775
--- /dev/null
+++ b/avmedia/source/java/x11/SystemWindowAdapter.java
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import java.awt.*;
+import java.lang.reflect.*;
+
+public class SystemWindowAdapter
+{
+    static public java.awt.Frame createFrame( int windowHandle )
+    {
+        String          aOS = (String) System.getProperty( "os.name" );
+        java.awt.Frame  aFrame = null;
+
+        if( aOS.startsWith( "SunOS" ) )
+        {
+            try
+            {
+                Class aClass = Class.forName( "sun.awt.motif.MEmbeddedFrame" );
+
+                if( aClass != null )
+                {
+                    try
+                    {
+                        Constructor aCtor = aClass.getConstructor( new Class[] { long.class, boolean.class } );
+
+                        if( aCtor != null )
+                        {
+                            aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ),
+                                                                                    new Boolean( false ) } );
+                        }
+                    }
+                    catch( Exception e )
+                    {
+                    }
+
+                    if( aFrame == null )
+                    {
+                        try
+                        {
+                            Constructor aCtor = aClass.getConstructor( new Class[] { long.class } );
+
+                            if( aCtor != null )
+                            {
+                                 aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ) } );
+                            }
+                        }
+                        catch( Exception e )
+                        {
+                        }
+                    }
+                }
+            }
+            catch( Exception e )
+            {
+            }
+        }
+        else
+        {
+            try
+            {
+                Class aClass = Class.forName( "sun.awt.motif.MEmbeddedFrame" );
+
+                if( aClass != null )
+                {
+                    Constructor aCtor = aClass.getConstructor( new Class[] { long.class } );
+
+                    if( aCtor != null )
+                    {
+                        aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ) } );
+                    }
+                }
+            }
+            catch( Exception e )
+            {
+            }
+
+            if( aFrame == null )
+            {
+                try
+                {
+                    Class aClass = Class.forName( "sun.awt.X11.XEmbeddedFrame" );
+
+                    if( aClass != null )
+                    {
+                        Constructor aCtor = aClass.getConstructor( new Class[] { long.class } );
+
+                        if( aCtor != null )
+                            aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ) } );
+                    }
+                }
+                catch( Exception e )
+                {
+                }
+            }
+        }
+
+        return aFrame;
+    }
+}
diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
new file mode 100644
index 000000000000..186820beaec3
--- /dev/null
+++ b/avmedia/source/quicktime/framegrabber.cxx
@@ -0,0 +1,152 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "framegrabber.hxx"
+#include "player.hxx"
+
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
+#include <vcl/cvtgrf.hxx>
+#include <unotools/localfilehelper.hxx>
+
+#define AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_Quicktime"
+#define AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_Quicktime"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+    OSErr result;
+
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    // check the version of QuickTime installed
+    result = Gestalt(gestaltQuickTime,&mnVersion);
+     if ((result == noErr) && (mnVersion >= QT701))
+    {
+      // we have version 7.01 or later, initialize
+      mpMovie = [QTMovie movie];
+      [mpMovie retain];
+      mbInitialized = true;
+    }
+    [pool release];
+}
+
+// ------------------------------------------------------------------------------
+
+FrameGrabber::~FrameGrabber()
+{
+    if( mbInitialized )
+    {
+        if( mpMovie )
+        {
+            [mpMovie release];
+            mpMovie = nil;
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+bool FrameGrabber::create( const ::rtl::OUString& rURL )
+{
+    bool bRet = false;
+    maURL = rURL;
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ;
+    NSURL* aURL = [NSURL URLWithString:aNSStr ];
+
+    // create the Movie
+
+        mpMovie = [mpMovie initWithURL:aURL error:nil];
+        if(mpMovie)
+        {
+            [mpMovie retain];
+            bRet = true;
+        }
+
+    [pool release];
+
+    return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< graphic::XGraphic > xRet;
+
+    NSImage* pImage = [mpMovie frameImageAtTime: QTMakeTimeWithTimeInterval(fMediaTime)];
+    NSData *pBitmap = [pImage TIFFRepresentation];
+    long nSize = [pBitmap length];
+    const void* pBitmapData = [pBitmap bytes];
+    SvMemoryStream  aMemStm( (char *)pBitmapData, nSize, STREAM_READ | STREAM_WRITE );
+    Graphic aGraphic;
+    if ( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) == ERRCODE_NONE )
+    {
+        xRet = aGraphic.GetXGraphic();
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
new file mode 100644
index 000000000000..a5b004e0383e
--- /dev/null
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _FRAMEGRABBER_HXX
+#define _FRAMEGRABBER_HXX
+
+#include "quicktimecommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
+#include "com/sun/star/media/XFrameGrabber.hdl"
+#endif
+
+namespace avmedia { namespace quicktime {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber,
+                                                      ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+            ~FrameGrabber();
+
+    bool    create( const ::rtl::OUString& rURL );
+
+    // XFrameGrabber
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) 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);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    mxMgr;
+    ::rtl::OUString                                                                     maURL;
+    QTMovie*                                                                            mpMovie;
+    sal_Bool                                                                            mbInitialized;
+    long                                                                                mnVersion;
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _FRAMEGRABBER_HXX
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
new file mode 100644
index 000000000000..f3c9f244f357
--- /dev/null
+++ b/avmedia/source/quicktime/makefile.mk
@@ -0,0 +1,85 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=avmediaQuickTime
+
+.IF "$(GUIBASE)"=="aqua"
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
+CDEFS+= -DVERBOSE
+.ENDIF
+
+# --- Files ----------------------------------
+
+CFLAGSCXX+=$(OBJCXXFLAGS)
+
+SLOFILES= \
+        $(SLO)$/quicktimeuno.obj  \
+        $(SLO)$/manager.obj       \
+        $(SLO)$/window.obj        \
+        $(SLO)$/framegrabber.obj        \
+        $(SLO)$/player.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/quicktimeuno.obj
+
+SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+
+SHL1STDLIBS= \
+             $(CPPULIB) \
+             $(SALLIB)  \
+             $(COMPHELPERLIB) \
+             $(CPPUHELPERLIB) \
+             $(TOOLSLIB) \
+             $(VCLLIB) 
+
+SHL1STDLIBS+= \
+             -framework Cocoa \
+             -framework QTKit \
+             -framework QuickTime
+
+# build DLL
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1IMPLIB=i$(TARGET)
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
+.ELSE
+dummy:
+    @echo " Nothing to build for GUIBASE=$(GUIBASE)"
+.ENDIF
diff --git a/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
new file mode 100644
index 000000000000..4970864c7e76
--- /dev/null
+++ b/avmedia/source/quicktime/manager.cxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "manager.hxx"
+#include "player.hxx"
+#include <tools/urlobj.hxx>
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+// ----------------
+// - Manager -
+// ----------------
+
+Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+    OSL_TRACE( "avmediaquicktime: Manager::Manager" );
+}
+
+// ------------------------------------------------------------------------------
+
+Manager::~Manager()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+    throw (uno::RuntimeException)
+{
+    Player*                             pPlayer( new Player( mxMgr ) );
+    uno::Reference< media::XPlayer >    xRet( pPlayer );
+    INetURLObject                       aURL( rURL );
+
+    OSL_TRACE( "avmediaquicktime: Manager::createPlayer" );
+
+    if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) )  )
+        xRet = uno::Reference< media::XPlayer >();
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Manager::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
new file mode 100644
index 000000000000..07740a1a9259
--- /dev/null
+++ b/avmedia/source/quicktime/manager.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _MANAGER_HXX
+#define _MANAGER_HXX
+
+#include "quicktimecommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
+#include "com/sun/star/media/XManager.hdl"
+#endif
+
+// -----------
+// - Manager -
+// -----------
+
+namespace avmedia { namespace quicktime {
+
+class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
+                                                 ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Manager();
+
+    // XManager
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) 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);
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _MANAGER_HXX
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
new file mode 100644
index 000000000000..6c77f999e110
--- /dev/null
+++ b/avmedia/source/quicktime/player.cxx
@@ -0,0 +1,501 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <math.h>
+
+#include "player.hxx"
+#include "framegrabber.hxx"
+#include "window.hxx"
+
+// dbg_dump for development
+#if OSL_DEBUG_LEVEL > 1
+#include <rtl/strbuf.hxx>
+#include <rtl/ustring.hxx>
+
+const sal_Char *dbg_dump(const rtl::OString &rStr)
+{
+    static rtl::OStringBuffer aStr;
+
+    aStr = rtl::OStringBuffer(rStr);
+    aStr.append(static_cast<char>(0));
+    return aStr.getStr();
+}
+
+const sal_Char *dbg_dump(const rtl::OUString &rStr)
+{
+    return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
+}
+
+const sal_Char *dbg_dump(rtl_String *pStr)
+{
+    return dbg_dump(rtl::OString(pStr));
+}
+
+const sal_Char *dbg_dump(rtl_uString *pStr)
+{
+    return dbg_dump(rtl::OUString(pStr));
+}
+
+#endif
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+
+// ----------------
+// - Player -
+// ----------------
+
+Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr ),
+    mpMovie( nil ),
+    /* GST
+    mbFakeVideo (sal_False ),
+    */
+    mnUnmutedVolume( 0 ),
+    mnStopTime( DBL_MAX ),  //max double
+    mbMuted( false ),
+    mbLooping( false ),
+    mbInitialized( false ),
+    mnWindowID( 0 ),
+    mnDuration( 0 ),
+    mnWidth( 0 ),
+    mnHeight( 0 ),
+    mnVersion( 0 ),
+    maSizeCondition( osl_createCondition() )
+{
+    OSErr result;
+
+    NSApplicationLoad();
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    // check the version of QuickTime installed
+    result = Gestalt(gestaltQuickTime,&mnVersion);
+    if ((result == noErr) && (mnVersion >= QT701))
+    {
+      // we have version 7.01 or later, initialize
+      mbInitialized = true;
+    }
+    [pool release];
+}
+
+// ------------------------------------------------------------------------------
+
+Player::~Player()
+{
+    if( mpMovie )
+    {
+        [mpMovie release];
+        mpMovie = nil;
+    }
+}
+// ------------------------------------------------------------------------------
+
+QTMovie* Player::getMovie()
+{
+    OSL_ASSERT( mpMovie );
+    return mpMovie;
+}
+
+// ------------------------------------------------------------------------------
+
+bool Player::create( const ::rtl::OUString& rURL )
+{
+    bool    bRet = false;
+    // create the Movie
+    if( mbInitialized )
+    {
+        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+        if( mpMovie )
+        {
+            [mpMovie release];
+            mpMovie = nil;
+        }
+
+        NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ;
+        NSURL* aURL = [NSURL URLWithString:aNSStr ];
+
+
+        NSError* pErr = nil;
+        mpMovie = [QTMovie movieWithURL:aURL error:&pErr];
+        if(mpMovie)
+        {
+            [mpMovie retain];
+            maURL = rURL;
+            bRet = true;
+        }
+        if( pErr )
+        {
+            OSL_TRACE( "NSMovie create failed with error %ld (%s)",
+                       (long)[pErr code],
+                       [[pErr localizedDescription] cString]
+                       );
+        }
+        [pool release];
+    }
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::start(  )
+    throw (uno::RuntimeException)
+{
+  OSL_TRACE ("Player::start");
+
+  if( mpMovie )
+  {
+      [mpMovie play];
+  }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::stop(  )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::stop");
+    if( mpMovie )
+    {
+        [mpMovie stop];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaying()
+    throw (uno::RuntimeException)
+{
+    bool bRet = false;
+
+    if ( mpMovie )
+    {
+        if ([mpMovie rate] != 0)
+        {
+            bRet = true;
+        }
+    }
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getDuration(  )
+    throw (uno::RuntimeException)
+{
+    // slideshow checks for non-zero duration, so cheat here
+    double duration = 0.01;
+
+    if ( mpMovie ) // && mnDuration > 0 ) {
+    {
+        QTTime structDuration =  [mpMovie duration] ;
+        duration = (double)structDuration.timeValue / (double)structDuration.timeScale;
+    }
+
+    return duration;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMediaTime( double fTime )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setMediaTime");
+
+    if ( mpMovie )
+    {
+        [mpMovie setCurrentTime: QTMakeTimeWithTimeInterval(fTime)];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getMediaTime(  )
+    throw (uno::RuntimeException)
+{
+  double position = 0.0;
+
+  if ( mpMovie )
+  {
+      QTTime structDuration =  [mpMovie currentTime] ;
+      position = (double)structDuration.timeValue / (double)structDuration.timeScale;
+  }
+
+  if(isPlaying() && position>mnStopTime)
+  {
+      stop();
+  }
+
+  return position;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setStopTime( double fTime )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setStopTime %f", fTime);
+
+    mnStopTime = fTime;
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getStopTime(  )
+    throw (uno::RuntimeException)
+{
+    double fRet = mnStopTime;
+
+    return fRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setRate( double fRate )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setRate");
+
+    // Quicktime: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
+    if ( mpMovie )
+    {
+        [mpMovie setRate: fRate];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getRate(  )
+    throw (uno::RuntimeException)
+{
+    // Quicktime: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
+    double rate = 1.0;
+
+    OSL_TRACE ("Player::getRate");
+
+    if ( mpMovie )
+    {
+        rate = (double) [mpMovie rate];
+    }
+
+    return rate;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setPlaybackLoop? %s", bSet?"True":"False" );
+
+    if(bSet)
+    {
+        [mpMovie setAttribute:[NSNumber numberWithBool:YES] forKey: QTMovieLoopsAttribute]  ;
+    }
+    else
+    {
+         [mpMovie setAttribute:[NSNumber numberWithBool:NO] forKey: QTMovieLoopsAttribute]  ;
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaybackLoop(  )
+    throw (uno::RuntimeException)
+{
+    bool bRet = [[mpMovie attributeForKey:QTMovieLoopsAttribute] boolValue];
+
+    OSL_TRACE ("Player::isPlaybackLoop ? %s", bRet?"True":"False" );
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMute( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume );
+
+    // change the volume to 0 or the unmuted volume
+    if(  mpMovie && mbMuted != bSet )
+    {
+        [mpMovie setMuted: bSet ];
+        mbMuted = bSet;
+    }
+
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isMute(  )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::isMuted");
+
+    return mbMuted;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
+    throw (uno::RuntimeException)
+{
+    // OOo db volume -40 = QTVolume 0
+    // OOo db volume 0   = QTvolume 1
+    if(nVolumeDB==-40)
+    {
+        mnUnmutedVolume = 0;
+    }
+    else
+    {
+        mnUnmutedVolume = pow( 10.0, nVolumeDB / 20.0 );
+    }
+
+    OSL_TRACE( "set volume: %d gst volume: %f", nVolumeDB, mnUnmutedVolume );
+
+    // change volume
+    if( !mbMuted && mpMovie )
+    {
+        [mpMovie setVolume: mnUnmutedVolume ];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL Player::getVolumeDB(  )
+    throw (uno::RuntimeException)
+{
+    sal_Int16 nVolumeDB = 0.0;
+
+    if( mpMovie )
+      {
+          float volume = 0.0;
+
+          volume = [mpMovie volume];
+          if(volume>0)            //protect from log10(0)
+          {
+              nVolumeDB = (sal_Int16) ( 20.0*log10 ( volume ) );
+          }
+          else
+          {
+              nVolumeDB = -40 ;  // QT zero volume is no volume, -40db
+          }
+      }
+
+    return nVolumeDB;
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
+    throw (uno::RuntimeException)
+{
+    NSSize  nsSize = [[mpMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
+    awt::Size aSize( nsSize.width, nsSize.height );
+    return aSize;
+}
+
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< ::media::XPlayerWindow >    xRet;
+    awt::Size                                   aSize( getPreferredPlayerWindowSize() );
+    NSSize                                      nsSize( NSMakeSize(aSize.Width, aSize.Height) );
+
+    OSL_TRACE( "Player::createPlayerWindow %d %d length: %d", aSize.Width, aSize.Height, aArguments.getLength() );
+
+    if( aSize.Width > 0 && aSize.Height > 0 )
+    {
+        sal_IntPtr nPtr = NULL;
+        aArguments[0] >>= nPtr;
+        NSView* pParentView = reinterpret_cast< NSView * >(nPtr);
+
+        ::avmedia::quicktime::Window* pWindow = new ::avmedia::quicktime::Window( mxMgr, *this, pParentView );
+        xRet = pWindow;
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+  uno::Reference< media::XFrameGrabber > xRet;
+  OSL_TRACE ("Player::createFrameGrabber");
+
+  if( maURL.getLength() > 0 )
+  {
+      FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
+
+      xRet = pGrabber;
+
+      if( !pGrabber->create( maURL ) )
+      {
+          xRet.clear();
+      }
+  }
+
+  return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Player::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
new file mode 100644
index 000000000000..e85bbc5035db
--- /dev/null
+++ b/avmedia/source/quicktime/player.hxx
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _PLAYER_HXX
+#define _PLAYER_HXX
+
+#include <osl/conditn.h>
+#include "quicktimecommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
+#include "com/sun/star/media/XPlayer.hdl"
+#endif
+
+namespace avmedia { namespace quicktime {
+
+/*
+// ----------
+// - Player -
+// ----------
+*/
+
+class Player : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer,
+                                               ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Player();
+
+    bool create( const ::rtl::OUString& rURL );
+
+//    void processMessage( GstMessage *message );
+
+    // XPlayer
+    virtual void SAL_CALL start(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL stop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaying(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getDuration(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getMediaTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getStopTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setRate( double fRate ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getRate(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isMute(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) 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);
+
+    QTMovie* getMovie();
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::rtl::OUString         maURL;
+
+    QTMovie                 *mpMovie;      // the Movie object
+  /* GST
+    sal_Bool                mbFakeVideo;
+  */
+    float                   mnUnmutedVolume;
+    double                  mnStopTime;
+
+    sal_Bool                mbMuted;
+    sal_Bool                mbLooping;
+    sal_Bool                mbInitialized;
+
+    long                    mnWindowID;
+    long                    mnDuration;
+    int                     mnWidth;
+    int                     mnHeight;
+
+    long                    mnVersion;
+    oslCondition            maSizeCondition;
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _PLAYER_HXX
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
new file mode 100644
index 000000000000..82ade238396c
--- /dev/null
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _QUICKTIMECOMMON_HXX
+#define _QUICKTIMECOMMON_HXX
+
+#ifdef MACOSX
+#include <premac.h>
+#import <Cocoa/Cocoa.h>
+#import <QTKit/QTKit.h>
+#import <QuickTime/QuickTime.h>
+#include <postmac.h>
+#endif
+#include <osl/mutex.hxx>
+#ifndef __RTL_USTRING_
+#include <rtl/ustring.hxx>
+#endif
+#include <tools/debug.hxx>
+#include <tools/stream.hxx>
+#include <tools/string.hxx>
+#include <tools/urlobj.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/factory.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/media/XManager.hpp>
+
+#define AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+#define AVMEDIA_QUICKTIME_MANAGER_SERVICENAME "com.sun.star.media.Manager_QuickTime"
+
+#define AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_QuickTime"
+#define AVMEDIA_QUICKTIME_PLAYER_SERVICENAME "com.sun.star.media.Player_QuickTime"
+
+#define AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_QuickTime"
+#define AVMEDIA_QUICKTIME_WINDOW_SERVICENAME "com.sun.star.media.Window_QuickTime"
+
+#define WM_GRAPHNOTIFY (WM_USER + 567)
+
+// Quicktime 7+ in Mac OS X 10.4
+#define QT701 0x07010000
+
+// Quicktime 6.4+ in Mac OS X 10.3
+#define QT64 0x06400000
+
+
+#endif // _QUICKTIMECOMMOM_HXX
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
new file mode 100644
index 000000000000..b2dee4d77838
--- /dev/null
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "quicktimecommon.hxx"
+#include "manager.hxx"
+
+using namespace ::com::sun::star;
+
+// -------------------
+// - factory methods -
+// -------------------
+
+static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+{
+    return uno::Reference< uno::XInterface >( *new ::avmedia::quicktime::Manager( rxFact ) );
+}
+
+// ------------------------------------------
+// - component_getImplementationEnvironment -
+// ------------------------------------------
+
+extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+// -----------------------
+// - component_writeInfo -
+// -----------------------
+
+extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
+{
+    sal_Bool bRet = sal_False;
+
+    if( pRegistryKey )
+    {
+        try
+        {
+            uno::Reference< registry::XRegistryKey > xNewKey1(
+                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
+                ::rtl::OUString::createFromAscii(
+                    "/" AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
+                    AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) ) );
+
+            bRet = sal_True;
+        }
+        catch( registry::InvalidRegistryException& )
+        {
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+        }
+    }
+
+    return bRet;
+}
+
+// ------------------------
+// - component_getFactory -
+// ------------------------
+
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+{
+    uno::Reference< lang::XSingleServiceFactory > xFactory;
+    void*                                   pRet = 0;
+
+    if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 )
+    {
+        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+
+        xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
+                        reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
+                        ::rtl::OUString::createFromAscii( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ),
+                        create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+    }
+
+    if( xFactory.is() )
+    {
+        xFactory->acquire();
+        pRet = xFactory.get();
+    }
+
+    return pRet;
+}
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
new file mode 100644
index 000000000000..e44acf4fbb67
--- /dev/null
+++ b/avmedia/source/quicktime/window.cxx
@@ -0,0 +1,353 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <com/sun/star/awt/SystemPointer.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+
+#include "window.hxx"
+#include "player.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+
+// -----------
+// - statics -
+// -----------
+
+static ::osl::Mutex& ImplGetOwnStaticMutex()
+{
+    static ::osl::Mutex* pMutex = NULL;
+
+    if( pMutex == NULL )
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+
+        if( pMutex == NULL )
+        {
+            static ::osl::Mutex aMutex;
+            pMutex = &aMutex;
+        }
+    }
+
+    return *pMutex;
+}
+
+// ---------------
+// - Window -
+// ---------------
+
+// ------------------------------------------------------------------------------
+
+Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView ) :
+    mxMgr( i_rxMgr ),
+    maListeners( maMutex ),
+    meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
+    mrPlayer( i_rPlayer ),
+    mnPointerType( awt::SystemPointer::ARROW ),
+    mpParentView( i_pParentView ),
+    mpMovieView( nil )
+{
+
+    ::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
+
+
+    if( mpParentView ) // sanity check
+    {
+
+        NSRect aViewRect = [mpParentView frame];
+        aViewRect.origin.x = aViewRect.origin.y = 0;
+        mpMovieView = [[QTMovieView alloc] initWithFrame: aViewRect];
+        [mpMovieView setMovie: mrPlayer.getMovie() ];
+        [mpMovieView setControllerVisible: NO];
+        [mpMovieView setPreservesAspectRatio: YES];
+        [mpMovieView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+        [mpParentView addSubview: mpMovieView];
+        [mpParentView setAutoresizesSubviews: YES];
+    }
+
+    OSL_TRACE ("Window::Window");
+}
+
+// ------------------------------------------------------------------------------
+
+Window::~Window()
+{
+    if( mpMovieView )
+    {
+        [mpMovieView removeFromSuperview];
+        [mpMovieView setMovie:nil];
+        [mpMovieView release];
+        mpMovieView = nil;
+    }
+}
+
+bool Window::create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+{
+    return true;
+}
+
+// XPlayerWindow
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::update(  )
+    throw (uno::RuntimeException)
+{
+    ;
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
+    throw (uno::RuntimeException)
+{
+        return false;
+}
+
+// ------------------------------------------------------------------------------
+
+media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
+    throw (uno::RuntimeException)
+{
+    return meZoomLevel;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
+    throw (uno::RuntimeException)
+{
+    mnPointerType = nPointerType;
+}
+
+// XWindow
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
+    throw (uno::RuntimeException)
+{
+    if( mpParentView && mpMovieView )
+    {
+        NSRect aRect = [mpMovieView frame];
+        if( (Flags & awt::PosSize::WIDTH) )
+            aRect.size.width = Width;
+        if( (Flags & awt::PosSize::HEIGHT) )
+            aRect.size.height = Height;
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Rectangle SAL_CALL Window::getPosSize()
+    throw (uno::RuntimeException)
+{
+    awt::Rectangle aRet;
+
+    NSRect aRect = [mpMovieView frame];
+    aRet.X = aRet.Y = 0;
+    aRet.Width = aRect.size.width;
+    aRet.Height = aRect.size.height;
+
+    return aRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setVisible( sal_Bool bVisible )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Window::setVisible");
+
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setEnable( sal_Bool bEnable )
+    throw (uno::RuntimeException)
+{
+    ;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setFocus(  )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Window::setFocus");
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+
+// XComponent
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::dispose(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// XServiceInfo
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Window::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
new file mode 100644
index 000000000000..4ca2e76ddc52
--- /dev/null
+++ b/avmedia/source/quicktime/window.hxx
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _WINDOW_HXX
+#define _WINDOW_HXX
+
+#include "quicktimecommon.hxx"
+#include <cppuhelper/interfacecontainer.h>
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
+#include "com/sun/star/media/XPlayerWindow.hdl"
+#endif
+
+namespace avmedia { namespace quicktime {
+
+// ---------------
+// - Window -
+// ---------------
+
+class Player;
+
+class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
+                                                ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rxMgr,
+                    Player& i_rPlayer,
+                    NSView* i_pParentView
+                    );
+            ~Window();
+
+    bool    create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+    void    processGraphEvent();
+    void    updatePointer();
+
+    // XPlayerWindow
+    virtual void SAL_CALL update(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XWindow
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 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);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::osl::Mutex                                maMutex;
+    ::cppu::OMultiTypeInterfaceContainerHelper  maListeners;
+    ::com::sun::star::media::ZoomLevel          meZoomLevel;
+    Player&                                     mrPlayer;
+    int                                         mnPointerType;
+
+    NSView*                                     mpParentView; // parent view for our own private movie view
+    QTMovieView*                                mpMovieView;  // the view containing the movie object, output target and controller
+
+    void                                        ImplLayoutVideoWindow();
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _WINDOW_HXX
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
new file mode 100644
index 000000000000..8d5d6a5df52d
--- /dev/null
+++ b/avmedia/source/viewer/makefile.mk
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=viewer
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Resources ---------------------------------
+
+SRS1NAME=$(TARGET)
+SRC1FILES =\
+        mediawindow.src					
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+        $(SLO)$/mediaevent_impl.obj     	\
+        $(SLO)$/mediawindowbase_impl.obj 	\
+        $(SLO)$/mediawindow_impl.obj 		\
+        $(SLO)$/mediawindow.obj         	
+
+EXCEPTIONSFILES= \
+        $(SLO)$/mediawindow.obj         	\
+        $(SLO)$/mediawindowbase_impl.obj 	\
+        $(SLO)$/mediawindow_impl.obj
+        
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
new file mode 100644
index 000000000000..cf86f54df8f9
--- /dev/null
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -0,0 +1,223 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediaevent_impl.hxx"
+#include "mediawindow_impl.hxx"
+#include <osl/mutex.hxx>
+#include <vos/mutex.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/event.hxx>
+
+using namespace ::com::sun::star;
+
+/* Definition of MediaWindowImpl class */
+
+namespace avmedia { namespace priv {
+// ---------------------------
+// - MediaEventListenersImpl -
+// ---------------------------
+
+MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) :
+    mpNotifyWindow( &rEventWindow )
+{
+}
+
+// ---------------------------------------------------------------------
+
+MediaEventListenersImpl::~MediaEventListenersImpl()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaEventListenersImpl::cleanUp()
+{
+    Application::RemoveMouseAndKeyEvents( reinterpret_cast< ::Window* >( mpNotifyWindow ) );
+    mpNotifyWindow = NULL;
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+        KeyCode aVCLKeyCode( e.KeyCode,
+                            ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) |
+                            ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) |
+                            ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
+        KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
+
+        Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+        KeyCode aVCLKeyCode( e.KeyCode,
+                            ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) |
+                            ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) |
+                            ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
+        KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
+        Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
+                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 0,
+                                ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
+                                ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
+                                ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
+                                e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ----------------------------------------------gvd-----------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
+                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 0,
+                                ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
+                                ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
+                                ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
+                                e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+}
+
+} // namespace priv
+} // namespace avemdia
+
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
new file mode 100644
index 000000000000..b06ccd885fd6
--- /dev/null
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -0,0 +1,89 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIAEVENT_IMPL_HXX
+#define _AVMEDIA_MEDIAEVENT_IMPL_HXX
+
+#include <avmedia/mediawindow.hxx>
+#include <cppuhelper/compbase4.hxx>
+#include <com/sun/star/awt/XKeyListener.hpp>
+#include <com/sun/star/awt/XMouseListener.hpp>
+#include <com/sun/star/awt/XMouseMotionListener.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+
+namespace avmedia
+{
+    namespace priv
+    {
+        // ---------------------------
+        // - MediaEventListenersImpl -
+        // ---------------------------
+
+        class MediaWindowImpl;
+
+        class MediaEventListenersImpl : public ::cppu::WeakImplHelper4< ::com::sun::star::awt::XKeyListener,
+                                                                        ::com::sun::star::awt::XMouseListener,
+                                                                        ::com::sun::star::awt::XMouseMotionListener,
+                                                                        ::com::sun::star::awt::XFocusListener >
+        {
+        public:
+
+                    MediaEventListenersImpl( Window& rNotifyWindow );
+                    ~MediaEventListenersImpl();
+
+        void        cleanUp();
+
+        protected:
+
+            // XKeyListener
+            virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XMouseListener
+            virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XMouseMotionListener
+            virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XFocusListener
+            virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+        private:
+
+            Window*                 mpNotifyWindow;
+            mutable ::osl::Mutex    maMutex;
+        };
+    }
+}
+
+#endif
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
new file mode 100644
index 000000000000..b2d1e5162cb5
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -0,0 +1,580 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <stdio.h>
+
+#include <avmedia/mediawindow.hxx>
+#include "mediawindow_impl.hxx"
+#include "mediamisc.hxx"
+#include "mediawindow.hrc"
+#include <tools/urlobj.hxx>
+#include <vcl/msgbox.hxx>
+#include <unotools/pathoptions.hxx>
+#include <sfx2/filedlghelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/media/XManager.hpp>
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+
+#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME 3.0
+
+using namespace ::com::sun::star;
+
+namespace avmedia {
+
+// ---------------
+// - MediaWindow -
+// ---------------
+
+MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) :
+    mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) )
+{
+    mpImpl->Show();
+}
+
+// -------------------------------------------------------------------------
+
+MediaWindow::~MediaWindow()
+{
+    mpImpl->cleanUp();
+    delete mpImpl;
+    mpImpl = NULL;
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setURL( const ::rtl::OUString& rURL )
+{
+    if( mpImpl )
+        mpImpl->setURL( rURL );
+}
+
+// -------------------------------------------------------------------------
+
+const ::rtl::OUString& MediaWindow::getURL() const
+{
+    return mpImpl->getURL();
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::isValid() const
+{
+    return( mpImpl != NULL && mpImpl->isValid() );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::MouseMove( const MouseEvent& /* rMEvt */ )
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindow::MouseButtonDown( const MouseEvent& /* rMEvt */ )
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::Command( const CommandEvent& /* rCEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
+{
+    return 0;
+}
+
+// -------------------------------------------------------------------------
+
+sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ )
+{
+    return 0;
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::hasPreferredSize() const
+{
+    return( mpImpl != NULL && mpImpl->hasPreferredSize() );
+}
+
+// -------------------------------------------------------------------------
+
+Size MediaWindow::getPreferredSize() const
+{
+    return mpImpl->getPreferredSize();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setPosSize( const Rectangle& rNewRect )
+{
+    if( mpImpl )
+        mpImpl->setPosSize( rNewRect );
+}
+
+// -------------------------------------------------------------------------
+
+Rectangle MediaWindow::getPosSize() const
+{
+    return Rectangle( mpImpl->GetPosPixel(), mpImpl->GetSizePixel() );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setPointer( const Pointer& rPointer )
+{
+    if( mpImpl )
+        mpImpl->setPointer( rPointer );
+}
+
+// -------------------------------------------------------------------------
+
+const Pointer& MediaWindow::getPointer() const
+{
+    return mpImpl->getPointer();
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::setZoom( ::com::sun::star::media::ZoomLevel eLevel )
+{
+    return( mpImpl != NULL && mpImpl->setZoom( eLevel ) );
+}
+
+// -------------------------------------------------------------------------
+
+::com::sun::star::media::ZoomLevel MediaWindow::getZoom() const
+{
+    return mpImpl->getZoom();
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::start()
+{
+    return( mpImpl != NULL && mpImpl->start() );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::stop()
+{
+    if( mpImpl )
+        mpImpl->stop();
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::isPlaying() const
+{
+    return( mpImpl != NULL && mpImpl->isPlaying() );
+}
+
+// -------------------------------------------------------------------------
+
+double MediaWindow::getDuration() const
+{
+    return mpImpl->getDuration();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setMediaTime( double fTime )
+{
+    if( mpImpl )
+        mpImpl->setMediaTime( fTime );
+}
+
+// -------------------------------------------------------------------------
+
+double MediaWindow::getMediaTime() const
+{
+    return mpImpl->getMediaTime();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setStopTime( double fTime )
+{
+    if( mpImpl )
+        mpImpl->setStopTime( fTime );
+}
+
+// -------------------------------------------------------------------------
+
+double MediaWindow::getStopTime() const
+{
+    return mpImpl->getStopTime();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setRate( double fRate )
+{
+    if( mpImpl )
+        mpImpl->setRate( fRate );
+}
+
+// -------------------------------------------------------------------------
+
+double MediaWindow::getRate() const
+{
+    return mpImpl->getRate();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setPlaybackLoop( bool bSet )
+{
+    if( mpImpl )
+        mpImpl->setPlaybackLoop( bSet );
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::isPlaybackLoop() const
+{
+    return mpImpl->isPlaybackLoop();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setMute( bool bSet )
+{
+    if( mpImpl )
+        mpImpl->setMute( bSet );
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::isMute() const
+{
+    return mpImpl->isMute();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::updateMediaItem( MediaItem& rItem ) const
+{
+    if( mpImpl )
+        mpImpl->updateMediaItem( rItem );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::executeMediaItem( const MediaItem& rItem )
+{
+    if( mpImpl )
+        mpImpl->executeMediaItem( rItem );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::show()
+{
+    if( mpImpl )
+        mpImpl->Show();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::hide()
+{
+    if( mpImpl )
+        mpImpl->Hide();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::enable()
+{
+    if( mpImpl )
+        mpImpl->Enable();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::disable()
+{
+    if( mpImpl )
+        mpImpl->Disable();
+}
+
+// -------------------------------------------------------------------------
+
+Window* MediaWindow::getWindow() const
+{
+    return mpImpl;
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
+{
+    static const char* pFilters[] = {   "AIF Audio", "aif;aiff",
+                                        "AU Audio", "au",
+                                        "AVI", "avi",
+                                        "CD Audio", "cda",
+                                        "MIDI Audio", "mid;midi",
+                                        "MPEG Audio", "mp2;mp3;mpa",
+                                        "MPEG Video", "mpg;mpeg;mpv;mp4",
+                                        "Ogg bitstream", "ogg",
+                                        "Quicktime Video", "mov",
+                                        "Vivo Video", "viv",
+                                        "WAVE Audio", "wav" };
+
+    unsigned int i;
+    for( i = 0; i < ( sizeof( pFilters ) / sizeof( char* ) ); i += 2 )
+    {
+        rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
+                                        ::rtl::OUString::createFromAscii( pFilters[ i ] ),
+                                        ::rtl::OUString::createFromAscii( pFilters[ i + 1 ] ) ) );
+    }
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString& rURL, bool bInsertDialog )
+{
+    ::sfx2::FileDialogHelper        aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+    static const ::rtl::OUString    aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+    FilterNameVector                aFilters;
+    const ::rtl::OUString           aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
+    ::rtl::OUString                 aAllTypes;
+
+    aDlg.SetTitle( AVMEDIA_RESID( bInsertDialog ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
+
+    getMediaFilters( aFilters );
+
+    unsigned int i;
+    for( i = 0; i < aFilters.size(); ++i )
+    {
+        for( sal_Int32 nIndex = 0; nIndex >= 0; )
+        {
+            if( aAllTypes.getLength() )
+                aAllTypes += aSeparator;
+
+            ( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
+        }
+    }
+
+    // add filter for all media types
+    aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
+
+    for( i = 0; i < aFilters.size(); ++i )
+    {
+        ::rtl::OUString aTypes;
+
+        for( sal_Int32 nIndex = 0; nIndex >= 0; )
+        {
+            if( aTypes.getLength() )
+                aTypes += aSeparator;
+
+            ( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
+        }
+
+        // add single filters
+        aDlg.AddFilter( aFilters[ i ].first, aTypes );
+    }
+
+    // add filter for all types
+    aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
+
+    if( aDlg.Execute() == ERRCODE_NONE )
+    {
+        const INetURLObject aURL( aDlg.GetPath() );
+        rURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+    }
+    else if( rURL.getLength() )
+        rURL = ::rtl::OUString();
+
+    return( rURL.getLength() > 0 );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::executeFormatErrorBox( Window* pParent )
+{
+    ErrorBox aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_ERR_URL ) );
+
+    aErrBox.Execute();
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPreferredSizePixel )
+{
+    const INetURLObject aURL( rURL );
+    bool                bRet = false;
+
+    if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
+    {
+        if( bDeep || pPreferredSizePixel )
+        {
+            uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+
+            if( xFactory.is() )
+            {
+                try
+                {
+                    fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
+
+                    uno::Reference< ::com::sun::star::media::XManager > xManager(
+                        xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
+                        uno::UNO_QUERY );
+
+                    if( xManager.is() )
+                    {
+                        uno::Reference< media::XPlayer > xPlayer( xManager->createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
+
+                        if( xPlayer.is() )
+                        {
+                            bRet = true;
+
+                            if( pPreferredSizePixel )
+                            {
+                                const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
+
+                                pPreferredSizePixel->Width() = aAwtSize.Width;
+                                pPreferredSizePixel->Height() = aAwtSize.Height;
+                            }
+                        }
+                    }
+                }
+                catch( ... )
+                {
+                }
+            }
+        }
+        else
+        {
+            FilterNameVector        aFilters;
+            const ::rtl::OUString   aExt( aURL.getExtension() );
+
+            getMediaFilters( aFilters );
+
+            unsigned int i;
+            for( i = 0; ( i < aFilters.size() ) && !bRet; ++i )
+            {
+                for( sal_Int32 nIndex = 0; nIndex >= 0 && !bRet; )
+                {
+                    if( aExt.equalsIgnoreAsciiCase( aFilters[ i ].second.getToken( 0, ';', nIndex ) ) )
+                        bRet = true;
+                }
+            }
+        }
+    }
+
+    return bRet;
+}
+
+// -------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > MediaWindow::createPlayer( const ::rtl::OUString& rURL )
+{
+    return priv::MediaWindowImpl::createPlayer( rURL );
+}
+
+// -------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUString& rURL,
+                                                            bool bAllowToCreateReplacementGraphic,
+                                                            double fMediaTime )
+{
+    uno::Reference< media::XPlayer >    xPlayer( createPlayer( rURL ) );
+    uno::Reference< graphic::XGraphic > xRet;
+    ::std::auto_ptr< Graphic >          apGraphic;
+
+    if( xPlayer.is() )
+    {
+        uno::Reference< media::XFrameGrabber > xGrabber( xPlayer->createFrameGrabber() );
+
+        if( xGrabber.is() )
+        {
+            if( AVMEDIA_FRAMEGRABBER_DEFAULTFRAME == fMediaTime )
+                fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME;
+
+            if( fMediaTime >= xPlayer->getDuration() )
+                fMediaTime = ( xPlayer->getDuration() * 0.5 );
+
+            xRet = xGrabber->grabFrame( fMediaTime );
+        }
+
+        if( !xRet.is() && bAllowToCreateReplacementGraphic  )
+        {
+            awt::Size aPrefSize( xPlayer->getPreferredPlayerWindowSize() );
+
+            if( !aPrefSize.Width && !aPrefSize.Height )
+            {
+                const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
+                apGraphic.reset( new Graphic( aBmpEx ) );
+            }
+        }
+    }
+
+    if( !xRet.is() && !apGraphic.get() && bAllowToCreateReplacementGraphic )
+    {
+        const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) );
+        apGraphic.reset( new Graphic( aBmpEx ) );
+    }
+
+    if( apGraphic.get() )
+        xRet = apGraphic->GetXGraphic();
+
+    return xRet;
+}
+
+} // namespace avemdia
diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc
new file mode 100644
index 000000000000..67036e300c13
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow.hrc
@@ -0,0 +1,9 @@
+#define AVMEDIA_STR_OPENMEDIA_DLG       16384
+#define AVMEDIA_STR_INSERTMEDIA_DLG     16385
+#define AVMEDIA_STR_ALL_MEDIAFILES      16386
+#define AVMEDIA_STR_ALL_FILES           16387
+
+#define AVMEDIA_BMP_AUDIOLOGO           20000
+#define AVMEDIA_BMP_EMPTYLOGO           20001
+
+#define AVMEDIA_ERR_URL                 21000
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
new file mode 100644
index 000000000000..1c92b4d913af
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow.src
@@ -0,0 +1,77 @@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediawindow.hrc"
+
+String AVMEDIA_STR_INSERTMEDIA_DLG
+{
+    Text[en-US] = "Insert Movie and Sound";
+};
+
+// ------------------------------------------------------------------------------
+
+STRING AVMEDIA_STR_OPENMEDIA_DLG
+{
+    Text[en-US] = "Open Movie and Sound";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ALL_MEDIAFILES
+{
+    Text[en-US] = "All movie and sound files";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ALL_FILES
+{
+    Text[en-US] = "All files (*.*)";
+};
+
+// ------------------------------------------------------------------------------
+
+Bitmap AVMEDIA_BMP_AUDIOLOGO
+{
+    file = "avaudiologo.png";
+};
+
+// ------------------------------------------------------------------------------
+
+Bitmap AVMEDIA_BMP_EMPTYLOGO
+{
+    file = "avemptylogo.png";
+};
+
+// ------------------------------------------------------------------------------
+
+ErrorBox AVMEDIA_ERR_URL
+{
+    BUTTONS = WB_OK ;
+    DEFBUTTON = WB_DEF_OK ;
+    Message[en-US] = "The format of the selected file is not supported.";
+};
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
new file mode 100644
index 000000000000..553eea6196c1
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -0,0 +1,546 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediawindow_impl.hxx"
+#include "mediaevent_impl.hxx"
+#include "mediamisc.hxx"
+#include "mediawindow.hrc"
+#include "helpids.hrc"
+
+#include <algorithm>
+#include <cmath>
+#include <osl/mutex.hxx>
+#include <tools/time.hxx>
+#include <vcl/svapp.hxx>
+
+#ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
+#include <com/sun/star/awt/SystemPointer.hdl>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
+#include <com/sun/star/lang/XComponent.hdl>
+#endif
+
+#define AVMEDIA_TOOLBOXITEM_PREV    0x0001
+#define AVMEDIA_TOOLBOXITEM_PLAY    0x0002
+#define AVMEDIA_TOOLBOXITEM_PAUSE   0x0004
+#define AVMEDIA_TOOLBOXITEM_STOP    0x0008
+#define AVMEDIA_TOOLBOXITEM_NEXT    0x0010
+#define AVMEDIA_TOOLBOXITEM_MUTE    0x0100
+
+#define AVMEDIA_FFW_PLAYRATE        4
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace priv {
+
+// ----------------------
+// - MediaWindowControl -
+// ----------------------
+
+MediaWindowControl::MediaWindowControl( Window* pParent ) :
+    MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE )
+{
+}
+
+// ---------------------------------------------------------------------
+
+MediaWindowControl::~MediaWindowControl()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowControl::update()
+{
+    MediaItem aItem;
+
+    static_cast< MediaWindowImpl* >( GetParent() )->updateMediaItem( aItem );
+    setState( aItem );
+}
+
+// ---------------------------------------------------------------------
+
+void  MediaWindowControl::execute( const MediaItem& rItem )
+{
+    static_cast< MediaWindowImpl* >( GetParent() )->executeMediaItem( rItem );
+}
+
+// --------------------
+// - MediaChildWindow -
+// --------------------
+
+MediaChildWindow::MediaChildWindow( Window* pParent ) :
+    JavaChildWindow( pParent, WB_CLIPCHILDREN )
+{
+}
+
+// ---------------------------------------------------------------------
+
+MediaChildWindow::~MediaChildWindow()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
+{
+    const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+                                          rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+    JavaChildWindow::MouseMove( rMEvt );
+    GetParent()->MouseMove( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+                                          rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+    JavaChildWindow::MouseButtonDown( rMEvt );
+    GetParent()->MouseButtonDown( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+                                          rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+    JavaChildWindow::MouseButtonUp( rMEvt );
+    GetParent()->MouseButtonUp( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
+{
+    JavaChildWindow::KeyInput( rKEvt );
+    GetParent()->KeyInput( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
+{
+    JavaChildWindow::KeyUp( rKEvt );
+    GetParent()->KeyUp( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::Command( const CommandEvent& rCEvt )
+{
+    const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
+                                            rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
+
+    JavaChildWindow::Command( rCEvt );
+    GetParent()->Command( aTransformedEvent );
+}
+
+// ----------------------
+// - MediaWindowImpl -
+// ----------------------
+
+MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) :
+    Control( pParent ),
+    MediaWindowBaseImpl( pMediaWindow ),
+    DropTargetHelper( this ),
+    DragSourceHelper( this ),
+    mxEventsIf( static_cast< ::cppu::OWeakObject* >( mpEvents = new MediaEventListenersImpl( maChildWindow ) ) ),
+    maChildWindow( this ),
+    mpMediaWindowControl( bInternalMediaControl ? new MediaWindowControl( this ) : NULL ),
+    mpEmptyBmpEx( NULL ),
+    mpAudioBmpEx( NULL )
+{
+    maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
+    maChildWindow.Hide();
+
+    if( mpMediaWindowControl )
+    {
+        mpMediaWindowControl->SetSizePixel( mpMediaWindowControl->getMinSizePixel() );
+        mpMediaWindowControl->Show();
+    }
+}
+
+// ---------------------------------------------------------------------
+
+MediaWindowImpl::~MediaWindowImpl()
+{
+    delete mpEmptyBmpEx;
+    delete mpAudioBmpEx;
+    delete mpMediaWindowControl;
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::cleanUp()
+{
+    uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
+
+    mpEvents->cleanUp();
+
+    if( xPlayerWindow.is() )
+    {
+        xPlayerWindow->removeKeyListener( uno::Reference< awt::XKeyListener >( mxEventsIf, uno::UNO_QUERY ) );
+        xPlayerWindow->removeMouseListener( uno::Reference< awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
+        xPlayerWindow->removeMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
+
+        uno::Reference< lang::XComponent > xComponent( xPlayerWindow, uno::UNO_QUERY );
+
+        if( xComponent.is() )
+            xComponent->dispose();
+
+        setPlayerWindow( NULL );
+    }
+
+    MediaWindowBaseImpl::cleanUp();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::onURLChanged()
+{
+    if( getPlayer().is() )
+    {
+        uno::Sequence< uno::Any >              aArgs( 2 );
+        uno::Reference< media::XPlayerWindow > xPlayerWindow;
+        const Point                            aPoint;
+        const Size                             aSize( maChildWindow.GetSizePixel() );
+        const sal_IntPtr                       nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() );
+
+        aArgs[ 0 ] = uno::makeAny( nWndHandle );
+        aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
+
+        try
+        {
+            if( nWndHandle != 0 )
+                xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
+        }
+        catch( uno::RuntimeException )
+        {
+            // happens eg, on MacOSX where Java frames cannot be created from X11 window handles
+        }
+
+        setPlayerWindow( xPlayerWindow );
+
+        if( xPlayerWindow.is() )
+        {
+            xPlayerWindow->addKeyListener( uno::Reference< awt::XKeyListener >( mxEventsIf, uno::UNO_QUERY ) );
+            xPlayerWindow->addMouseListener( uno::Reference< awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
+            xPlayerWindow->addMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
+            xPlayerWindow->addFocusListener( uno::Reference< awt::XFocusListener >( mxEventsIf, uno::UNO_QUERY ) );
+        }
+    }
+    else
+        setPlayerWindow( NULL );
+
+    if( getPlayerWindow().is() )
+        maChildWindow.Show();
+    else
+        maChildWindow.Hide();
+
+    if( mpMediaWindowControl )
+    {
+        MediaItem aItem;
+
+        updateMediaItem( aItem );
+        mpMediaWindowControl->setState( aItem );
+    }
+
+    Invalidate();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::update()
+{
+    uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
+
+    if( xPlayerWindow.is() )
+        xPlayerWindow->update();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::setPosSize( const Rectangle& rRect )
+{
+    SetPosSizePixel( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight() );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::setPointer( const Pointer& rPointer )
+{
+    uno::Reference< media::XPlayerWindow >  xPlayerWindow( getPlayerWindow() );
+
+    SetPointer( rPointer );
+    maChildWindow.SetPointer( rPointer );
+
+    if( xPlayerWindow.is() )
+    {
+
+        long nPointer;
+
+        switch( rPointer.GetStyle() )
+        {
+            case( POINTER_CROSS ): nPointer = awt::SystemPointer::CROSS; break;
+            case( POINTER_HAND ): nPointer = awt::SystemPointer::HAND; break;
+            case( POINTER_MOVE ): nPointer = awt::SystemPointer::MOVE; break;
+            case( POINTER_WAIT ): nPointer = awt::SystemPointer::WAIT; break;
+
+            default: nPointer = awt::SystemPointer::ARROW; break;
+        }
+
+        xPlayerWindow->setPointerType( nPointer );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+const Pointer& MediaWindowImpl::getPointer() const
+{
+    return GetPointer();
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowImpl::hasInternalMediaControl() const
+{
+    return( mpMediaWindowControl != NULL );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::Resize()
+{
+    uno::Reference< media::XPlayerWindow >  xPlayerWindow( getPlayerWindow() );
+    const Size                              aCurSize( GetOutputSizePixel() );
+    const sal_Int32                         nOffset( mpMediaWindowControl ? AVMEDIA_CONTROLOFFSET : 0 );
+    Size                                    aPlayerWindowSize( aCurSize.Width() - ( nOffset << 1 ),
+                                                               aCurSize.Height() - ( nOffset << 1 ) );
+
+    if( mpMediaWindowControl )
+    {
+        const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height();
+        const sal_Int32 nControlY = ::std::max( aCurSize.Height() - nControlHeight - nOffset, 0L );
+
+        aPlayerWindowSize.Height() = ( nControlY - ( nOffset << 1 ) );
+        mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) );
+    }
+
+    maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
+
+    if( xPlayerWindow.is() )
+        xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::StateChanged( StateChangedType eType )
+{
+    uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
+
+    if( xPlayerWindow.is() )
+    {
+        // stop playing when going disabled or hidden
+        switch( eType )
+        {
+            case STATE_CHANGE_VISIBLE:
+            {
+                stopPlayingInternal( !IsVisible() );
+                xPlayerWindow->setVisible( IsVisible() );
+            }
+            break;
+
+            case STATE_CHANGE_ENABLE:
+            {
+                stopPlayingInternal( !IsEnabled() );
+                xPlayerWindow->setEnable( IsEnabled() );
+            }
+            break;
+
+            default:
+            break;
+        }
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::Paint( const Rectangle& )
+{
+    BitmapEx* pLogo = NULL;
+
+    if( !getPlayer().is() )
+    {
+        if( !mpEmptyBmpEx )
+            mpEmptyBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) );
+
+        pLogo = mpEmptyBmpEx;
+    }
+    else if ( !getPlayerWindow().is() )
+    {
+        if( !mpAudioBmpEx )
+            mpAudioBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
+
+        pLogo = mpAudioBmpEx;
+    }
+
+    const Point     aBasePos( maChildWindow.GetPosPixel() );
+    const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() );
+
+    if( pLogo && !pLogo->IsEmpty() && ( aVideoRect.GetWidth() > 0 ) && ( aVideoRect.GetHeight() > 0 ) )
+    {
+        Size        aLogoSize( pLogo->GetSizePixel() );
+        const Color aBackgroundColor( 67, 67, 67 );
+
+        SetLineColor( aBackgroundColor );
+        SetFillColor( aBackgroundColor );
+        DrawRect( aVideoRect );
+
+        if( ( aLogoSize.Width() > aVideoRect.GetWidth() || aLogoSize.Height() > aVideoRect.GetHeight() ) &&
+            ( aLogoSize.Height() > 0 ) )
+        {
+            const double fLogoWH = (double) aLogoSize.Width() / aLogoSize.Height();
+
+            if( fLogoWH < ( (double) aVideoRect.GetWidth() / aVideoRect.GetHeight() ) )
+            {
+                aLogoSize.Width() = (long) ( aVideoRect.GetHeight() * fLogoWH );
+                aLogoSize.Height()= aVideoRect.GetHeight();
+            }
+            else
+            {
+                aLogoSize.Width() = aVideoRect.GetWidth();
+                aLogoSize.Height()= (long) ( aVideoRect.GetWidth() / fLogoWH );
+            }
+        }
+
+        DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ),
+                             aBasePos.Y() + ( ( aVideoRect.GetHeight() - aLogoSize.Height() ) >> 1 ) ),
+                      aLogoSize, *pLogo );
+    }
+
+    update();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::GetFocus()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->MouseMove( rMEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->MouseButtonDown( rMEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->MouseButtonUp( rMEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->KeyInput( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->KeyUp( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::Command( const CommandEvent& rCEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->Command( rCEvt );
+}
+
+// ---------------------------------------------------------------------
+
+sal_Int8 MediaWindowImpl::AcceptDrop( const AcceptDropEvent& rEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+    return( pMediaWindow ? pMediaWindow->AcceptDrop( rEvt ) : 0 );
+}
+
+// ---------------------------------------------------------------------
+
+sal_Int8 MediaWindowImpl::ExecuteDrop( const ExecuteDropEvent& rEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+    return( pMediaWindow ? pMediaWindow->ExecuteDrop( rEvt ) : 0 );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->StartDrag( nAction, rPosPixel );
+}
+
+} // namespace priv
+} // namespace avmedia
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
new file mode 100644
index 000000000000..679b864af6b7
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -0,0 +1,145 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIAWINDOW_IMPL_HXX
+#define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
+
+#include <svtools/transfer.hxx>
+#include <vcl/javachild.hxx>
+
+#include "mediawindowbase_impl.hxx"
+#include "mediacontrol.hxx"
+
+class BitmapEx;
+
+namespace avmedia
+{
+    namespace priv
+    {
+        // ----------------------
+        // - MediaWindowControl -
+        // ----------------------
+
+        class MediaWindowControl : public MediaControl
+        {
+        public:
+
+                    MediaWindowControl( Window* pParent );
+                    ~MediaWindowControl();
+
+        protected:
+
+            void    update();
+            void    execute( const MediaItem& rItem );
+        };
+
+        // --------------------
+        // - MediaChildWindow -
+        // --------------------
+
+        class MediaChildWindow : public JavaChildWindow
+        {
+        public:
+
+                            MediaChildWindow( Window* pParent );
+                            ~MediaChildWindow();
+
+        protected:
+
+            virtual void    MouseMove( const MouseEvent& rMEvt );
+            virtual void    MouseButtonDown( const MouseEvent& rMEvt );
+            virtual void    MouseButtonUp( const MouseEvent& rMEvt );
+            virtual void    KeyInput( const KeyEvent& rKEvt );
+            virtual void    KeyUp( const KeyEvent& rKEvt );
+            virtual void    Command( const CommandEvent& rCEvt );
+        };
+
+        // ------------------.
+        // - MediaWindowImpl -
+        // -------------------
+
+        class MediaEventListenersImpl;
+
+        class MediaWindowImpl : public Control,
+                                public MediaWindowBaseImpl,
+                                public DropTargetHelper,
+                                public DragSourceHelper
+
+        {
+        public:
+
+                            MediaWindowImpl( Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl );
+            virtual         ~MediaWindowImpl();
+
+            virtual void    cleanUp();
+            virtual void    onURLChanged();
+
+        public:
+
+            void            update();
+
+            void            setPosSize( const Rectangle& rRect );
+
+            void            setPointer( const Pointer& rPointer );
+            const Pointer&  getPointer() const;
+
+            bool            hasInternalMediaControl() const;
+
+        protected:
+
+            // Window
+            virtual void    MouseMove( const MouseEvent& rMEvt );
+            virtual void    MouseButtonDown( const MouseEvent& rMEvt );
+            virtual void    MouseButtonUp( const MouseEvent& rMEvt );
+            virtual void    KeyInput( const KeyEvent& rKEvt );
+            virtual void    KeyUp( const KeyEvent& rKEvt );
+            virtual void    Command( const CommandEvent& rCEvt );
+            virtual void    Resize();
+            virtual void    StateChanged( StateChangedType );
+            virtual void    Paint( const Rectangle& ); // const
+            virtual void    GetFocus();
+
+            // DropTargetHelper
+            virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+            virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+
+            // DragSourceHelper
+            virtual void    StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+
+        private:
+
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   mxEventsIf;
+            MediaEventListenersImpl*                                                mpEvents;
+            MediaChildWindow                                                        maChildWindow;
+            MediaWindowControl*                                                     mpMediaWindowControl;
+            BitmapEx*                                                               mpEmptyBmpEx;
+            BitmapEx*                                                               mpAudioBmpEx;
+        };
+    }
+}
+
+#endif
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
new file mode 100644
index 000000000000..ea28121e3609
--- /dev/null
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -0,0 +1,442 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediawindowbase_impl.hxx"
+#include <avmedia/mediaitem.hxx>
+#include "mediamisc.hxx"
+#include "mediawindow.hrc"
+#include <tools/urlobj.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/media/XManager.hpp>
+#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
+#include <com/sun/star/lang/XComponent.hdl>
+#endif
+
+#define MEDIA_TIMER_TIMEOUT 100
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace priv {
+
+// -----------------------
+// - MediaWindowBaseImpl -
+// -----------------------
+
+MediaWindowBaseImpl::MediaWindowBaseImpl( MediaWindow* pMediaWindow ) :
+    mpMediaWindow( pMediaWindow )
+{
+}
+
+// ---------------------------------------------------------------------
+
+MediaWindowBaseImpl::~MediaWindowBaseImpl()
+{
+    uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+}
+
+// -------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL )
+{
+    uno::Reference< lang::XMultiServiceFactory >    xFactory( ::comphelper::getProcessServiceFactory() );
+    uno::Reference< media::XPlayer >                xPlayer;
+
+    if( xFactory.is() )
+    {
+        try
+        {
+
+            uno::Reference< ::com::sun::star::media::XManager > xManager(
+                xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
+                uno::UNO_QUERY );
+
+            if( xManager.is() )
+            {
+                xPlayer = uno::Reference< ::com::sun::star::media::XPlayer >(
+                    xManager->createPlayer( rURL ), uno::UNO_QUERY );
+            }
+        }
+        catch( ... )
+        {
+        }
+    }
+
+    return xPlayer;
+}
+
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL )
+{
+    if( rURL != getURL() )
+    {
+        INetURLObject aURL( maFileURL = rURL );
+
+        if( mxPlayer.is() )
+            mxPlayer->stop();
+
+        if( mxPlayerWindow.is() )
+        {
+            mxPlayerWindow->setVisible( false );
+            mxPlayerWindow.clear();
+        }
+
+        mxPlayer.clear();
+
+        if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
+            maFileURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+
+        mxPlayer = createPlayer( maFileURL );
+        onURLChanged();
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::onURLChanged()
+{
+}
+
+// ---------------------------------------------------------------------
+
+const ::rtl::OUString& MediaWindowBaseImpl::getURL() const
+{
+    return maFileURL;
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowBaseImpl::isValid() const
+{
+    return( getPlayer().is() );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::stopPlayingInternal( bool bStop )
+{
+    if( isPlaying() )
+    {
+        if( bStop )
+            mxPlayer->stop();
+        else
+            mxPlayer->start();
+    }
+}
+
+// ---------------------------------------------------------------------
+
+MediaWindow* MediaWindowBaseImpl::getMediaWindow() const
+{
+    return mpMediaWindow;
+}
+
+// ---------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > MediaWindowBaseImpl::getPlayer() const
+{
+    return mxPlayer;
+}
+
+// ---------------------------------------------------------------------
+
+uno::Reference< media::XPlayerWindow > MediaWindowBaseImpl::getPlayerWindow() const
+{
+    return mxPlayerWindow;
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setPlayerWindow( const uno::Reference< media::XPlayerWindow >& rxPlayerWindow )
+{
+    mxPlayerWindow = rxPlayerWindow;
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::cleanUp()
+{
+    if( mxPlayer.is() )
+    {
+        mxPlayer->stop();
+
+        uno::Reference< lang::XComponent > xComponent( mxPlayer, uno::UNO_QUERY );
+
+        if( xComponent.is() )
+            xComponent->dispose();
+
+        mxPlayer.clear();
+    }
+
+    mpMediaWindow = NULL;
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowBaseImpl::hasPreferredSize() const
+{
+    return( mxPlayerWindow.is() );
+}
+
+// ---------------------------------------------------------------------
+
+Size MediaWindowBaseImpl::getPreferredSize() const
+{
+    Size aRet;
+
+    if( mxPlayer.is() )
+    {
+        awt::Size aPrefSize( mxPlayer->getPreferredPlayerWindowSize() );
+
+        aRet.Width() = aPrefSize.Width;
+        aRet.Height() = aPrefSize.Height;
+    }
+
+    return aRet;
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowBaseImpl::setZoom( ::com::sun::star::media::ZoomLevel eLevel )
+{
+    return( mxPlayerWindow.is() ? mxPlayerWindow->setZoomLevel( eLevel ) : false );
+}
+
+// -------------------------------------------------------------------------
+
+::com::sun::star::media::ZoomLevel MediaWindowBaseImpl::getZoom() const
+{
+    return( mxPlayerWindow.is() ? mxPlayerWindow->getZoomLevel() : ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE );
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowBaseImpl::start()
+{
+    return( mxPlayer.is() ? ( mxPlayer->start(), true ) : false );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::stop()
+{
+    if( mxPlayer.is() )
+        mxPlayer->stop();
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowBaseImpl::isPlaying() const
+{
+    return( mxPlayer.is() && mxPlayer->isPlaying() );
+}
+
+// ---------------------------------------------------------------------
+
+double MediaWindowBaseImpl::getDuration() const
+{
+    return( mxPlayer.is() ? mxPlayer->getDuration() : 0.0 );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setMediaTime( double fTime )
+{
+    if( mxPlayer.is() )
+        mxPlayer->setMediaTime( fTime );
+}
+
+// ---------------------------------------------------------------------
+
+double MediaWindowBaseImpl::getMediaTime() const
+{
+    return( mxPlayer.is() ? mxPlayer->getMediaTime() : 0.0 );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setStopTime( double fTime )
+{
+    if( mxPlayer.is() )
+        mxPlayer->setStopTime( fTime );
+}
+
+// ---------------------------------------------------------------------
+
+double MediaWindowBaseImpl::getStopTime() const
+{
+    return( mxPlayer.is() ? mxPlayer->getStopTime() : 0.0 );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setRate( double fRate )
+{
+    if( mxPlayer.is() )
+        mxPlayer->setRate( fRate );
+}
+
+// ---------------------------------------------------------------------
+
+double MediaWindowBaseImpl::getRate() const
+{
+    return( mxPlayer.is() ? mxPlayer->getRate() : 0.0 );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setPlaybackLoop( bool bSet )
+{
+    if( mxPlayer.is() )
+        mxPlayer->setPlaybackLoop( bSet );
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowBaseImpl::isPlaybackLoop() const
+{
+    return( mxPlayer.is() ? mxPlayer->isPlaybackLoop() : false );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setMute( bool bSet )
+{
+    if( mxPlayer.is() )
+        mxPlayer->setMute( bSet );
+}
+
+// ---------------------------------------------------------------------
+
+bool MediaWindowBaseImpl::isMute() const
+{
+    return( mxPlayer.is() ? mxPlayer->isMute() : false );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowBaseImpl::setVolumeDB( sal_Int16 nVolumeDB )
+{
+    if( mxPlayer.is() )
+        mxPlayer->setVolumeDB( nVolumeDB );
+}
+
+// ---------------------------------------------------------------------
+
+sal_Int16 MediaWindowBaseImpl::getVolumeDB() const
+{
+    return( mxPlayer.is() ? mxPlayer->getVolumeDB() : 0 );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindowBaseImpl::updateMediaItem( MediaItem& rItem ) const
+{
+    if( isPlaying() )
+        rItem.setState( ( getRate() > 1.0 ) ? MEDIASTATE_PLAYFFW : MEDIASTATE_PLAY );
+    else
+        rItem.setState( ( 0.0 == getMediaTime() ) ? MEDIASTATE_STOP : MEDIASTATE_PAUSE );
+
+    rItem.setDuration( getDuration() );
+    rItem.setTime( getMediaTime() );
+    rItem.setLoop( isPlaybackLoop() );
+    rItem.setMute( isMute() );
+    rItem.setVolumeDB( getVolumeDB() );
+    rItem.setZoom( getZoom() );
+    rItem.setURL( getURL() );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindowBaseImpl::executeMediaItem( const MediaItem& rItem )
+{
+    const sal_uInt32 nMaskSet = rItem.getMaskSet();
+
+    // set URL first
+    if( nMaskSet & AVMEDIA_SETMASK_URL )
+        setURL( rItem.getURL() );
+
+    // set different states next
+    if( nMaskSet & AVMEDIA_SETMASK_TIME )
+        setMediaTime( ::std::min( rItem.getTime(), getDuration() ) );
+
+    if( nMaskSet & AVMEDIA_SETMASK_LOOP )
+        setPlaybackLoop( rItem.isLoop() );
+
+    if( nMaskSet & AVMEDIA_SETMASK_MUTE )
+        setMute( rItem.isMute() );
+
+    if( nMaskSet & AVMEDIA_SETMASK_VOLUMEDB )
+        setVolumeDB( rItem.getVolumeDB() );
+
+    if( nMaskSet & AVMEDIA_SETMASK_ZOOM )
+        setZoom( rItem.getZoom() );
+
+    // set play state at last
+    if( nMaskSet & AVMEDIA_SETMASK_STATE )
+    {
+        switch( rItem.getState() )
+        {
+            case( MEDIASTATE_PLAY ):
+            case( MEDIASTATE_PLAYFFW ):
+            {
+/*
+                const double fNewRate = ( ( MEDIASTATE_PLAYFFW == rItem.getState() ) ? AVMEDIA_FFW_PLAYRATE : 1.0 );
+
+                if( getRate() != fNewRate )
+                    setRate( fNewRate );
+*/
+                if( !isPlaying() )
+                    start();
+            }
+            break;
+
+            case( MEDIASTATE_PAUSE ):
+            {
+                if( isPlaying() )
+                    stop();
+            }
+            break;
+
+            case( MEDIASTATE_STOP ):
+            {
+                if( isPlaying() )
+                {
+                    setMediaTime( 0.0 );
+                    stop();
+                    setMediaTime( 0.0 );
+                }
+            }
+            break;
+        }
+    }
+}
+
+} // namespace priv
+} // namespace avemdia
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
new file mode 100644
index 000000000000..0b0f160b6e3c
--- /dev/null
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIAWINDOWBASE_IMPL_HXX
+#define _AVMEDIA_MEDIAWINDOWBASE_IMPL_HXX
+
+#include <avmedia/mediawindow.hxx>
+#include <com/sun/star/media/XPlayer.hpp>
+#include <com/sun/star/media/XPlayerWindow.hpp>
+
+namespace avmedia
+{
+    namespace priv
+    {
+        // --------------
+        // - UpdateMode -
+        // --------------
+
+        enum UpdateMode
+        {
+            UPDATEMODE_SYNC_STATUSBAR = 0,
+            UPDATEMODE_SYNC_PLAYER = 1,
+            UPDATEMODE_SYNC_NONE = 2
+        };
+
+        // -----------------------
+        // - MediaWindowBaseImpl -
+        // -----------------------
+
+        class MediaWindowBaseImpl
+        {
+        public:
+
+                            MediaWindowBaseImpl( MediaWindow* pMediaWindow );
+            virtual         ~MediaWindowBaseImpl();
+
+            virtual void    cleanUp();
+            virtual void    onURLChanged();
+
+            static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+
+        public:
+
+            void    setURL( const ::rtl::OUString& rURL );
+            const ::rtl::OUString&  getURL() const;
+
+            bool    isValid() const;
+
+            bool    hasPreferredSize() const;
+            Size    getPreferredSize() const;
+
+            bool    setZoom( ::com::sun::star::media::ZoomLevel eLevel );
+            ::com::sun::star::media::ZoomLevel getZoom() const;
+
+            bool    start();
+            void    stop();
+
+            bool    isPlaying() const;
+
+            double  getDuration() const;
+
+            void    setMediaTime( double fTime );
+            double  getMediaTime() const;
+
+            void    setStopTime( double fTime );
+            double  getStopTime() const;
+
+            void    setRate( double fRate );
+            double  getRate() const;
+
+            void    setPlaybackLoop( bool bSet );
+            bool    isPlaybackLoop() const;
+
+            void    setFixedAspectRatio( bool bSet );
+            bool    isFixedAspectRatio() const;
+
+            void    setMute( bool bSet );
+            bool    isMute() const;
+
+            void    setVolumeDB( sal_Int16 nVolumeDB );
+            sal_Int16 getVolumeDB() const;
+
+            void    updateMediaItem( MediaItem& rItem ) const;
+            void    executeMediaItem( const MediaItem& rItem );
+
+        protected:
+
+            void    stopPlayingInternal( bool );
+
+            MediaWindow* getMediaWindow() const;
+
+            ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > getPlayer() const;
+
+            void setPlayerWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow >& rxPlayerWindow );
+            ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > getPlayerWindow() const;
+
+        private:
+
+            ::rtl::OUString                                                             maFileURL;
+            ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >        mxPlayer;
+            ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow >  mxPlayerWindow;
+            MediaWindow*                                                                mpMediaWindow;
+        };
+    }
+}
+
+#endif
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
new file mode 100644
index 000000000000..db9c0a52f288
--- /dev/null
+++ b/avmedia/source/win/exports.dxp
@@ -0,0 +1,4 @@
+component_getImplementationEnvironment
+component_writeInfo
+component_getFactory
+
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
new file mode 100644
index 000000000000..dc4a5dbeeb74
--- /dev/null
+++ b/avmedia/source/win/framegrabber.cxx
@@ -0,0 +1,247 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <tools/prewin.h>
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable: 4917)
+#endif
+#include <windows.h>
+#include <objbase.h>
+#include <strmif.h>
+#include <Amvideo.h>
+#if defined(_MSC_VER) && (_MSC_VER < 1500)
+#include <Qedit.h>
+#else
+#include "interface.hxx"
+#endif
+#include <uuids.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#include <tools/postwin.h>
+
+#include "framegrabber.hxx"
+#include "player.hxx"
+
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
+#include <unotools/localfilehelper.hxx>
+
+#define AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_DirectX"
+#define AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_DirectX"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace win {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+    ::CoInitialize( NULL );
+}
+
+// ------------------------------------------------------------------------------
+
+FrameGrabber::~FrameGrabber()
+{
+    ::CoUninitialize();
+}
+
+// ------------------------------------------------------------------------------
+
+IMediaDet* FrameGrabber::implCreateMediaDet( const ::rtl::OUString& rURL ) const
+{
+    IMediaDet* pDet = NULL;
+
+    if( SUCCEEDED( CoCreateInstance( CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, IID_IMediaDet, (void**) &pDet ) ) )
+    {
+        String aLocalStr;
+
+        if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr ) && aLocalStr.Len() )
+        {
+            if( !SUCCEEDED( pDet->put_Filename( ::SysAllocString( reinterpret_cast<LPCOLESTR>(aLocalStr.GetBuffer()) ) ) ) )
+            {
+                pDet->Release();
+                pDet = NULL;
+            }
+        }
+    }
+
+    return pDet;
+}
+
+// ------------------------------------------------------------------------------
+
+bool FrameGrabber::create( const ::rtl::OUString& rURL )
+{
+    // just check if a MediaDet interface can be created with the given URL
+    IMediaDet*  pDet = implCreateMediaDet( rURL );
+
+    if( pDet )
+    {
+        maURL = rURL;
+        pDet->Release();
+        pDet = NULL;
+    }
+    else
+        maURL = ::rtl::OUString();
+
+    return( maURL.getLength() > 0 );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< graphic::XGraphic > xRet;
+    IMediaDet*                          pDet = implCreateMediaDet( maURL );
+
+    if( pDet )
+    {
+        double  fLength;
+        long    nStreamCount;
+        bool    bFound = false;
+
+        if( SUCCEEDED( pDet->get_OutputStreams( &nStreamCount ) ) )
+        {
+            for( long n = 0; ( n < nStreamCount ) && !bFound; ++n )
+            {
+                GUID aMajorType;
+
+                if( SUCCEEDED( pDet->put_CurrentStream( n ) )  &&
+                    SUCCEEDED( pDet->get_StreamType( &aMajorType ) ) &&
+                    ( aMajorType == MEDIATYPE_Video ) )
+                {
+                    bFound = true;
+                }
+            }
+        }
+
+        if( bFound &&
+            ( S_OK == pDet->get_StreamLength( &fLength ) ) &&
+            ( fLength > 0.0 ) && ( fMediaTime >= 0.0 ) && ( fMediaTime <= fLength ) )
+        {
+            AM_MEDIA_TYPE   aMediaType;
+            long            nWidth = 0, nHeight = 0, nSize = 0;
+
+            if( SUCCEEDED( pDet->get_StreamMediaType( &aMediaType ) ) )
+            {
+                if( ( aMediaType.formattype == FORMAT_VideoInfo ) &&
+                    ( aMediaType.cbFormat >= sizeof( VIDEOINFOHEADER ) ) )
+                {
+                    VIDEOINFOHEADER* pVih = reinterpret_cast< VIDEOINFOHEADER* >( aMediaType.pbFormat );
+
+                    nWidth = pVih->bmiHeader.biWidth;
+                    nHeight = pVih->bmiHeader.biHeight;
+
+                    if( nHeight < 0 )
+                        nHeight *= -1;
+                }
+
+                if( aMediaType.cbFormat != 0 )
+                {
+                    ::CoTaskMemFree( (PVOID) aMediaType.pbFormat );
+                    aMediaType.cbFormat = 0;
+                    aMediaType.pbFormat = NULL;
+                }
+
+                if( aMediaType.pUnk != NULL )
+                {
+                    aMediaType.pUnk->Release();
+                    aMediaType.pUnk = NULL;
+                }
+            }
+
+            if( ( nWidth > 0 ) && ( nHeight > 0 ) &&
+                SUCCEEDED( pDet->GetBitmapBits( 0, &nSize, NULL, nWidth, nHeight ) ) &&
+                ( nSize > 0  ) )
+            {
+                char* pBuffer = new char[ nSize ];
+
+                try
+                {
+                    if( SUCCEEDED( pDet->GetBitmapBits( fMediaTime, NULL, pBuffer, nWidth, nHeight ) ) )
+                    {
+                        SvMemoryStream  aMemStm( pBuffer, nSize, STREAM_READ | STREAM_WRITE );
+                        Bitmap          aBmp;
+
+                        if( aBmp.Read( aMemStm, false ) && !aBmp.IsEmpty() )
+                        {
+                            const Graphic aGraphic( aBmp );
+                            xRet = aGraphic.GetXGraphic();
+                        }
+                    }
+                }
+                catch( ... )
+                {
+                }
+
+                delete [] pBuffer;
+            }
+        }
+
+        pDet->Release();
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace win
+} // namespace avmedia
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
new file mode 100644
index 000000000000..17085571feea
--- /dev/null
+++ b/avmedia/source/win/framegrabber.hxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _FRAMEGRABBER_HXX
+#define _FRAMEGRABBER_HXX
+
+#include "wincommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
+#include "com/sun/star/media/XFrameGrabber.hdl"
+#endif
+
+struct IMediaDet;
+
+namespace avmedia { namespace win {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber,
+                                                      ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+            ~FrameGrabber();
+
+    bool    create( const ::rtl::OUString& rURL );
+
+    // XFrameGrabber
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) 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);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    mxMgr;
+    ::rtl::OUString                                                                     maURL;
+
+    IMediaDet* implCreateMediaDet( const ::rtl::OUString& rURL ) const;
+};
+
+} // namespace win
+} // namespace avmedia
+
+#endif // _FRAMEGRABBER_HXX
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
new file mode 100644
index 000000000000..a5928139e7a7
--- /dev/null
+++ b/avmedia/source/win/interface.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+extern "C" const CLSID CLSID_MediaDet;
+extern "C" const IID IID_IMediaDet;
+struct ISampleGrabber;
+
+struct
+#ifndef __MINGW32__
+__declspec(uuid("65BD0710-24D2-4ff7-9324-ED2E5D3ABAFA")) __declspec(novtable)
+#endif
+IMediaDet : public IUnknown
+{
+public:
+    virtual  HRESULT __stdcall get_Filter(
+          IUnknown **pVal) = 0;
+    virtual  HRESULT __stdcall put_Filter(
+          IUnknown *newVal) = 0;
+    virtual  HRESULT __stdcall get_OutputStreams(
+          long *pVal) = 0;
+    virtual  HRESULT __stdcall get_CurrentStream(
+          long *pVal) = 0;
+    virtual  HRESULT __stdcall put_CurrentStream(
+         long newVal) = 0;
+    virtual  HRESULT __stdcall get_StreamType(
+          GUID *pVal) = 0;
+    virtual  HRESULT __stdcall get_StreamTypeB(
+          BSTR *pVal) = 0;
+    virtual  HRESULT __stdcall get_StreamLength(
+          double *pVal) = 0;
+    virtual  HRESULT __stdcall get_Filename(
+          BSTR *pVal) = 0;
+    virtual  HRESULT __stdcall put_Filename(
+          BSTR newVal) = 0;
+    virtual  HRESULT __stdcall GetBitmapBits(
+        double StreamTime,
+         long *pBufferSize,
+         char *pBuffer,
+        long Width,
+        long Height) = 0;
+    virtual  HRESULT __stdcall WriteBitmapBits(
+        double StreamTime,
+        long Width,
+        long Height,
+         BSTR Filename) = 0;
+    virtual  HRESULT __stdcall get_StreamMediaType(
+          AM_MEDIA_TYPE *pVal) = 0;
+    virtual  HRESULT __stdcall GetSampleGrabber(
+          ISampleGrabber **ppVal) = 0;
+    virtual  HRESULT __stdcall get_FrameRate(
+          double *pVal) = 0;
+    virtual  HRESULT __stdcall EnterBitmapGrabMode(
+        double SeekTime) = 0;
+};
+
+extern "C" const IID IID_ISampleGrabberCB;
+struct
+#ifndef __MINGW32__
+__declspec(uuid("0579154A-2B53-4994-B0D0-E773148EFF85")) __declspec(novtable)
+#endif
+ISampleGrabberCB : public IUnknown
+{
+public:
+    virtual HRESULT __stdcall SampleCB(
+        double SampleTime,
+        IMediaSample *pSample) = 0;
+    virtual HRESULT __stdcall BufferCB(
+        double SampleTime,
+        WIN_BYTE *pBuffer,
+        long BufferLen) = 0;
+};
+
+extern "C" const IID IID_ISampleGrabber;
+struct
+#ifndef __MINGW32__
+__declspec(uuid("6B652FFF-11FE-4fce-92AD-0266B5D7C78F")) __declspec(novtable)
+#endif
+ISampleGrabber : public IUnknown
+{
+public:
+    virtual HRESULT __stdcall SetOneShot(
+        WIN_BOOL OneShot) = 0;
+    virtual HRESULT __stdcall SetMediaType(
+        const AM_MEDIA_TYPE *pType) = 0;
+    virtual HRESULT __stdcall GetConnectedMediaType(
+        AM_MEDIA_TYPE *pType) = 0;
+    virtual HRESULT __stdcall SetBufferSamples(
+        WIN_BOOL BufferThem) = 0;
+    virtual HRESULT __stdcall GetCurrentBuffer(
+         long *pBufferSize,
+         long *pBuffer) = 0;
+    virtual HRESULT __stdcall GetCurrentSample(
+         IMediaSample **ppSample) = 0;
+    virtual HRESULT __stdcall SetCallback(
+        ISampleGrabberCB *pCallback,
+        long WhichMethodToCallback) = 0;
+
+};
+
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
new file mode 100644
index 000000000000..b70841e8bdf7
--- /dev/null
+++ b/avmedia/source/win/makefile.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=avmediawin
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+.IF "$(ENABLE_DIRECTX)" != ""
+
+.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
+CDEFS+= -DVERBOSE
+.ENDIF
+
+# --- Files ----------------------------------
+
+.IF "$(GUI)" == "WNT"
+
+SLOFILES= \
+        $(SLO)$/winuno.obj      \
+        $(SLO)$/manager.obj     \
+        $(SLO)$/window.obj      \
+        $(SLO)$/player.obj      \
+        $(SLO)$/framegrabber.obj    
+        
+
+EXCEPTIONSFILES= \
+        $(SLO)$/winuno.obj      \
+        $(SLO)$/framegrabber.obj    
+
+SHL1TARGET=$(TARGET)
+SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) $(VCLLIB) 
+SHL1IMPLIB=i$(TARGET)
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+SHL1STDLIBS += $(OLE32LIB)
+SHL1STDLIBS += $(OLEAUT32LIB)
+SHL1STDLIBS += $(GDI32LIB)
+SHL1STDLIBS += $(DDRAWLIB)
+
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib
+.ELSE
+SHL1STDLIBS += strmiids.lib
+SHL1STDLIBS += dxguid.lib
+.ENDIF
+
+.ENDIF
+.ENDIF
+
+.INCLUDE :  	target.mk
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
new file mode 100644
index 000000000000..13bc1e4fe593
--- /dev/null
+++ b/avmedia/source/win/manager.cxx
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "manager.hxx"
+#include "player.hxx"
+
+#include <tools/urlobj.hxx>
+
+#define AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_DirectX"
+#define AVMEDIA_WIN_MANAGER_SERVICENAME "com.sun.star.media.Manager"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace win {
+// ----------------
+// - Manager -
+// ----------------
+
+Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+Manager::~Manager()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+    throw (uno::RuntimeException)
+{
+    Player*                             pPlayer( new Player( mxMgr ) );
+    uno::Reference< media::XPlayer >    xRet( pPlayer );
+    const INetURLObject                 aURL( rURL );
+
+    if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) )  )
+        xRet = uno::Reference< media::XPlayer >();
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Manager::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_WIN_MANAGER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_MANAGER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace win
+} // namespace avmedia
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
new file mode 100644
index 000000000000..1bb3e530c016
--- /dev/null
+++ b/avmedia/source/win/manager.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _MANAGER_HXX
+#define _MANAGER_HXX
+
+#include "wincommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
+#include "com/sun/star/media/XManager.hdl"
+#endif
+
+// -----------
+// - Manager -
+// -----------
+
+namespace avmedia { namespace win {
+
+class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
+                                                 ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Manager();
+
+    // XManager
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) 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);
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+};
+
+} // namespace win
+} // namespace avmedia
+
+#endif // _MANAGER_HXX
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
new file mode 100644
index 000000000000..d27b2b55ff93
--- /dev/null
+++ b/avmedia/source/win/player.cxx
@@ -0,0 +1,494 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <tools/prewin.h>
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable: 4917)
+#endif
+#include <windows.h>
+#include <objbase.h>
+#include <strmif.h>
+#include <control.h>
+#include <uuids.h>
+#include <evcode.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#include <tools/postwin.h>
+
+#include "player.hxx"
+#include "framegrabber.hxx"
+#include "window.hxx"
+
+#define AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_DirectX"
+#define AVMEDIA_WIN_PLAYER_SERVICENAME "com.sun.star.media.Player_DirectX"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace win {
+
+bool isWindowsVistaOrHigher()
+{
+    // POST: return true if we are at least on Windows Vista
+    OSVERSIONINFO osvi;
+    ZeroMemory(&osvi, sizeof(osvi));
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    GetVersionEx(&osvi);
+    if ( osvi.dwMajorVersion >= 6 )
+        return true;
+
+    return false;
+}
+
+// ----------------
+// - Player -
+// ----------------
+
+Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr ),
+    mpGB( NULL ),
+    mpOMF( NULL ),
+    mpMC( NULL ),
+    mpME( NULL ),
+    mpMS( NULL ),
+    mpMP( NULL ),
+    mpBA( NULL ),
+    mpBV( NULL ),
+    mpVW( NULL ),
+    mpEV( NULL ),
+    mnUnmutedVolume( 0 ),
+    mbMuted( false ),
+    mbLooping( false )
+{
+    ::CoInitialize( NULL );
+}
+
+// ------------------------------------------------------------------------------
+
+Player::~Player()
+{
+    if( mpBA )
+        mpBA->Release();
+
+    if( mpBV )
+        mpBV->Release();
+
+    if( mpVW )
+        mpVW->Release();
+
+    if( mpMP )
+        mpMP->Release();
+
+    if( mpMS )
+        mpMS->Release();
+
+    if( mpME )
+        mpME->Release();
+
+    if( mpMC )
+        mpMC->Release();
+
+    if( mpEV )
+        mpEV->Release();
+
+    if( mpOMF )
+        mpOMF->Release();
+
+    if( mpGB )
+        mpGB->Release();
+
+    ::CoUninitialize();
+}
+
+// ------------------------------------------------------------------------------
+
+bool Player::create( const ::rtl::OUString& rURL )
+{
+    HRESULT hR;
+    bool    bRet = false;
+
+    if( SUCCEEDED( hR = CoCreateInstance( CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, IID_IGraphBuilder, (void**) &mpGB ) ) )
+    {
+        // Don't use the overlay mixer on Windows Vista
+        // It disables the desktop composition as soon as RenderFile is called
+        // also causes some other problems: video rendering is not reliable
+        if( !isWindowsVistaOrHigher() )
+        {
+            if( SUCCEEDED( CoCreateInstance( CLSID_OverlayMixer, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**) &mpOMF ) ) )
+            {
+                mpGB->AddFilter( mpOMF, L"com_sun_star_media_OverlayMixerFilter" );
+
+                if( !SUCCEEDED( mpOMF->QueryInterface( IID_IDDrawExclModeVideo, (void**) &mpEV ) ) )
+                    mpEV = NULL;
+            }
+        }
+
+        if( SUCCEEDED( hR = mpGB->RenderFile( reinterpret_cast<LPCWSTR>(rURL.getStr()), NULL ) ) &&
+            SUCCEEDED( hR = mpGB->QueryInterface( IID_IMediaControl, (void**) &mpMC ) ) &&
+            SUCCEEDED( hR = mpGB->QueryInterface( IID_IMediaEventEx, (void**) &mpME ) ) &&
+            SUCCEEDED( hR = mpGB->QueryInterface( IID_IMediaSeeking, (void**) &mpMS ) ) &&
+            SUCCEEDED( hR = mpGB->QueryInterface( IID_IMediaPosition, (void**) &mpMP ) ) )
+        {
+            // Video interfaces
+            mpGB->QueryInterface( IID_IVideoWindow, (void**) &mpVW );
+            mpGB->QueryInterface( IID_IBasicVideo, (void**) &mpBV );
+
+            // Audio interface
+            mpGB->QueryInterface( IID_IBasicAudio, (void**) &mpBA );
+
+            if( mpBA )
+                mpBA->put_Volume( mnUnmutedVolume );
+
+            bRet = true;
+        }
+    }
+
+    if( bRet )
+        maURL = rURL;
+    else
+        maURL = ::rtl::OUString();
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+const IVideoWindow* Player::getVideoWindow() const
+{
+    return mpVW;
+}
+
+// ------------------------------------------------------------------------------
+
+void Player::setNotifyWnd( int nNotifyWnd )
+{
+    if( mpME )
+        mpME->SetNotifyWindow( (OAHWND) nNotifyWnd, WM_GRAPHNOTIFY, reinterpret_cast< LONG_PTR>( this ) );
+}
+
+// ------------------------------------------------------------------------------
+
+void Player::setDDrawParams( IDirectDraw* pDDraw, IDirectDrawSurface* pDDrawSurface )
+{
+    if( mpEV && pDDraw && pDDrawSurface )
+    {
+        mpEV->SetDDrawObject( pDDraw );
+        mpEV->SetDDrawSurface( pDDrawSurface );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+long Player::processEvent()
+{
+    long nCode, nParam1, nParam2;
+
+    if( mpME && SUCCEEDED( mpME->GetEvent( &nCode, &nParam1, &nParam2, 0 ) ) )
+    {
+        if( EC_COMPLETE == nCode )
+        {
+            if( mbLooping )
+            {
+                setMediaTime( 0.0 );
+                start();
+            }
+            else
+            {
+                setMediaTime( getDuration() );
+                stop();
+            }
+        }
+
+        mpME->FreeEventParams( nCode, nParam1, nParam2 );
+    }
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::start(  )
+    throw (uno::RuntimeException)
+{
+    if( mpMC )
+        mpMC->Run();
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::stop(  )
+    throw (uno::RuntimeException)
+{
+    if( mpMC )
+        mpMC->Stop();
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaying()
+    throw (uno::RuntimeException)
+{
+    OAFilterState   eFilterState;
+    bool            bRet = false;
+
+    if( mpMC && SUCCEEDED( mpMC->GetState( 10, &eFilterState ) ) )
+        bRet = ( State_Running == eFilterState );
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getDuration(  )
+    throw (uno::RuntimeException)
+{
+    REFTIME aRefTime( 0.0 );
+
+    if( mpMP  )
+        mpMP->get_Duration( &aRefTime );
+
+    return aRefTime;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMediaTime( double fTime )
+    throw (uno::RuntimeException)
+{
+    if( mpMP  )
+    {
+        const bool bPlaying = isPlaying();
+
+        mpMP->put_CurrentPosition( fTime );
+
+        if( !bPlaying && mpMC )
+            mpMC->StopWhenReady();
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getMediaTime(  )
+    throw (uno::RuntimeException)
+{
+    REFTIME aRefTime( 0.0 );
+
+    if( mpMP  )
+        mpMP->get_CurrentPosition( &aRefTime );
+
+    return aRefTime;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setStopTime( double fTime )
+    throw (uno::RuntimeException)
+{
+    if( mpMP  )
+        mpMP->put_StopTime( fTime );
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getStopTime(  )
+    throw (uno::RuntimeException)
+{
+    REFTIME aRefTime( 0.0 );
+
+    if( mpMP  )
+        mpMP->get_StopTime( &aRefTime );
+
+    return aRefTime;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setRate( double fRate )
+    throw (uno::RuntimeException)
+{
+    if( mpMP  )
+        mpMP->put_Rate( fRate );
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getRate(  )
+    throw (uno::RuntimeException)
+{
+    double fRet( 0.0 );
+
+    if( mpMP  )
+        mpMP->get_Rate( &fRet );
+
+    return fRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    mbLooping = bSet;
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaybackLoop(  )
+    throw (uno::RuntimeException)
+{
+    return mbLooping;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMute( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    if( mpBA && ( mbMuted != bSet ) )
+    {
+        mbMuted = bSet;
+        mpBA->put_Volume( mbMuted ? -10000 : mnUnmutedVolume );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isMute(  )
+    throw (uno::RuntimeException)
+{
+    return mbMuted;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
+    throw (uno::RuntimeException)
+{
+    mnUnmutedVolume = static_cast< long >( nVolumeDB ) * 100;
+
+    if( !mbMuted && mpBA )
+        mpBA->put_Volume( mnUnmutedVolume );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL Player::getVolumeDB(  )
+    throw (uno::RuntimeException)
+{
+    return( static_cast< sal_Int16 >( mnUnmutedVolume / 100 ) );
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
+    throw (uno::RuntimeException)
+{
+    awt::Size aSize( 0, 0 );
+
+    if( mpBV )
+    {
+        long nWidth = 0, nHeight = 0;
+
+        mpBV->GetVideoSize( &nWidth, &nHeight );
+        aSize.Width = nWidth;
+        aSize.Height = nHeight;
+    }
+
+    return aSize;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< ::media::XPlayerWindow >    xRet;
+    awt::Size                                   aSize( getPreferredPlayerWindowSize() );
+
+    if( mpVW && aSize.Width > 0 && aSize.Height > 0 )
+    {
+        ::avmedia::win::Window* pWindow = new ::avmedia::win::Window( mxMgr, *this );
+
+        xRet = pWindow;
+
+        if( !pWindow->create( aArguments ) )
+            xRet = uno::Reference< ::media::XPlayerWindow >();
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< media::XFrameGrabber > xRet;
+
+    if( maURL.getLength() > 0 )
+    {
+        FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
+
+        xRet = pGrabber;
+
+        if( !pGrabber->create( maURL ) )
+            xRet.clear();
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Player::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_WIN_PLAYER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_PLAYER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace win
+} // namespace avmedia
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
new file mode 100644
index 000000000000..34a567750b74
--- /dev/null
+++ b/avmedia/source/win/player.hxx
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _PLAYER_HXX
+#define _PLAYER_HXX
+
+#include "wincommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
+#include "com/sun/star/media/XPlayer.hdl"
+#endif
+
+struct IGraphBuilder;
+struct IBaseFilter;
+struct IMediaControl;
+struct IMediaEventEx;
+struct IMediaSeeking;
+struct IMediaPosition;
+struct IBasicAudio;
+struct IBasicVideo;
+struct IVideoWindow;
+struct IDDrawExclModeVideo;
+struct IDirectDraw;
+struct IDirectDrawSurface;
+
+namespace avmedia { namespace win {
+
+// ----------
+// - Player -
+// ----------
+
+class Player : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer,
+                                               ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+                        Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+                        ~Player();
+
+    bool                create( const ::rtl::OUString& rURL );
+
+    void                setNotifyWnd( int nNotifyWnd );
+    void                setDDrawParams( IDirectDraw* pDDraw, IDirectDrawSurface* pDDrawSurface );
+    long                processEvent();
+
+    const IVideoWindow* getVideoWindow() const;
+
+    // XPlayer
+    virtual void SAL_CALL start(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL stop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaying(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getDuration(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getMediaTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getStopTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setRate( double fRate ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getRate(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isMute(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) 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);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::rtl::OUString         maURL;
+    IGraphBuilder*          mpGB;
+    IBaseFilter*            mpOMF;
+    IMediaControl*          mpMC;
+    IMediaEventEx*          mpME;
+    IMediaSeeking*          mpMS;
+    IMediaPosition*         mpMP;
+    IBasicAudio*            mpBA;
+    IBasicVideo*            mpBV;
+    IVideoWindow*           mpVW;
+    IDDrawExclModeVideo*    mpEV;
+    long                    mnUnmutedVolume;
+    sal_Bool                mbMuted;
+    sal_Bool                mbLooping;
+
+    void                    ImplLayoutVideoWindow();
+};
+
+} // namespace win
+} // namespace avmedia
+
+#endif // _PLAYER_HXX
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
new file mode 100644
index 000000000000..502f4300273a
--- /dev/null
+++ b/avmedia/source/win/wincommon.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _WINCOMMON_HXX
+#define _WINCOMMON_HXX
+
+#include <osl/mutex.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
+#include <tools/stream.hxx>
+#include <tools/string.hxx>
+#include <tools/urlobj.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/factory.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/media/XManager.hpp>
+
+#define WM_GRAPHNOTIFY (WM_USER + 567)
+
+#endif // _WINCOMMOM_HXX
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
new file mode 100644
index 000000000000..1170505b440b
--- /dev/null
+++ b/avmedia/source/win/window.cxx
@@ -0,0 +1,740 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <tools/prewin.h>
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable: 4917)
+#endif
+#include <windows.h>
+#include <objbase.h>
+#include <strmif.h>
+#include <control.h>
+#include <dshow.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#include <tools/postwin.h>
+#include <com/sun/star/awt/SystemPointer.hdl>
+
+#include "window.hxx"
+#include "player.hxx"
+
+#define AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_DirectX"
+#define AVMEDIA_WIN_WINDOW_SERVICENAME "com.sun.star.media.Window_DirectX"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace win {
+
+// -----------
+// - statics -
+// -----------
+
+static ::osl::Mutex& ImplGetOwnStaticMutex()
+{
+    static ::osl::Mutex* pMutex = NULL;
+
+    if( pMutex == NULL )
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+
+        if( pMutex == NULL )
+        {
+            static ::osl::Mutex aMutex;
+            pMutex = &aMutex;
+        }
+    }
+
+    return *pMutex;
+}
+
+// -----------
+// - WndProc -
+// -----------
+
+LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 )
+{
+    Window* pWindow = (Window*) ::GetWindowLong( hWnd, 0 );
+    bool    bProcessed = true;
+
+    if( pWindow )
+    {
+        switch( nMsg )
+        {
+            case( WM_SETCURSOR ):
+                pWindow->updatePointer();
+            break;
+
+            case( WM_GRAPHNOTIFY ):
+                pWindow->processGraphEvent();
+            break;
+
+            case( WM_MOUSEMOVE ):
+            case( WM_LBUTTONDOWN ):
+            case( WM_MBUTTONDOWN ):
+            case( WM_RBUTTONDOWN ):
+            case( WM_LBUTTONUP ):
+            case( WM_MBUTTONUP ):
+            case( WM_RBUTTONUP ):
+            {
+                awt::MouseEvent aUNOEvt;
+                POINT           aWinPoint;
+
+                if( !::GetCursorPos( &aWinPoint ) || !::ScreenToClient( hWnd, &aWinPoint ) )
+                {
+                    aWinPoint.x = GET_X_LPARAM( nPar2 );
+                    aWinPoint.y = GET_Y_LPARAM( nPar2 );
+                }
+                aUNOEvt.Modifiers = 0;
+                aUNOEvt.Buttons = 0;
+                aUNOEvt.X = aWinPoint.x;
+                aUNOEvt.Y = aWinPoint.y;
+                aUNOEvt.PopupTrigger = false;
+
+                // Modifiers
+                if( nPar1 & MK_SHIFT )
+                    aUNOEvt.Modifiers |= awt::KeyModifier::SHIFT;
+
+                if( nPar1 & MK_CONTROL )
+                    aUNOEvt.Modifiers |= awt::KeyModifier::MOD1;
+
+                // Buttons
+                if( WM_LBUTTONDOWN == nMsg || WM_LBUTTONUP == nMsg )
+                    aUNOEvt.Buttons |= awt::MouseButton::LEFT;
+
+                if( WM_MBUTTONDOWN == nMsg || WM_MBUTTONUP == nMsg )
+                    aUNOEvt.Buttons |= awt::MouseButton::MIDDLE;
+
+                if( WM_RBUTTONDOWN == nMsg || WM_RBUTTONUP == nMsg )
+                    aUNOEvt.Buttons |= awt::MouseButton::RIGHT;
+
+                // event type
+                if( WM_LBUTTONDOWN == nMsg ||
+                    WM_MBUTTONDOWN == nMsg ||
+                    WM_RBUTTONDOWN == nMsg )
+                {
+                    aUNOEvt.ClickCount = 1;
+                    pWindow->fireMousePressedEvent( aUNOEvt );
+                }
+                else if( WM_LBUTTONUP == nMsg ||
+                         WM_MBUTTONUP == nMsg ||
+                         WM_RBUTTONUP == nMsg )
+                {
+                    aUNOEvt.ClickCount = 1;
+                    pWindow->fireMouseReleasedEvent( aUNOEvt );
+                }
+                else if( WM_MOUSEMOVE == nMsg )
+                {
+                    aUNOEvt.ClickCount = 0;
+                    pWindow->fireMouseMovedEvent( aUNOEvt );
+                    pWindow->updatePointer();
+                }
+            }
+            break;
+
+            case( WM_SETFOCUS ):
+            {
+                const awt::FocusEvent aUNOEvt;
+                pWindow->fireSetFocusEvent( aUNOEvt );
+            }
+            break;
+
+            default:
+                bProcessed = false;
+            break;
+        }
+    }
+    else
+        bProcessed = false;
+
+    return( bProcessed ? 0 : DefWindowProc( hWnd, nMsg, nPar1, nPar2 ) );
+}
+
+// ---------------
+// - Window -
+// ---------------
+
+WNDCLASS* Window::mpWndClass = NULL;
+
+// ------------------------------------------------------------------------------
+
+Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) :
+    mxMgr( rxMgr ),
+    mrPlayer( rPlayer ),
+    meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
+    mnParentWnd( 0 ),
+    mnFrameWnd( 0 ),
+    maListeners( maMutex ),
+    mnPointerType( awt::SystemPointer::ARROW )
+{
+    ::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
+
+    if( !mpWndClass )
+    {
+        mpWndClass = new WNDCLASS;
+
+        memset( mpWndClass, 0, sizeof( *mpWndClass ) );
+        mpWndClass->hInstance = GetModuleHandle( NULL );
+        mpWndClass->cbWndExtra = sizeof( DWORD );
+        mpWndClass->lpfnWndProc = MediaPlayerWndProc;
+        mpWndClass->lpszClassName = "com_sun_star_media_PlayerWnd";
+        mpWndClass->hbrBackground = (HBRUSH) ::GetStockObject( BLACK_BRUSH );
+        mpWndClass->hCursor = ::LoadCursor( NULL, IDC_ARROW );
+
+        ::RegisterClass( mpWndClass );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+Window::~Window()
+{
+    if( mnFrameWnd )
+        ::DestroyWindow( (HWND) mnFrameWnd );
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::ImplLayoutVideoWindow()
+{
+    if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel )
+    {
+        awt::Size           aPrefSize( mrPlayer.getPreferredPlayerWindowSize() );
+        awt::Rectangle      aRect = getPosSize();
+        int                 nW = aRect.Width, nH = aRect.Height;
+        int                 nVideoW = nW, nVideoH = nH;
+        int                 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
+        bool                bDone = false, bZoom = false;
+
+        if( media::ZoomLevel_ORIGINAL == meZoomLevel )
+        {
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_1_TO_4 == meZoomLevel )
+        {
+            aPrefSize.Width >>= 2;
+            aPrefSize.Height >>= 2;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_1_TO_2 == meZoomLevel )
+        {
+            aPrefSize.Width >>= 1;
+            aPrefSize.Height >>= 1;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_2_TO_1 == meZoomLevel )
+        {
+            aPrefSize.Width <<= 1;
+            aPrefSize.Height <<= 1;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_4_TO_1 == meZoomLevel )
+        {
+            aPrefSize.Width <<= 2;
+            aPrefSize.Height <<= 2;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_FIT_TO_WINDOW == meZoomLevel )
+        {
+            nWidth = nVideoW;
+            nHeight = nVideoH;
+            bDone = true;
+        }
+
+        if( bZoom )
+        {
+            if( ( aPrefSize.Width <= nVideoW ) && ( aPrefSize.Height <= nVideoH ) )
+            {
+                nX = ( nVideoW - aPrefSize.Width ) >> 1;
+                nY = ( nVideoH - aPrefSize.Height ) >> 1;
+                nWidth = aPrefSize.Width;
+                nHeight = aPrefSize.Height;
+                bDone = true;
+            }
+        }
+
+        if( !bDone )
+        {
+            if( aPrefSize.Width > 0 && aPrefSize.Height > 0 && nVideoW > 0 && nVideoH > 0 )
+            {
+                double fPrefWH = (double) aPrefSize.Width / aPrefSize.Height;
+
+                if( fPrefWH < ( (double) nVideoW / nVideoH ) )
+                    nVideoW = (int)( nVideoH * fPrefWH );
+                else
+                    nVideoH = (int)( nVideoW / fPrefWH );
+
+                nX = ( nW - nVideoW ) >> 1;
+                nY = ( nH - nVideoH ) >> 1;
+                nWidth = nVideoW;
+                nHeight = nVideoH;
+            }
+            else
+                nX = nY = nWidth = nHeight = 0;
+        }
+
+        IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() );
+
+        if( pVideoWindow )
+            pVideoWindow->SetWindowPosition( nX, nY, nWidth, nHeight );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+bool Window::create( const uno::Sequence< uno::Any >& rArguments )
+{
+    IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() );
+
+    if( !mnFrameWnd && pVideoWindow && mpWndClass )
+    {
+        awt::Rectangle  aRect;
+        sal_IntPtr       nWnd;
+
+        rArguments[ 0 ] >>= nWnd;
+        rArguments[ 1 ] >>= aRect;
+
+        mnParentWnd = static_cast<int>(nWnd);
+
+        mnFrameWnd = (int) ::CreateWindow( mpWndClass->lpszClassName, NULL,
+                                           WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
+                                           aRect.X, aRect.Y, aRect.Width, aRect.Height,
+                                           (HWND) mnParentWnd, NULL, mpWndClass->hInstance, 0 );
+
+        // if the last CreateWindow failed...
+        if( mnFrameWnd == 0 )
+        {
+            // try again and this time assume that mnParent is indeed a dc
+            mnParentWnd = reinterpret_cast<int>(::WindowFromDC( (HDC)mnParentWnd ));
+            mnFrameWnd = (int) ::CreateWindow( mpWndClass->lpszClassName, NULL,
+                                           WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
+                                           aRect.X, aRect.Y, aRect.Width, aRect.Height,
+                                           (HWND)mnParentWnd , NULL, mpWndClass->hInstance, 0 );
+        }
+
+        if( mnFrameWnd )
+        {
+            ::SetWindowLong( (HWND) mnFrameWnd, 0, (DWORD) this );
+
+#ifdef DDRAW_TEST_OUTPUT
+            IDirectDraw7*           pDDraw;
+            IDirectDrawSurface7*    pDDSurface;
+            IDirectDrawClipper*     pDDClipper;
+
+            if( DD_OK == DirectDrawCreateEx( NULL, (void**) &pDDraw, IID_IDirectDraw7, NULL ) )
+            {
+                if( DD_OK == pDDraw->SetCooperativeLevel( (HWND) mnParentWnd, DDSCL_NORMAL ) )
+                {
+                    DDSURFACEDESC2 aDDDesc;
+
+                    memset( &aDDDesc, 0, sizeof( aDDDesc ) );
+                    aDDDesc.dwSize = sizeof( aDDDesc );
+                    aDDDesc.dwFlags = DDSD_CAPS;
+                    aDDDesc.ddsCaps.dwCaps |= DDSCAPS_PRIMARYSURFACE;
+
+                    if( DD_OK == pDDraw->CreateSurface( &aDDDesc, &pDDSurface, NULL ) )
+                    {
+                        if( DD_OK == pDDraw->CreateClipper( 0, &pDDClipper, NULL ) )
+                        {
+                            pDDClipper->SetHWnd( 0, (HWND) mnFrameWnd );
+                            pDDSurface->SetClipper( pDDClipper );
+                        }
+
+                        mrPlayer.setDDrawParams( (IDirectDraw*) pDDraw, (IDirectDrawSurface*) pDDSurface );
+#endif
+
+                        pVideoWindow->put_Owner( (OAHWND) mnFrameWnd );
+                        pVideoWindow->put_MessageDrain( (OAHWND) mnFrameWnd );
+                        pVideoWindow->put_WindowStyle( WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN );
+
+                        mrPlayer.setNotifyWnd( mnFrameWnd );
+
+                        meZoomLevel = media::ZoomLevel_ORIGINAL;
+                        ImplLayoutVideoWindow();
+#ifdef DDRAW_TEST_OUTPUT
+                    }
+                }
+            }
+#endif
+        }
+    }
+
+    return( mnFrameWnd != 0 );
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::processGraphEvent()
+{
+    mrPlayer.processEvent();
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::updatePointer()
+{
+    char* pCursorName;
+
+    switch( mnPointerType )
+    {
+        case( awt::SystemPointer::CROSS ): pCursorName = IDC_CROSS; break;
+        //case( awt::SystemPointer::HAND ): pCursorName = IDC_HAND; break;
+        case( awt::SystemPointer::MOVE ): pCursorName = IDC_SIZEALL; break;
+        case( awt::SystemPointer::WAIT ): pCursorName = IDC_WAIT; break;
+
+        default:
+            pCursorName = IDC_ARROW;
+        break;
+    }
+
+    ::SetCursor( ::LoadCursor( NULL, pCursorName ) );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::update(  )
+    throw (uno::RuntimeException)
+{
+    ::RedrawWindow( (HWND) mnFrameWnd, NULL, NULL, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE  );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
+    throw (uno::RuntimeException)
+{
+        boolean bRet = false;
+
+        if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
+            media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
+        {
+            if( eZoomLevel != meZoomLevel )
+            {
+                meZoomLevel = eZoomLevel;
+                ImplLayoutVideoWindow();
+            }
+
+            bRet = true;
+        }
+
+        return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
+    throw (uno::RuntimeException)
+{
+    return meZoomLevel;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
+    throw (uno::RuntimeException)
+{
+    mnPointerType = nPointerType;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 )
+    throw (uno::RuntimeException)
+{
+    if( mnFrameWnd )
+    {
+        ::SetWindowPos( (HWND) mnFrameWnd, HWND_TOP, X, Y, Width, Height, 0 );
+        ImplLayoutVideoWindow();
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Rectangle SAL_CALL Window::getPosSize()
+    throw (uno::RuntimeException)
+{
+    awt::Rectangle aRet;
+
+    if( mnFrameWnd )
+    {
+        ::RECT  aWndRect;
+
+        if( ::GetClientRect( (HWND) mnFrameWnd, &aWndRect ) )
+        {
+            aRet.X = aWndRect.left;
+            aRet.Y = aWndRect.top;
+            aRet.Width = aWndRect.right - aWndRect.left + 1;
+            aRet.Height = aWndRect.bottom - aWndRect.top + 1;
+        }
+    }
+
+    return aRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setVisible( sal_Bool bVisible )
+    throw (uno::RuntimeException)
+{
+    if( mnFrameWnd )
+    {
+        IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() );
+
+        if( pVideoWindow )
+            pVideoWindow->put_Visible( bVisible ? OATRUE : OAFALSE );
+
+        ::ShowWindow( (HWND) mnFrameWnd, bVisible ? SW_SHOW : SW_HIDE );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setEnable( sal_Bool bEnable )
+    throw (uno::RuntimeException)
+{
+    if( mnFrameWnd )
+        ::EnableWindow( (HWND) mnFrameWnd, bEnable );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setFocus(  )
+    throw (uno::RuntimeException)
+{
+    if( mnFrameWnd )
+        ::SetFocus( (HWND) mnFrameWnd );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::dispose(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XMouseListener >( aIter.next(), uno::UNO_QUERY )->mousePressed( rEvt );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XMouseListener >( aIter.next(), uno::UNO_QUERY )->mouseReleased( rEvt );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseMotionListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XMouseMotionListener >( aIter.next(), uno::UNO_QUERY )->mouseMoved( rEvt );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XFocusListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XFocusListener >( aIter.next(), uno::UNO_QUERY )->focusGained( rEvt );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Window::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_WIN_WINDOW_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_WINDOW_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace win
+} // namespace avmedia
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
new file mode 100644
index 000000000000..36cff49a742a
--- /dev/null
+++ b/avmedia/source/win/window.hxx
@@ -0,0 +1,125 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _WINDOW_HXX
+#define _WINDOW_HXX
+
+#include "wincommon.hxx"
+#include <cppuhelper/interfacecontainer.h>
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
+#include "com/sun/star/media/XPlayerWindow.hdl"
+#endif
+
+struct IVideoWindow;
+
+namespace avmedia { namespace win {
+
+// ---------------
+// - Window -
+// ---------------
+
+class Player;
+
+class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
+                                                ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr,
+                    Player& rPlayer );
+            ~Window();
+
+    bool    create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+    void    processGraphEvent();
+    void    updatePointer();
+
+    // XPlayerWindow
+    virtual void SAL_CALL update(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XWindow
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 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);
+
+public:
+
+    void fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+    void fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+    void fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+    void fireKeyPressedEvent( const ::com::sun::star::awt::KeyEvent& rEvt );
+    void fireKeyReleasedEvent( const ::com::sun::star::awt::KeyEvent& rEvt );
+    void fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt );
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::osl::Mutex                                maMutex;
+    ::cppu::OMultiTypeInterfaceContainerHelper  maListeners;
+    ::com::sun::star::media::ZoomLevel          meZoomLevel;
+    Player&                                     mrPlayer;
+    int                                         mnFrameWnd;
+    int                                         mnParentWnd;
+    int                                         mnPointerType;
+
+    static WNDCLASS*                            mpWndClass;
+
+    void                                        ImplLayoutVideoWindow();
+};
+
+} // namespace win
+} // namespace avmedia
+
+#endif // _WINDOW_HXX
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
new file mode 100644
index 000000000000..4b06fd10727f
--- /dev/null
+++ b/avmedia/source/win/winuno.cxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "wincommon.hxx"
+#include "manager.hxx"
+
+using namespace ::com::sun::star;
+
+// -------------------
+// - factory methods -
+// -------------------
+
+static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+{
+    return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( rxFact ) );
+}
+
+// ------------------------------------------
+// - component_getImplementationEnvironment -
+// ------------------------------------------
+
+extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+// -----------------------
+// - component_writeInfo -
+// -----------------------
+
+extern "C" sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
+{
+    sal_Bool bRet = sal_False;
+
+    if( pRegistryKey )
+    {
+        try
+        {
+            uno::Reference< registry::XRegistryKey > xNewKey1(
+                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
+                ::rtl::OUString::createFromAscii( "/com.sun.star.comp.media.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" ) ) );
+
+            bRet = sal_True;
+        }
+        catch( registry::InvalidRegistryException& )
+        {
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+        }
+    }
+
+    return bRet;
+}
+
+// ------------------------
+// - component_getFactory -
+// ------------------------
+
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
+{
+    uno::Reference< lang::XSingleServiceFactory > xFactory;
+    void*                                   pRet = 0;
+
+    if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_DirectX" ) == 0 )
+    {
+        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( "com.sun.star.media.Manager_DirectX" ) );
+
+        xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
+                        reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
+                        ::rtl::OUString::createFromAscii( "com.sun.star.comp.media.Manager_DirectX" ),
+                        create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+    }
+
+    if( xFactory.is() )
+    {
+        xFactory->acquire();
+        pRet = xFactory.get();
+    }
+
+    return pRet;
+}
diff --git a/avmedia/source/xine/exports.dxp b/avmedia/source/xine/exports.dxp
new file mode 100644
index 000000000000..db9c0a52f288
--- /dev/null
+++ b/avmedia/source/xine/exports.dxp
@@ -0,0 +1,4 @@
+component_getImplementationEnvironment
+component_writeInfo
+component_getFactory
+
diff --git a/avmedia/source/xine/makefile.mk b/avmedia/source/xine/makefile.mk
new file mode 100644
index 000000000000..3ba341c0d32b
--- /dev/null
+++ b/avmedia/source/xine/makefile.mk
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmediaxine
+TARGET=avmediaxine
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
+CDEFS+= -DVERBOSE
+.ENDIF
+
+# --- Files ----------------------------------
+
+.IF "$(GUI)" == "UNX"  && "$(GUIBASE)"!="aqua"
+
+SLOFILES= \
+        $(SLO)$/xineuno.obj      \
+        $(SLO)$/manager.obj     \
+        $(SLO)$/window.obj      \
+        $(SLO)$/player.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/xineuno.obj
+
+SHL1TARGET=$(TARGET)
+SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB)
+SHL1IMPLIB=i$(TARGET)
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+.ENDIF
+
+.INCLUDE :  	target.mk
diff --git a/avmedia/source/xine/manager.cxx b/avmedia/source/xine/manager.cxx
new file mode 100644
index 000000000000..8fa1f27129b9
--- /dev/null
+++ b/avmedia/source/xine/manager.cxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "manager.hxx"
+#include "player.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace xine {
+// ----------------
+// - Manager -
+// ----------------
+
+Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+Manager::~Manager()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& aURL )
+    throw (uno::RuntimeException)
+{
+    Player*                             pPlayer( new Player );
+    uno::Reference< media::XPlayer >    xRet( pPlayer );
+
+    if( !pPlayer->create( aURL )  )
+        xRet = uno::Reference< media::XPlayer >();
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Manager::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_XINE_MANAGER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_XINE_MANAGER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace xine
+} // namespace avmedia
diff --git a/avmedia/source/xine/manager.hxx b/avmedia/source/xine/manager.hxx
new file mode 100644
index 000000000000..b8faf2774f73
--- /dev/null
+++ b/avmedia/source/xine/manager.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _MANAGER_HXX
+#define _MANAGER_HXX
+
+#include "xinecommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
+#include "com/sun/star/media/XManager.hdl"
+#endif
+
+// -----------
+// - Manager -
+// -----------
+
+namespace avmedia { namespace xine {
+
+class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
+                                                 ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Manager();
+
+    // XManager
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) 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);
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+};
+
+} // namespace xine
+} // namespace avmedia
+
+#endif // _MANAGER_HXX
diff --git a/avmedia/source/xine/player.cxx b/avmedia/source/xine/player.cxx
new file mode 100644
index 000000000000..e343bf2c0dcf
--- /dev/null
+++ b/avmedia/source/xine/player.cxx
@@ -0,0 +1,262 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "player.hxx"
+#include "window.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace xine {
+
+// ----------------
+// - Player -
+// ----------------
+
+Player::Player()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+Player::~Player()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+bool Player::create( const ::rtl::OUString& /* rURL */ )
+{
+    bool bRet = false;
+
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::start(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::stop(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaying()
+    throw (uno::RuntimeException)
+{
+    bool bRet = false;
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getDuration(  )
+    throw (uno::RuntimeException)
+{
+    double fRet = 0.0;
+
+    return fRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMediaTime( double /* fTime */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getMediaTime(  )
+    throw (uno::RuntimeException)
+{
+    double fRet = 0.0;
+
+    return fRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setStopTime( double /* fTime */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getStopTime(  )
+    throw (uno::RuntimeException)
+{
+    double fRet = 0.0;
+
+    return fRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setRate( double /* fRate */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getRate(  )
+    throw (uno::RuntimeException)
+{
+    double fRet = 0.0;
+
+    return fRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setPlaybackLoop( sal_Bool /* bSet */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaybackLoop(  )
+    throw (uno::RuntimeException)
+{
+    bool bRet = false;
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMute( sal_Bool /* bSet */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isMute(  )
+    throw (uno::RuntimeException)
+{
+    bool bRet = false;
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setVolumeDB( sal_Int16 /* nVolumeDB */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL Player::getVolumeDB(  )
+    throw (uno::RuntimeException)
+{
+    sal_Int16 nRet = 0;
+
+    return nRet;
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
+    throw (uno::RuntimeException)
+{
+    awt::Size aSize( 0, 0 );
+
+    return aSize;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< ::media::XPlayerWindow >    xRet;
+    awt::Size                                   aSize( getPreferredPlayerWindowSize() );
+
+    if( aSize.Width > 0 && aSize.Height > 0 )
+    {
+        ::avmedia::xine::Window* pWindow = new ::avmedia::xine::Window( *this );
+
+        xRet = pWindow;
+
+        if( !pWindow->create( aArguments ) )
+            xRet = uno::Reference< ::media::XPlayerWindow >();
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    return NULL;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Player::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_XINE_PLAYER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_XINE_PLAYER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_XINE_PLAYER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace xine
+} // namespace avmedia
diff --git a/avmedia/source/xine/player.hxx b/avmedia/source/xine/player.hxx
new file mode 100644
index 000000000000..b1e18613fbeb
--- /dev/null
+++ b/avmedia/source/xine/player.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _PLAYER_HXX
+#define _PLAYER_HXX
+
+#include "xinecommon.hxx"
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
+#include "com/sun/star/media/XPlayer.hdl"
+#endif
+
+namespace avmedia { namespace xine {
+
+// ----------
+// - Player -
+// ----------
+
+class Player : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer,
+                                               ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+                        Player();
+                        ~Player();
+
+    bool                create( const ::rtl::OUString& rURL );
+
+    // XPlayer
+    virtual void SAL_CALL start(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL stop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaying(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getDuration(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getMediaTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getStopTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setRate( double fRate ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getRate(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isMute(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) 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);
+
+private:
+};
+
+} // namespace xine
+} // namespace avmedia
+
+#endif // _PLAYER_HXX
diff --git a/avmedia/source/xine/window.cxx b/avmedia/source/xine/window.cxx
new file mode 100644
index 000000000000..fb4f428c65fd
--- /dev/null
+++ b/avmedia/source/xine/window.cxx
@@ -0,0 +1,571 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <com/sun/star/awt/SystemPointer.hdl>
+
+#include "window.hxx"
+#include "player.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace xine {
+
+// -----------
+// - statics -
+// -----------
+
+static ::osl::Mutex& ImplGetOwnStaticMutex()
+{
+    static ::osl::Mutex* pMutex = NULL;
+
+    if( pMutex == NULL )
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+
+        if( pMutex == NULL )
+        {
+            static ::osl::Mutex aMutex;
+            pMutex = &aMutex;
+        }
+    }
+
+    return *pMutex;
+}
+
+// -----------
+// - WndProc -
+// -----------
+
+/*
+LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 )
+{
+    Window* pWindow = (Window*) ::GetWindowLong( hWnd, 0 );
+    bool    bProcessed = true;
+
+    if( pWindow )
+    {
+        switch( nMsg )
+        {
+            case( WM_SETCURSOR ):
+                pWindow->updatePointer();
+            break;
+
+            case( WM_GRAPHNOTIFY ):
+                pWindow->processGraphEvent();
+            break;
+
+            case( WM_MOUSEMOVE ):
+            case( WM_LBUTTONDOWN ):
+            case( WM_MBUTTONDOWN ):
+            case( WM_RBUTTONDOWN ):
+            case( WM_LBUTTONUP ):
+            case( WM_MBUTTONUP ):
+            case( WM_RBUTTONUP ):
+            {
+                awt::MouseEvent aUNOEvt;
+                POINT           aWinPoint;
+
+                if( !::GetCursorPos( &aWinPoint ) || !::ScreenToClient( hWnd, &aWinPoint ) )
+                {
+                    aWinPoint.x = GET_X_LPARAM( nPar2 );
+                    aWinPoint.y = GET_Y_LPARAM( nPar2 );
+                }
+                aUNOEvt.Modifiers = 0;
+                aUNOEvt.Buttons = 0;
+                aUNOEvt.X = aWinPoint.x;
+                aUNOEvt.Y = aWinPoint.y;
+                aUNOEvt.PopupTrigger = false;
+
+                // Modifiers
+                if( nPar1 & MK_SHIFT )
+                    aUNOEvt.Modifiers |= awt::KeyModifier::SHIFT;
+
+                if( nPar1 & MK_CONTROL )
+                    aUNOEvt.Modifiers |= awt::KeyModifier::MOD1;
+
+                // Buttons
+                if( WM_LBUTTONDOWN == nMsg || WM_LBUTTONUP == nMsg )
+                    aUNOEvt.Buttons |= awt::MouseButton::LEFT;
+
+                if( WM_MBUTTONDOWN == nMsg || WM_MBUTTONUP == nMsg )
+                    aUNOEvt.Buttons |= awt::MouseButton::MIDDLE;
+
+                if( WM_RBUTTONDOWN == nMsg || WM_RBUTTONUP == nMsg )
+                    aUNOEvt.Buttons |= awt::MouseButton::RIGHT;
+
+                // event type
+                if( WM_LBUTTONDOWN == nMsg ||
+                    WM_MBUTTONDOWN == nMsg ||
+                    WM_RBUTTONDOWN == nMsg )
+                {
+                    aUNOEvt.ClickCount = 1;
+                    pWindow->fireMousePressedEvent( aUNOEvt );
+                }
+                else if( WM_LBUTTONUP == nMsg ||
+                         WM_MBUTTONUP == nMsg ||
+                         WM_RBUTTONUP == nMsg )
+                {
+                    aUNOEvt.ClickCount = 1;
+                    pWindow->fireMouseReleasedEvent( aUNOEvt );
+                }
+                else if( WM_MOUSEMOVE == nMsg )
+                {
+                    aUNOEvt.ClickCount = 0;
+                    pWindow->fireMouseMovedEvent( aUNOEvt );
+                    pWindow->updatePointer();
+                }
+            }
+            break;
+
+            case( WM_SETFOCUS ):
+            {
+                const awt::FocusEvent aUNOEvt;
+                pWindow->fireSetFocusEvent( aUNOEvt );
+            }
+            break;
+
+            default:
+                bProcessed = false;
+            break;
+        }
+    }
+    else
+        bProcessed = false;
+
+    return( bProcessed ? 0 : DefWindowProc( hWnd, nMsg, nPar1, nPar2 ) );
+}
+*/
+
+// ---------------
+// - Window -
+// ---------------
+
+Window::Window( Player& rPlayer ) :
+    mrPlayer( rPlayer ),
+    maListeners( maMutex ),
+    meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
+    mnPointerType( awt::SystemPointer::ARROW )
+{
+    ::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
+}
+
+// ------------------------------------------------------------------------------
+
+Window::~Window()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::implLayoutVideoWindow()
+{
+    if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel )
+    {
+        awt::Size           aPrefSize( mrPlayer.getPreferredPlayerWindowSize() );
+        awt::Rectangle      aRect = getPosSize();
+        int                 nW = aRect.Width, nH = aRect.Height;
+        int                 nVideoW = nW, nVideoH = nH;
+        int                 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
+        bool                bDone = false, bZoom = false;
+
+        if( media::ZoomLevel_ORIGINAL == meZoomLevel )
+        {
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_1_TO_4 == meZoomLevel )
+        {
+            aPrefSize.Width >>= 2;
+            aPrefSize.Height >>= 2;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_1_TO_2 == meZoomLevel )
+        {
+            aPrefSize.Width >>= 1;
+            aPrefSize.Height >>= 1;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_2_TO_1 == meZoomLevel )
+        {
+            aPrefSize.Width <<= 1;
+            aPrefSize.Height <<= 1;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_ZOOM_4_TO_1 == meZoomLevel )
+        {
+            aPrefSize.Width <<= 2;
+            aPrefSize.Height <<= 2;
+            bZoom = true;
+        }
+        else if( media::ZoomLevel_FIT_TO_WINDOW == meZoomLevel )
+        {
+            nWidth = nVideoW;
+            nHeight = nVideoH;
+            bDone = true;
+        }
+
+        if( bZoom )
+        {
+            if( ( aPrefSize.Width <= nVideoW ) && ( aPrefSize.Height <= nVideoH ) )
+            {
+                nX = ( nVideoW - aPrefSize.Width ) >> 1;
+                nY = ( nVideoH - aPrefSize.Height ) >> 1;
+                nWidth = aPrefSize.Width;
+                nHeight = aPrefSize.Height;
+                bDone = true;
+            }
+        }
+
+        if( !bDone )
+        {
+            if( aPrefSize.Width > 0 && aPrefSize.Height > 0 && nVideoW > 0 && nVideoH > 0 )
+            {
+                double fPrefWH = (double) aPrefSize.Width / aPrefSize.Height;
+
+                if( fPrefWH < ( (double) nVideoW / nVideoH ) )
+                    nVideoW = (int)( nVideoH * fPrefWH );
+                else
+                    nVideoH = (int)( nVideoW / fPrefWH );
+
+                nX = ( nW - nVideoW ) >> 1;
+                nY = ( nH - nVideoH ) >> 1;
+                nWidth = nVideoW;
+                nHeight = nVideoH;
+            }
+            else
+                nX = nY = nWidth = nHeight = 0;
+        }
+
+        /*
+        IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() );
+
+        if( pVideoWindow )
+            pVideoWindow->SetWindowPosition( nX, nY, nWidth, nHeight );
+        */
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+bool Window::create( const uno::Sequence< uno::Any >& /*rArguments*/ )
+{
+    bool bRet = false;
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::update(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
+    throw (uno::RuntimeException)
+{
+    bool bRet = false;
+
+    if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
+        media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
+    {
+        if( eZoomLevel != meZoomLevel )
+        {
+            meZoomLevel = eZoomLevel;
+            implLayoutVideoWindow();
+        }
+
+        bRet = true;
+    }
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
+    throw (uno::RuntimeException)
+{
+    return meZoomLevel;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
+    throw (uno::RuntimeException)
+{
+    mnPointerType = nPointerType;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ )
+    throw (uno::RuntimeException)
+{
+    implLayoutVideoWindow();
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Rectangle SAL_CALL Window::getPosSize()
+    throw (uno::RuntimeException)
+{
+    awt::Rectangle aRet;
+
+    return aRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setVisible( sal_Bool /* bVisible */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setEnable( sal_Bool /* bEnable */ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setFocus(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::dispose(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XMouseListener >( aIter.next(), uno::UNO_QUERY )->mousePressed( rEvt );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XMouseListener >( aIter.next(), uno::UNO_QUERY )->mouseReleased( rEvt );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseMotionListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XMouseMotionListener >( aIter.next(), uno::UNO_QUERY )->mouseMoved( rEvt );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
+{
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XFocusListener >*) 0 ) );
+
+    if( pContainer )
+    {
+        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
+
+        while( aIter.hasMoreElements() )
+            uno::Reference< awt::XFocusListener >( aIter.next(), uno::UNO_QUERY )->focusGained( rEvt );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Window::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_XINE_WINDOW_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_XINE_WINDOW_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_XINE_WINDOW_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace xine
+} // namespace avmedia
diff --git a/avmedia/source/xine/window.hxx b/avmedia/source/xine/window.hxx
new file mode 100644
index 000000000000..014d349acfac
--- /dev/null
+++ b/avmedia/source/xine/window.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _WINDOW_HXX
+#define _WINDOW_HXX
+
+#include "xinecommon.hxx"
+#include <cppuhelper/interfacecontainer.h>
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
+#include "com/sun/star/media/XPlayerWindow.hdl"
+#endif
+
+namespace avmedia { namespace xine {
+
+// ---------------
+// - Window -
+// ---------------
+
+class Player;
+
+class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
+                                                ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            Window( Player& rPlayer );
+            ~Window();
+
+    bool    create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+
+    // XPlayerWindow
+    virtual void SAL_CALL update(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XWindow
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) 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);
+
+public:
+
+    void fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+    void fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+    void fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt );
+    void fireKeyPressedEvent( const ::com::sun::star::awt::KeyEvent& rEvt );
+    void fireKeyReleasedEvent( const ::com::sun::star::awt::KeyEvent& rEvt );
+    void fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt );
+
+private:
+
+    ::osl::Mutex                                maMutex;
+    Player&                                     mrPlayer;
+    ::cppu::OMultiTypeInterfaceContainerHelper  maListeners;
+    ::com::sun::star::media::ZoomLevel          meZoomLevel;
+    sal_Int32                                   mnPointerType;
+
+    void                                        implLayoutVideoWindow();
+};
+
+} // namespace xine
+} // namespace avmedia
+
+#endif // _WINDOW_HXX
diff --git a/avmedia/source/xine/xinecommon.hxx b/avmedia/source/xine/xinecommon.hxx
new file mode 100644
index 000000000000..fe80a75370b6
--- /dev/null
+++ b/avmedia/source/xine/xinecommon.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _XINECOMMON_HXX
+#define _XINECOMMON_HXX
+
+#include <osl/mutex.hxx>
+#ifndef __RTL_USTRING_
+#include <rtl/ustring.hxx>
+#endif
+#include <tools/debug.hxx>
+#include <tools/stream.hxx>
+#include <tools/string.hxx>
+#include <tools/urlobj.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/factory.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/media/XManager.hpp>
+
+#define AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_Xine"
+#define AVMEDIA_XINE_MANAGER_SERVICENAME "com.sun.star.media.Manager_Xine"
+
+#define AVMEDIA_XINE_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_Xine"
+#define AVMEDIA_XINE_PLAYER_SERVICENAME "com.sun.star.media.Player_Xine"
+
+#define AVMEDIA_XINE_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_Xine"
+#define AVMEDIA_XINE_WINDOW_SERVICENAME "com.sun.star.media.Window_Xine"
+
+#endif // _XINECOMMOM_HXX
diff --git a/avmedia/source/xine/xineuno.cxx b/avmedia/source/xine/xineuno.cxx
new file mode 100644
index 000000000000..4dc4f3f7e1dd
--- /dev/null
+++ b/avmedia/source/xine/xineuno.cxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "xinecommon.hxx"
+#include "manager.hxx"
+
+using namespace ::com::sun::star;
+
+// -------------------
+// - factory methods -
+// -------------------
+
+static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+{
+    return uno::Reference< uno::XInterface >( *new ::avmedia::xine::Manager( rxFact ) );
+}
+
+// ------------------------------------------
+// - component_getImplementationEnvironment -
+// ------------------------------------------
+
+extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+// -----------------------
+// - component_writeInfo -
+// -----------------------
+
+extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
+{
+    sal_Bool bRet = sal_False;
+
+    if( pRegistryKey )
+    {
+        try
+        {
+            uno::Reference< registry::XRegistryKey > xNewKey1(
+                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
+                ::rtl::OUString::createFromAscii(
+                    "/" AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
+                    AVMEDIA_XINE_MANAGER_SERVICENAME ) ) );
+
+            bRet = sal_True;
+        }
+        catch( registry::InvalidRegistryException& )
+        {
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+        }
+    }
+
+    return bRet;
+}
+
+// ------------------------
+// - component_getFactory -
+// ------------------------
+
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+{
+    uno::Reference< lang::XSingleServiceFactory > xFactory;
+    void*                                   pRet = 0;
+
+    if( rtl_str_compare( pImplName, AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME ) == 0 )
+    {
+        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( AVMEDIA_XINE_MANAGER_SERVICENAME ) );
+
+        xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
+                        reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
+                        ::rtl::OUString::createFromAscii( AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME ),
+                        create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+    }
+
+    if( xFactory.is() )
+    {
+        xFactory->acquire();
+        pRet = xFactory.get();
+    }
+
+    return pRet;
+}
diff --git a/avmedia/util/hidother.src b/avmedia/util/hidother.src
new file mode 100755
index 000000000000..c6d5dc07c9a5
--- /dev/null
+++ b/avmedia/util/hidother.src
@@ -0,0 +1,41 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "../inc/helpids.hrc"
+
+hidspecial HID_AVMEDIA_TOOLBOXITEM_PLAY    { HelpId = HID_AVMEDIA_TOOLBOXITEM_PLAY; };
+hidspecial HID_AVMEDIA_TOOLBOXITEM_PAUSE   { HelpId = HID_AVMEDIA_TOOLBOXITEM_PAUSE; };
+hidspecial HID_AVMEDIA_TOOLBOXITEM_STOP    { HelpId = HID_AVMEDIA_TOOLBOXITEM_STOP; };
+hidspecial HID_AVMEDIA_TOOLBOXITEM_MUTE    { HelpId = HID_AVMEDIA_TOOLBOXITEM_MUTE; };
+hidspecial HID_AVMEDIA_TOOLBOXITEM_LOOP    { HelpId = HID_AVMEDIA_TOOLBOXITEM_LOOP; };
+hidspecial HID_AVMEDIA_TOOLBOXITEM_OPEN    { HelpId = HID_AVMEDIA_TOOLBOXITEM_OPEN; };
+hidspecial HID_AVMEDIA_TOOLBOXITEM_INSERT  { HelpId = HID_AVMEDIA_TOOLBOXITEM_INSERT; };
+hidspecial HID_AVMEDIA_ZOOMLISTBOX         { HelpId = HID_AVMEDIA_ZOOMLISTBOX; };
+hidspecial HID_AVMEDIA_TIMESLIDER          { HelpId = HID_AVMEDIA_TIMESLIDER; };
+hidspecial HID_AVMEDIA_TIMEEDIT            { HelpId = HID_AVMEDIA_TIMEEDIT; };
+hidspecial HID_AVMEDIA_VOLUMESLIDER        { HelpId = HID_AVMEDIA_VOLUMESLIDER; };
+hidspecial HID_AVMEDIA_PLAYERWINDOW        { HelpId = HID_AVMEDIA_PLAYERWINDOW; };
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
new file mode 100644
index 000000000000..b0d0a6816cf8
--- /dev/null
+++ b/avmedia/util/makefile.mk
@@ -0,0 +1,79 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+PRJNAME=avmedia
+TARGET=avmedia
+GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Resources ---------------------------------
+
+RESLIB1NAME=$(TARGET)
+RESLIB1IMAGES=$(PRJ)$/res	
+RESLIB1SRSFILES=			\
+    $(SRS)$/viewer.srs		\
+    $(SRS)$/framework.srs
+
+# --- Files -------------------------------------
+
+LIB1TARGET=$(SLB)$/$(TARGET).lib
+LIB1FILES=\
+    $(SLB)$/viewer.lib		\
+    $(SLB)$/framework.lib	
+                
+# ==========================================================================
+
+SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+SHL1IMPLIB=i$(TARGET)
+SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(VOSLIB)
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+
+DEF1NAME=$(SHL1TARGET)
+DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt $(LIB1TARGET)
+DEF1DES=Avmedia
+DEFLIB1NAME	=$(TARGET)
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
+
+.IF "$(depend)"==""
+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
+    @echo ------------------------------
+    @echo Making: $@
+    @echo _Impl>$@
+    @echo WEP>>$@
+    @echo LIBMAIN>>$@
+    @echo LibMain>>$@
+    @echo CT>>$@
+.ENDIF
diff --git a/basebmp/inc/basebmp/accessor.hxx b/basebmp/inc/basebmp/accessor.hxx
new file mode 100644
index 000000000000..b98f05e78f6c
--- /dev/null
+++ b/basebmp/inc/basebmp/accessor.hxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_ACCESSOR_HXX
+#define INCLUDED_BASEBMP_ACCESSOR_HXX
+
+#include <vigra/numerictraits.hxx>
+
+namespace basebmp
+{
+
+/** Standard accessor type
+
+    Accesses the iterator values the standard way (i.e. via
+    *operator()/operator[])
+ */
+template<typename ValueType> class StandardAccessor
+{
+public:
+    typedef ValueType value_type;
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return *i;
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return i[diff];
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        *i = vigra::detail::RequiresExplicitCast<value_type>::cast(value);
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        i[diff] = vigra::detail::RequiresExplicitCast<value_type>::cast(value);
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+/** Non-standard accessor type
+
+    Uses getter/setter methods at the given iterator type, to access
+    the underlying values.
+ */
+template<typename ValueType> class NonStandardAccessor
+{
+public:
+    typedef ValueType value_type;
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return i.get();
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return i.get(diff);
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        i.set( vigra::detail::RequiresExplicitCast<value_type>::cast(value) );
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        i.set( vigra::detail::RequiresExplicitCast<value_type>::cast(value),
+               diff );
+    }
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_ACCESSOR_HXX */
diff --git a/basebmp/inc/basebmp/accessoradapters.hxx b/basebmp/inc/basebmp/accessoradapters.hxx
new file mode 100644
index 000000000000..40b4faed4bae
--- /dev/null
+++ b/basebmp/inc/basebmp/accessoradapters.hxx
@@ -0,0 +1,526 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX
+#define INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX
+
+#include <vigra/numerictraits.hxx>
+
+namespace basebmp
+{
+
+/** Interpose given accessor's set and get methods with two unary
+    functors.
+
+    @tpl WrappedAccessor
+    Wrapped type must provide the usual get and set accessor methods,
+    with the usual signatures (see StandardAccessor for a conforming
+    example).
+
+    @tpl GetterFunctor
+    An Adaptable Unary Function (i.e. providing result_type and
+    argument_type typedefs)
+
+    @tpl SetterFunctor
+    An Adaptable Unary Function (i.e. providing result_type and
+    argument_type typedefs)
+ */
+template< class WrappedAccessor,
+          typename GetterFunctor,
+          typename SetterFunctor > class UnaryFunctionAccessorAdapter
+{
+public:
+    typedef typename GetterFunctor::result_type   value_type;
+    typedef typename SetterFunctor::argument_type argument_type;
+
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+// making all members public, if no member template friends
+private:
+    template<class A, typename G, typename S> friend class UnaryFunctionAccessorAdapter;
+#endif
+
+    // we don't derive from wrapped type, to avoid ambiguities
+    // regarding templatized getter/setter methods.
+    WrappedAccessor maAccessor;
+    GetterFunctor   maGetterFunctor;
+    SetterFunctor   maSetterFunctor;
+
+public:
+    UnaryFunctionAccessorAdapter() :
+        maAccessor(),
+        maGetterFunctor(),
+        maSetterFunctor()
+    {}
+
+    template< class A > explicit
+    UnaryFunctionAccessorAdapter( UnaryFunctionAccessorAdapter< A,
+                                                                GetterFunctor,
+                                                                SetterFunctor > const& rSrc ) :
+        maAccessor( rSrc.maAccessor ),
+        maGetterFunctor( rSrc.maGetterFunctor ),
+        maSetterFunctor( rSrc.maSetterFunctor )
+    {}
+
+    template< class T > explicit UnaryFunctionAccessorAdapter( T const& accessor ) :
+        maAccessor( accessor ),
+        maGetterFunctor(),
+        maSetterFunctor()
+    {}
+
+    template< class T > UnaryFunctionAccessorAdapter( T             accessor,
+                                                      GetterFunctor getterFunctor,
+                                                      SetterFunctor setterFunctor) :
+        maAccessor( accessor ),
+        maGetterFunctor( getterFunctor ),
+        maSetterFunctor( setterFunctor )
+    {}
+
+    // -------------------------------------------------------
+
+    WrappedAccessor const& getWrappedAccessor() const { return maAccessor; }
+    WrappedAccessor&       getWrappedAccessor() { return maAccessor; }
+
+    // -------------------------------------------------------
+
+    value_type getter(typename GetterFunctor::argument_type v) const
+    {
+        return maGetterFunctor(v);
+    }
+    typename SetterFunctor::result_type setter(argument_type v) const
+    {
+        return maSetterFunctor(v);
+    }
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return maGetterFunctor( maAccessor(i) );
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return maGetterFunctor( maAccessor(i,diff) );
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        maAccessor.set(
+            maSetterFunctor(
+                vigra::detail::RequiresExplicitCast<argument_type>::cast(value) ),
+            i );
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        maAccessor.set(
+            maSetterFunctor(
+                vigra::detail::RequiresExplicitCast<argument_type>::cast(value) ),
+            i,
+            diff );
+    }
+
+};
+
+//-----------------------------------------------------------------------------
+
+/** Interpose given accessor's set methods with a binary function,
+    taking both old and new value.
+
+    The wrappee's getter methods kept as-is.
+
+    @tpl WrappedAccessor
+    Wrapped type must provide the usual get and set accessor methods,
+    with the usual signatures (see StandardAccessor for a conforming
+    example). Furthermore, must provide a nested typedef value_type.
+
+    @tpl SetterFunctor
+    An adaptable binary function (i.e. providing nested typedefs for
+    result_type and first and second argument type)
+ */
+template< class WrappedAccessor,
+          typename SetterFunctor > class BinarySetterFunctionAccessorAdapter
+{
+public:
+    typedef typename WrappedAccessor::value_type         value_type;
+    typedef typename SetterFunctor::second_argument_type argument_type;
+
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+// making all members public, if no member template friends
+private:
+    template<class A, typename S> friend class BinarySetterFunctionAccessorAdapter;
+#endif
+
+    WrappedAccessor    maAccessor;
+    SetterFunctor      maFunctor;
+
+public:
+    BinarySetterFunctionAccessorAdapter() :
+        maAccessor(),
+        maFunctor()
+    {}
+
+    template< class A > explicit
+    BinarySetterFunctionAccessorAdapter(
+        BinarySetterFunctionAccessorAdapter< A,
+                                             SetterFunctor > const& rSrc ) :
+        maAccessor( rSrc.maAccessor ),
+        maFunctor( rSrc.maFunctor )
+    {}
+
+    template< class T > explicit BinarySetterFunctionAccessorAdapter( T const& accessor ) :
+        maAccessor( accessor ),
+        maFunctor()
+    {}
+
+    template< class T > BinarySetterFunctionAccessorAdapter( T             accessor,
+                                                             SetterFunctor functor ) :
+        maAccessor( accessor ),
+        maFunctor( functor )
+    {}
+
+    // -------------------------------------------------------
+
+    WrappedAccessor const& getWrappedAccessor() const { return maAccessor; }
+    WrappedAccessor&       getWrappedAccessor() { return maAccessor; }
+
+    // -------------------------------------------------------
+
+    typename SetterFunctor::result_type setter(
+        typename SetterFunctor::first_argument_type v1,
+        argument_type                               v2 ) const
+    {
+        return maSetterFunctor(v1,v2);
+    }
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return maAccessor(i);
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return maAccessor(i,diff);
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        maAccessor.set(
+            maFunctor(maAccessor(i),
+                      vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
+            i );
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        maAccessor.set(
+            maFunctor(maAccessor(i,diff),
+                      vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
+            i,
+            diff );
+    }
+
+};
+
+//-----------------------------------------------------------------------------
+
+/** Write through a CompositeIterator's first wrapped iterator, by
+    piping the first wrapped iterator value, the second iterator
+    value, and the specified new value through a ternary function.
+
+    Passed iterator must fulfill the CompositeIterator concept. Note
+    that the getter/setter methods are not templatized regarding the
+    iterator type, to make the mask calculation optimization below
+    safe (see the maskedAccessor template metafunction below)
+
+    @tpl WrappedAccessor1
+    Wrapped type must provide the usual get and set accessor methods,
+    with the usual signatures (see StandardAccessor for a conforming
+    example). Furthermore, the type must provide a nested typedef
+    value_type (the selection of WrappedAccessor1 as the provider for
+    that typedef is rather arbitrary. Could have been
+    WrappedAccessor2, too. So sue me)
+
+    @tpl Functor
+    An adaptable ternary function (i.e. providing nested typedefs for
+    result_type and first, second and third argument type)
+ */
+template< class WrappedAccessor1,
+          class WrappedAccessor2,
+          typename Functor > class TernarySetterFunctionAccessorAdapter
+{
+public:
+    typedef typename WrappedAccessor1::value_type value_type;
+    typedef typename Functor::third_argument_type argument_type;
+
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+// making all members public, if no member template friends
+private:
+    template<class A1, class A2, typename F> friend class TernarySetterFunctionAccessorAdapter;
+#endif
+
+    WrappedAccessor1 ma1stAccessor;
+    WrappedAccessor2 ma2ndAccessor;
+    Functor          maFunctor;
+
+public:
+    TernarySetterFunctionAccessorAdapter() :
+        ma1stAccessor(),
+        ma2ndAccessor(),
+        maFunctor()
+    {}
+
+    template< class T > explicit TernarySetterFunctionAccessorAdapter( T const& accessor ) :
+        ma1stAccessor( accessor ),
+        ma2ndAccessor(),
+        maFunctor()
+    {}
+
+    template< class A1, class A2 > explicit
+    TernarySetterFunctionAccessorAdapter(
+        TernarySetterFunctionAccessorAdapter< A1,
+                                              A2,
+                                              Functor > const& rSrc ) :
+        ma1stAccessor( rSrc.ma1stAccessor ),
+        ma2ndAccessor( rSrc.ma2ndAccessor ),
+        maFunctor( rSrc.maFunctor )
+    {}
+
+    template< class T1, class T2 >
+    TernarySetterFunctionAccessorAdapter( T1 accessor1,
+                                          T2 accessor2 ) :
+        ma1stAccessor( accessor1 ),
+        ma2ndAccessor( accessor2 ),
+        maFunctor()
+    {}
+
+    template< class T1, class T2 >
+    TernarySetterFunctionAccessorAdapter( T1      accessor1,
+                                          T2      accessor2,
+                                          Functor func ) :
+        ma1stAccessor( accessor1 ),
+        ma2ndAccessor( accessor2 ),
+        maFunctor( func )
+    {}
+
+    // -------------------------------------------------------
+
+    WrappedAccessor1 const& get1stWrappedAccessor() const { return ma1stAccessor; }
+    WrappedAccessor1&       get1stWrappedAccessor() { return ma1stAccessor; }
+
+    WrappedAccessor2 const& get2ndWrappedAccessor() const { return ma2ndAccessor; }
+    WrappedAccessor2&       get2ndWrappedAccessor() { return ma2ndAccessor; }
+
+    // -------------------------------------------------------
+
+    typename Functor::result_type setter(
+        typename Functor::first_argument_type  v1,
+        typename Functor::second_argument_type v2,
+        argument_type                          v3 ) const
+    {
+        return maSetterFunctor(v1,v2,v3);
+    }
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return ma1stAccessor(i.first());
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return ma1stAccessor(i.second(),diff);
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        ma1stAccessor.set(
+            maFunctor(ma1stAccessor(i.first()),
+                      ma2ndAccessor(i.second()),
+                      vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
+            i.first() );
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        ma1stAccessor.set(
+            maFunctor(ma1stAccessor(i.first(), diff),
+                      ma2ndAccessor(i.second(),diff),
+                      vigra::detail::RequiresExplicitCast<argument_type>::cast(value)),
+            i.first(),
+            diff );
+    }
+
+};
+
+//-----------------------------------------------------------------------------
+
+/** Access two distinct images simultaneously
+
+    Passed iterator must fulfill the CompositeIterator concept
+    (i.e. wrap the two image's iterators into one
+    CompositeIterator). The getter and setter methods expect and
+    return a pair of values, with types equal to the two accessors
+    value types
+
+    @tpl WrappedAccessor1
+    Wrapped type must provide the usual get and set accessor methods,
+    with the usual signatures (see StandardAccessor for a conforming
+    example). Furthermore, the type must provide a nested typedef
+    value_type.
+
+    @tpl WrappedAccessor2
+    Wrapped type must provide the usual get and set accessor methods,
+    with the usual signatures (see StandardAccessor for a conforming
+    example). Furthermore, the type must provide a nested typedef
+    value_type.
+ */
+template< class WrappedAccessor1,
+          class WrappedAccessor2 > class JoinImageAccessorAdapter
+{
+public:
+    // TODO(F3): Need numeric traits and a few free functions to
+    // actually calculate with a pair (semantic: apply every operation
+    // individually to the contained types)
+    typedef std::pair<typename WrappedAccessor1::value_type,
+                      typename WrappedAccessor2::value_type>    value_type;
+
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+// making all members public, if no member template friends
+private:
+    template<class A1, class A2> friend class JoinImageAccessorAdapter;
+#endif
+
+    WrappedAccessor1 ma1stAccessor;
+    WrappedAccessor2 ma2ndAccessor;
+
+public:
+    JoinImageAccessorAdapter() :
+        ma1stAccessor(),
+        ma2ndAccessor()
+    {}
+
+    template< class T > explicit JoinImageAccessorAdapter( T const& accessor ) :
+        ma1stAccessor( accessor ),
+        ma2ndAccessor()
+    {}
+
+    template< class A1, class A2 > explicit
+    JoinImageAccessorAdapter(
+        JoinImageAccessorAdapter< A1,
+                                  A2 > const& rSrc ) :
+        ma1stAccessor( rSrc.ma1stAccessor ),
+        ma2ndAccessor( rSrc.ma2ndAccessor )
+    {}
+
+    template< class T1, class T2 >
+    JoinImageAccessorAdapter( T1 accessor1,
+                              T2 accessor2 ) :
+        ma1stAccessor( accessor1 ),
+        ma2ndAccessor( accessor2 )
+    {}
+
+    // -------------------------------------------------------
+
+    WrappedAccessor1 const& get1stWrappedAccessor() const { return ma1stAccessor; }
+    WrappedAccessor1&       get1stWrappedAccessor() { return ma1stAccessor; }
+
+    WrappedAccessor2 const& get2ndWrappedAccessor() const { return ma2ndAccessor; }
+    WrappedAccessor2&       get2ndWrappedAccessor() { return ma2ndAccessor; }
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return std::make_pair(ma1stAccessor(i.first()),
+                              ma2ndAccessor(i.second()));
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return std::make_pair(ma1stAccessor(i.first(),diff),
+                              ma2ndAccessor(i.second(),diff));
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        ma1stAccessor.set(
+            vigra::detail::RequiresExplicitCast<typename WrappedAccessor1::value_type>::cast(
+                value.first),
+            i.first() );
+        ma2ndAccessor.set(
+            vigra::detail::RequiresExplicitCast<typename WrappedAccessor2::value_type>::cast(
+                value.second),
+            i.second() );
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        ma1stAccessor.set(
+            vigra::detail::RequiresExplicitCast<typename WrappedAccessor1::value_type>::cast(
+                value.first),
+            i.first(),
+            diff );
+        ma2ndAccessor.set(
+            vigra::detail::RequiresExplicitCast<typename WrappedAccessor2::value_type>::cast(
+                value.second),
+            i.second(),
+            diff );
+    }
+
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX */
diff --git a/basebmp/inc/basebmp/accessorfunctors.hxx b/basebmp/inc/basebmp/accessorfunctors.hxx
new file mode 100644
index 000000000000..fdb9b75aa64f
--- /dev/null
+++ b/basebmp/inc/basebmp/accessorfunctors.hxx
@@ -0,0 +1,187 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX
+#define INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX
+
+#include <osl/diagnose.h>
+#include <basebmp/metafunctions.hxx>
+
+#include <functional>
+
+namespace basebmp
+{
+
+// Some common accessor functors
+// ------------------------------------------------------------
+
+
+/// combine two values via XOR
+template< typename T > struct XorFunctor : public std::binary_function<T,T,T>
+{
+    T operator()( T v1, T v2 ) const { return v1 ^ v2; }
+};
+
+//-----------------------------------------------------------------------------
+
+/// Base class, passing on the arg types
+template< typename T, typename M > struct MaskFunctorBase :
+        public TernaryFunctorBase<T,M,T,T> {};
+
+
+/** Let a mask flag decide between two values
+
+    @tpl polarity
+    Mask polarity. When true, a false in the mask denotes
+    transparency, i.e. the original value will display. And vice
+    versa.
+ */
+template< typename T,
+          typename M,
+          bool     polarity > struct GenericOutputMaskFunctor : public MaskFunctorBase<T,M>
+{
+    /// Ternary mask operation - selects v1 for !m == polarity, v2 otherwise
+    T operator()( T v1, M m, T v2 ) const
+    {
+        return !m == polarity ? v1 : v2;
+    }
+};
+
+/** Let a mask bit decide between two values (specialization for
+    integer mask types)
+ */
+template< typename T,
+          typename M,
+          bool     polarity > struct IntegerOutputMaskFunctor;
+template< typename T,
+          typename M > struct IntegerOutputMaskFunctor<T,M,true> : public MaskFunctorBase<T,M>
+{
+    /** Mask v with state of m
+
+        @return v2, if m != 0, v1 otherwise.
+     */
+    T operator()( T v1, M m, T v2 ) const
+    {
+        typedef typename make_unsigned<T>::type unsigned_T;
+
+        // mask will be 0, iff m == 0, and 1 otherwise
+        const T mask( unsigned_cast<T>(m | -m) >> (sizeof(unsigned_T)*8 - 1) );
+        return v1*(M)(1-mask) + v2*mask;
+    }
+};
+template< typename T,
+          typename M > struct IntegerOutputMaskFunctor<T,M,false> : public MaskFunctorBase<T,M>
+{
+    /** Mask v with state of m
+
+        @return v2, if m != 0, v1 otherwise.
+     */
+    T operator()( T v1, M m, T v2 ) const
+    {
+        typedef typename make_unsigned<T>::type unsigned_T;
+
+        // mask will be 0, iff m == 0, and 1 otherwise
+        const T mask( unsigned_cast<T>(m | -m) >> (sizeof(unsigned_T)*8 - 1) );
+        return v1*mask + v2*(M)(1-mask);
+    }
+};
+
+/** Let a mask bit decide between two values (specialization for
+    binary-valued mask types)
+ */
+template< typename T, typename M, bool polarity > struct FastIntegerOutputMaskFunctor;
+template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,true> :
+   public MaskFunctorBase<T,M>
+{
+    /// Specialization, only valid if mask can only attain 0 or 1
+    T operator()( T v1, M m, T v2 ) const
+    {
+        OSL_ASSERT(m<=1);
+
+        return v1*(M)(1-m) + v2*m;
+    }
+};
+template< typename T, typename M > struct FastIntegerOutputMaskFunctor<T,M,false> :
+   public MaskFunctorBase<T,M>
+{
+    /// Specialization, only valid if mask can only attain 0 or 1
+    T operator()( T v1, M m, T v2 ) const
+    {
+        OSL_ASSERT(m<=1);
+
+        return v1*m + v2*(M)(1-m);
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+/** Split a pair value from a JoinImageAccessorAdapter into its
+    individual values, and pass it on to a ternary functor
+
+    This wrapper is an adaptable binary functor, and can thus be used
+    with a BinarySetterFunctionAccessorAdapter. Useful e.g. for
+    out-of-image alpha channel, or a masked image.
+
+    @tpl Functor
+    An adaptable ternary functor (as can e.g. be passed to the
+    TernarySetterFunctionAccessorAdapter)
+ */
+template< typename Functor > struct BinaryFunctorSplittingWrapper :
+        public std::binary_function<typename Functor::first_argument_type,
+                                    std::pair<typename Functor::third_argument_type,
+                                              typename Functor::second_argument_type>,
+                                    typename Functor::result_type>
+{
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+// making all members public, if no member template friends
+private:
+    template<class A> friend struct BinaryFunctorSplittingWrapper;
+#endif
+    Functor maFunctor;
+
+public:
+    BinaryFunctorSplittingWrapper() : maFunctor() {}
+
+    template< class A > explicit
+    BinaryFunctorSplittingWrapper(
+        BinaryFunctorSplittingWrapper<A> const& src ) : maFunctor(src.maFunctor) {}
+
+    template< class F > explicit
+    BinaryFunctorSplittingWrapper( F const& func ) : maFunctor(func) {}
+
+    typename Functor::result_type operator()(
+        typename Functor::first_argument_type                      v1,
+        std::pair< typename Functor::third_argument_type,
+                   typename Functor::second_argument_type > const& v2 ) const
+    {
+        return maFunctor( v1, v2.second, v2.first );
+    }
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX */
diff --git a/basebmp/inc/basebmp/accessortraits.hxx b/basebmp/inc/basebmp/accessortraits.hxx
new file mode 100644
index 000000000000..0cb0d1f8d37d
--- /dev/null
+++ b/basebmp/inc/basebmp/accessortraits.hxx
@@ -0,0 +1,130 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_ACCESSORTRAITS_HXX
+#define INCLUDED_BASEBMP_ACCESSORTRAITS_HXX
+
+#include <basebmp/accessorfunctors.hxx>
+#include <basebmp/accessoradapters.hxx>
+#include <basebmp/metafunctions.hxx>
+
+#include <functional>
+
+namespace basebmp
+{
+
+struct FastMask;
+struct NoFastMask;
+
+/// Metafunction to select output mask functor from iterator and mask value type
+template< typename T, typename M, bool polarity, typename DUMMY > struct outputMaskFunctorSelector : public
+    ifBothScalarIntegral< T, M,
+                          IntegerOutputMaskFunctor< T, M, polarity >,
+                          GenericOutputMaskFunctor< T, M, polarity > >
+{
+};
+template< typename T, typename M, bool polarity > struct outputMaskFunctorSelector< T, M, polarity, FastMask > : public
+    ifBothScalarIntegral< T, M,
+                          FastIntegerOutputMaskFunctor< T, M, polarity >,
+                          GenericOutputMaskFunctor< T, M, polarity > >
+{
+};
+
+/** Metafunction providing a point of configuration for iterators
+    capable of employing the fast output mask functor.
+
+    Specialize this metafunction for your case, and pass FastMask to
+    the outputMaskFunctorSelector.
+ */
+template< class Accessor,
+          class MaskAccessor,
+          class Iterator,
+          class MaskIterator,
+          bool  polarity > struct maskedAccessorSelector
+{
+    typedef TernarySetterFunctionAccessorAdapter<
+        Accessor,
+        MaskAccessor,
+        typename outputMaskFunctorSelector<
+            typename Accessor::value_type,
+            typename MaskAccessor::value_type,
+            polarity,
+            NoFastMask > ::type >
+        type;
+};
+
+//-----------------------------------------------------------------------------
+
+/** Traits template for Accessor
+
+    Provides wrapped types for color lookup, raw pixel access, xor and
+    mask accessors.
+ */
+template< class Accessor > struct AccessorTraits
+{
+    /// value type of described accessor
+    typedef typename Accessor::value_type           value_type;
+
+    /// Retrieve stand-alone color lookup function for given Accessor type
+    typedef std::project2nd< Accessor, value_type > color_lookup;
+
+    /// Retrieve raw pixel data accessor for given Accessor type
+    typedef Accessor                                raw_accessor;
+
+    /// Retrieve wrapped accessor for XOR setter access
+    typedef BinarySetterFunctionAccessorAdapter<
+        Accessor,
+        XorFunctor< value_type > >                  xor_accessor;
+
+    /** Retrieve masked accessor for given types
+
+        A masked accessor works like a filter, where the mask gates
+        the accessor's setter methods (if the mask contains a 0 at a
+        given iterator position, the original value is
+        preserved. Otherwise, the new value gets set).
+
+        @attention be careful when retrieving a masked accessor for a
+        set of types, and using it for a different one - there are
+        partial specializations that take an optimized functor for
+        certain mask accessors.
+     */
+    template< class MaskAccessor,
+              class Iterator,
+              class MaskIterator,
+              bool  polarity > struct               masked_accessor :
+        public maskedAccessorSelector< Accessor,
+                                       MaskAccessor,
+                                       Iterator,
+                                       MaskIterator,
+                                       polarity >
+    {};
+
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_ACCESSORTRAITS_HXX */
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
new file mode 100644
index 000000000000..b1c513444fe6
--- /dev/null
+++ b/basebmp/inc/basebmp/bitmapdevice.hxx
@@ -0,0 +1,692 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_BITMAPDEVICE_HXX
+#define INCLUDED_BASEBMP_BITMAPDEVICE_HXX
+
+#include <sal/types.h>
+#include <basebmp/drawmodes.hxx>
+
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/shared_array.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/noncopyable.hpp>
+#include <vector>
+
+namespace basegfx
+{
+    class B2IPoint;
+    class B2DPoint;
+    class B2IVector;
+    class B2IRange;
+    class B2DPolygon;
+    class B2DPolyPolygon;
+}
+
+namespace basebmp
+{
+
+// Temporary. Use like the tools color object
+class Color;
+typedef boost::shared_ptr< class BitmapDevice >         BitmapDeviceSharedPtr;
+typedef boost::shared_array< sal_uInt8 >                RawMemorySharedArray;
+typedef boost::shared_ptr< const std::vector<Color> >   PaletteMemorySharedVector;
+
+struct ImplBitmapDevice;
+
+/** Definition of BitmapDevice interface
+
+    Use the createBitmapDevice() factory method to create instances.
+
+    Implementation note: the clip mask and bitmap parameter instances
+    of BitmapDevice that are passed to individual BitmapDevice
+    instances work best with 1 bit grey masks for the clip and a
+    format matching that of the target BitmapDevice for the other
+    parameters. The alpha mask passed to the drawMaskedColor() methods
+    works best when given as an eight bit grey bitmap. Everything else
+    is accepted, but potentially slow.
+ */
+class BitmapDevice : public boost::enable_shared_from_this<BitmapDevice>,
+                     private boost::noncopyable
+{
+public:
+    /** Query size of device in pixel
+     */
+    basegfx::B2IVector getSize() const;
+
+    /** Query whether buffer starts with 0th scanline
+
+        @return true, if the buffer memory starts with the 0th
+        scanline, and false if it starts with the last one. The latter
+        is e.g. the typical scan line ordering for the Windows BMP
+        format.
+     */
+    bool isTopDown() const;
+
+    /** Query type of scanline memory format
+     */
+    sal_Int32 getScanlineFormat() const;
+
+    /** Query byte offset to get from scanline n to scanline n+1
+
+        @return the scanline stride in bytes. In the case of
+        isTopDown()==false, this offset will be negative.
+     */
+    sal_Int32 getScanlineStride() const;
+
+    /** Get pointer to frame buffer
+
+        @return a shared ptr to the bitmap buffer memory. As this is a
+        shared ptr, you can freely store and use the pointer, even
+        after this object has been deleted.
+     */
+    RawMemorySharedArray getBuffer() const;
+
+    /** Get pointer to palette
+
+        The returned pointer is const on purpose, since the
+        BitmapDevice might internally cache lookup information. Don't
+        modify the returned data, unless you want to enter the realm
+        of completely undefined behaviour.
+
+        @return shared pointer to vector of Color entries.
+     */
+    PaletteMemorySharedVector getPalette() const;
+
+    /** Query number of palette entries.
+
+        This is just a frontend for getPalette->size()
+     */
+    sal_Int32 getPaletteEntryCount() const;
+
+    /** Clear whole device with given color
+
+        This method works like a fill with the given color value,
+        resulting in a bitmap uniformly colored in fillColor.
+     */
+    void clear( Color fillColor );
+
+    /** Set given pixel to specified color
+
+        @param rPt
+        Pixel to set
+
+        @param pixelColor
+        Color value to set the pixel to
+
+        @param drawMode
+        Draw mode to use when changing the pixel value
+     */
+    void setPixel( const basegfx::B2IPoint& rPt,
+                   Color                    pixelColor,
+                   DrawMode                 drawMode );
+
+    /** Set given pixel to specified color
+
+        @param rPt
+        Pixel to set
+
+        @param pixelColor
+        Color value to set the pixel to
+
+        @param drawMode
+        Draw mode to use when changing the pixel value
+
+        @param rClip
+        Clip mask to use. If the clip mask is 1 at the given pixel
+        position, no change will take place.
+     */
+    void setPixel( const basegfx::B2IPoint&     rPt,
+                   Color                        pixelColor,
+                   DrawMode                     drawMode,
+                   const BitmapDeviceSharedPtr& rClip );
+
+    /** Get color value at given pixel
+     */
+    Color getPixel( const basegfx::B2IPoint& rPt );
+
+    /** Get underlying pixel data value at given position
+
+        This method returns the raw pixel data. In the case of
+        paletted bitmaps, this is the palette index, not the final
+        color value.
+     */
+    sal_uInt32 getPixelData( const basegfx::B2IPoint& rPt );
+
+    /** Draw a line
+
+        @param rPt1
+        Start point of the line
+
+        @param rPt2
+        End point of the line. If the analytical line from rP1 to rPt2
+        (with the actual pixel positions assumed to be the center of
+        the pixel) is exactly in the middle between two pixel, this
+        method always selects the pixel closer to rPt1.
+
+        @param lineColor
+        Color value to draw the line with
+
+        @param drawMode
+        Draw mode to use when changing the pixel value
+     */
+    void drawLine( const basegfx::B2IPoint& rPt1,
+                   const basegfx::B2IPoint& rPt2,
+                   Color                    lineColor,
+                   DrawMode                 drawMode );
+
+    /** Draw a line
+
+        @param rPt1
+        Start point of the line
+
+        @param rPt2
+        End point of the line. If the analytical line from rP1 to rPt2
+        (with the actual pixel positions assumed to be the center of
+        the pixel) is exactly in the middle between two pixel, this
+        method always selects the pixel closer to rPt1.
+
+        @param lineColor
+        Color value to draw the line with
+
+        @param drawMode
+        Draw mode to use when changing the pixel value
+
+        @param rClip
+        Clip mask to use. Pixel where the corresponding clip mask
+        pixel is 1 will not be modified.
+     */
+    void drawLine( const basegfx::B2IPoint&     rPt1,
+                   const basegfx::B2IPoint&     rPt2,
+                   Color                        lineColor,
+                   DrawMode                     drawMode,
+                   const BitmapDeviceSharedPtr& rClip );
+
+    /** Draw a polygon
+
+        @param rPoly
+        Polygon to draw. Depending on the value returned by rPoly's
+        isClosed() method, the resulting line polygon will be drawn
+        closed or not.
+
+        @param lineColor
+        Color value to draw the polygon with
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+     */
+    void drawPolygon( const basegfx::B2DPolygon& rPoly,
+                      Color                      lineColor,
+                      DrawMode                   drawMode );
+
+    /** Draw a polygon
+
+        @param rPoly
+        Polygon to draw. Depending on the value returned by rPoly's
+        isClosed() method, the resulting line polygon will be drawn
+        closed or not.
+
+        @param lineColor
+        Color value to draw the polygon with
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+
+        @param rClip
+        Clip mask to use. Pixel where the corresponding clip mask
+        pixel is 1 will not be modified.
+     */
+    void drawPolygon( const basegfx::B2DPolygon&   rPoly,
+                      Color                        lineColor,
+                      DrawMode                     drawMode,
+                      const BitmapDeviceSharedPtr& rClip );
+
+    /** Fill a poly-polygon
+
+        @param rPoly
+        Poly-polygon to fill. Regardless of the value returned by
+        rPoly's isClosed() method, the resulting filled poly-polygon
+        is always considered closed. As usual, when filling a shape,
+        the rightmost and bottommost pixel are not filled, compared to
+        the drawPolygon() method. For example, the rectangle
+        (0,0),(1,1) will have four pixel set, when drawn via
+        drawPolygon(), and only one pixel, when filled via
+        fillPolyPolygon().
+
+        @param fillColor
+        Color value to fill the poly-polygon with
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+     */
+    void fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
+                          Color                          fillColor,
+                          DrawMode                       drawMode );
+
+    /** Fill a poly-polygon
+
+        @param rPoly
+        Poly-polygon to fill. Regardless of the value returned by
+        rPoly's isClosed() method, the resulting filled poly-polygon
+        is always considered closed. As usual, when filling a shape,
+        the rightmost and bottommost pixel are not filled, compared to
+        the drawPolygon() method. For example, the rectangle
+        (0,0),(1,1) will have four pixel set, when drawn via
+        drawPolygon(), and only one pixel, when filled via
+        fillPolyPolygon().
+
+        @param fillColor
+        Color value to fill the poly-polygon with
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+
+        @param rClip
+        Clip mask to use. Pixel where the corresponding clip mask
+        pixel is 1 will not be modified.
+     */
+    void fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
+                          Color                          fillColor,
+                          DrawMode                       drawMode,
+                          const BitmapDeviceSharedPtr&   rClip );
+
+    /** Draw another bitmap into this device
+
+        @param rSrcBitmap
+        Bitmap to render into this one. It is permitted that source
+        and destination bitmap are the same.
+
+        @param rSrcRect
+        Rectangle within the source bitmap to take the pixel from.
+
+        @param rDstRect
+        Rectangle in the destination bitmap to put the pixel
+        into. Source and destination rectangle are permitted to have
+        differing sizes; this method will scale the source pixel
+        accordingly. Please note that both source and destination
+        rectangle are interpreted excluding the rightmost pixel column
+        and the bottommost pixel row, this is much like polygon
+        filling. As a result, filling a given rectangle with
+        fillPolyPolygon(), and using the same rectangle as the
+        destination rectangle of this method, will affect exactly the
+        same set of pixel.
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+     */
+    void drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                     const basegfx::B2IRange&     rSrcRect,
+                     const basegfx::B2IRange&     rDstRect,
+                     DrawMode                     drawMode );
+
+    /** Draw another bitmap into this device
+
+        @param rSrcBitmap
+        Bitmap to render into this one. It is permitted that source
+        and destination bitmap are the same.
+
+        @param rSrcRect
+        Rectangle within the source bitmap to take the pixel from.
+
+        @param rDstRect
+        Rectangle in the destination bitmap to put the pixel
+        into. Source and destination rectangle are permitted to have
+        differing sizes; this method will scale the source pixel
+        accordingly. Please note that both source and destination
+        rectangle are interpreted excluding the rightmost pixel column
+        and the bottommost pixel row, this is much like polygon
+        filling. As a result, filling a given rectangle with
+        fillPolyPolygon(), and using the same rectangle as the
+        destination rectangle of this method, will affect exactly the
+        same set of pixel.
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+
+        @param rClip
+        Clip mask to use. Pixel where the corresponding clip mask
+        pixel is 1 will not be modified.
+     */
+    void drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                     const basegfx::B2IRange&     rSrcRect,
+                     const basegfx::B2IRange&     rDstRect,
+                     DrawMode                     drawMode,
+                     const BitmapDeviceSharedPtr& rClip );
+
+    /** Draw a color with an alpha-modulation bitmap into this device
+
+        This method takes a fixed color value, and an alpha mask. For
+        each pixel in the alpha mask, the given color value is blended
+        with the corresponding alpha value against the content of this
+        object.
+
+        @param aSrcColor
+        Color value to use for blending
+
+        @param rAlphaMask
+        Alpha mask to use for blending. It is permitted that alpha
+        mask and this bitmap are the same object.
+
+        @param rSrcRect
+        Rectangle within the alpha mask to take the pixel from.
+        Please note that the destination rectangle is interpreted
+        excluding the rightmost pixel column and the bottommost pixel
+        row, this is much like polygon filling. As a result, filling a
+        given rectangle with fillPolyPolygon(), and using the same
+        rectangle as the source rectangle of this method, will affect
+        exactly the same set of pixel.
+
+        @param rDstPoint
+        Destination point, where to start placing the pixel from the
+        source rectangle
+     */
+    void drawMaskedColor( Color                        aSrcColor,
+                          const BitmapDeviceSharedPtr& rAlphaMask,
+                          const basegfx::B2IRange&     rSrcRect,
+                          const basegfx::B2IPoint&     rDstPoint );
+
+    /** Draw a color with an alpha-modulation bitmap into this device
+
+        This method takes a fixed color value, and an alpha mask. For
+        each pixel in the alpha mask, the given color value is blended
+        with the corresponding alpha value against the content of this
+        object.
+
+        @param aSrcColor
+        Color value to use for blending
+
+        @param rAlphaMask
+        Alpha mask to use for blending. It is permitted that alpha
+        mask and this bitmap are the same object.
+
+        @param rSrcRect
+        Rectangle within the alpha mask to take the pixel from.
+        Please note that the destination rectangle is interpreted
+        excluding the rightmost pixel column and the bottommost pixel
+        row, this is much like polygon filling. As a result, filling a
+        given rectangle with fillPolyPolygon(), and using the same
+        rectangle as the source rectangle of this method, will affect
+        exactly the same set of pixel.
+
+        @param rDstPoint
+        Destination point, where to start placing the pixel from the
+        source rectangle
+
+        @param rClip
+        Clip mask to use. Pixel where the corresponding clip mask
+        pixel is 1 will not be modified.
+     */
+    void drawMaskedColor( Color                        aSrcColor,
+                          const BitmapDeviceSharedPtr& rAlphaMask,
+                          const basegfx::B2IRange&     rSrcRect,
+                          const basegfx::B2IPoint&     rDstPoint,
+                          const BitmapDeviceSharedPtr& rClip );
+
+    /** Draw another bitmap through a mask into this device
+
+        This method renders a source bitmap into this device, much
+        like the drawBitmap() method. The only difference is the
+        additional mask parameter, which operates much like an
+        additional clip mask: pixel with value zero in this mask
+        result in destination pixel not being modified.
+
+        @param rSrcBitmap
+        Bitmap to render into this one. It is permitted that source
+        and destination bitmap are the same.
+
+        @param rMask
+        Bitmap to use as a mask. Pixel with value != zero in this mask
+        will result in destination pixel not being affected by the
+        blit operation.
+
+        @param rSrcRect
+        Rectangle within the source bitmap to take the pixel from.
+
+        @param rDstRect
+        Rectangle in the destination bitmap to put the pixel
+        into. Source and destination rectangle are permitted to have
+        differing sizes; this method will scale the source pixel
+        accordingly. Please note that both source and destination
+        rectangle are interpreted excluding the rightmost pixel column
+        and the bottommost pixel row, this is much like polygon
+        filling. As a result, filling a given rectangle with
+        fillPolyPolygon(), and using the same rectangle as the
+        destination rectangle of this method, will affect exactly the
+        same set of pixel.
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+     */
+    void drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                           const BitmapDeviceSharedPtr& rMask,
+                           const basegfx::B2IRange&     rSrcRect,
+                           const basegfx::B2IRange&     rDstRect,
+                           DrawMode                     drawMode );
+
+    /** Draw another bitmap through a mask into this device
+
+        This method renders a source bitmap into this device, much
+        like the drawBitmap() method. The only difference is the
+        additional mask parameter, which operates much like an
+        additional clip mask: pixel with value != zero in this mask
+        result in destination pixel not being modified.
+
+        @param rSrcBitmap
+        Bitmap to render into this one. It is permitted that source
+        and destination bitmap are the same.
+
+        @param rMask
+        Bitmap to use as a mask. Pixel with value != zero in this mask
+        will result in destination pixel not being affected by the
+        blit operation.
+
+        @param rSrcRect
+        Rectangle within the source bitmap to take the pixel from.
+
+        @param rDstRect
+        Rectangle in the destination bitmap to put the pixel
+        into. Source and destination rectangle are permitted to have
+        differing sizes; this method will scale the source pixel
+        accordingly. Please note that both source and destination
+        rectangle are interpreted excluding the rightmost pixel column
+        and the bottommost pixel row, this is much like polygon
+        filling. As a result, filling a given rectangle with
+        fillPolyPolygon(), and using the same rectangle as the
+        destination rectangle of this method, will affect exactly the
+        same set of pixel.
+
+        @param drawMode
+        Draw mode to use when changing pixel values
+
+        @param rClip
+        Clip mask to use. Pixel where the corresponding clip mask
+        pixel is 1 will not be modified.
+     */
+    void drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                           const BitmapDeviceSharedPtr& rMask,
+                           const basegfx::B2IRange&     rSrcRect,
+                           const basegfx::B2IRange&     rDstRect,
+                           DrawMode                     drawMode,
+                           const BitmapDeviceSharedPtr& rClip );
+
+protected:
+    BitmapDevice( const basegfx::B2IRange&         rBounds,
+                  sal_Int32                        nScanlineFormat,
+                  sal_Int32                        nScanlineStride,
+                  sal_uInt8*                       pFirstScanline,
+                  const RawMemorySharedArray&      rMem,
+                  const PaletteMemorySharedVector& rPalette );
+
+    virtual ~BitmapDevice();
+
+private:
+    virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const = 0;
+    virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const = 0;
+    virtual bool isCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const = 0;
+
+    virtual void clear_i( Color                     fillColor,
+                          const basegfx::B2IRange&  rBounds ) = 0;
+
+    virtual void setPixel_i( const basegfx::B2IPoint& rPt,
+                             Color                    lineColor,
+                             DrawMode                 drawMode ) = 0;
+    virtual void setPixel_i( const basegfx::B2IPoint&     rPt,
+                             Color                        lineColor,
+                             DrawMode                     drawMode,
+                             const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    virtual Color getPixel_i( const basegfx::B2IPoint& rPt ) = 0;
+
+    virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt ) = 0;
+
+    virtual void drawLine_i( const basegfx::B2IPoint& rPt1,
+                             const basegfx::B2IPoint& rPt2,
+                             const basegfx::B2IRange& rBounds,
+                             Color                    lineColor,
+                             DrawMode                 drawMode ) = 0;
+    virtual void drawLine_i( const basegfx::B2IPoint&     rPt1,
+                             const basegfx::B2IPoint&     rPt2,
+                             const basegfx::B2IRange&     rBounds,
+                             Color                        lineColor,
+                             DrawMode                     drawMode,
+                             const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    virtual void drawPolygon_i( const basegfx::B2DPolygon& rPoly,
+                                const basegfx::B2IRange&   rBounds,
+                                Color                      lineColor,
+                                DrawMode                   drawMode ) = 0;
+    virtual void drawPolygon_i( const basegfx::B2DPolygon&   rPoly,
+                                const basegfx::B2IRange&     rBounds,
+                                Color                        lineColor,
+                                DrawMode                     drawMode,
+                                const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
+                                    Color                          fillColor,
+                                    DrawMode                       drawMode,
+                                    const basegfx::B2IRange&       rBounds ) = 0;
+    virtual void fillPolyPolygon_i( const basegfx::B2DPolyPolygon& rPoly,
+                                    Color                          fillColor,
+                                    DrawMode                       drawMode,
+                                    const basegfx::B2IRange&       rBounds,
+                                    const BitmapDeviceSharedPtr&   rClip ) = 0;
+
+    // must work with *this == rSrcBitmap!
+    virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                               const basegfx::B2IRange&     rSrcRect,
+                               const basegfx::B2IRange&     rDstRect,
+                               DrawMode                     drawMode ) = 0;
+    virtual void drawBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                               const basegfx::B2IRange&     rSrcRect,
+                               const basegfx::B2IRange&     rDstRect,
+                               DrawMode                     drawMode,
+                               const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    // must work with *this == rSrcBitmap!
+    virtual void drawMaskedColor_i( Color                        rSrcColor,
+                                    const BitmapDeviceSharedPtr& rAlphaMask,
+                                    const basegfx::B2IRange&     rSrcRect,
+                                    const basegfx::B2IPoint&     rDstPoint ) = 0;
+    virtual void drawMaskedColor_i( Color                        rSrcColor,
+                                    const BitmapDeviceSharedPtr& rAlphaMask,
+                                    const basegfx::B2IRange&     rSrcRect,
+                                    const basegfx::B2IPoint&     rDstPoint,
+                                    const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    // must work with *this == rSrcBitmap!
+    virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                     const BitmapDeviceSharedPtr& rMask,
+                                     const basegfx::B2IRange&     rSrcRect,
+                                     const basegfx::B2IRange&     rDstRect,
+                                     DrawMode                     drawMode ) = 0;
+    virtual void drawMaskedBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                     const BitmapDeviceSharedPtr& rMask,
+                                     const basegfx::B2IRange&     rSrcRect,
+                                     const basegfx::B2IRange&     rDstRect,
+                                     DrawMode                     drawMode,
+                                     const BitmapDeviceSharedPtr& rClip ) = 0;
+
+    BitmapDeviceSharedPtr getGenericRenderer() const;
+
+    boost::scoped_ptr< ImplBitmapDevice > mpImpl;
+};
+
+/** Factory method to create a BitmapDevice for given scanline format
+ */
+BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
+                                          bool                      bTopDown,
+                                          sal_Int32                 nScanlineFormat );
+
+/** Factory method to create a BitmapDevice for given scanline format
+    with the given palette
+
+    Note: the provided palette must have sufficient size, to satisfy
+    lookups for the whole range of pixel values from the specified
+    format.
+ */
+BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize,
+                                          bool                             bTopDown,
+                                          sal_Int32                        nScanlineFormat,
+                                          const PaletteMemorySharedVector& rPalette );
+
+/** Factory method to create a BitmapDevice for given scanline format
+    from the given piece of raw memory and palette
+
+    Note: the provided memory must have sufficient size, to store the
+    image of the specified area and format.
+ */
+BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize,
+                                          bool                             bTopDown,
+                                          sal_Int32                        nScanlineFormat,
+                                          const RawMemorySharedArray&      rMem,
+                                          const PaletteMemorySharedVector& rPalette );
+
+
+/** Factory method to retrieve a subsetted BitmapDevice to the same
+    memory.
+
+    This method creates a second bitmap device instance, which renders
+    to the same memory as the original, but to a limited, rectangular
+    area. Useful to implement rectangular clips (usually faster than
+    setting up a 1bpp clip mask).
+ */
+BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr&     rProto,
+                                          const basegfx::B2IRange&         rSubset );
+
+/** Factory method to clone a BitmapDevice from a given prototype.
+
+    All attributes (like scanline format and top-down state) are
+    copied, only the size can be varied. Note that the prototype's
+    bitmap content is <em>not</em> copied, only a palette (if any).
+ */
+BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector&        rSize,
+                                         const BitmapDeviceSharedPtr&     rProto );
+
+}
+
+#endif /* INCLUDED_BASEBMP_BITMAPDEVICE_HXX */
diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx
new file mode 100644
index 000000000000..03b2bc860cbd
--- /dev/null
+++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx
@@ -0,0 +1,412 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX
+#define INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX
+
+#include <basegfx/tools/rectcliptools.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/range/b2irange.hxx>
+
+#include <vigra/diff2d.hxx>
+#include <vigra/iteratortraits.hxx>
+
+namespace basebmp
+{
+
+// factored-out bresenham setup code, which is used from two different
+// places in renderClippedLine() below. Admittedly messy for the long
+// parameter list...
+inline bool prepareClip( sal_Int32  a1,
+                         sal_Int32  a2,
+                         sal_Int32  b1,
+                         sal_Int32  da,
+                         sal_Int32  db,
+                         sal_Int32& o_as,
+                         sal_Int32& o_bs,
+                         int        sa,
+                         int        sb,
+                         sal_Int32& io_rem,
+                         int&       o_n,
+                         sal_uInt32 clipCode1,
+                         sal_uInt32 clipCount1,
+                         sal_uInt32 clipCode2,
+                         sal_uInt32 clipCount2,
+                         sal_Int32  aMin,
+                         sal_uInt32 aMinFlag,
+                         sal_Int32  aMax,
+                         sal_uInt32 aMaxFlag,
+                         sal_Int32  bMin,
+                         sal_uInt32 bMinFlag,
+                         sal_Int32  bMax,
+                         sal_uInt32 bMaxFlag,
+                         bool       bRoundTowardsPt2 )
+{
+    int ca(0), cb(0);
+    if( clipCode1 )
+    {
+        if( clipCode1 & aMinFlag )
+        {
+            ca = 2*db*(aMin - a1);
+            o_as = aMin;
+        }
+        else if( clipCode1 & aMaxFlag )
+        {
+            ca = 2*db*(a1 - aMax);
+            o_as = aMax;
+        }
+
+        if( clipCode1 & bMinFlag )
+        {
+            cb = 2*da*(bMin - b1);
+            o_bs = bMin;
+        }
+        else if( clipCode1 & bMaxFlag )
+        {
+            cb = 2*da*(b1 - bMax);
+            o_bs = bMax;
+        }
+
+        if( clipCount1 == 2 )
+            clipCode1 &= (ca + da < cb + !bRoundTowardsPt2) ? ~(aMinFlag|aMaxFlag) : ~(bMinFlag|bMaxFlag);
+
+        if( clipCode1 & (aMinFlag|aMaxFlag) )
+        {
+            cb = (ca + da - !bRoundTowardsPt2) / (2*da);
+
+            if( sb >= 0 )
+            {
+                o_bs = b1 + cb;
+                if( o_bs > bMax )
+                    return false;
+            }
+            else
+            {
+                o_bs = b1 - cb;
+                if( o_bs < bMin )
+                    return false;
+            }
+
+            io_rem += ca - 2*da*cb;
+        }
+        else
+        {
+            ca = (cb - da + 2*db - bRoundTowardsPt2) / (2*db);
+            if( sa >= 0 )
+            {
+                o_as = a1 + ca;
+                if( o_as > aMax )
+                    return false;
+            }
+            else
+            {
+                o_as = a1 - ca;
+                if( o_as < aMin )
+                    return false;
+            }
+
+            io_rem += 2*db*ca - cb;
+        }
+    }
+    else
+    {
+        o_as = a1; o_bs = b1;
+    }
+
+    bool bRetVal = false;
+    if( clipCode2 )
+    {
+        if( clipCount2 == 2 )
+        {
+            ca = 2*db*((clipCode2 & aMinFlag) ? a1 - aMin : aMax - a1);
+            cb = 2*da*((clipCode2 & bMinFlag) ? b1 - bMin : bMax - b1);
+            clipCode2 &= (cb + da < ca + bRoundTowardsPt2) ? ~(aMinFlag|aMaxFlag) : ~(bMinFlag|bMaxFlag);
+        }
+
+        if( clipCode2 & (aMinFlag|aMaxFlag) )
+            o_n = (clipCode2 & aMinFlag) ? o_as - aMin : aMax - o_as;
+        else
+        {
+            o_n = (clipCode2 & bMinFlag) ? o_bs - bMin : bMax - o_bs;
+            bRetVal = true;
+        }
+    }
+    else
+        o_n = (a2 >= o_as) ? a2 - o_as : o_as - a2;
+
+    return bRetVal;
+}
+
+
+/** Render line to image iterators, clip against given rectangle
+
+    This method renders a line from aPt1 to aPt2, clipped against
+    rClipRect (the clipping will take place pixel-perfect, i.e. as if
+    the original bresenham-rendered line would have been clipped each
+    pixel individually. No slight shifts compared to unclipped lines).
+
+    @param aPt1
+    Start point of the line
+
+    @param aPt2
+    End point of the line
+
+    @param rClipRect
+    Rectangle to clip against
+
+    @param color
+    Color value to render the line with
+
+    @param begin
+    left-top image iterator
+
+    @param end
+    right-bottom image iterator
+
+    @param acc
+    Image accessor
+
+    @param bRoundTowardsPt2
+    Rounding mode to use. Giving false here results in line pixel tend
+    towards pt1, i.e. when a pixel exactly hits the middle between two
+    pixel, the pixel closer to pt1 will be chosen. Giving true here
+    makes renderClippedLine() choose pt2 in those cases.
+ */
+template< class Iterator, class Accessor >
+void renderClippedLine( basegfx::B2IPoint             aPt1,
+                        basegfx::B2IPoint             aPt2,
+                        const basegfx::B2IRange&      rClipRect,
+                        typename Accessor::value_type color,
+                        Iterator                      begin,
+                        Accessor                      acc,
+                        bool                          bRoundTowardsPt2=false )
+{
+    // Algorithm according to Steven Eker's 'Pixel-perfect line clipping',
+    // Graphics Gems V, pp. 314-322
+    sal_uInt32 clipCode1 = basegfx::tools::getCohenSutherlandClipFlags(aPt1,
+                                                                       rClipRect);
+    sal_uInt32 clipCode2 = basegfx::tools::getCohenSutherlandClipFlags(aPt2,
+                                                                       rClipRect);
+
+    if( clipCode1 & clipCode2 )
+        return; // line fully clipped away
+
+    sal_uInt32 clipCount1 = basegfx::tools::getNumberOfClipPlanes(clipCode1);
+    sal_uInt32 clipCount2 = basegfx::tools::getNumberOfClipPlanes(clipCode2);
+
+    if( (clipCode1 != 0 && clipCode2 == 0)
+        || (clipCount1 == 2 && clipCount2 == 1) )
+    {
+        std::swap(clipCount2,clipCount1);
+        std::swap(clipCode2,clipCode1);
+        std::swap(aPt1,aPt2);
+        bRoundTowardsPt2 = !bRoundTowardsPt2;
+    }
+
+    const sal_Int32 x1 = aPt1.getX();
+    const sal_Int32 x2 = aPt2.getX();
+    const sal_Int32 y1 = aPt1.getY();
+    const sal_Int32 y2 = aPt2.getY();
+
+    // TODO(E1): This might overflow
+    sal_Int32 adx = x2 - x1;
+    int sx = 1;
+    if( adx < 0 )
+    {
+        adx *= -1;
+        sx = -1;
+    }
+
+    // TODO(E1): This might overflow
+    sal_Int32 ady = y2 - y1;
+    int sy = 1;
+    if( ady < 0 )
+    {
+        ady *= -1;
+        sy = -1;
+    }
+
+    int n  = 0;
+    sal_Int32 xs = x1;
+    sal_Int32 ys = y1;
+    if( adx >= ady )
+    {
+        // semi-horizontal line
+        sal_Int32 rem = 2*ady - adx - !bRoundTowardsPt2;
+
+        const bool bUseAlternateBresenham(
+            prepareClip(x1, x2, y1, adx, ady, xs, ys, sx, sy,
+                        rem, n, clipCode1, clipCount1, clipCode2, clipCount2,
+                        rClipRect.getMinX(), basegfx::tools::RectClipFlags::LEFT,
+                        rClipRect.getMaxX(), basegfx::tools::RectClipFlags::RIGHT,
+                        rClipRect.getMinY(), basegfx::tools::RectClipFlags::TOP,
+                        rClipRect.getMaxY(), basegfx::tools::RectClipFlags::BOTTOM,
+                        bRoundTowardsPt2 ));
+
+        Iterator currIter( begin + vigra::Diff2D(0,ys) );
+        typename vigra::IteratorTraits<Iterator>::row_iterator
+            rowIter( currIter.rowIterator() + xs );
+
+        adx *= 2;
+        ady *= 2;
+
+        if( bUseAlternateBresenham )
+        {
+            while(true)
+            {
+                acc.set(color, rowIter);
+
+                if( rem >= 0 )
+                {
+                    if( --n < 0 )
+                        break;
+
+                    ys += sy;
+                    xs += sx;
+                    rem -= adx;
+
+                    currIter.y += sy;
+                    rowIter = currIter.rowIterator() + xs;
+                }
+                else
+                {
+                    xs += sx;
+                    rowIter += sx;
+                }
+
+                rem += ady;
+            }
+        }
+        else
+        {
+            while(true)
+            {
+                acc.set(color, rowIter);
+
+                if( --n < 0 )
+                    break;
+
+                if( rem >= 0 )
+                {
+                    ys += sy;
+                    xs += sx;
+                    rem -= adx;
+
+                    currIter.y += sy;
+                    rowIter = currIter.rowIterator() + xs;
+                }
+                else
+                {
+                    xs += sx;
+                    rowIter += sx;
+                }
+
+                rem += ady;
+            }
+        }
+    }
+    else
+    {
+        // semi-vertical line
+        sal_Int32 rem = 2*adx - ady - !bRoundTowardsPt2;
+
+        const bool bUseAlternateBresenham(
+            prepareClip(y1, y2, x1, ady, adx, ys, xs, sy, sx,
+                        rem, n, clipCode1, clipCount1, clipCode2, clipCount2,
+                        rClipRect.getMinY(), basegfx::tools::RectClipFlags::TOP,
+                        rClipRect.getMaxY(), basegfx::tools::RectClipFlags::BOTTOM,
+                        rClipRect.getMinX(), basegfx::tools::RectClipFlags::LEFT,
+                        rClipRect.getMaxX(), basegfx::tools::RectClipFlags::RIGHT,
+                        bRoundTowardsPt2 ));
+
+        Iterator currIter( begin + vigra::Diff2D(xs,0) );
+        typename vigra::IteratorTraits<Iterator>::column_iterator
+            colIter( currIter.columnIterator() + ys );
+
+        adx *= 2;
+        ady *= 2;
+
+        if( bUseAlternateBresenham )
+        {
+            while(true)
+            {
+                acc.set(color, colIter);
+
+                if( rem >= 0 )
+                {
+                    if( --n < 0 )
+                        break;
+
+                    xs += sx;
+                    ys += sy;
+                    rem -= ady;
+
+                    currIter.x += sx;
+                    colIter = currIter.columnIterator() + ys;
+                }
+                else
+                {
+                    ys += sy;
+                    colIter += sy;
+                }
+
+                rem += adx;
+            }
+        }
+        else
+        {
+            while(true)
+            {
+                acc.set(color, colIter);
+
+                if( --n < 0 )
+                    break;
+
+                if( rem >= 0 )
+                {
+                    xs += sx;
+                    ys += sy;
+                    rem -= ady;
+
+                    currIter.x += sx;
+                    colIter = currIter.columnIterator() + ys;
+                }
+                else
+                {
+                    ys += sy;
+                    colIter += sy;
+                }
+
+                rem += adx;
+            }
+        }
+    }
+}
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX */
diff --git a/basebmp/inc/basebmp/color.hxx b/basebmp/inc/basebmp/color.hxx
new file mode 100644
index 000000000000..e9aab93a715c
--- /dev/null
+++ b/basebmp/inc/basebmp/color.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_COLOR_HXX
+#define INCLUDED_BASEBMP_COLOR_HXX
+
+#include <sal/types.h>
+#include <rtl/math.hxx>
+
+namespace basebmp
+{
+
+class Color
+{
+private:
+    sal_uInt32          mnColor;
+
+public:
+    typedef sal_uInt32  value_type;
+    typedef sal_uInt8   component_type;
+
+    Color() : mnColor(0) {}
+    explicit Color( sal_uInt32 nVal ) : mnColor(nVal) {}
+    Color( sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue ) :
+        mnColor( ((sal_uInt32)nRed << 16) | ((sal_uInt32)nGreen << 8) | nBlue )
+    {}
+
+    void setRed( sal_uInt8 nRed ) { mnColor &= ~0x00FF0000UL; mnColor |= (sal_uInt32)nRed << 16; }
+    void setGreen( sal_uInt8 nGreen ) { mnColor &= ~0x0000FF00UL; mnColor |= (sal_uInt32)nGreen << 8; }
+    void setBlue( sal_uInt8 nBlue ) { mnColor &= ~0x000000FFUL; mnColor |= nBlue; }
+
+    void setGrey( sal_uInt8 nGreyVal ) { mnColor = (sal_uInt32)nGreyVal << 16 | (sal_uInt32)nGreyVal << 8 | nGreyVal; }
+
+    sal_uInt8 getRed() const   { return 0xFF & (sal_uInt8)(mnColor >> 16); }
+    sal_uInt8 getGreen() const { return 0xFF & (sal_uInt8)(mnColor >> 8); }
+    sal_uInt8 getBlue() const  { return 0xFF & (sal_uInt8)mnColor; }
+
+    sal_uInt8 getGreyscale() const { return (sal_uInt8)((getBlue()*28UL +
+                                                         getGreen()*151 +
+                                                         getRed()*77) / 256); }
+
+    sal_uInt32 toInt32() const { return mnColor; }
+
+    bool  operator!() const { return mnColor == 0; }
+    Color operator&( sal_uInt32 nMask ) const { return Color(mnColor & nMask); }
+    Color operator^( Color col ) const { return Color(col.getRed()^getRed(),
+                                                      col.getGreen()^getGreen(),
+                                                      col.getBlue()^getBlue()); }
+    Color operator-( Color col ) const { return Color((sal_uInt8)abs((int)getRed()-col.getRed()),
+                                                      (sal_uInt8)abs((int)getGreen()-col.getGreen()),
+                                                      (sal_uInt8)abs((int)getBlue()-col.getBlue())); }
+    Color operator+( Color col ) const { return Color(getRed()+col.getRed(),
+                                                      getGreen()+col.getGreen(),
+                                                      getBlue()+col.getBlue()); }
+    Color operator*( Color col ) const { return Color((sal_uInt8)((sal_uInt32)col.getRed()*getRed()/SAL_MAX_UINT8),
+                                                      (sal_uInt8)((sal_uInt32)col.getGreen()*getGreen()/SAL_MAX_UINT8),
+                                                      (sal_uInt8)((sal_uInt32)col.getBlue()*getBlue()/SAL_MAX_UINT8)); }
+    Color operator*( sal_uInt8 n ) const { return Color((sal_uInt8)((sal_uInt32)n*getRed()/SAL_MAX_UINT8),
+                                                        (sal_uInt8)((sal_uInt32)n*getGreen()/SAL_MAX_UINT8),
+                                                        (sal_uInt8)((sal_uInt32)n*getBlue()/SAL_MAX_UINT8)); }
+    Color operator*( double n ) const { return Color((sal_uInt8)(n*getRed()+.5),
+                                                     (sal_uInt8)(n*getGreen()+.5),
+                                                     (sal_uInt8)(n*getBlue()+.5)); }
+    bool operator==( const Color& rhs ) const { return (getRed()==rhs.getRed() &&
+                                                        getGreen()==rhs.getGreen() &&
+                                                        getBlue()==rhs.getBlue()); }
+    bool operator!=( const Color& rhs ) const { return !(*this==rhs); }
+    double magnitude() const { return sqrt((double)getRed()*getRed()
+                                           + getGreen()*getGreen()
+                                           + getBlue()*getBlue()); }
+};
+
+} // namespace vigra
+
+#endif /* INCLUDED_BASEBMP_COLOR_HXX */
diff --git a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
new file mode 100644
index 000000000000..03263c2c6062
--- /dev/null
+++ b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
@@ -0,0 +1,148 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
+#define INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX
+
+#include <basebmp/colortraits.hxx>
+
+namespace basebmp
+{
+
+/** Accessor adapter that blends input value against fixed color value
+
+    Used to blend an alpha mask 'through' a fixed color value into the
+    destination.
+
+    The getter functors return a constant value (usually the zero of
+    the value type, this preserves the original destination content
+    when blitting through a mask) - there really isn't no other
+    sensible default behaviour for these methods.
+ */
+template< class    WrappedAccessor,
+          typename AlphaType,
+          bool     polarity > class ConstantColorBlendSetterAccessorAdapter
+{
+public:
+    typedef AlphaType                            alpha_type;
+    typedef AlphaType                            value_type;
+    typedef typename WrappedAccessor::value_type color_type;
+
+private:
+    typename ColorTraits< color_type >::
+             template blend_functor<alpha_type,polarity>::type   maFunctor;
+    WrappedAccessor                                              maWrappee;
+    color_type                                                   maBlendColor;
+    value_type                                                   maGetterValue;
+
+public:
+    ConstantColorBlendSetterAccessorAdapter() :
+        maFunctor(),
+        maWrappee(),
+        maBlendColor(),
+        maGetterValue()
+    {}
+
+    template< class T > explicit ConstantColorBlendSetterAccessorAdapter( T acc ) :
+        maFunctor(),
+        maWrappee(acc),
+        maBlendColor(),
+        maGetterValue()
+    {}
+
+    template< class T > ConstantColorBlendSetterAccessorAdapter( T          acc,
+                                                                 color_type col ) :
+        maFunctor(),
+        maWrappee(acc),
+        maBlendColor(col),
+        maGetterValue()
+    {}
+
+    template< class T > ConstantColorBlendSetterAccessorAdapter( T          acc,
+                                                                 color_type col,
+                                                                 value_type val ) :
+        maFunctor(),
+        maWrappee(acc),
+        maBlendColor(col),
+        maGetterValue(val)
+    {}
+
+    // -------------------------------------------------------
+
+    void        setColor( color_type col ) { maBlendColor=col; }
+    color_type  getColor() { return maBlendColor; }
+    void        setGetterValue( value_type val ) { maGetterValue=val; }
+    value_type  getGetterValue() { return maGetterValue; }
+
+    // -------------------------------------------------------
+
+    WrappedAccessor const& getWrappedAccessor() const { return maWrappee; }
+    WrappedAccessor&       getWrappedAccessor() { return maWrappee; }
+
+    // -------------------------------------------------------
+
+    /// @return constant value, regardless of iterator content
+    template< typename IteratorType > value_type operator()(IteratorType const& ) const
+    {
+        return maGetterValue;
+    }
+    /// @return constant value, regardless of iterator content
+    template< typename IteratorType, class Difference >
+    value_type operator()(IteratorType const& , Difference const& ) const
+    {
+        return maGetterValue;
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, typename IteratorType >
+    void set(V const& value, IteratorType const& i) const
+    {
+        maWrappee.set(
+            maFunctor(
+                vigra::detail::RequiresExplicitCast<alpha_type>::cast(value),
+                maWrappee(i),
+                maBlendColor),
+            i );
+    }
+
+    template< typename V, typename IteratorType, class Difference >
+    void set(V const& value, IteratorType const& i, Difference const& diff) const
+    {
+        maWrappee.set(
+            maFunctor(
+                vigra::detail::RequiresExplicitCast<alpha_type>::cast(value),
+                maWrappee(i,diff),
+                maBlendColor),
+            i,
+            diff );
+    }
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX */
diff --git a/basebmp/inc/basebmp/colormisc.hxx b/basebmp/inc/basebmp/colormisc.hxx
new file mode 100644
index 000000000000..0974ebaa44a4
--- /dev/null
+++ b/basebmp/inc/basebmp/colormisc.hxx
@@ -0,0 +1,191 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_COLORMISC_HXX
+#define INCLUDED_BASEBMP_COLORMISC_HXX
+
+#include <osl/diagnose.h>
+#include <basebmp/color.hxx>
+#include <basebmp/colortraits.hxx>
+#include <basebmp/accessortraits.hxx>
+#include <vigra/mathutil.hxx>
+
+// Contents of this header moved out of color.hxx, as it is not useful
+// for the general public (drags in vigra and other template
+// functionality, that shouldn't be necessary for the ordinary client
+// of BitmapDevice etc.)
+
+namespace basebmp
+{
+
+template< bool polarity > struct ColorBitmaskOutputMaskFunctor;
+template<> struct ColorBitmaskOutputMaskFunctor<true> : MaskFunctorBase<Color,sal_uInt8>
+{
+    Color operator()( Color v1, sal_uInt8 m, Color v2 ) const
+    {
+        OSL_ASSERT(m<=1);
+
+        return Color(v1.toInt32()*(sal_uInt8)(1-m) + v2.toInt32()*m);
+    }
+};
+template<> struct ColorBitmaskOutputMaskFunctor<false> : MaskFunctorBase<Color,sal_uInt8>
+{
+    Color operator()( Color v1, sal_uInt8 m, Color v2 ) const
+    {
+        OSL_ASSERT(m<=1);
+
+        return Color(v1.toInt32()*m + v2.toInt32()*(sal_uInt8)(1-m));
+    }
+};
+
+/// Specialized output mask functor for Color value type
+template<bool polarity> struct outputMaskFunctorSelector< Color, sal_uInt8, polarity, FastMask >
+{
+    typedef ColorBitmaskOutputMaskFunctor<polarity> type;
+};
+
+template< bool polarity > struct ColorBlendFunctor8
+  : public TernaryFunctorBase<sal_uInt8,Color,Color,Color>
+{
+    Color operator()( sal_uInt8 alpha,
+                      Color     v1,
+                      Color     v2 ) const
+    {
+        alpha = polarity ? alpha : 255 - alpha;
+
+        const sal_uInt8 v1_red( v1.getRed() );
+        const sal_uInt8 v1_green( v1.getGreen() );
+        const sal_uInt8 v1_blue( v1.getBlue() );
+
+        // using '>> 8' instead of '/ 0x100' is ill-advised (shifted
+        // value might be negative). Better rely on decent optimizer
+        // here...
+        return Color(((((sal_Int32)v2.getRed() - v1_red)*alpha) / 0x100) + v1_red,
+                     ((((sal_Int32)v2.getGreen() - v1_green)*alpha) / 0x100) + v1_green,
+                     ((((sal_Int32)v2.getBlue() - v1_blue)*alpha) / 0x100) + v1_blue);
+    }
+};
+
+template< bool polarity > struct ColorBlendFunctor32
+  : public TernaryFunctorBase<Color,Color,Color,Color>
+{
+    Color operator()( Color input,
+                      Color v1,
+                      Color v2 ) const
+    {
+        sal_uInt8 alpha = input.getGreyscale();
+        alpha = polarity ? alpha : 255 - alpha;
+
+        const sal_uInt8 v1_red( v1.getRed() );
+        const sal_uInt8 v1_green( v1.getGreen() );
+        const sal_uInt8 v1_blue( v1.getBlue() );
+
+        // using '>> 8' instead of '/ 0x100' is ill-advised (shifted
+        // value might be negative). Better rely on decent optimizer
+        // here...
+        return Color(((((sal_Int32)v2.getRed() - v1_red)*alpha) / 0x100) + v1_red,
+                     ((((sal_Int32)v2.getGreen() - v1_green)*alpha) / 0x100) + v1_green,
+                     ((((sal_Int32)v2.getBlue() - v1_blue)*alpha) / 0x100) + v1_blue);
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+template<> struct ColorTraits< Color >
+{
+    /// @return number of color channels
+    static int numChannels() { return 3; }
+
+    /// Type of a color component (i.e. the type of an individual channel)
+    typedef sal_uInt8 component_type;
+
+    /// Metafunction to select blend functor from color and alpha type
+    template< typename AlphaType, bool polarity > struct blend_functor;
+
+    /// Calculate normalized distance between color c1 and c2
+    static inline double distance( const Color& c1,
+                                   const Color& c2 )
+    {
+        return (c1 - c2).magnitude();
+    }
+
+    static inline component_type toGreyscale( const Color& c )
+    {
+        return c.getGreyscale();
+    }
+
+    static inline Color fromGreyscale( component_type c )
+    {
+        return Color(c,c,c);
+    }
+};
+
+/// The version for plain 8 bit alpha
+template<bool polarity> struct ColorTraits< Color >::blend_functor< sal_uInt8, polarity >
+{
+    typedef ColorBlendFunctor8<polarity> type;
+};
+
+/// The version taking grey value of a Color
+template<bool polarity> struct ColorTraits< Color >::blend_functor< Color, polarity >
+{
+    typedef ColorBlendFunctor32<polarity> type;
+};
+
+} // namespace basebmp
+
+namespace vigra
+{
+
+template<>
+struct NumericTraits<basebmp::Color>
+{
+    typedef basebmp::Color Type;
+    typedef basebmp::Color Promote;
+    typedef basebmp::Color RealPromote;
+    typedef std::complex<basebmp::Color> ComplexPromote;
+    typedef sal_uInt8 ValueType;
+
+    typedef VigraTrueType  isIntegral;
+    typedef VigraFalseType isScalar;
+    typedef VigraTrueType  isSigned;
+    typedef VigraTrueType  isOrdered;
+    typedef VigraFalseType isComplex;
+
+    static Type zero() { return Type(); }
+    static Type one() { return Type(0x01010101); }
+    static Type nonZero() { return Type(0x01010101); }
+
+    static Promote toPromote(const Type& v) { return v; }
+    static RealPromote toRealPromote(const Type& v) { return v; }
+    static Type fromPromote(const Promote& v) { return v; }
+    static Type fromRealPromote(const RealPromote& v) { return v; }
+};
+
+} // namespace vigra
+
+#endif /* INCLUDED_BASEBMP_COLORMISC_HXX */
diff --git a/basebmp/inc/basebmp/colortraits.hxx b/basebmp/inc/basebmp/colortraits.hxx
new file mode 100644
index 000000000000..9c30b8f082c0
--- /dev/null
+++ b/basebmp/inc/basebmp/colortraits.hxx
@@ -0,0 +1,150 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_COLORTRAITS_HXX
+#define INCLUDED_BASEBMP_COLORTRAITS_HXX
+
+#include <basebmp/accessoradapters.hxx>
+#include <basebmp/metafunctions.hxx>
+
+#include <vigra/mathutil.hxx>
+
+namespace basebmp
+{
+
+/** Functor template, to calculate alpha blending between two
+    values. Float case.
+
+    @tpl polarity
+    When true, 0 means fully transparent, and 1 fully opaque. And vice
+    versa.
+ */
+template< typename ValueType,
+          typename AlphaType,
+          bool     polarity > struct BlendFunctor;
+template< typename ValueType,
+          typename AlphaType > struct BlendFunctor<ValueType,AlphaType,true>
+  : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
+{
+    ValueType operator()( AlphaType alpha,
+                          ValueType v1,
+                          ValueType v2 ) const
+    {
+        const typename vigra::NumericTraits<AlphaType>::RealPromote fAlpha(
+            vigra::NumericTraits<AlphaType>::toRealPromote(alpha));
+        return (vigra::NumericTraits<AlphaType>::one()-fAlpha)*v1 + fAlpha*v2;
+    }
+};
+template< typename ValueType,
+          typename AlphaType > struct BlendFunctor<ValueType,AlphaType,false>
+  : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
+{
+    ValueType operator()( AlphaType alpha,
+                          ValueType v1,
+                          ValueType v2 ) const
+    {
+        const typename vigra::NumericTraits<AlphaType>::RealPromote fAlpha(
+            vigra::NumericTraits<AlphaType>::toRealPromote(alpha));
+        return fAlpha*v1 + (vigra::NumericTraits<AlphaType>::one()-fAlpha)*v2;
+    }
+};
+
+/** Functor template, to calculate alpha blending between two
+    values. Integer case.
+
+    @tpl polarity
+    When true, 0 means fully transparent, and 1 fully opaque. And vice
+    versa.
+ */
+template< typename ValueType,
+          typename AlphaType,
+          bool     polarity > struct IntegerBlendFunctor;
+template< typename ValueType,
+          typename AlphaType > struct IntegerBlendFunctor<ValueType,AlphaType,true>
+  : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
+{
+    ValueType operator()( AlphaType alpha,
+                          ValueType v1,
+                          ValueType v2 ) const
+    {
+        return (vigra::NumericTraits<AlphaType>::toPromote(
+                    vigra::NumericTraits<AlphaType>::max()-alpha)*v1 + alpha*v2) /
+            vigra::NumericTraits<AlphaType>::max();
+    }
+};
+template< typename ValueType,
+          typename AlphaType > struct IntegerBlendFunctor<ValueType,AlphaType,false>
+  : public TernaryFunctorBase<AlphaType,ValueType,ValueType,ValueType>
+{
+    ValueType operator()( AlphaType alpha,
+                          ValueType v1,
+                          ValueType v2 ) const
+    {
+        return (alpha*v1 +
+                vigra::NumericTraits<AlphaType>::toPromote(
+                    vigra::NumericTraits<AlphaType>::max()-alpha)*v2) /
+            vigra::NumericTraits<AlphaType>::max();
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+template< typename ColorType > struct ColorTraits
+{
+    /// Metafunction to select blend functor from color and alpha type
+    template< typename AlphaType, bool polarity > struct blend_functor : public
+        ifScalarIntegral< AlphaType,
+                          IntegerBlendFunctor< ColorType, AlphaType, polarity >,
+                          BlendFunctor< ColorType, AlphaType, polarity > > {};
+
+    /// @return number of color channels
+    static int numChannels() { return 1; }
+
+    /// Type of a color component (i.e. the type of an individual channel)
+    typedef ColorType component_type;
+
+    /// Calculate normalized distance between color c1 and c2
+    static inline vigra::NormTraits<ColorType> distance( ColorType c1,
+                                                         ColorType c2 )
+    {
+        return vigra::norm(c1 - c2);
+    }
+
+    static inline component_type toGreyscale( ColorType c )
+    {
+        return c;
+    }
+
+    static inline ColorType fromGreyscale( component_type c )
+    {
+        return c;
+    }
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_COLORTRAITS_HXX */
diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx
new file mode 100755
index 000000000000..70f2acebb043
--- /dev/null
+++ b/basebmp/inc/basebmp/compositeiterator.hxx
@@ -0,0 +1,367 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX
+#define INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX
+
+#include <sal/types.h>
+#include <osl/diagnose.h>
+
+#include <basebmp/nonstandarditerator.hxx>
+#include <vigra/tuple.hxx>
+#include <vigra/iteratortraits.hxx>
+
+
+namespace basebmp
+{
+
+namespace detail
+{
+    template< typename T1, typename T2 > class ArithmeticProxy
+    {
+    public:
+        ArithmeticProxy(T1& val1, T2& val2) :
+            mpVal1( &val1 ),
+            mpVal2( &val2 )
+        {}
+
+        void operator++() { ++(*mpVal1); ++(*mpVal2); }
+        void operator++(int) { (*mpVal1)++; (*mpVal2)++; }
+        void operator--() { --(*mpVal1); --(*mpVal2); }
+        void operator--(int) { (*mpVal1)--; (*mpVal2)--; }
+        void operator+=(int d) {*mpVal1+=d; *mpVal2+=d; }
+        void operator-=(int d) {*mpVal1-=d; *mpVal2-=d; }
+
+        bool operator==(ArithmeticProxy const & rhs) const
+        { return *mpVal1==*rhs.mpVal1 && *mpVal2==*rhs.mpVal2; }
+
+        bool operator!=(ArithmeticProxy const & rhs) const
+        { return *mpVal1!=*rhs.mpVal1 || *mpVal2!=*rhs.mpVal2; }
+
+        bool operator<(ArithmeticProxy const & rhs) const
+        { return *mpVal1<*rhs.mpVal1 && *mpVal2<*rhs.mpVal2; }
+
+        bool operator<=(ArithmeticProxy const & rhs) const
+        { return *mpVal1<=*rhs.mpVal1 && *mpVal2<=*rhs.mpVal2; }
+
+        bool operator>(ArithmeticProxy const & rhs) const
+        { return *mpVal1>*rhs.mpVal1 && *mpVal2>*rhs.mpVal2; }
+
+        bool operator>=(ArithmeticProxy const & rhs) const
+        { return *mpVal1>=*rhs.mpVal1 && *mpVal2>=*rhs.mpVal2; }
+
+        int operator-(ArithmeticProxy const & rhs) const
+        { return *mpVal1 - *rhs.mpVal1; }
+
+    private:
+        T1* mpVal1;
+        T2* mpVal2;
+    };
+
+    template< typename Iterator1,
+              typename Iterator2,
+              typename ValueType,
+              typename DifferenceType,
+              typename IteratorCategory,
+              class Derived >
+    class CompositeIteratorBase : public NonStandardIterator
+    {
+    public:
+        typedef Iterator1        iterator1_type;
+        typedef Iterator2        iterator2_type;
+        typedef ValueType        value_type;
+        typedef DifferenceType   difference_type;
+        typedef IteratorCategory iterator_category;
+
+    protected:
+        iterator1_type maIter1;
+        iterator2_type maIter2;
+
+    private:
+        bool equal(CompositeIteratorBase const & rhs) const
+        {
+            return (maIter1 == rhs.maIter1) && (maIter2 == rhs.maIter2);
+        }
+
+    public:
+        CompositeIteratorBase() :
+            maIter1(),
+            maIter2()
+        {}
+
+        CompositeIteratorBase( const iterator1_type& rIter1, const iterator2_type& rIter2 ) :
+            maIter1( rIter1 ),
+            maIter2( rIter2 )
+        {}
+
+        bool operator==(Derived const & rhs) const
+        {
+            return equal(rhs);
+        }
+
+        bool operator!=(Derived const & rhs) const
+        {
+            return !equal(rhs);
+        }
+
+        difference_type operator-(Derived const & rhs) const
+        {
+            OSL_ASSERT( maIter1 - rhs.maIter1 == maIter2 - rhs.maIter2 );
+            return maIter1 - rhs.maIter1;
+        }
+
+        Derived & operator+=(difference_type const & s)
+        {
+            maIter1 += s;
+            maIter2 += s;
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived & operator-=(difference_type const & s)
+        {
+            maIter1 -= s;
+            maIter2 -= s;
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived operator+(difference_type const & s) const
+        {
+            Derived ret(static_cast<Derived const&>(*this));
+            ret += s;
+            return ret;
+        }
+
+        Derived operator-(difference_type const & s) const
+        {
+            Derived ret(static_cast<Derived const&>(*this));
+            ret -= s;
+            return ret;
+        }
+
+        Derived& operator++()
+        {
+            ++maIter1;
+            ++maIter2;
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived& operator--()
+        {
+            --maIter1;
+            --maIter2;
+            return static_cast<Derived&>(*this);
+        }
+
+        Derived operator++(int)
+        {
+            Derived ret(static_cast<Derived const&>(*this));
+            ++maIter1;
+            ++maIter2;
+            return ret;
+        }
+
+        Derived operator--(int)
+        {
+            Derived ret(static_cast<Derived const&>(*this));
+            --maIter1;
+            --maIter2;
+            return ret;
+        }
+
+        value_type get() const
+        {
+            return value_type(maIter1.get(),
+                              maIter2.get());
+        }
+
+        value_type get(difference_type const & d) const
+        {
+            return value_type(maIter1.get(d),
+                              maIter2.get(d));
+        }
+
+        void set( value_type v ) const
+        {
+            maIter1.set(v);
+            maIter2.set(v);
+        }
+
+        void set( value_type v, difference_type const & d ) const
+        {
+            maIter1.set(v,d);
+            maIter2.set(v,d);
+        }
+
+        const iterator1_type& first() const { return maIter1; }
+        iterator1_type& first() { return maIter1; }
+
+        const iterator2_type& second() const { return maIter2; }
+        iterator2_type& second() { return maIter2; }
+    };
+}
+
+/** Provide the composition of two 1D image iterators
+
+    Use this template to compose two iterators into one (e.g. image
+    and mask). Operations are transitive, e.g. operator== only returns
+    true, if both wrapped iterator operator== have yielded true.
+
+    Note that both iterators must have compatible difference types. To
+    avoid funny effects, iterator ranges given by a CompositeIterator
+    should consist of wrapped iterators of similar range
+ */
+template< typename Iterator1,
+          typename Iterator2,
+          typename ValueType,
+          typename DifferenceType,
+          typename IteratorCategory >
+class CompositeIterator1D :
+    public detail::CompositeIteratorBase< Iterator1,
+                                          Iterator2,
+                                          ValueType,
+                                          DifferenceType,
+                                          IteratorCategory,
+                                          CompositeIterator1D<Iterator1,
+                                                              Iterator2,
+                                                              ValueType,
+                                                              DifferenceType,
+                                                              IteratorCategory> >
+{
+    typedef detail::CompositeIteratorBase< Iterator1,
+                                           Iterator2,
+                                           ValueType,
+                                           DifferenceType,
+                                           IteratorCategory,
+                                           CompositeIterator1D<Iterator1,
+                                                               Iterator2,
+                                                               ValueType,
+                                                               DifferenceType,
+                                                               IteratorCategory> > base_type;
+public:
+    CompositeIterator1D() :
+        base_type()
+    {}
+
+    CompositeIterator1D( const Iterator1& rIter1,
+                         const Iterator2& rIter2 ) :
+        base_type( rIter1, rIter2 )
+    {}
+};
+
+/** Provide the composition of two 2D image iterators
+
+    Use this template to compose two iterators into one (e.g. image
+    and mask). Operations are transitive, e.g. operator== only returns
+    true, if both wrapped iterator operator== have yielded true.
+
+    Note that both iterators must have compatible difference types. To
+    avoid funny effects, iterator ranges given by a CompositeIterator
+    should consist of wrapped iterators of similar range
+ */
+template< typename Iterator1, typename Iterator2 > class CompositeIterator2D :
+    public detail::CompositeIteratorBase< Iterator1,
+                                          Iterator2,
+                                          std::pair<
+                                                typename vigra::IteratorTraits<Iterator1>::value_type,
+                                                typename vigra::IteratorTraits<Iterator2>::value_type >,
+                                          typename vigra::IteratorTraits<Iterator1>::difference_type,
+                                          typename vigra::IteratorTraits<Iterator1>::iterator_category,
+                                          CompositeIterator2D<Iterator1, Iterator2> >
+{
+    typedef detail::CompositeIteratorBase< Iterator1,
+                                           Iterator2,
+                                           std::pair<
+                                                typename vigra::IteratorTraits<Iterator1>::value_type,
+                                                typename vigra::IteratorTraits<Iterator2>::value_type >,
+                                           typename vigra::IteratorTraits<Iterator1>::difference_type,
+                                           typename vigra::IteratorTraits<Iterator1>::iterator_category,
+                                           CompositeIterator2D<Iterator1, Iterator2> > base_type;
+public:
+    typedef CompositeIterator1D< typename Iterator1::row_iterator,
+                                 typename Iterator2::row_iterator,
+                                 typename base_type::value_type,
+                                 int,
+                                 typename base_type::iterator_category >  row_iterator;
+    typedef CompositeIterator1D< typename Iterator1::column_iterator,
+                                 typename Iterator2::column_iterator,
+                                 typename base_type::value_type,
+                                 int,
+                                 typename base_type::iterator_category >  column_iterator;
+
+    typedef detail::ArithmeticProxy< typename Iterator1::MoveX,
+                                     typename Iterator2::MoveX >            MoveX;
+    typedef detail::ArithmeticProxy< typename Iterator1::MoveY,
+                                     typename Iterator2::MoveY >            MoveY;
+
+    MoveX x;
+    MoveY y;
+
+    CompositeIterator2D() :
+        base_type(),
+        x(this->maIter1.x,this->maIter2.x),
+        y(this->maIter1.y,this->maIter2.y)
+    {}
+
+    CompositeIterator2D( const Iterator1& rIter1, const Iterator2& rIter2 ) :
+        base_type( rIter1, rIter2 ),
+        x(this->maIter1.x,this->maIter2.x),
+        y(this->maIter1.y,this->maIter2.y)
+    {}
+
+    CompositeIterator2D( const CompositeIterator2D& rOld ) :
+        base_type(rOld),
+        x(this->maIter1.x,this->maIter2.x),
+        y(this->maIter1.y,this->maIter2.y)
+    {}
+
+    CompositeIterator2D& operator=( const CompositeIterator2D& rNew )
+    {
+        this->maIter1 = rNew.maIter1;
+        this->maIter2 = rNew.maIter2;
+
+        x = MoveX(this->maIter1.x,
+                  this->maIter2.x);
+        y = MoveY(this->maIter1.y,
+                  this->maIter2.y);
+    }
+
+    row_iterator rowIterator() const
+    {
+        return row_iterator(this->maIter1.rowIterator(),
+                            this->maIter2.rowIterator());
+    }
+
+    column_iterator columnIterator() const
+    {
+        return column_iterator(this->maIter1.columnIterator(),
+                               this->maIter2.columnIterator());
+    }
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX */
diff --git a/basebmp/inc/basebmp/debug.hxx b/basebmp/inc/basebmp/debug.hxx
new file mode 100644
index 000000000000..a01d69326307
--- /dev/null
+++ b/basebmp/inc/basebmp/debug.hxx
@@ -0,0 +1,50 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_DEBUG_HXX
+#define INCLUDED_BASEBMP_DEBUG_HXX
+
+#include <iostream>
+#include <boost/shared_ptr.hpp>
+
+namespace basebmp
+{
+    class BitmapDevice;
+
+    /** Dump content of BitmapDevice to given output stream.
+
+        @param rDevice
+        Device whose content should be dumped.
+
+        @param rOutputStream
+        Stream to write output to.
+    */
+    void debugDump( const boost::shared_ptr< BitmapDevice >& rDevice,
+                    ::std::ostream&                          rOutputStream );
+}
+
+#endif /* INCLUDED_BASEBMP_DEBUG_HXX */
diff --git a/basebmp/inc/basebmp/drawmodes.hxx b/basebmp/inc/basebmp/drawmodes.hxx
new file mode 100644
index 000000000000..6cdf34fd808a
--- /dev/null
+++ b/basebmp/inc/basebmp/drawmodes.hxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_DRAWMODES_HXX
+#define INCLUDED_BASEBMP_DRAWMODES_HXX
+
+/* Definition of Draw modes */
+
+namespace basebmp
+{
+    enum DrawMode
+    {
+        /** Default draw mode, which simply renders pixel in the
+            requested color
+         */
+        DrawMode_PAINT,
+
+        /** XOR draw mode, which XORs each existing pixel value with
+            the new color.
+
+            The result of this XOR operation strongly depends on the
+            underlying pixel format, as it is defined by the bitwise
+            XOR of the (potentially palette-looked-up) color value and
+            the existing pixel content (being it true color or a
+            palette index).
+         */
+        DrawMode_XOR
+    };
+}
+
+#endif /* INCLUDED_BASEBMP_DRAWMODES_HXX */
diff --git a/basebmp/inc/basebmp/endian.hxx b/basebmp/inc/basebmp/endian.hxx
new file mode 100644
index 000000000000..fb76ad1b306e
--- /dev/null
+++ b/basebmp/inc/basebmp/endian.hxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_ENDIAN_HXX
+#define INCLUDED_BASEBMP_ENDIAN_HXX
+
+#include <osl/endian.h>
+
+namespace basebmp
+{
+
+/// Swap the order of bytes for the given POD type
+template< typename T > inline T byteSwap( T );
+
+#define BASEBMP_BYTE_SWAP(Type,SwapFunc) \
+   template<> inline Type byteSwap<Type>( Type v ) \
+   { \
+       return SwapFunc(v); \
+   }
+
+// byteSwap<T> shall fail for any type T not in the list below
+BASEBMP_BYTE_SWAP(sal_Int8,)
+BASEBMP_BYTE_SWAP(sal_uInt8,)
+BASEBMP_BYTE_SWAP(sal_Int16,OSL_SWAPWORD)
+BASEBMP_BYTE_SWAP(sal_uInt16,OSL_SWAPWORD)
+BASEBMP_BYTE_SWAP(sal_Int32,OSL_SWAPDWORD)
+BASEBMP_BYTE_SWAP(sal_uInt32,OSL_SWAPDWORD)
+
+#undef BASEBMP_BYTE_SWAP
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_ENDIAN_HXX */
diff --git a/basebmp/inc/basebmp/fillimage.hxx b/basebmp/inc/basebmp/fillimage.hxx
new file mode 100644
index 000000000000..344ee20e6ce5
--- /dev/null
+++ b/basebmp/inc/basebmp/fillimage.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_FILLIMAGE_HXX
+#define INCLUDED_BASEBMP_FILLIMAGE_HXX
+
+#include <vigra/tuple.hxx>
+#include <vigra/iteratortraits.hxx>
+
+namespace basebmp
+{
+
+template< class DestIterator, class DestAccessor, typename T >
+void fillImage( DestIterator begin,
+                DestIterator end,
+                DestAccessor ad,
+                T            fillVal )
+{
+    const int width ( end.x - begin.x );
+    const int height( end.y - begin.y );
+
+    for( int y=0; y<height; ++y, ++begin.y )
+    {
+        typename vigra::IteratorTraits<DestIterator>::row_iterator
+            rowIter( begin.rowIterator() );
+        const typename vigra::IteratorTraits<DestIterator>::row_iterator
+            rowEnd( rowIter + width );
+
+        // TODO(P2): Provide specialized span fill methods on the
+        // iterator/accessor
+        while( rowIter != rowEnd )
+            ad.set(fillVal, rowIter++);
+    }
+}
+
+template< class DestIterator, class DestAccessor, typename T >
+inline void fillImage( vigra::triple<DestIterator,DestIterator,DestAccessor> const& src,
+                       T                                                            fillVal )
+{
+    fillImage(src.first,src.second,src.third,fillVal);
+}
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_FILLIMAGE_HXX */
diff --git a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx b/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
new file mode 100644
index 000000000000..eaf8e2b34bfa
--- /dev/null
+++ b/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX
+#define INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX
+
+#include <basebmp/color.hxx>
+#include <basebmp/bitmapdevice.hxx>
+
+namespace basebmp
+{
+    /** Access a BitmapDevice generically
+
+        This accessor deals with an opaque BitmapDevice generically,
+        via getPixel()/setPixel() at the published interface.
+     */
+    class GenericColorImageAccessor
+    {
+        BitmapDeviceSharedPtr mpDevice;
+        DrawMode              meDrawMode;
+
+    public:
+        typedef Color value_type;
+
+        explicit GenericColorImageAccessor( BitmapDeviceSharedPtr const& rTarget ) :
+            mpDevice(rTarget),
+            meDrawMode(DrawMode_PAINT)
+        {}
+
+        GenericColorImageAccessor( BitmapDeviceSharedPtr const& rTarget,
+                                   DrawMode                     eDrawMode ) :
+            mpDevice(rTarget),
+            meDrawMode(eDrawMode)
+        {}
+
+        template< typename Iterator >
+        Color operator()( Iterator const& i ) const
+        { return mpDevice->getPixel( basegfx::B2IPoint( i->x,i->y ) ); }
+
+        template< typename Iterator, typename Difference >
+        Color operator()( Iterator const& i, Difference const& diff) const
+        { return mpDevice->getPixel( basegfx::B2IPoint( i[diff]->x,
+                                                        i[diff]->y ) ); }
+
+        template< typename Iterator >
+        void set(Color const& value, Iterator const& i) const
+        { return mpDevice->setPixel( basegfx::B2IPoint( i->x,i->y ),
+                                     value, meDrawMode ); }
+
+        template< class Iterator, class Difference >
+        void set(value_type const& value, Iterator const& i, Difference const& diff) const
+        { return mpDevice->setPixel( basegfx::B2IPoint( i[diff]->x,
+                                                        i[diff]->y ),
+                                     value, meDrawMode ); }
+    };
+}
+
+#endif /* INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX */
diff --git a/basebmp/inc/basebmp/greylevelformats.hxx b/basebmp/inc/basebmp/greylevelformats.hxx
new file mode 100644
index 000000000000..0adbcbb53c30
--- /dev/null
+++ b/basebmp/inc/basebmp/greylevelformats.hxx
@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX
+#define INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX
+
+#include <basebmp/color.hxx>
+#include <basebmp/colortraits.hxx>
+#include <basebmp/accessor.hxx>
+#include <basebmp/pixeliterator.hxx>
+#include <basebmp/packedpixeliterator.hxx>
+#include <basebmp/pixelformatadapters.hxx>
+#include <basebmp/metafunctions.hxx>
+
+#include <vigra/numerictraits.hxx>
+#include <vigra/metaprogramming.hxx>
+
+#include <functional>
+
+namespace basebmp
+{
+
+template< typename PixelType,
+          typename ColorType,
+          int      UsedRange > struct GreylevelGetter :
+        public std::unary_function<PixelType, ColorType>
+{
+    ColorType operator()( PixelType const& c ) const
+    {
+        return ColorTraits<ColorType>::fromGreyscale(
+            vigra::NumericTraits<PixelType>::toPromote(c) *
+            vigra::NumericTraits<PixelType>::maxConst / UsedRange );
+    }
+};
+
+template< typename PixelType,
+          typename ColorType,
+          int      UsedRange > struct GreylevelSetter :
+    public std::unary_function<ColorType, PixelType>
+{
+    PixelType operator()( ColorType const& c ) const
+    {
+        return vigra::NumericTraits<PixelType>::toPromote(
+            ColorTraits<ColorType>::toGreyscale(c)) *
+            UsedRange /
+            vigra::NumericTraits<PixelType>::maxConst;
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+template< class Iterator,
+          class Accessor,
+          int   UsedRange > struct PixelFormatTraitsTemplate_Greylevel
+{
+    typedef typename Iterator::value_type       pixel_type;
+
+    typedef GreylevelGetter<pixel_type,
+                            Color,
+                            UsedRange>          getter_type;
+    typedef GreylevelSetter<pixel_type,
+                            Color,
+                            UsedRange>          setter_type;
+
+    typedef Iterator                            iterator_type;
+    typedef Accessor                            raw_accessor_type;
+    typedef AccessorSelector<
+        getter_type,
+        setter_type >                           accessor_selector;
+};
+
+template< int BitsPerPixel,
+          bool MsbFirst > struct PixelFormatTraitsTemplate_PackedGreylevel :
+    public PixelFormatTraitsTemplate_Greylevel<
+               PackedPixelIterator< sal_uInt8,
+                                    BitsPerPixel,
+                                    true >,
+               NonStandardAccessor< sal_uInt8 >,
+               (1UL << BitsPerPixel)-1 >
+{};
+
+//-----------------------------------------------------------------------------
+
+// 1bpp MSB
+typedef PixelFormatTraitsTemplate_PackedGreylevel<1, true> PixelFormatTraits_GREY1_MSB;
+
+// 1bpp LSB
+typedef PixelFormatTraitsTemplate_PackedGreylevel<1, false> PixelFormatTraits_GREY1_LSB;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_GREY1_MSB::getter_type,
+                                  PixelFormatTraits_GREY1_MSB::setter_type);
+
+
+// 4bpp MSB
+typedef PixelFormatTraitsTemplate_PackedGreylevel<4, true> PixelFormatTraits_GREY4_MSB;
+
+// 4bpp LSB
+typedef PixelFormatTraitsTemplate_PackedGreylevel<4, false> PixelFormatTraits_GREY4_LSB;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_GREY4_MSB::getter_type,
+                                  PixelFormatTraits_GREY4_MSB::setter_type);
+
+// 8bpp
+typedef PixelFormatTraitsTemplate_Greylevel<
+    PixelIterator< sal_uInt8 >,
+    StandardAccessor< sal_uInt8 >,
+    255 >                                                   PixelFormatTraits_GREY8;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_GREY8::getter_type,
+                                  PixelFormatTraits_GREY8::setter_type);
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX */
diff --git a/basebmp/inc/basebmp/iteratortraits.hxx b/basebmp/inc/basebmp/iteratortraits.hxx
new file mode 100644
index 000000000000..716081f62c53
--- /dev/null
+++ b/basebmp/inc/basebmp/iteratortraits.hxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_ITERATORTRAITS_HXX
+#define INCLUDED_BASEBMP_ITERATORTRAITS_HXX
+
+#include <basebmp/accessor.hxx>
+#include <basebmp/nonstandarditerator.hxx>
+
+namespace basebmp
+{
+
+template< class Iterator > struct IteratorTraits
+{
+    /// VigraTrueType, if iterator does not provide *operator()/operator[] methods
+    typedef typename vigra::IsDerivedFrom<Iterator,NonStandardIterator>::result
+            isNonStandardIterator;
+
+    /// Retrieve default accessor for this iterator (and given value type)
+    template< typename ValueType > struct defaultAccessor : public
+        // select according to non-standardness of iterator type
+        vigra::If< isNonStandardIterator,
+            NonStandardAccessor< ValueType >,
+            StandardAccessor< ValueType > >
+    {};
+
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_ITERATORTRAITS_HXX */
diff --git a/basebmp/inc/basebmp/linerenderer.hxx b/basebmp/inc/basebmp/linerenderer.hxx
new file mode 100644
index 000000000000..7c5f09dbb2d1
--- /dev/null
+++ b/basebmp/inc/basebmp/linerenderer.hxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_LINERENDERER_HXX
+#define INCLUDED_BASEBMP_LINERENDERER_HXX
+
+#include <basegfx/point/b2ipoint.hxx>
+
+#include <vigra/diff2d.hxx>
+#include <vigra/iteratortraits.hxx>
+
+
+/* Scan-converting lines */
+
+namespace basebmp
+{
+
+/** Render line with Bresenham
+
+    This function renders the line given by rPt1 and rPt2 using the
+    Bresenham algorithm with the specified color value. Make sure rPt1
+    and rPt1 are valid coordinates in the image given by begin and
+    end, since no clipping takes place.
+
+    @param aPt1
+    Start point of the line
+
+    @param aPt2
+    End point of the line
+
+    @param color
+    Color value to render the line with
+
+    @param begin
+    left-top image iterator
+
+    @param end
+    right-bottom image iterator
+
+    @param acc
+    Image accessor
+
+    @param bRoundTowardsPt2
+    Rounding mode to use. Giving false here results in line pixel tend
+    towards pt1, i.e. when a pixel exactly hits the middle between two
+    pixel, the pixel closer to pt1 will be chosen. Giving true here
+    makes renderClippedLine() choose pt2 in those cases.
+ */
+template< class Iterator, class Accessor >
+void renderLine( const basegfx::B2IPoint&      rPt1,
+                 const basegfx::B2IPoint&      rPt2,
+                 typename Accessor::value_type color,
+                 Iterator                      begin,
+                 Accessor                      acc,
+                 bool                          bRoundTowardsPt2=false )
+{
+    // code inspired by Paul Heckbert's Digital Line Drawing
+    // (Graphics Gems, Academic Press 1990)
+    const sal_Int32 x1 = rPt1.getX();
+    const sal_Int32 x2 = rPt2.getX();
+    const sal_Int32 y1 = rPt1.getY();
+    const sal_Int32 y2 = rPt2.getY();
+
+    // TODO(E1): This might overflow
+    sal_Int32 adx = x2 - x1;
+    int sx = 1;
+    if( adx < 0 )
+    {
+        adx *= -1;
+        sx = -1;
+    }
+
+    // TODO(E1): This might overflow
+    sal_Int32 ady = y2 - y1;
+    int sy = 1;
+    if( ady < 0 )
+    {
+        ady *= -1;
+        sy = -1;
+    }
+
+    // TODO(P3): handle horizontal and vertical lines specially
+    sal_Int32 xs = x1;
+    sal_Int32 ys = y1;
+    if( adx >= ady )
+    {
+        // semi-horizontal line
+        sal_Int32 rem = 2*ady - adx - !bRoundTowardsPt2;
+        adx *= 2;
+        ady *= 2;
+
+        Iterator currIter( begin + vigra::Diff2D(0,ys) );
+        typename vigra::IteratorTraits<Iterator>::row_iterator
+            rowIter( currIter.rowIterator() + xs );
+        while(true)
+        {
+            acc.set(color, rowIter);
+
+            if( xs == x2 )
+                return;
+
+            if( rem >= 0 )
+            {
+                ys += sy;
+                xs += sx;
+                currIter.y += sy;
+                rowIter = currIter.rowIterator() + xs;
+                rem -= adx;
+            }
+            else
+            {
+                xs += sx;
+                rowIter += sx;
+            }
+
+            rem += ady;
+        }
+    }
+    else
+    {
+        // semi-vertical line
+        sal_Int32 rem = 2*adx - ady - !bRoundTowardsPt2;
+        adx *= 2;
+        ady *= 2;
+
+        Iterator currIter( begin + vigra::Diff2D(xs,0) );
+        typename vigra::IteratorTraits<Iterator>::column_iterator
+            colIter( currIter.columnIterator() + ys );
+        while(true)
+        {
+            acc.set(color, colIter);
+
+            if( ys == y2 )
+                return;
+
+            if( rem >= 0 )
+            {
+                xs += sx;
+                ys += sy;
+                currIter.x += sx;
+                colIter = currIter.columnIterator() + ys;
+                rem -= ady;
+            }
+            else
+            {
+                ys += sy;
+                colIter += sy;
+            }
+
+            rem += adx;
+        }
+    }
+}
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_LINERENDERER_HXX */
diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx
new file mode 100644
index 000000000000..7eafac284f56
--- /dev/null
+++ b/basebmp/inc/basebmp/metafunctions.hxx
@@ -0,0 +1,222 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_METAFUNCTIONS_HXX
+#define INCLUDED_BASEBMP_METAFUNCTIONS_HXX
+
+#include <boost/mpl/integral_c.hpp>
+#include <vigra/metaprogramming.hxx>
+#include <vigra/numerictraits.hxx>
+
+namespace basebmp
+{
+
+// TODO(Q3): move to generic place (o3tl?)
+
+/** template meta function: add const qualifier to 2nd type, if given
+    1st type has it
+*/
+template<typename A, typename B> struct clone_const
+{
+    typedef B type;
+};
+template<typename A, typename B> struct clone_const<const A,B>
+{
+    typedef const B type;
+};
+
+/** template meta function: add const qualifier to plain type (if not
+    already there)
+ */
+template <typename T> struct add_const
+{
+    typedef const T type;
+};
+template <typename T> struct add_const<const T>
+{
+    typedef const T type;
+};
+
+/// template meta function: remove const qualifier from plain type
+template <typename T> struct remove_const
+{
+    typedef T type;
+};
+template <typename T> struct remove_const<const T>
+{
+    typedef T type;
+};
+
+//--------------------------------------------------------------
+
+/// Base class for an adaptable ternary functor
+template< typename A1, typename A2, typename A3, typename R > struct TernaryFunctorBase
+{
+    typedef A1 first_argument_type;
+    typedef A2 second_argument_type;
+    typedef A3 third_argument_type;
+    typedef R  result_type;
+};
+
+//--------------------------------------------------------------
+
+/** template meta function: ensure that given integer type is unsigned
+
+    If given integer type is already unsigned, return as-is -
+    otherwise, convert to unsigned type of same or greater range.
+ */
+template< typename T > struct make_unsigned;
+
+#define BASEBMP_MAKE_UNSIGNED(T,U)        \
+    template<> struct make_unsigned<T> { \
+        typedef U type; \
+    };
+
+BASEBMP_MAKE_UNSIGNED(signed char,unsigned char)
+BASEBMP_MAKE_UNSIGNED(unsigned char,unsigned char)
+BASEBMP_MAKE_UNSIGNED(short,unsigned short)
+BASEBMP_MAKE_UNSIGNED(unsigned short,unsigned short)
+BASEBMP_MAKE_UNSIGNED(int,unsigned int)
+BASEBMP_MAKE_UNSIGNED(unsigned int,unsigned int)
+BASEBMP_MAKE_UNSIGNED(long,unsigned long)
+BASEBMP_MAKE_UNSIGNED(unsigned long,unsigned long)
+
+#undef BASEBMP_MAKE_UNSIGNED
+
+/// cast integer to unsigned type of similar size
+template< typename T > inline typename make_unsigned<T>::type unsigned_cast( T value )
+{
+    return static_cast< typename make_unsigned<T>::type >(value);
+}
+
+//--------------------------------------------------------------
+
+/// returns true, if given number is strictly less than 0
+template< typename T > inline bool is_negative( T x )
+{
+    return x < 0;
+}
+
+/// Overload for ints (branch-free)
+inline bool is_negative( int x )
+{
+    // force logic shift (result for signed shift right is undefined)
+    return static_cast<unsigned int>(x) >> (sizeof(int)*8-1);
+}
+
+//--------------------------------------------------------------
+
+/// Results in VigraTrueType, if T is of integer type and scalar
+template< typename T, typename trueCase, typename falseCase >
+struct ifScalarIntegral
+{
+    typedef
+    typename vigra::If<
+        typename vigra::NumericTraits< T >::isIntegral,
+        typename vigra::If<
+            typename vigra::NumericTraits< T >::isScalar,
+            trueCase,
+            falseCase >::type,
+        falseCase >::type type;
+};
+
+/// Results in VigraTrueType, if T is of non-integer type and scalar
+template< typename T, typename trueCase, typename falseCase >
+struct ifScalarNonIntegral
+{
+    typedef
+    typename vigra::If<
+        typename vigra::NumericTraits< T >::isIntegral,
+        falseCase,
+        typename vigra::If<
+            typename vigra::NumericTraits< T >::isScalar,
+            trueCase,
+            falseCase >::type >::type type;
+};
+
+/// Results in VigraTrueType, if both T1 and T2 are of integer type and scalar
+template< typename T1, typename T2, typename trueCase, typename falseCase >
+struct ifBothScalarIntegral
+{
+    typedef
+    typename ifScalarIntegral<
+        T1,
+        typename ifScalarIntegral<
+            T2,
+            trueCase,
+            falseCase >::type,
+        falseCase >::type type;
+};
+
+//--------------------------------------------------------------
+
+/// Count number of trailing zeros
+template< unsigned int val > struct numberOfTrailingZeros
+{
+    enum { next = val >> 1 };
+    enum { value = vigra::IfBool< (val & 1) == 0,
+                                  numberOfTrailingZeros<next>,
+                                  boost::mpl::integral_c< int,-1 > > ::type::value + 1 };
+};
+
+template<> struct numberOfTrailingZeros<0>
+{
+    enum { value = 0 };
+};
+
+//--------------------------------------------------------------
+
+/// Count number of one bits
+template< unsigned int val > struct bitcount
+{
+    enum { next = val >> 1 };
+    enum { value = bitcount<next>::value + (val & 1) };
+};
+
+template<> struct bitcount<0>
+{
+    enum { value = 0 };
+};
+
+//--------------------------------------------------------------
+
+/// Shift left for positive shift value, and right otherwise
+template< typename T > inline T shiftLeft( T v, int shift )
+{
+    return shift > 0 ? v << shift : v >> (-shift);
+}
+
+/// Shift right for positive shift value, and left otherwise
+template< typename T > inline T shiftRight( T v, int shift )
+{
+    return shift > 0 ? v >> shift : v << (-shift);
+}
+
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_METAFUNCTIONS_HXX */
diff --git a/basebmp/inc/basebmp/nonstandarditerator.hxx b/basebmp/inc/basebmp/nonstandarditerator.hxx
new file mode 100644
index 000000000000..c9069da18826
--- /dev/null
+++ b/basebmp/inc/basebmp/nonstandarditerator.hxx
@@ -0,0 +1,45 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
+#define INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
+
+#include <vigra/metaprogramming.hxx>
+
+namespace basebmp
+{
+    /// Base class defining pointer and reference types as VigraFalseType
+    struct NonStandardIterator
+    {
+        typedef vigra::VigraFalseType reference;
+        typedef vigra::VigraFalseType index_reference;
+        typedef vigra::VigraFalseType pointer;
+    };
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX */
diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx b/basebmp/inc/basebmp/packedpixeliterator.hxx
new file mode 100644
index 000000000000..0a48ce2024ff
--- /dev/null
+++ b/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -0,0 +1,677 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX
+#define INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX
+
+#include <basebmp/metafunctions.hxx>
+#include <basebmp/stridedarrayiterator.hxx>
+#include <basebmp/nonstandarditerator.hxx>
+#include <basebmp/accessortraits.hxx>
+
+#include <boost/static_assert.hpp>
+#include <vigra/metaprogramming.hxx>
+#include <vigra/diff2d.hxx>
+
+namespace basebmp
+{
+
+/// Get bitmask for data at given intra-word position, for given bit depth
+template< typename value_type,
+          int      bits_per_pixel,
+          bool     MsbFirst,
+          typename difference_type >
+inline value_type get_mask( difference_type d )
+{
+    BOOST_STATIC_ASSERT(bits_per_pixel > 0);
+    BOOST_STATIC_ASSERT(sizeof(value_type)*8 % bits_per_pixel == 0);
+    BOOST_STATIC_ASSERT(sizeof(value_type)*8 / bits_per_pixel > 1);
+    BOOST_STATIC_ASSERT(vigra::TypeTraits<value_type>::isPOD::asBool);
+
+    const unsigned int nIntraWordPositions( sizeof(value_type)*8 / bits_per_pixel );
+
+    //      create bits_per_pixel 1s      shift to intra-word position
+    return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
+                                                         (nIntraWordPositions-1 - (d % nIntraWordPositions)) :
+                                                         (d % nIntraWordPositions)));
+}
+
+template< int num_intraword_positions, int bits_per_pixel, bool MsbFirst, typename difference_type > inline difference_type get_shift( difference_type remainder )
+{
+    return bits_per_pixel*(MsbFirst ?
+                           (num_intraword_positions - 1 - remainder) :
+                           remainder);
+}
+
+template< typename Valuetype,
+          int      bits_per_pixel,
+          bool     MsbFirst > class PackedPixelColumnIterator : public NonStandardIterator
+{
+public:
+    // no reference, no index_reference type here
+    typedef Valuetype                                   value_type;
+    typedef int                                         difference_type;
+    typedef image_traverser_tag                         iterator_category;
+
+    typedef typename remove_const<value_type>::type     mask_type;
+    typedef value_type*                                 pointer;
+    typedef StridedArrayIterator< value_type >          MoveY;
+
+    enum {
+        /** The number of pixel within a single value_type value
+         */
+        num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
+        /** Bit mask for one pixel (least significant bits)
+         */
+        bit_mask=~(~0 << bits_per_pixel)
+    };
+
+private:
+    MoveY           y;
+    mask_type       mask_;
+    difference_type shift_;
+
+    void inc()
+    {
+        ++y;
+    }
+
+    void dec()
+    {
+        --y;
+    }
+
+    bool equal( PackedPixelColumnIterator const & rhs ) const
+    {
+        return rhs.y == y;
+    }
+
+    bool less( PackedPixelColumnIterator const & rhs ) const
+    {
+        return y < rhs.y;
+    }
+
+public:
+    PackedPixelColumnIterator() :
+        y(0),
+        mask_( get_mask<value_type, bits_per_pixel, MsbFirst, difference_type>(0) ),
+        shift_( get_shift<num_intraword_positions, bits_per_pixel, MsbFirst, difference_type>(0) )
+    {}
+
+    PackedPixelColumnIterator( const MoveY& base, difference_type remainder ) :
+        y(base),
+        mask_( get_mask<value_type, bits_per_pixel, MsbFirst>(remainder) ),
+        shift_( get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder) )
+    {}
+
+    PackedPixelColumnIterator& operator+=( difference_type d )
+    {
+        y += d;
+        return *this;
+    }
+
+    PackedPixelColumnIterator& operator-=( difference_type d )
+    {
+        y -= d;
+        return *this;
+    }
+
+    PackedPixelColumnIterator operator+( difference_type d )
+    {
+        PackedPixelColumnIterator res(*this);
+        res += d;
+        return res;
+    }
+
+    PackedPixelColumnIterator operator-( difference_type d )
+    {
+        PackedPixelColumnIterator res(*this);
+        res -= d;
+        return res;
+    }
+
+    PackedPixelColumnIterator& operator++()
+    {
+        inc();
+        return *this;
+    }
+
+    PackedPixelColumnIterator& operator--()
+    {
+        dec();
+        return *this;
+    }
+
+    PackedPixelColumnIterator operator++(int)
+    {
+        PackedPixelColumnIterator res(*this);
+        inc();
+        return res;
+    }
+
+    PackedPixelColumnIterator operator--(int)
+    {
+        PackedPixelColumnIterator res(*this);
+        dec();
+        return res;
+    }
+
+    bool operator==(PackedPixelColumnIterator const & rhs) const
+    {
+        return equal( rhs );
+    }
+
+    bool operator!=(PackedPixelColumnIterator const & rhs) const
+    {
+        return !equal( rhs );
+    }
+
+    bool operator<(PackedPixelColumnIterator const & rhs) const
+    {
+        return less(rhs);
+    }
+
+    bool operator<=(PackedPixelColumnIterator const & rhs) const
+    {
+        return !rhs.less(*this);
+    }
+
+    bool operator>(PackedPixelColumnIterator const & rhs) const
+    {
+        return rhs.less(*this);
+    }
+
+    bool operator>=(PackedPixelColumnIterator const & rhs) const
+    {
+        return !less(rhs);
+    }
+
+    difference_type operator-(PackedPixelColumnIterator const & rhs) const
+    {
+        return y - rhs.y;
+    }
+
+    value_type get() const
+    {
+        return unsigned_cast<value_type>(*y() & mask_) >> shift_;
+    }
+
+    value_type get(difference_type d) const
+    {
+        return unsigned_cast<value_type>(*y(d) & mask_) >> shift_;
+    }
+
+    void set( value_type v ) const
+    {
+        const value_type pixel_value( (v << shift_) & mask_ );
+        *y() = (*y() & ~mask_) | pixel_value;
+    }
+
+    void set( value_type v, difference_type d ) const
+    {
+        const value_type pixel_value( (v << shift_) & mask_ );
+        *y(d) = (*y(d) & ~mask_) | pixel_value;
+    }
+};
+
+template< typename Valuetype,
+          int      bits_per_pixel,
+          bool     MsbFirst > class PackedPixelRowIterator : public NonStandardIterator
+{
+public:
+    // no reference, no index_reference type here
+    typedef Valuetype                                   value_type;
+    typedef int                                         difference_type;
+    typedef image_traverser_tag                         iterator_category;
+
+    typedef typename remove_const<value_type>::type     mask_type;
+    typedef value_type*                                 pointer;
+
+    enum {
+        /** The number of pixel within a single value_type value
+         */
+        num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
+        /** Bit mask for one pixel (least significant bits)
+         */
+        bit_mask=~(~0 << bits_per_pixel)
+    };
+
+private:
+    pointer         data_;
+    mask_type       mask_;
+    difference_type remainder_;
+
+    void update_mask()
+    {
+        mask_ = get_mask<value_type, bits_per_pixel, MsbFirst>(remainder_);
+    }
+
+    void inc()
+    {
+        const difference_type newValue( remainder_ + 1 );
+        const difference_type data_offset( newValue / num_intraword_positions );
+
+        data_ += data_offset;
+        remainder_ = newValue % num_intraword_positions;
+
+        const mask_type shifted_mask(
+            MsbFirst ?
+            unsigned_cast<mask_type>(mask_) >> bits_per_pixel :
+            mask_ << bits_per_pixel );
+
+        // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+                                                            bit_mask << bits_per_pixel*(num_intraword_positions-1) :
+                                                            bit_mask);
+    }
+
+    void dec()
+    {
+        const difference_type newValue( remainder_ - 1 );
+        const bool            isNegative( is_negative(newValue) );
+        const difference_type newRemainder( newValue % num_intraword_positions );
+
+        // calc  data_ += newValue / num_intraword_positions;
+        //       remainder_ = newRemainder;
+        // for newValue >= 0, and
+        //       data_ += newValue / num_intraword_positions - 1;
+        //       remainder_ = num_intraword_positions - newRemainder;
+        // (to force remainder_ to be positive).
+        // This is branch-free, if is_negative() is branch-free
+        const difference_type data_offset( newValue / num_intraword_positions - isNegative );
+        data_     += data_offset;
+        remainder_ = newRemainder + isNegative*num_intraword_positions;
+
+        const mask_type shifted_mask(
+            MsbFirst ?
+            mask_ << bits_per_pixel :
+            unsigned_cast<mask_type>(mask_) >> bits_per_pixel );
+
+        // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+                                                            bit_mask :
+                                                            bit_mask << bits_per_pixel*(num_intraword_positions-1));
+    }
+
+    bool equal( PackedPixelRowIterator const & rhs ) const
+    {
+        return rhs.data_ == data_ && rhs.remainder_ == remainder_;
+    }
+
+    bool less( PackedPixelRowIterator const & rhs ) const
+    {
+        return data_ == rhs.data_ ?
+            (remainder_ < rhs.remainder_) :
+            (data_ < rhs.data_);
+    }
+
+public:
+    PackedPixelRowIterator() :
+        data_(0),
+        mask_( get_mask<value_type, bits_per_pixel, MsbFirst, difference_type>(0) ),
+        remainder_(0)
+    {}
+
+    explicit PackedPixelRowIterator( pointer base, int x ) :
+        data_(base),
+        mask_(0),
+        remainder_(x % num_intraword_positions)
+    {
+        update_mask();
+    }
+
+    PackedPixelRowIterator& operator+=( difference_type d )
+    {
+        const difference_type newValue( remainder_ + d );
+        const bool            isNegative( is_negative(newValue) );
+        const difference_type newRemainder( newValue % num_intraword_positions );
+
+        // calc  data_ += newValue / num_intraword_positions;
+        //       remainder_ = newRemainder;
+        // for newValue >= 0, and
+        //       data_ += newValue / num_intraword_positions - 1;
+        //       remainder_ = newRemainder + num_intraword_positions;
+        // (to force remainder_ to be positive).
+        // This is branch-free, if is_negative() is branch-free
+        data_     += newValue / num_intraword_positions - isNegative;
+        remainder_ = newRemainder + isNegative*num_intraword_positions;
+        update_mask();
+
+        return *this;
+    }
+
+    PackedPixelRowIterator& operator-=( difference_type d )
+    {
+        // forward to operator+= - which has to cope with negative
+        // values, anyway.
+        return *this += -d;
+    }
+
+    PackedPixelRowIterator operator+( difference_type d )
+    {
+        PackedPixelRowIterator res(*this);
+        res += d;
+        return res;
+    }
+
+    PackedPixelRowIterator operator-( difference_type d )
+    {
+        PackedPixelRowIterator res(*this);
+        res -= d;
+        return res;
+    }
+
+    PackedPixelRowIterator& operator++()
+    {
+        inc();
+        return *this;
+    }
+
+    PackedPixelRowIterator& operator--()
+    {
+        dec();
+        return *this;
+    }
+
+    PackedPixelRowIterator operator++(int)
+    {
+        PackedPixelRowIterator res(*this);
+        inc();
+        return res;
+    }
+
+    PackedPixelRowIterator operator--(int)
+    {
+        PackedPixelRowIterator res(*this);
+        dec();
+        return res;
+    }
+
+    bool operator==(PackedPixelRowIterator const & rhs) const
+    {
+        return equal( rhs );
+    }
+
+    bool operator!=(PackedPixelRowIterator const & rhs) const
+    {
+        return !equal( rhs );
+    }
+
+    bool operator<(PackedPixelRowIterator const & rhs) const
+    {
+        return less(rhs);
+    }
+
+    bool operator<=(PackedPixelRowIterator const & rhs) const
+    {
+        return !rhs.less(*this);
+    }
+
+    bool operator>(PackedPixelRowIterator const & rhs) const
+    {
+        return rhs.less(*this);
+    }
+
+    bool operator>=(PackedPixelRowIterator const & rhs) const
+    {
+        return !less(rhs);
+    }
+
+    difference_type operator-(PackedPixelRowIterator const & rhs) const
+    {
+        return (data_ - rhs.data_)*num_intraword_positions + (remainder_ - rhs.remainder_);
+    }
+
+    value_type get() const
+    {
+        return unsigned_cast<value_type>(*data_ & mask_) >>
+            get_shift<num_intraword_positions,
+                      bits_per_pixel,
+                      MsbFirst>(remainder_);
+    }
+
+    value_type get(difference_type d) const
+    {
+        PackedPixelRowIterator tmp(*this);
+        tmp += d;
+        return tmp.get();
+    }
+
+    void set( value_type v ) const
+    {
+        const value_type pixel_value(
+            (v <<
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_))
+            & mask_ );
+        *data_ = (*data_ & ~mask_) | pixel_value;
+    }
+
+    void set( value_type v, difference_type d ) const
+    {
+        PackedPixelRowIterator tmp(*this);
+        tmp += d;
+        tmp.set(v);
+    }
+};
+
+/** 2D image iterator for packed pixel formats
+
+    This iterator can be used for image formats that pack more than
+    one pixel into an machine data type (like one bit per pixel, eight
+    of which packed into one char)
+ */
+template< typename Valuetype,
+          int      bits_per_pixel,
+          bool     MsbFirst > class PackedPixelIterator : public NonStandardIterator
+{
+public:
+    // no reference, no index_reference type here
+    typedef Valuetype                                   value_type;
+    typedef vigra::Diff2D                               difference_type;
+    typedef image_traverser_tag                         iterator_category;
+    typedef PackedPixelRowIterator<value_type,
+                                   bits_per_pixel,
+                                   MsbFirst>            row_iterator;
+    typedef PackedPixelColumnIterator<value_type,
+                                      bits_per_pixel,
+                                      MsbFirst>         column_iterator;
+
+    typedef value_type*                                 pointer;
+    typedef int                                         MoveX;
+    typedef StridedArrayIterator< value_type >          MoveY;
+
+    enum {
+        /** The number of pixel within a single value_type value
+         */
+        num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
+        /** Bit mask for one pixel (least significant bits)
+         */
+        bit_mask=~(~0 << bits_per_pixel)
+    };
+
+    // TODO(F2): direction of iteration (ImageIterator can be made to
+    // run backwards)
+
+private:
+    pointer current() const
+    {
+        return y() + (x / num_intraword_positions);
+    }
+
+    pointer current(int dx, int dy) const
+    {
+        return y(dy) + ((x+dx)/num_intraword_positions);
+    }
+
+    bool equal(PackedPixelIterator const & rhs) const
+    {
+        return (x == rhs.x) && (y == rhs.y);
+    }
+
+public:
+    PackedPixelIterator() :
+        x(0),
+        y(0)
+    {}
+
+    PackedPixelIterator(pointer base, int ystride) :
+        x(0),
+        y(ystride,base)
+    {}
+
+    bool operator==(PackedPixelIterator const & rhs) const
+    {
+        return equal(rhs);
+    }
+
+    bool operator!=(PackedPixelIterator const & rhs) const
+    {
+        return !equal(rhs);
+    }
+
+    difference_type operator-(PackedPixelIterator const & rhs) const
+    {
+        return difference_type(x - rhs.x, y - rhs.y);
+    }
+
+    MoveX x;
+    MoveY y;
+
+    PackedPixelIterator & operator+=(difference_type const & s)
+    {
+        x += s.x;
+        y += s.y;
+        return *this;
+    }
+
+    PackedPixelIterator & operator-=(difference_type const & s)
+    {
+        x -= s.x;
+        y -= s.y;
+        return *this;
+    }
+
+    PackedPixelIterator operator+(difference_type const & s) const
+    {
+        PackedPixelIterator ret(*this);
+        ret += s;
+        return ret;
+    }
+
+    PackedPixelIterator operator-(difference_type const & s) const
+    {
+        PackedPixelIterator ret(*this);
+        ret -= s;
+        return ret;
+    }
+
+    row_iterator rowIterator() const
+    {
+        return row_iterator(current(),x);
+    }
+
+    column_iterator columnIterator() const
+    {
+        return column_iterator(MoveY(y,
+                                     x / num_intraword_positions),
+                               x % num_intraword_positions);
+    }
+
+    value_type get() const
+    {
+        const int remainder( x % num_intraword_positions );
+
+        return (unsigned_cast<value_type>(*current() &
+                                          get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
+                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
+    }
+
+    value_type get(difference_type const & d) const
+    {
+        const int remainder( x(d.x) % num_intraword_positions );
+
+        return (unsigned_cast<value_type>(*current(d.x,d.y) &
+                                          get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
+                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
+    }
+
+    void set( value_type v ) const
+    {
+        const int remainder( x % num_intraword_positions );
+        const int mask( get_mask<value_type, bits_per_pixel, MsbFirst>(remainder) );
+        const value_type pixel_value(
+            (v <<
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+            & mask );
+        pointer p = current();
+        *p = (*p & ~mask) | pixel_value;
+    }
+
+    void set( value_type v, difference_type const & d ) const
+    {
+        const int remainder( (x + d.x) % num_intraword_positions );
+        const int mask( get_mask<value_type, bits_per_pixel, MsbFirst>(remainder) );
+        const value_type pixel_value(
+            (v <<
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+             & mask );
+        pointer p = current(d.x,d.y);
+        *p = (*p & ~mask) | pixel_value;
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+// partial specialization for the accessor traits masked_accessor
+// selector metafunction - can employ fast mask functor for the 1bpp
+// case.
+template< class Accessor,
+          class MaskAccessor,
+          class Iterator,
+          bool  polarity,
+          bool  MsbFirst > struct maskedAccessorSelector< Accessor,
+                                                          MaskAccessor,
+                                                          Iterator,
+                                                          PackedPixelIterator< typename MaskAccessor::value_type,
+                                                                               1,
+                                                                               MsbFirst >,
+                                                          polarity >
+{
+    typedef TernarySetterFunctionAccessorAdapter<
+        Accessor,
+        MaskAccessor,
+        typename outputMaskFunctorSelector<
+            typename Accessor::value_type,
+            typename MaskAccessor::value_type,
+            polarity,
+            FastMask>::type >
+        type;
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX */
diff --git a/basebmp/inc/basebmp/paletteformats.hxx b/basebmp/inc/basebmp/paletteformats.hxx
new file mode 100644
index 000000000000..d3de0ea18dd7
--- /dev/null
+++ b/basebmp/inc/basebmp/paletteformats.hxx
@@ -0,0 +1,147 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_PACKEDPIXELFORMATS_HXX
+#define INCLUDED_BASEBMP_PACKEDPIXELFORMATS_HXX
+
+#include <basebmp/color.hxx>
+#include <basebmp/colortraits.hxx>
+#include <basebmp/accessor.hxx>
+#include <basebmp/pixeliterator.hxx>
+#include <basebmp/packedpixeliterator.hxx>
+#include <basebmp/pixelformatadapters.hxx>
+#include <basebmp/paletteimageaccessor.hxx>
+#include <basebmp/metafunctions.hxx>
+
+#include <vigra/numerictraits.hxx>
+#include <vigra/metaprogramming.hxx>
+
+#include <functional>
+
+namespace basebmp
+{
+
+//-----------------------------------------------------------------------------
+
+/** Lookup index value for given color value in a PaletteImageAccessor
+ */
+template< class Accessor > struct ColorLookup
+{
+    typename Accessor::data_type operator()( const Accessor&               acc,
+                                             typename Accessor::value_type v ) const
+    {
+        return acc.lookup(v);
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+// partial specialization of AccessorTraits for PaletteAccessor
+template< class Accessor, typename ColorType > struct AccessorTraits<
+    PaletteImageAccessor< Accessor, ColorType > >
+{
+    /// value type of described accessor
+    typedef typename PaletteImageAccessor< Accessor, ColorType >::value_type  value_type;
+
+    /// Retrieve stand-alone color lookup function for given Accessor type
+    typedef ColorLookup< PaletteImageAccessor< Accessor, ColorType > >        color_lookup;
+
+    /// Retrieve raw pixel data accessor for given Accessor type
+    typedef Accessor                                                          raw_accessor;
+
+    /** accessor for XOR setter access is disabled, since the results
+     *  are usually completely unintended - you'll usually want to
+     *  wrap an xor_accessor with a PaletteAccessor, not the other way
+     *  around.
+     */
+    typedef vigra::VigraFalseType                                             xor_accessor;
+
+    /** accessor for masked setter access is disabled, since the
+     *  results are usually completely unintended - you'll usually
+     *  want to wrap a masked_accessor with a PaletteAccessor, not the
+     *  other way around.
+     */
+    template< class MaskAccessor,
+              class Iterator,
+              class MaskIterator > struct                                     masked_accessor
+    {
+        typedef vigra::VigraFalseType type;
+    };
+};
+
+//-----------------------------------------------------------------------------
+
+template< typename ColorType > struct PaletteAccessorSelector
+{
+    template< class Accessor > struct wrap_accessor
+    {
+        typedef PaletteImageAccessor< Accessor, ColorType > type;
+    };
+};
+
+//-----------------------------------------------------------------------------
+
+template< class Iterator,
+          class Accessor > struct PixelFormatTraitsTemplate_Palette
+{
+    typedef typename Iterator::value_type       pixel_type;
+    typedef Iterator                            iterator_type;
+    typedef Accessor                            raw_accessor_type;
+    typedef PaletteAccessorSelector<Color>      accessor_selector;
+};
+
+template< int BitsPerPixel,
+          bool MsbFirst > struct PixelFormatTraitsTemplate_PackedPalette :
+    public PixelFormatTraitsTemplate_Palette<
+               PackedPixelIterator< sal_uInt8,
+                                    BitsPerPixel,
+                                    MsbFirst >,
+               NonStandardAccessor< sal_uInt8 > >
+{};
+
+//-----------------------------------------------------------------------------
+
+// 1bpp MSB
+typedef PixelFormatTraitsTemplate_PackedPalette<1, true>  PixelFormatTraits_PAL1_MSB;
+
+// 1bpp LSB
+typedef PixelFormatTraitsTemplate_PackedPalette<1, false> PixelFormatTraits_PAL1_LSB;
+
+// 4bpp MSB
+typedef PixelFormatTraitsTemplate_PackedPalette<4, true>  PixelFormatTraits_PAL4_MSB;
+
+// 4bpp LSB
+typedef PixelFormatTraitsTemplate_PackedPalette<4, false> PixelFormatTraits_PAL4_LSB;
+
+// 8bpp
+typedef PixelFormatTraitsTemplate_Palette<
+    PixelIterator< sal_uInt8 >,
+    StandardAccessor< sal_uInt8 > >                       PixelFormatTraits_PAL8;
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_PACKEDPIXELFORMATS_HXX */
diff --git a/basebmp/inc/basebmp/paletteimageaccessor.hxx b/basebmp/inc/basebmp/paletteimageaccessor.hxx
new file mode 100644
index 000000000000..79bbb9aae9b7
--- /dev/null
+++ b/basebmp/inc/basebmp/paletteimageaccessor.hxx
@@ -0,0 +1,168 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX
+#define INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX
+
+#include <basebmp/colortraits.hxx>
+#include <basebmp/accessortraits.hxx>
+
+#include <vigra/numerictraits.hxx>
+#include <vigra/metaprogramming.hxx>
+
+#include <algorithm>
+#include <functional>
+
+namespace basebmp
+{
+
+/** Access pixel data via palette indirection
+
+    @tpl Accessor
+    Raw accessor, to be used to actually access the pixel values
+
+    @tpl ColorType
+    The color value type to use - e.g. the palette is an array of that
+    type
+ */
+template< class Accessor, typename ColorType > class PaletteImageAccessor
+{
+public:
+    typedef typename Accessor::value_type  data_type;
+    typedef ColorType                      value_type;
+
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+// making all members public, if no member template friends
+private:
+    template<class A, typename C> friend class PaletteImageAccessor;
+#endif
+
+    Accessor          maAccessor;
+    const value_type* mpPalette;
+    std::size_t       mnNumEntries;
+
+public:
+    PaletteImageAccessor() :
+        maAccessor(),
+        mpPalette(0),
+        mnNumEntries(0)
+    {}
+
+    template< class A > explicit
+    PaletteImageAccessor( PaletteImageAccessor<A,ColorType> const& rSrc ) :
+        maAccessor( rSrc.maAccessor ),
+        mpPalette( rSrc.mpPalette ),
+        mnNumEntries( rSrc.mnNumEntries )
+    {}
+
+    PaletteImageAccessor( const value_type* pPalette,
+                          std::size_t       numEntries ) :
+        maAccessor(),
+        mpPalette(pPalette),
+        mnNumEntries(numEntries)
+    {}
+
+    template< class T > PaletteImageAccessor( T                 accessor,
+                                              const value_type* pPalette,
+                                              std::size_t       numEntries ) :
+        maAccessor(accessor),
+        mpPalette(pPalette),
+        mnNumEntries(numEntries)
+    {}
+
+    // -------------------------------------------------------
+
+    Accessor const& getWrappedAccessor() const { return maAccessor; }
+    Accessor&       getWrappedAccessor() { return maAccessor; }
+
+    // -------------------------------------------------------
+
+    data_type lookup(value_type const& v) const
+    {
+        // TODO(P3): use table-based/octree approach here!
+        const value_type* best_entry;
+        const value_type* palette_end( mpPalette+mnNumEntries );
+        if( (best_entry=std::find( mpPalette, palette_end, v)) != palette_end )
+            return best_entry-mpPalette;
+
+        const value_type* curr_entry( mpPalette );
+        best_entry = curr_entry;
+        while( curr_entry != palette_end )
+        {
+            if( ColorTraits<value_type>::distance(*curr_entry,
+                                                  *best_entry)
+                > ColorTraits<value_type>::distance(*curr_entry,
+                                                    v) )
+            {
+                best_entry = curr_entry;
+            }
+
+            ++curr_entry;
+        }
+
+        return best_entry-mpPalette;
+    }
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return mpPalette[ maAccessor(i) ];
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return mpPalette[ maAccessor(i,diff) ];
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        maAccessor.set(
+            lookup(
+                vigra::detail::RequiresExplicitCast<value_type>::cast(value) ),
+            i );
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        maAccessor.set(
+            lookup(
+                vigra::detail::RequiresExplicitCast<value_type>::cast(value) ),
+            i,
+            diff );
+    }
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX */
diff --git a/basebmp/inc/basebmp/pixelformatadapters.hxx b/basebmp/inc/basebmp/pixelformatadapters.hxx
new file mode 100644
index 000000000000..2acd90b5bea8
--- /dev/null
+++ b/basebmp/inc/basebmp/pixelformatadapters.hxx
@@ -0,0 +1,108 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX
+#define INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX
+
+#include <basebmp/accessortraits.hxx>
+#include <basebmp/accessoradapters.hxx>
+
+#include <vigra/metaprogramming.hxx>
+
+namespace basebmp
+{
+
+// convenience functionality, providing everything necessary for a new
+// pixel format. simply plug in two conversion functors from/to a
+// common color format.
+
+/** Accessor selection metafunction, used to wrap a given accessor
+    with one converting between the pixel and color types
+
+    Use the nested template's typedef type, to retrieve an
+    AccessorAdapter which operates on a pixel value accessor, and
+    provides color values to the outside.
+
+    Nested like this, to avoid template template parameters at other
+    places: an instantiated version of AccessorSelector can be passed
+    to other templates, which in turn can invoke the nested meta
+    function.
+ */
+template< typename Getter,
+          typename Setter > struct AccessorSelector
+{
+    template< typename Accessor > struct wrap_accessor
+    {
+        typedef UnaryFunctionAccessorAdapter< Accessor,
+                                              Getter,
+                                              Setter > type;
+    };
+};
+
+//-----------------------------------------------------------------------------
+
+/** Convert color value to pixel data type
+ */
+template< class Accessor, typename DataType > struct ColorConvert
+{
+    DataType operator()( const Accessor&               acc,
+                         typename Accessor::value_type v ) const
+    {
+        return acc.setter(v);
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+/** Macro generates partial specialization for color-conversion
+    UnaryFunctionAccessorAdapter, and the given getter/setter functors
+ */
+#define BASEBMP_SPECIALIZE_ACCESSORTRAITS(Getter,Setter)          \
+template< class Accessor > struct AccessorTraits<                 \
+    UnaryFunctionAccessorAdapter< Accessor,                       \
+                                  Getter,                         \
+                                  Setter > >                      \
+{                                                                 \
+    typedef typename Accessor::value_type          data_type;     \
+    typedef UnaryFunctionAccessorAdapter<                         \
+        Accessor,                                                 \
+        Getter,                                                   \
+        Setter >                                   accessor_type; \
+    typedef typename accessor_type::value_type     value_type;    \
+    typedef ColorConvert< accessor_type,                          \
+                          data_type >              color_lookup;  \
+    typedef Accessor                               raw_accessor;  \
+    typedef vigra::VigraFalseType                  xor_accessor;  \
+    template< class MaskAccessor,                                 \
+              class Iterator,                                     \
+              class MaskIterator > struct          masked_accessor\
+    { typedef vigra::VigraFalseType type; };                      \
+}
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX */
diff --git a/basebmp/inc/basebmp/pixeliterator.hxx b/basebmp/inc/basebmp/pixeliterator.hxx
new file mode 100644
index 000000000000..84b99942927b
--- /dev/null
+++ b/basebmp/inc/basebmp/pixeliterator.hxx
@@ -0,0 +1,355 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_PIXELITERATOR_HXX
+#define INCLUDED_BASEBMP_PIXELITERATOR_HXX
+
+#include <basebmp/metafunctions.hxx>
+#include <basebmp/stridedarrayiterator.hxx>
+
+#include <vigra/metaprogramming.hxx>
+#include <vigra/diff2d.hxx>
+
+namespace basebmp
+{
+
+template< typename Valuetype > class PixelColumnIterator
+{
+public:
+    typedef Valuetype                           value_type;
+    typedef Valuetype&                          reference;
+    typedef reference                           index_reference;
+    typedef Valuetype*                          pointer;
+    typedef int                                 difference_type;
+    typedef image_traverser_tag                 iterator_category;
+
+    typedef StridedArrayIterator< value_type >  MoveY;
+
+private:
+    MoveY           y;
+
+    bool equal( PixelColumnIterator const & rhs ) const
+    {
+        return rhs.y == y;
+    }
+
+    bool less( PixelColumnIterator const & rhs ) const
+    {
+        return y < rhs.y;
+    }
+
+public:
+    PixelColumnIterator() :
+        y(0)
+    {}
+
+    explicit PixelColumnIterator( const MoveY& pos ) :
+        y(pos)
+    {}
+
+    PixelColumnIterator( const MoveY& pos, int x ) :
+        y(pos,x)
+    {}
+
+    PixelColumnIterator& operator+=( difference_type d )
+    {
+        y += d;
+        return *this;
+    }
+
+    PixelColumnIterator& operator-=( difference_type d )
+    {
+        y -= d;
+        return *this;
+    }
+
+    PixelColumnIterator operator+( difference_type d )
+    {
+        PixelColumnIterator res(*this);
+        res += d;
+        return res;
+    }
+
+    PixelColumnIterator operator-( difference_type d )
+    {
+        PixelColumnIterator res(*this);
+        res -= d;
+        return res;
+    }
+
+    PixelColumnIterator& operator++()
+    {
+        ++y;
+        return *this;
+    }
+
+    PixelColumnIterator& operator--()
+    {
+        --y;
+        return *this;
+    }
+
+    PixelColumnIterator operator++(int)
+    {
+        PixelColumnIterator res(*this);
+        ++y;
+        return res;
+    }
+
+    PixelColumnIterator operator--(int)
+    {
+        PixelColumnIterator res(*this);
+        --y;
+        return res;
+    }
+
+    bool operator==(PixelColumnIterator const & rhs) const
+    {
+        return equal( rhs );
+    }
+
+    bool operator!=(PixelColumnIterator const & rhs) const
+    {
+        return !equal( rhs );
+    }
+
+    bool operator<(PixelColumnIterator const & rhs) const
+    {
+        return less(rhs);
+    }
+
+    bool operator<=(PixelColumnIterator const & rhs) const
+    {
+        return !rhs.less(*this);
+    }
+
+    bool operator>(PixelColumnIterator const & rhs) const
+    {
+        return rhs.less(*this);
+    }
+
+    bool operator>=(PixelColumnIterator const & rhs) const
+    {
+        return !less(rhs);
+    }
+
+    difference_type operator-(PixelColumnIterator const & rhs) const
+    {
+        return y - rhs.y;
+    }
+
+    value_type get() const
+    {
+        return *y();
+    }
+
+    value_type get(difference_type d) const
+    {
+        return *y(d);
+    }
+
+    void set( value_type v ) const
+    {
+        *y() = v;
+    }
+
+    void set( value_type v, difference_type d ) const
+    {
+        *y(d) = v;
+    }
+
+    reference operator*() const
+    {
+        return *y();
+    }
+
+    pointer operator->() const
+    {
+        return y();
+    }
+
+    reference operator[](difference_type d) const
+    {
+        return *y(d);
+    }
+
+    reference operator()(int dy) const
+    {
+        return *y(dy);
+    }
+};
+
+template< typename Valuetype > class PixelIterator
+{
+public:
+    typedef Valuetype                          value_type;
+    typedef Valuetype&                         reference;
+    typedef reference                          index_reference;
+    typedef Valuetype*                         pointer;
+    typedef vigra::Diff2D                      difference_type;
+    typedef image_traverser_tag                iterator_category;
+    typedef pointer                            row_iterator;
+    typedef PixelColumnIterator<value_type>    column_iterator;
+
+    typedef int                                MoveX;
+    typedef StridedArrayIterator< value_type > MoveY;
+
+    // TODO(F2): direction of iteration (ImageIterator can be made to
+    // run backwards)
+
+private:
+    bool equal(PixelIterator const & rhs) const
+    {
+        return (x == rhs.x) && (y == rhs.y);
+    }
+
+    pointer current() const
+    {
+        return y() + x;
+    }
+
+    pointer current(int dx, int dy) const
+    {
+        return y(dy) + x+dx;
+    }
+
+public:
+    PixelIterator() :
+        x(0),
+        y(0)
+    {}
+
+    PixelIterator(pointer base, int ystride) :
+        x(0),
+        y(ystride,base)
+    {}
+
+    bool operator==(PixelIterator const & rhs) const
+    {
+        return equal(rhs);
+    }
+
+    bool operator!=(PixelIterator const & rhs) const
+    {
+        return !equal(rhs);
+    }
+
+    difference_type operator-(PixelIterator const & rhs) const
+    {
+        return difference_type(x - rhs.x, y - rhs.y);
+    }
+
+    MoveX x;
+    MoveY y;
+
+    PixelIterator & operator+=(difference_type const & s)
+    {
+        x += s.x;
+        y += s.y;
+        return *this;
+    }
+
+    PixelIterator & operator-=(difference_type const & s)
+    {
+        x -= s.x;
+        y -= s.y;
+        return *this;
+    }
+
+    PixelIterator operator+(difference_type const & s) const
+    {
+        PixelIterator ret(*this);
+        ret += s;
+        return ret;
+    }
+
+    PixelIterator operator-(difference_type const & s) const
+    {
+        PixelIterator ret(*this);
+        ret -= s;
+        return ret;
+    }
+
+    row_iterator rowIterator() const
+    {
+        return row_iterator(y()+x);
+    }
+
+    column_iterator columnIterator() const
+    {
+        return column_iterator(y,x);
+    }
+
+    value_type get() const
+    {
+        return *current();
+    }
+
+    value_type get(difference_type const & d) const
+    {
+        return *current(d.y, d.x);
+    }
+
+    void set( value_type v ) const
+    {
+        *current() = v;
+    }
+
+    void set( value_type v, difference_type const & d ) const
+    {
+        *current(d.y,d.x) = v;
+    }
+
+    reference operator*() const
+    {
+        return *current();
+    }
+
+    pointer operator->() const
+    {
+        return current();
+    }
+
+    reference operator[]( const vigra::Diff2D& d ) const
+    {
+        return *current(d.x,d.y);
+    }
+
+    reference operator()(int dx, int dy) const
+    {
+        return *current(dx,dy);
+    }
+
+    pointer operator[](int dy) const
+    {
+        return y(dy) + x;
+    }
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_PIXELITERATOR_HXX */
diff --git a/basebmp/inc/basebmp/polypolygonrenderer.hxx b/basebmp/inc/basebmp/polypolygonrenderer.hxx
new file mode 100644
index 000000000000..7cfacad510e5
--- /dev/null
+++ b/basebmp/inc/basebmp/polypolygonrenderer.hxx
@@ -0,0 +1,366 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX
+#define INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygonfillrule.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+#include <vigra/diff2d.hxx>
+#include <vigra/iteratortraits.hxx>
+
+#include <vector>
+
+
+namespace basebmp
+{
+    namespace detail
+    {
+        /// convert int32 to 32:32 fixed point
+        inline sal_Int64 toFractional( sal_Int32 v ) { return (sal_Int64)v << 32; }
+        /// convert double to 32:32 fixed point
+        inline sal_Int64 toFractional( double v ) { return (sal_Int64)(v*SAL_MAX_UINT32 + (v < 0.0 ? -0.5 : 0.5 )); }
+        /// convert 32:32 fixed point to int32 (truncate)
+        inline sal_Int32 toInteger( sal_Int64 v ) { return (sal_Int32)(v < 0 ? ~((~v) >> 32) : v >> 32); }
+        /// convert 32:32 fixed point to int32 (properly rounded)
+        inline sal_Int32 toRoundedInteger( sal_Int64 v ) { return toInteger(v) + (sal_Int32)((v&0x80000000) >> 31); }
+
+        /** internal vertex store -
+
+            Different from B2DPoint, since we don't need floating
+            point coords, but orientation of vertex and y counter
+         */
+        struct Vertex
+        {
+            sal_Int32 mnYCounter;
+            sal_Int64 mnX;
+            sal_Int64 mnXDelta;
+
+            bool      mbDownwards; // needed for nonzero winding rule
+                                   // fills
+
+            Vertex() :
+                mnYCounter(0),
+                mnX(0),
+                mnXDelta(0),
+                mbDownwards(true)
+            {}
+            Vertex( basegfx::B2DPoint const& rPt1,
+                    basegfx::B2DPoint const& rPt2,
+                    bool                     bDownwards ) :
+                mnYCounter( basegfx::fround(rPt2.getY()) -
+                            basegfx::fround(rPt1.getY()) ),
+                mnX( toFractional( basegfx::fround(rPt1.getX()) )),
+                mnXDelta( toFractional(
+                              ((rPt2.getX() - rPt1.getX()) /
+                               (double)mnYCounter) )),
+                mbDownwards(bDownwards)
+            {}
+        };
+
+        typedef std::vector< std::vector<Vertex> > VectorOfVectorOfVertices;
+        typedef std::vector< Vertex* >             VectorOfVertexPtr;
+
+        /// non-templated setup of GET
+        sal_uInt32 setupGlobalEdgeTable( VectorOfVectorOfVertices&      rGET,
+                                         basegfx::B2DPolyPolygon const& rPoly,
+                                         sal_Int32                      nMinY );
+        /// sort rAETSrc, copy not-yet-ended edges over to rAETDest
+        void sortAET( VectorOfVertexPtr& rAETSrc,
+                      VectorOfVertexPtr& rAETDest );
+
+        /// For the STL algorithms
+        struct RasterConvertVertexComparator
+        {
+            RasterConvertVertexComparator() {}
+
+            bool operator()( const Vertex& rLHS,
+                             const Vertex& rRHS ) const
+            {
+                return rLHS.mnX < rRHS.mnX;
+            }
+
+            bool operator()( const Vertex* pLHS,
+                             const Vertex* pRHS ) const
+            {
+                return pLHS->mnX < pRHS->mnX;
+            }
+        };
+
+    } // namespace detail
+
+
+    /** Raster-convert a poly-polygon.
+
+        This algorithm does not perform antialiasing, and thus
+        internally works with integer vertex coordinates.
+
+        @param begin
+        Left, top edge of the destination bitmap. This position is
+        considered (0,0) relative to all polygon vertices
+
+        @param ad
+        Accessor to set pixel values
+
+        @param fillColor
+        Color to use for filling
+
+        @param rClipRect
+        Clipping rectangle, relative to the begin iterator. No pixel outside
+        this clip rect will be modified.
+
+        @param rPoly
+        Polygon to fill
+     */
+    template< class DestIterator, class DestAccessor, typename T >
+    void renderClippedPolyPolygon( DestIterator                   begin,
+                                   DestAccessor                   ad,
+                                   T                              fillColor,
+                                   const basegfx::B2IRange&       rClipRect,
+                                   basegfx::B2DPolyPolygon const& rPoly,
+                                   basegfx::FillRule              eFillRule )
+    {
+        const sal_Int32 nClipX1( std::max((sal_Int32)0,rClipRect.getMinX()) );
+        const sal_Int32 nClipX2( rClipRect.getMaxX() );
+        const sal_Int32 nClipY1( std::max((sal_Int32)0,rClipRect.getMinY()) );
+        const sal_Int32 nClipY2( rClipRect.getMaxY() );
+        const sal_Int64 nClipX1_frac( detail::toFractional(nClipX1) );
+        const sal_Int64 nClipX2_frac( detail::toFractional(nClipX2) );
+
+        basegfx::B2DRange const aPolyBounds( basegfx::tools::getRange(rPoly) );
+
+        const sal_Int32 nMinY( basegfx::fround(aPolyBounds.getMinY()) );
+        const sal_Int32 nMaxY(
+            std::min(
+                nClipY2-1,
+                basegfx::fround(aPolyBounds.getMaxY())));
+
+        if( nMinY > nMaxY )
+            return; // really, nothing to do then.
+
+        detail::VectorOfVectorOfVertices aGET; // the Global Edge Table
+        aGET.resize( nMaxY - nMinY + 1 );
+
+        sal_uInt32 const nVertexCount(
+            detail::setupGlobalEdgeTable( aGET, rPoly, nMinY ) );
+
+
+        // Perform actual scan conversion
+        //----------------------------------------------------------------------
+
+        if( aGET.empty() )
+            return;
+
+        detail::VectorOfVertexPtr      aAET1; // the Active Edge Table
+        detail::VectorOfVertexPtr      aAET2;
+        detail::VectorOfVertexPtr*     pAET = &aAET1;
+        detail::VectorOfVertexPtr*     pAETOther = &aAET2;
+        aAET1.reserve( nVertexCount );
+        aAET2.reserve( nVertexCount );
+
+        // current scanline - initially, points to first scanline
+        // within the clip rect, or to the polygon's first scanline
+        // (whichever is greater)
+        DestIterator aScanline( begin +
+                                vigra::Diff2D(
+                                    0,
+                                    std::max(nMinY,
+                                             nClipY1)) );
+        detail::RasterConvertVertexComparator aComp;
+
+
+        // now process each of the nMaxY - nMinY + 1 scanlines
+        // ------------------------------------------------------------
+
+        for( sal_Int32 y=nMinY; y <= nMaxY; ++y )
+        {
+            if( !aGET[y-nMinY].empty() )
+            {
+                // merge AET with current scanline's new vertices (both
+                // are already correctly sorted)
+                detail::VectorOfVectorOfVertices::value_type::iterator       vertex=aGET[y-nMinY].begin();
+                detail::VectorOfVectorOfVertices::value_type::iterator const end=aGET[y-nMinY].end();
+                while( vertex != end )
+                {
+                    // find insertion pos by binary search, and put ptr
+                    // into active edge vector
+                    pAET->insert( std::lower_bound( pAET->begin(),
+                                                    pAET->end(),
+                                                    &(*vertex),
+                                                    aComp ),
+                                  &(*vertex) );
+
+                    ++vertex;
+                }
+            }
+
+            // with less than two active edges, no fill visible
+            if( pAET->size() >= 2 )
+            {
+                typename vigra::IteratorTraits<DestIterator>::row_iterator
+                    rowIter( aScanline.rowIterator() );
+
+                // process each span in current scanline, with
+                // even-odd fill rule
+                detail::VectorOfVertexPtr::iterator       currVertex( pAET->begin() );
+                detail::VectorOfVertexPtr::iterator const lastVertex( pAET->end()-1 );
+                sal_uInt32                                nCrossedEdges(0);
+                sal_Int32                                 nWindingNumber(0);
+                while( currVertex != lastVertex )
+                {
+                    // TODO(P1): might be worth a try to extend the
+                    // size()==2 case also to the actual filling
+                    // here. YMMV.
+                    detail::Vertex&       rV1( **currVertex );
+                    detail::Vertex const& rV2( **++currVertex );
+
+                    nWindingNumber += -1 + 2*rV1.mbDownwards;
+
+                    // calc fill status for both rules. might save a
+                    // few percent runtime to specialize here...
+                    const bool bEvenOddFill(
+                        eFillRule == basegfx::FillRule_EVEN_ODD && !(nCrossedEdges & 0x01) );
+                    const bool bNonZeroWindingFill(
+                        eFillRule == basegfx::FillRule_NONZERO_WINDING_NUMBER && nWindingNumber != 0 );
+
+                    // is span visible?
+                    if( (bEvenOddFill || bNonZeroWindingFill) &&
+                        y >= nClipY1 &&
+                        rV1.mnX < nClipX2_frac &&
+                        rV2.mnX > nClipX1_frac )
+                    {
+                        // clip span to horizontal bounds
+                        sal_Int32 const nStartX(
+                            std::max( nClipX1,
+                                      std::min( nClipX2-1,
+                                                detail::toRoundedInteger(rV1.mnX) )));
+                        sal_Int32 const nEndX(
+                            std::max( nClipX1,
+                                      std::min( nClipX2,
+                                                detail::toRoundedInteger(rV2.mnX) )));
+
+                        typename vigra::IteratorTraits<DestIterator>::row_iterator
+                            currPix( rowIter + nStartX);
+                        typename vigra::IteratorTraits<DestIterator>::row_iterator
+                            rowEnd( rowIter + nEndX );
+
+                        // TODO(P2): Provide specialized span fill methods on the
+                        // iterator/accessor
+                        while( currPix != rowEnd )
+                            ad.set(fillColor, currPix++);
+                    }
+
+                    // step vertices
+                    rV1.mnX += rV1.mnXDelta;
+                    --rV1.mnYCounter;
+
+                    ++nCrossedEdges;
+                }
+
+                // step vertex also for the last one
+                detail::Vertex& rLastV( **currVertex );
+                rLastV.mnX += rLastV.mnXDelta;
+                --rLastV.mnYCounter;
+
+
+                // prune AET from ended edges, and keep it sorted
+                // ---------------------------------------------------------
+
+                pAETOther->clear();
+                if( pAET->size() == 2 )
+                {
+                    // the case of exactly two active edges is both
+                    // sufficiently common (all 'simple' polygons have
+                    // it), and further more would complicate the
+                    // generic case below (which works with a sliding
+                    // triple of vertices).
+                    if( !aComp(*(*pAET)[0], *(*pAET)[1]) )
+                        std::swap(*(*pAET)[0], *(*pAET)[1]);
+
+                    if( (*pAET)[0]->mnYCounter > 0 )
+                        pAETOther->push_back( (*pAET)[0] );
+                    if( (*pAET)[1]->mnYCounter > 0 )
+                        pAETOther->push_back( (*pAET)[1] );
+                }
+                else
+                {
+                    bool bFallbackTaken(false);
+                    currVertex = pAET->begin();
+                    detail::VectorOfVertexPtr::iterator prevVertex( currVertex );
+                    while( currVertex != lastVertex )
+                    {
+                        // try to get away with one linear swoop and
+                        // simple neighbor swapping. this is an
+                        // overwhelmingly common case - polygons with
+                        // excessively crisscrossing edges (which on
+                        // top of that cross more than one other edge
+                        // per scanline) are seldom. And even if we
+                        // get such a beast here, this extra loop has
+                        // still only linear cost
+                        if( aComp(**(currVertex+1),**currVertex) )
+                        {
+                            std::swap(*currVertex, *(currVertex+1));
+
+                            if( aComp(**currVertex,**prevVertex) )
+                            {
+                                // one swap was not sufficient -
+                                // fallback to generic sort algo, then
+                                detail::sortAET(*pAET, *pAETOther);
+                                bFallbackTaken = true;
+                                break;
+                            }
+                        }
+
+                        if( (*currVertex)->mnYCounter > 0 )
+                            pAETOther->push_back( *currVertex );
+
+                        prevVertex = currVertex++;
+                    }
+
+                    // don't forget to add last vertex (loop above
+                    // only deals with n-1 vertices)
+                    if( !bFallbackTaken && (*currVertex)->mnYCounter > 0 )
+                        pAETOther->push_back( *currVertex );
+                }
+
+                std::swap( pAET, pAETOther );
+            }
+
+            if( y >= nClipY1 )
+                ++aScanline.y;
+        }
+    }
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX */
diff --git a/basebmp/inc/basebmp/rgb24pixelformats.hxx b/basebmp/inc/basebmp/rgb24pixelformats.hxx
new file mode 100644
index 000000000000..788144a50b8d
--- /dev/null
+++ b/basebmp/inc/basebmp/rgb24pixelformats.hxx
@@ -0,0 +1,98 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX
+#define INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX
+
+#include <basebmp/color.hxx>
+#include <basebmp/accessor.hxx>
+#include <basebmp/pixeliterator.hxx>
+#include <basebmp/pixelformatadapters.hxx>
+
+#include <vigra/rgbvalue.hxx>
+
+#include <functional>
+
+namespace basebmp
+{
+
+template< typename PixelType, typename ColorType > struct RGBValueGetter :
+        public std::unary_function<PixelType, ColorType>
+{
+    ColorType operator()( PixelType const& c ) const
+    {
+        return ColorType(c.red(),c.green(),c.blue());
+    }
+};
+
+template< typename PixelType, typename ColorType > struct RGBValueSetter :
+    public std::unary_function<ColorType, PixelType>
+{
+    PixelType operator()( ColorType const& c ) const
+    {
+        PixelType res;
+        res.setRed(c.getRed());
+        res.setGreen(c.getGreen());
+        res.setBlue(c.getBlue());
+        return res;
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+template< typename PixelType > struct PixelFormatTraitsTemplate_RGBValue
+{
+    typedef PixelType                     pixel_type;
+
+    typedef RGBValueGetter<pixel_type,
+                           Color>         getter_type;
+    typedef RGBValueSetter<pixel_type,
+                           Color>         setter_type;
+
+    typedef PixelIterator<pixel_type>     iterator_type;
+    typedef StandardAccessor<pixel_type>  raw_accessor_type;
+    typedef AccessorSelector<
+        getter_type, setter_type>         accessor_selector;
+};
+
+//-----------------------------------------------------------------------------
+
+// 24bpp RGB
+typedef PixelFormatTraitsTemplate_RGBValue<
+    vigra::RGBValue<sal_uInt8> >            PixelFormatTraits_RGB24;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGB24::getter_type,
+                                  PixelFormatTraits_RGB24::setter_type);
+
+// 24bpp BGR
+typedef PixelFormatTraitsTemplate_RGBValue<
+    vigra::RGBValue<sal_uInt8,2,1,0> >      PixelFormatTraits_BGR24;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGR24::getter_type,
+                                  PixelFormatTraits_BGR24::setter_type);
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX */
diff --git a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
new file mode 100644
index 000000000000..d42125239529
--- /dev/null
+++ b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
@@ -0,0 +1,289 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX
+#define INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX
+
+#include <basebmp/color.hxx>
+#include <basebmp/colortraits.hxx>
+#include <basebmp/accessor.hxx>
+#include <basebmp/pixeliterator.hxx>
+#include <basebmp/pixelformatadapters.hxx>
+#include <basebmp/metafunctions.hxx>
+#include <basebmp/endian.hxx>
+
+#include <vigra/numerictraits.hxx>
+#include <vigra/metaprogramming.hxx>
+
+#include <functional>
+
+namespace basebmp
+{
+
+/** Base class operating on RGB truecolor mask pixel
+
+    Use this template, if you have an (integer) pixel type, and three
+    bitmasks denoting where the channel bits are.
+
+    @tpl PixelType
+    Input pixel type to operate on
+
+    @tpl ColorType
+    Underlying color type, to convert the pixel values into
+
+    @tpl RedMask
+    Bitmask, to access the red bits in the data type
+
+    @tpl GreenMask
+    Bitmask, to access the green bits in the data type
+
+    @tpl BlueMask
+    Bitmask, to access the blue bits in the data type
+
+    @tpl SwapBytes
+    When true, the final pixel values will be byte-swapped before
+    passed on.
+ */
+template< typename     PixelType,
+          typename     ColorType,
+          unsigned int RedMask,
+          unsigned int GreenMask,
+          unsigned int BlueMask,
+          bool         SwapBytes > struct RGBMaskFunctorBase
+{
+    typedef PixelType                                       pixel_type;
+    typedef ColorType                                       color_type;
+    typedef typename make_unsigned<pixel_type>::type        unsigned_pixel_type;
+    typedef typename ColorTraits<ColorType>::component_type component_type;
+
+    // calc corrective shifts for all three channels in advance
+    enum {
+        red_shift   = numberOfTrailingZeros<RedMask>::value,
+        green_shift = numberOfTrailingZeros<GreenMask>::value,
+        blue_shift  = numberOfTrailingZeros<BlueMask>::value,
+
+        red_bits    = bitcount<RedMask>::value,
+        green_bits  = bitcount<GreenMask>::value,
+        blue_bits   = bitcount<BlueMask>::value
+    };
+};
+
+template< typename     PixelType,
+          typename     ColorType,
+          unsigned int RedMask,
+          unsigned int GreenMask,
+          unsigned int BlueMask,
+          bool         SwapBytes > struct RGBMaskGetter :
+        public RGBMaskFunctorBase<PixelType,
+                                  ColorType,
+                                  RedMask,
+                                  GreenMask,
+                                  BlueMask,
+                                  SwapBytes>,
+        public std::unary_function<PixelType, ColorType>
+{
+    typedef RGBMaskFunctorBase<PixelType,
+                               ColorType,
+                               RedMask,
+                               GreenMask,
+                               BlueMask,
+                               SwapBytes> base_type;
+
+    ColorType operator()( PixelType v ) const
+    {
+        v = SwapBytes ? byteSwap(v) : v;
+
+        const typename base_type::unsigned_pixel_type red  (v & RedMask);
+        const typename base_type::unsigned_pixel_type green(v & GreenMask);
+        const typename base_type::unsigned_pixel_type blue (v & BlueMask);
+
+        // shift color nibbles to right-aligend position. ORing it
+        // channel value shifted twice the number of channel bits, to
+        // spread the value into the component_type range
+        ColorType res( (shiftRight(red,
+                                   base_type::red_shift-8*
+                                   (signed)sizeof(typename base_type::component_type)+
+                                   base_type::red_bits)) |
+                       (shiftRight(red,
+                                   base_type::red_shift-8*
+                                   (signed)sizeof(typename base_type::component_type)+
+                                   2*base_type::red_bits)),
+
+                       (shiftRight(green,
+                                   base_type::green_shift-8*
+                                   (signed)sizeof(typename base_type::component_type)+
+                                   base_type::green_bits)) |
+                       (shiftRight(green,
+                                   base_type::green_shift-8*
+                                   (signed)sizeof(typename base_type::component_type)+
+                                   2*base_type::green_bits)),
+
+                       (shiftRight(blue,
+                                   base_type::blue_shift-8*
+                                   (signed)sizeof(typename base_type::component_type)+
+                                   base_type::blue_bits)) |
+                       (shiftRight(blue,
+                                   base_type::blue_shift-8*
+                                   (signed)sizeof(typename base_type::component_type)+
+                                   2*base_type::blue_bits)) );
+        return res;
+    }
+};
+
+template< typename     PixelType,
+          typename     ColorType,
+          unsigned int RedMask,
+          unsigned int GreenMask,
+          unsigned int BlueMask,
+          bool         SwapBytes > struct RGBMaskSetter :
+        public RGBMaskFunctorBase<PixelType,
+                                  ColorType,
+                                  RedMask,
+                                  GreenMask,
+                                  BlueMask,
+                                  SwapBytes>,
+        public std::unary_function<ColorType, PixelType>
+{
+    typedef RGBMaskFunctorBase<PixelType,
+                               ColorType,
+                               RedMask,
+                               GreenMask,
+                               BlueMask,
+                               SwapBytes> base_type;
+
+    PixelType operator()( ColorType const& c ) const
+    {
+        const typename base_type::unsigned_pixel_type red  (c.getRed());
+        const typename base_type::unsigned_pixel_type green(c.getGreen());
+        const typename base_type::unsigned_pixel_type blue (c.getBlue());
+
+        typename base_type::unsigned_pixel_type res(
+            (shiftLeft(red,
+                       base_type::red_shift-8*
+                       (signed)sizeof(typename base_type::component_type)+
+                       base_type::red_bits) & RedMask) |
+            (shiftLeft(green,
+                       base_type::green_shift-8*
+                       (signed)sizeof(typename base_type::component_type)+
+                       base_type::green_bits) & GreenMask) |
+            (shiftLeft(blue,
+                       base_type::blue_shift-8*
+                       (signed)sizeof(typename base_type::component_type)+
+                       base_type::blue_bits) & BlueMask) );
+
+        return SwapBytes ? byteSwap(res) : res;
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+template< typename     PixelType,
+          unsigned int RedMask,
+          unsigned int GreenMask,
+          unsigned int BlueMask,
+          bool         SwapBytes > struct PixelFormatTraitsTemplate_RGBMask
+{
+    typedef PixelType                           pixel_type;
+
+    typedef RGBMaskGetter<pixel_type,
+                          Color,
+                          RedMask,
+                          GreenMask,
+                          BlueMask,
+                          SwapBytes>            getter_type;
+    typedef RGBMaskSetter<pixel_type,
+                          Color,
+                          RedMask,
+                          GreenMask,
+                          BlueMask,
+                          SwapBytes>            setter_type;
+
+    typedef PixelIterator<pixel_type>           iterator_type;
+    typedef StandardAccessor<pixel_type>        raw_accessor_type;
+    typedef AccessorSelector<
+        getter_type, setter_type>               accessor_selector;
+};
+
+//-----------------------------------------------------------------------------
+
+#ifdef OSL_LITENDIAN
+# define BASEBMP_TRUECOLORMASK_LSB_SWAP false
+# define BASEBMP_TRUECOLORMASK_MSB_SWAP true
+#else
+# ifdef OSL_BIGENDIAN
+#  define BASEBMP_TRUECOLORMASK_LSB_SWAP true
+#  define BASEBMP_TRUECOLORMASK_MSB_SWAP false
+# else
+#  error Undetermined endianness!
+# endif
+#endif
+
+//-----------------------------------------------------------------------------
+
+// 16bpp MSB RGB
+typedef PixelFormatTraitsTemplate_RGBMask<
+    sal_uInt16,
+    0xF800,
+    0x07E0,
+    0x001F,
+    BASEBMP_TRUECOLORMASK_MSB_SWAP >            PixelFormatTraits_RGB16_565_MSB;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGB16_565_MSB::getter_type,
+                                  PixelFormatTraits_RGB16_565_MSB::setter_type);
+
+// 16bpp LSB RGB
+typedef PixelFormatTraitsTemplate_RGBMask<
+    sal_uInt16,
+    0xF800,
+    0x07E0,
+    0x001F,
+    BASEBMP_TRUECOLORMASK_LSB_SWAP >            PixelFormatTraits_RGB16_565_LSB;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGB16_565_LSB::getter_type,
+                                  PixelFormatTraits_RGB16_565_LSB::setter_type);
+
+// 32bpp endian-sensitive RGB
+typedef PixelFormatTraitsTemplate_RGBMask<
+    sal_uInt32,
+    0xFF0000,
+    0x00FF00,
+    0x0000FF,
+    BASEBMP_TRUECOLORMASK_LSB_SWAP >            PixelFormatTraits_RGB32_888;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGB32_888::getter_type,
+                                  PixelFormatTraits_RGB32_888::setter_type);
+
+// 32bpp endian-sensitive BGR
+typedef PixelFormatTraitsTemplate_RGBMask<
+    sal_uInt32,
+    0xFF0000,
+    0x00FF00,
+    0x0000FF,
+    BASEBMP_TRUECOLORMASK_MSB_SWAP >            PixelFormatTraits_BGR32_888;
+BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGR32_888::getter_type,
+                                  PixelFormatTraits_BGR32_888::setter_type);
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX */
diff --git a/basebmp/inc/basebmp/scaleimage.hxx b/basebmp/inc/basebmp/scaleimage.hxx
new file mode 100644
index 000000000000..cb83e1353d5c
--- /dev/null
+++ b/basebmp/inc/basebmp/scaleimage.hxx
@@ -0,0 +1,195 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_SCALEIMAGE_HXX
+#define INCLUDED_BASEBMP_SCALEIMAGE_HXX
+
+#include <osl/diagnose.h>
+
+#include <vigra/tuple.hxx>
+#include <vigra/copyimage.hxx>
+#include <vigra/basicimage.hxx>
+#include <vigra/iteratortraits.hxx>
+
+namespace basebmp
+{
+
+template< class SourceIter, class SourceAcc,
+          class DestIter, class DestAcc >
+void scaleLine( SourceIter      s_begin,
+                SourceIter      s_end,
+                SourceAcc       s_acc,
+                DestIter        d_begin,
+                DestIter        d_end,
+                DestAcc         d_acc )
+{
+    const int src_width  = s_end - s_begin;
+    const int dest_width = d_end - d_begin;
+
+    OSL_ASSERT( src_width > 0 && dest_width > 0 );
+
+    if( src_width >= dest_width )
+    {
+        // shrink
+        int rem = 0;
+        while( s_begin != s_end )
+        {
+            if( rem >= 0 )
+            {
+                d_acc.set( s_acc(s_begin), d_begin );
+
+                rem -= src_width;
+                ++d_begin;
+            }
+
+            rem += dest_width;
+            ++s_begin;
+        }
+    }
+    else
+    {
+        // enlarge
+        int rem = -dest_width;
+        while( d_begin != d_end )
+        {
+            if( rem >= 0 )
+            {
+                rem -= dest_width;
+                ++s_begin;
+            }
+
+            d_acc.set( s_acc(s_begin), d_begin );
+
+            rem += src_width;
+            ++d_begin;
+        }
+    }
+}
+
+/** Scale an image using zero order interpolation (pixel replication)
+
+    Source and destination range must be at least one pixel wide and
+    high.
+
+    @param s_begin
+    Start iterator for source image
+
+    @param s_end
+    End iterator for source image
+
+    @param s_acc
+    Source accessor
+
+    @param d_begin
+    Start iterator for destination image
+
+    @param d_end
+    End iterator for destination image
+
+    @param d_acc
+    Destination accessor
+
+    @param bMustCopy
+    When true, scaleImage always copies source, even when doing 1:1
+    copy
+ */
+template< class SourceIter, class SourceAcc,
+          class DestIter, class DestAcc >
+void scaleImage( SourceIter      s_begin,
+                 SourceIter      s_end,
+                 SourceAcc       s_acc,
+                 DestIter        d_begin,
+                 DestIter        d_end,
+                 DestAcc         d_acc,
+                 bool            bMustCopy=false )
+{
+    const int src_width ( s_end.x - s_begin.x );
+    const int src_height( s_end.y - s_begin.y );
+
+    const int dest_width ( d_end.x - d_begin.x );
+    const int dest_height( d_end.y - d_begin.y );
+
+    if( !bMustCopy &&
+        src_width == dest_width &&
+        src_height == dest_height )
+    {
+        // no scaling involved, can simply copy
+        vigra::copyImage( s_begin, s_end, s_acc,
+                          d_begin, d_acc );
+        return;
+    }
+
+    typedef vigra::BasicImage<typename SourceAcc::value_type> TmpImage;
+    typedef typename TmpImage::traverser TmpImageIter;
+
+    TmpImage     tmp_image(src_width,
+                           dest_height);
+    TmpImageIter t_begin = tmp_image.upperLeft();
+
+    // scale in y direction
+    for( int x=0; x<src_width; ++x, ++s_begin.x, ++t_begin.x )
+    {
+        typename SourceIter::column_iterator   s_cbegin = s_begin.columnIterator();
+        typename TmpImageIter::column_iterator t_cbegin = t_begin.columnIterator();
+
+        scaleLine(s_cbegin, s_cbegin+src_height, s_acc,
+                  t_cbegin, t_cbegin+dest_height, tmp_image.accessor());
+    }
+
+    t_begin = tmp_image.upperLeft();
+
+    // scale in x direction
+    for( int y=0; y<dest_height; ++y, ++d_begin.y, ++t_begin.y )
+    {
+        typename DestIter::row_iterator     d_rbegin = d_begin.rowIterator();
+        typename TmpImageIter::row_iterator t_rbegin = t_begin.rowIterator();
+
+        scaleLine(t_rbegin, t_rbegin+src_width, tmp_image.accessor(),
+                  d_rbegin, d_rbegin+dest_width, d_acc);
+    }
+}
+
+/** Scale an image, range tuple version
+
+    @param bMustCopy
+    When true, scaleImage always copies source, even when doing 1:1
+    copy
+ */
+template< class SourceIter, class SourceAcc,
+          class DestIter, class DestAcc >
+inline void scaleImage( vigra::triple<SourceIter,SourceIter,SourceAcc> const& src,
+                        vigra::triple<DestIter,DestIter,DestAcc> const&       dst,
+                        bool                                                  bMustCopy=false )
+{
+    scaleImage(src.first,src.second,src.third,
+               dst.first,dst.second,dst.third,
+               bMustCopy);
+}
+
+}
+
+#endif /* INCLUDED_BASEBMP_SCALEIMAGE_HXX */
diff --git a/basebmp/inc/basebmp/scanlineformats.hxx b/basebmp/inc/basebmp/scanlineformats.hxx
new file mode 100644
index 000000000000..d83aea688a37
--- /dev/null
+++ b/basebmp/inc/basebmp/scanlineformats.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_SCANLINEFORMATS_HXX
+#define INCLUDED_BASEBMP_SCANLINEFORMATS_HXX
+
+#include <sal/types.h>
+
+/* Definition of Scanline formats */
+
+namespace basebmp { namespace Format
+{
+    static const sal_Int32 NONE                         = 0;
+    static const sal_Int32 ONE_BIT_MSB_GREY             = (sal_Int32)0x01;
+    static const sal_Int32 ONE_BIT_LSB_GREY             = (sal_Int32)0x02;
+    static const sal_Int32 ONE_BIT_MSB_PAL              = (sal_Int32)0x03;
+    static const sal_Int32 ONE_BIT_LSB_PAL              = (sal_Int32)0x04;
+    static const sal_Int32 FOUR_BIT_MSB_GREY            = (sal_Int32)0x05;
+    static const sal_Int32 FOUR_BIT_LSB_GREY            = (sal_Int32)0x06;
+    static const sal_Int32 FOUR_BIT_MSB_PAL             = (sal_Int32)0x07;
+    static const sal_Int32 FOUR_BIT_LSB_PAL             = (sal_Int32)0x08;
+    static const sal_Int32 EIGHT_BIT_PAL                = (sal_Int32)0x09;
+    static const sal_Int32 EIGHT_BIT_GREY               = (sal_Int32)0x0A;
+    static const sal_Int32 SIXTEEN_BIT_LSB_TC_MASK      = (sal_Int32)0x0B;
+    static const sal_Int32 SIXTEEN_BIT_MSB_TC_MASK      = (sal_Int32)0x0C;
+    static const sal_Int32 TWENTYFOUR_BIT_TC_MASK       = (sal_Int32)0x0D;
+    static const sal_Int32 THIRTYTWO_BIT_TC_MASK        = (sal_Int32)0x0E;
+    static const sal_Int32 THIRTYTWO_BIT_TC_MASK_ARGB   = (sal_Int32)0x0F;
+    static const sal_Int32 MAX                          = (sal_Int32)0x0F;
+} }
+
+#endif /* INCLUDED_BASEBMP_SCANLINEFORMATS_HXX */
diff --git a/basebmp/inc/basebmp/stridedarrayiterator.hxx b/basebmp/inc/basebmp/stridedarrayiterator.hxx
new file mode 100644
index 000000000000..8139cc8a8bc9
--- /dev/null
+++ b/basebmp/inc/basebmp/stridedarrayiterator.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX
+#define INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX
+
+#include <basebmp/metafunctions.hxx>
+
+namespace basebmp
+{
+
+/** Like vigra::StridedArrayIterator
+
+    Changed semantics re. DirectionSelector<StridedArrayTag>: stride
+    now counts in <em>raw</em> bytes
+
+    Adapts given ptr, in a way that iterator increments move forward
+    in strided steps. Stride can, by the way, also be negative
+ */
+template< typename T > class StridedArrayIterator
+{
+public:
+    typedef typename clone_const<T, unsigned char>::type  internal_type;
+
+    /** Create iterator
+
+        @param stride
+
+        Stride in bytes. Given value should better match memory layout
+        of T, as memory gets reinterpret-casted.
+     */
+    explicit StridedArrayIterator(int stride, T* ptr = 0) :
+        stride_(stride),
+        current_(reinterpret_cast<internal_type*>(ptr))
+    {}
+
+    /** Copy from other StridedArrayIterator, plus given offset
+
+        @param offset
+        Offset in bytes
+     */
+    StridedArrayIterator( StridedArrayIterator const& rSrc,
+                          int                         offset ) :
+        stride_(rSrc.stride_),
+        current_(reinterpret_cast<internal_type*>(
+                     reinterpret_cast<T*>(rSrc.current_)+offset))
+    {}
+
+    void operator++()       {current_ += stride_; }
+    void operator++(int)    {current_ += stride_; }
+    void operator--()       {current_ -= stride_; }
+    void operator--(int)    {current_ -= stride_; }
+    void operator+=(int dy) {current_ += dy*stride_; }
+    void operator-=(int dy) {current_ -= dy*stride_; }
+
+    int operator-(StridedArrayIterator const & rhs) const
+    { return (current_ - rhs.current_) / stride_; }
+
+    bool operator==(StridedArrayIterator const & rhs) const
+    { return current_ == rhs.current_; }
+
+    bool operator!=(StridedArrayIterator const & rhs) const
+    { return current_ != rhs.current_; }
+
+    bool operator<(StridedArrayIterator const & rhs) const
+    { return *this - rhs < 0; }
+
+    bool operator<=(StridedArrayIterator const & rhs) const
+    { return *this - rhs <= 0; }
+
+    bool operator>(StridedArrayIterator const & rhs) const
+    { return *this - rhs > 0; }
+
+    bool operator>=(StridedArrayIterator const & rhs) const
+    { return *this - rhs >= 0; }
+
+    T* operator()() const
+    { return reinterpret_cast<T*>(current_); }
+
+    T* operator()(int d) const
+    { return reinterpret_cast<T*>(current_ + d*stride_); }
+
+private:
+    int            stride_;
+    internal_type* current_;
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX */
diff --git a/basebmp/inc/basebmp/tools.hxx b/basebmp/inc/basebmp/tools.hxx
new file mode 100644
index 000000000000..d7ca0423ac1f
--- /dev/null
+++ b/basebmp/inc/basebmp/tools.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_TOOLS_HXX
+#define INCLUDED_BASEBMP_TOOLS_HXX
+
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <vigra/tuple.hxx>
+#include <vigra/diff2d.hxx>
+
+namespace basebmp
+{
+    inline vigra::Diff2D topLeft( const basegfx::B2IRange& rRange )
+    { return vigra::Diff2D(rRange.getMinX(),rRange.getMinY()); }
+
+    inline vigra::Diff2D bottomRight( const basegfx::B2IRange& rRange )
+    { return vigra::Diff2D(rRange.getMaxX(),rRange.getMaxY()); }
+
+    template< class Iterator, class Accessor >
+    inline vigra::triple<Iterator,Iterator,Accessor>
+    destIterRange(Iterator const&          begin,
+                  Accessor const&          accessor,
+                  const basegfx::B2IRange& rRange)
+    {
+        return vigra::triple<Iterator,Iterator,Accessor>(
+            begin + topLeft(rRange),
+            begin + bottomRight(rRange),
+            accessor);
+    }
+
+    template< class Iterator, class Accessor >
+    inline vigra::triple<Iterator,Iterator,Accessor>
+    srcIterRange(Iterator const&          begin,
+                 Accessor const&          accessor,
+                 const basegfx::B2IRange& rRange)
+    {
+        return vigra::triple<Iterator,Iterator,Accessor>(
+            begin + topLeft(rRange),
+            begin + bottomRight(rRange),
+            accessor);
+    }
+
+    template< class Iterator, class Accessor >
+    inline vigra::pair<Iterator,Accessor>
+    srcIter(Iterator const&          begin,
+            Accessor const&          accessor,
+            const basegfx::B2IPoint& rPt)
+    {
+        return vigra::pair<Iterator,Accessor>(
+            begin + vigra::Diff2D(rPt.getX(),rPt.getY()),
+            accessor);
+    }
+
+    template< class Iterator, class Accessor >
+    inline vigra::pair<Iterator,Accessor>
+    destIter(Iterator const&          begin,
+             Accessor const&          accessor,
+             const basegfx::B2IPoint& rPt)
+    {
+        return vigra::pair<Iterator,Accessor>(
+            begin + vigra::Diff2D(rPt.getX(),rPt.getY()),
+            accessor);
+    }
+}
+
+#endif /* INCLUDED_BASEBMP_TOOLS_HXX */
diff --git a/basebmp/inc/basebmp/truecolormaskaccessor.hxx b/basebmp/inc/basebmp/truecolormaskaccessor.hxx
new file mode 100644
index 000000000000..d4e3ff33f30e
--- /dev/null
+++ b/basebmp/inc/basebmp/truecolormaskaccessor.hxx
@@ -0,0 +1,290 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_TRUECOLORMASKACCESSOR_HXX
+#define INCLUDED_BASEBMP_TRUECOLORMASKACCESSOR_HXX
+
+#include <basebmp/colortraits.hxx>
+#include <basebmp/accessortraits.hxx>
+#include <basebmp/metafunctions.hxx>
+#include <basebmp/endian.hxx>
+
+#include <vigra/numerictraits.hxx>
+#include <vigra/metaprogramming.hxx>
+
+namespace basebmp
+{
+
+namespace
+{
+    /// Shift left for positive shift value, and right otherwise
+    template< typename T > inline T shiftLeft( T v, int shift )
+    {
+        return shift > 0 ? v << shift : v >> (-shift);
+    }
+
+    /// Shift right for positive shift value, and left otherwise
+    template< typename T > inline T shiftRight( T v, int shift )
+    {
+        return shift > 0 ? v >> shift : v << (-shift);
+    }
+}
+
+/** Access true color data, which is pixel-packed into a POD.
+
+    @tpl Accessor
+    Wrapped accessor, used to access the actual pixel values
+
+    @tpl ColorType
+    Underlying color type, to convert the pixel values into
+
+    @tpl RedMask
+    Bitmask, to access the red bits in the data type
+
+    @tpl GreenMask
+    Bitmask, to access the green bits in the data type
+
+    @tpl BlueMask
+    Bitmask, to access the blue bits in the data type
+
+    @tpl SwapBytes
+    When true, the final pixel values will be byte-swapped before
+    passed to/from the iterator.
+ */
+template< class    Accessor,
+          typename ColorType,
+          int      RedMask,
+          int      GreenMask,
+          int      BlueMask,
+          bool     SwapBytes > class TrueColorMaskAccessor
+{
+public:
+    typedef typename Accessor::value_type                   data_type;
+    typedef ColorType                                       value_type;
+    typedef typename make_unsigned<data_type>::type         unsigned_data_type;
+    typedef typename ColorTraits<ColorType>::component_type component_type;
+
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+// making all members public, if no member template friends
+private:
+    template<class A, typename C, int R, int G, int B, bool S> friend class TrueColorMaskAccessor;
+#endif
+
+    Accessor     maAccessor;
+
+public:
+    // calc corrective shifts for all three channels in advance
+    enum {
+        red_shift   = numberOfTrailingZeros<RedMask>::value,
+        green_shift = numberOfTrailingZeros<GreenMask>::value,
+        blue_shift  = numberOfTrailingZeros<BlueMask>::value,
+
+        red_bits    = bitcount<RedMask>::value,
+        green_bits  = bitcount<GreenMask>::value,
+        blue_bits   = bitcount<BlueMask>::value
+    };
+
+    // -------------------------------------------------------
+
+    TrueColorMaskAccessor() :
+        maAccessor()
+    {}
+
+    template< class A > explicit
+    TrueColorMaskAccessor( TrueColorMaskAccessor< A,
+                                                  ColorType,
+                                                  RedMask,
+                                                  GreenMask,
+                                                  BlueMask,
+                                                  SwapBytes > const& rSrc ) :
+        maAccessor( rSrc.maAccessor )
+    {}
+
+    template< class T > explicit TrueColorMaskAccessor( T accessor ) :
+        maAccessor(accessor)
+    {}
+
+    // -------------------------------------------------------
+
+    Accessor const& getWrappedAccessor() const { return maAccessor; }
+    Accessor&       getWrappedAccessor() { return maAccessor; }
+
+    // -------------------------------------------------------
+
+    value_type toValue( unsigned_data_type v ) const
+    {
+        v = SwapBytes ? byteSwap(v) : v;
+
+        const unsigned_data_type red  (v & RedMask);
+        const unsigned_data_type green(v & GreenMask);
+        const unsigned_data_type blue (v & BlueMask);
+
+        value_type res( (shiftRight(red,
+                                    red_shift-8*sizeof(component_type)+red_bits)) |
+                        (shiftRight(red,
+                                    red_shift-8*sizeof(component_type)+2*red_bits)),
+
+                        (shiftRight(green,
+                                    green_shift-8*sizeof(component_type)+green_bits)) |
+                        (shiftRight(green,
+                                    green_shift-8*sizeof(component_type)+2*green_bits)),
+
+                        (shiftRight(blue,
+                                    blue_shift-8*sizeof(component_type)+blue_bits)) |
+                        (shiftRight(blue,
+                                    blue_shift-8*sizeof(component_type)+2*blue_bits)) );
+        return res;
+    }
+
+    data_type toPacked( value_type v ) const
+    {
+        const unsigned_data_type red  (v.getRed());
+        const unsigned_data_type green(v.getGreen());
+        const unsigned_data_type blue (v.getBlue());
+
+        unsigned_data_type res(
+            (shiftLeft(red,
+                       red_shift-8*sizeof(component_type)+red_bits) & RedMask) |
+            (shiftLeft(green,
+                       green_shift-8*sizeof(component_type)+green_bits) & GreenMask) |
+            (shiftLeft(blue,
+                       blue_shift-8*sizeof(component_type)+blue_bits) & BlueMask) );
+
+        return SwapBytes ? byteSwap(res) : res;
+    }
+
+    // -------------------------------------------------------
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const
+    {
+        return toValue(
+            unsigned_cast<data_type>( maAccessor(i)) );
+    }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return toValue(
+            unsigned_cast<data_type>( maAccessor(i,diff)) );
+    }
+
+    // -------------------------------------------------------
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        maAccessor.set(
+            toPacked(
+                vigra::detail::RequiresExplicitCast<value_type>::cast(
+                    value) ),
+            i);
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        maAccessor.set(
+            toPacked(
+                vigra::detail::RequiresExplicitCast<value_type>::cast(
+                    value)),
+            i,
+            diff );
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+/** Convert Color to packed true color value for TrueColorMaskAccessor
+ */
+template< class Accessor > struct ColorConvert
+{
+    typename Accessor::data_type operator()( const Accessor&               acc,
+                                             typename Accessor::value_type v )
+    {
+        return acc.toPacked(v);
+    }
+};
+
+//-----------------------------------------------------------------------------
+
+// partial specialization for TrueColorMaskAccessor
+template< class    Accessor,
+          typename ColorType,
+          int      RedMask,
+          int      GreenMask,
+          int      BlueMask,
+          bool     SwapBytes > struct AccessorTraits<
+    TrueColorMaskAccessor< Accessor,
+                           ColorType,
+                           RedMask,
+                           GreenMask,
+                           BlueMask,
+                           SwapBytes > >
+{
+    /// value type of described accessor
+    typedef typename TrueColorMaskAccessor< Accessor,
+                                            ColorType,
+                                            RedMask,
+                                            GreenMask,
+                                            BlueMask,
+                                            SwapBytes >::value_type  value_type;
+
+    /// Retrieve stand-alone color lookup function for given Accessor type
+    typedef ColorConvert< TrueColorMaskAccessor< Accessor,
+                                                 ColorType,
+                                                 RedMask,
+                                                 GreenMask,
+                                                 BlueMask,
+                                                 SwapBytes > >        color_lookup;
+
+    /// Retrieve raw pixel data accessor for given Accessor type
+    typedef Accessor                                                 raw_accessor;
+
+    /** accessor for XOR setter access is disabled, since the results
+     *  are usually completely unintended - you'll usually want to
+     *  wrap an xor_accessor with a TrueColorMaskAccessor, not the
+     *  other way around.
+     */
+    typedef vigra::VigraFalseType                                    xor_accessor;
+
+    /** accessor for masked setter access is disabled, since the
+     *  results are usually completely unintended - you'll usually
+     *  want to wrap a masked_accessor with a TrueColorMaskAccessor,
+     *  not the other way around.
+     */
+    template< class MaskAccessor,
+              class Iterator,
+              class MaskIterator > struct                            masked_accessor
+    {
+        typedef vigra::VigraFalseType type;
+    };
+};
+
+} // namespace basebmp
+
+#endif /* INCLUDED_BASEBMP_TRUECOLORMASKACCESSOR_HXX */
diff --git a/basebmp/prj/build.lst b/basebmp/prj/build.lst
new file mode 100644
index 000000000000..b68e8f2eb6fd
--- /dev/null
+++ b/basebmp/prj/build.lst
@@ -0,0 +1,5 @@
+bx	basebmp	:	sal VIGRA:vigra basegfx BOOST:boost NULL
+bx	basebmp									usr1	-	all	bx_mkout NULL
+bx	basebmp\source							nmake	-	all	bx_source NULL
+bx	basebmp\util							nmake	-	all	bx_util bx_source NULL
+bx	basebmp\test							nmake	-	all	bx_test bx_util NULL
diff --git a/basebmp/prj/d.lst b/basebmp/prj/d.lst
new file mode 100644
index 000000000000..e94118c72b9d
--- /dev/null
+++ b/basebmp/prj/d.lst
@@ -0,0 +1,9 @@
+..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib%_EXT%\ibasebmp.lib
+
+..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin%_EXT%\basebmp?????.dll
+
+..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib%_EXT%\libbasebmp*.*
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+
+mkdir: %_DEST%\inc%_EXT%\basebmp
+..\inc\basebmp\*.hxx %_DEST%\inc%_EXT%\basebmp\*.hxx
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
new file mode 100644
index 000000000000..4e179c3a0ce0
--- /dev/null
+++ b/basebmp/source/bitmapdevice.cxx
@@ -0,0 +1,2064 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// FIXME: in vigra
+#if defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x580)
+#include <math.h> // needed for fabs, hypot
+#endif
+#include "basebmp/bitmapdevice.hxx"
+
+#include "basebmp/compositeiterator.hxx"
+#include "basebmp/iteratortraits.hxx"
+
+#include "basebmp/accessor.hxx"
+#include "basebmp/accessortraits.hxx"
+#include "basebmp/accessoradapters.hxx"
+#include "basebmp/colorblendaccessoradapter.hxx"
+
+#include "basebmp/color.hxx"
+#include "basebmp/colormisc.hxx"
+#include "basebmp/colortraits.hxx"
+
+#include "basebmp/greylevelformats.hxx"
+#include "basebmp/paletteformats.hxx"
+#include "basebmp/rgbmaskpixelformats.hxx"
+#include "basebmp/rgb24pixelformats.hxx"
+
+#include "basebmp/scanlineformats.hxx"
+#include "basebmp/fillimage.hxx"
+#include "basebmp/scaleimage.hxx"
+#include "basebmp/clippedlinerenderer.hxx"
+#include "basebmp/polypolygonrenderer.hxx"
+#include "basebmp/genericcolorimageaccessor.hxx"
+
+#include "basebmp/tools.hxx"
+#include "intconversion.hxx"
+
+#include <rtl/alloc.h>
+#include <rtl/memory.h>
+#include <osl/diagnose.h>
+
+#include <basegfx/tools/tools.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/vector/b2ivector.hxx>
+
+#include <vigra/iteratortraits.hxx>
+#include <vigra/rgbvalue.hxx>
+#include <vigra/copyimage.hxx>
+#include <vigra/tuple.hxx>
+
+
+namespace vigra
+{
+
+/// componentwise xor of an RGBValue (missing from rgbvalue.hxx)
+template< class Value, unsigned int RedIndex, unsigned int BlueIndex, unsigned int GreenIndex >
+inline RGBValue<Value, RedIndex, GreenIndex, BlueIndex>
+operator^( RGBValue<Value, RedIndex, GreenIndex, BlueIndex> const& lhs,
+           RGBValue<Value, RedIndex, GreenIndex, BlueIndex> const& rhs )
+{
+    RGBValue<Value, RedIndex, GreenIndex, BlueIndex> res(
+        lhs[0] ^ rhs[0],
+        lhs[1] ^ rhs[1],
+        lhs[2] ^ rhs[2]);
+    return res;
+}
+}
+
+namespace basebmp
+{
+
+namespace
+{
+    /** Create the type for an accessor that takes the (mask,bitmap)
+        input value generated from a JoinImageAccessorAdapter, and
+        pipe that through a mask functor.
+
+        @tpl DestAccessor
+        Destination bitmap accessor
+
+        @tpl JoinedAccessor
+        Input accessor, is expected to generate a std::pair as the
+        value type
+
+        @tpl MaskFunctorMode
+        Either FastMask or NoFastMask, depending on whether the mask
+        is guaranteed to contain only 0s and 1s.
+     */
+    template< class    DestAccessor,
+              class    JoinedAccessor,
+              bool     polarity,
+              typename MaskFunctorMode > struct masked_input_splitting_accessor
+    {
+        typedef BinarySetterFunctionAccessorAdapter<
+            DestAccessor,
+            BinaryFunctorSplittingWrapper<
+                typename outputMaskFunctorSelector<
+                         typename JoinedAccessor::value_type::first_type,
+                         typename JoinedAccessor::value_type::second_type,
+                         polarity,
+                         MaskFunctorMode >::type > > type;
+    };
+
+
+
+    // Actual BitmapDevice implementation (templatized by accessor and iterator)
+    //--------------------------------------------------------------------------
+
+    /** Implementation of the BitmapDevice interface
+
+        @tpl DestIterator
+        Iterator to access bitmap memory
+
+        @tpl RawAccessor
+        Raw accessor, to access pixel values directly
+
+        @tpl AccessorSelector
+        Accessor adapter selector, which, when applying the nested
+        template metafunction wrap_accessor to one of the raw bitmap
+        accessors, yields a member type named 'type', which is a
+        wrapped accessor that map color values.
+
+        @tpl Masks
+        Traits template, containing nested traits
+        clipmask_format_traits and alphamask_format_traits, which
+        determine what specialized formats are to be used for clip and
+        alpha masks. With those mask formats, clipping and alpha
+        blending is handled natively.
+     */
+    template< class DestIterator,
+              class RawAccessor,
+              class AccessorSelector,
+              class Masks > class BitmapRenderer :
+                  public BitmapDevice
+    {
+    public:
+        typedef DestIterator                                               dest_iterator_type;
+        typedef RawAccessor                                                raw_accessor_type;
+        typedef AccessorSelector                                           accessor_selector;
+
+        typedef typename Masks::clipmask_format_traits::iterator_type      mask_iterator_type;
+        typedef typename Masks::clipmask_format_traits::raw_accessor_type  mask_rawaccessor_type;
+        typedef typename Masks::clipmask_format_traits::accessor_selector  mask_accessorselector_type;
+
+        typedef typename Masks::alphamask_format_traits::iterator_type     alphamask_iterator_type;
+        typedef typename Masks::alphamask_format_traits::raw_accessor_type alphamask_rawaccessor_type;
+        typedef typename Masks::alphamask_format_traits::accessor_selector alphamask_accessorselector_type;
+
+        typedef typename AccessorSelector::template wrap_accessor<
+            raw_accessor_type >::type                                      dest_accessor_type;
+
+        typedef AccessorTraits< dest_accessor_type >                       accessor_traits;
+        typedef CompositeIterator2D< dest_iterator_type,
+                                     mask_iterator_type >                  composite_iterator_type;
+        typedef CompositeIterator2D< vigra::Diff2D,
+                                     vigra::Diff2D >                       generic_composite_iterator_type;
+
+        typedef BitmapRenderer<mask_iterator_type,
+                               mask_rawaccessor_type,
+                               mask_accessorselector_type,
+                               Masks>                                      mask_bitmap_type;
+        typedef BitmapRenderer<alphamask_iterator_type,
+                               alphamask_rawaccessor_type,
+                               alphamask_accessorselector_type,
+                               Masks>                                      alphamask_bitmap_type;
+
+        // -------------------------------------------------------
+
+        typedef AccessorTraits< raw_accessor_type >                        raw_accessor_traits;
+        typedef typename uInt32Converter<
+            typename raw_accessor_type::value_type>::to                    to_uint32_functor;
+
+        // -------------------------------------------------------
+
+        typedef typename raw_accessor_traits::xor_accessor                 raw_xor_accessor_type;
+        typedef AccessorTraits<raw_xor_accessor_type>                      raw_xor_accessor_traits;
+        typedef typename accessor_selector::template wrap_accessor<
+            raw_xor_accessor_type >::type                                  xor_accessor_type;
+        typedef AccessorTraits<xor_accessor_type>                          xor_accessor_traits;
+
+        // -------------------------------------------------------
+
+        typedef typename raw_accessor_traits::template masked_accessor<
+            mask_rawaccessor_type,
+            dest_iterator_type,
+            mask_iterator_type,
+            Masks::clipmask_polarity>::type                                raw_maskedaccessor_type;
+        typedef typename accessor_selector::template wrap_accessor<
+            raw_maskedaccessor_type >::type                                masked_accessor_type;
+        typedef typename AccessorTraits<
+            raw_maskedaccessor_type>::xor_accessor                         raw_maskedxor_accessor_type;
+        typedef typename accessor_selector::template wrap_accessor<
+            raw_maskedxor_accessor_type >::type                            masked_xoraccessor_type;
+
+        // -------------------------------------------------------
+
+        // ((iter,mask),mask) special case (e.g. for clipped
+        // drawMaskedColor())
+        typedef AccessorTraits< raw_maskedaccessor_type >                  raw_maskedaccessor_traits;
+        typedef typename raw_maskedaccessor_traits::template masked_accessor<
+            mask_rawaccessor_type,
+            composite_iterator_type,
+            mask_iterator_type,
+            Masks::clipmask_polarity>::type                                raw_maskedmask_accessor_type;
+
+        typedef CompositeIterator2D<
+            composite_iterator_type,
+            mask_iterator_type>                                            composite_composite_mask_iterator_type;
+
+        // -------------------------------------------------------
+
+        typedef ConstantColorBlendSetterAccessorAdapter<
+            dest_accessor_type,
+            typename alphamask_rawaccessor_type::value_type,
+            Masks::alphamask_polarity>                                     colorblend_accessor_type;
+        typedef AccessorTraits<colorblend_accessor_type>                   colorblend_accessor_traits;
+        typedef typename colorblend_accessor_traits::template masked_accessor<
+            mask_rawaccessor_type,
+            dest_iterator_type,
+            mask_iterator_type,
+            Masks::clipmask_polarity>::type                                masked_colorblend_accessor_type;
+
+        // -------------------------------------------------------
+
+        typedef ConstantColorBlendSetterAccessorAdapter<
+            dest_accessor_type,
+            Color,
+            Masks::alphamask_polarity>                                     colorblend_generic_accessor_type;
+        typedef AccessorTraits<colorblend_generic_accessor_type>           colorblend_generic_accessor_traits;
+        typedef typename colorblend_generic_accessor_traits::template masked_accessor<
+            mask_rawaccessor_type,
+            dest_iterator_type,
+            mask_iterator_type,
+            Masks::clipmask_polarity>::type                                masked_colorblend_generic_accessor_type;
+
+        // -------------------------------------------------------
+
+        typedef JoinImageAccessorAdapter< dest_accessor_type,
+                                          mask_rawaccessor_type >          joined_image_accessor_type;
+        typedef JoinImageAccessorAdapter< GenericColorImageAccessor,
+                                          GenericColorImageAccessor >      joined_generic_image_accessor_type;
+
+        // -------------------------------------------------------
+
+        dest_iterator_type                      maBegin;
+        typename accessor_traits::color_lookup  maColorLookup;
+        to_uint32_functor                       maToUInt32Converter;
+        dest_accessor_type                      maAccessor;
+        colorblend_accessor_type                maColorBlendAccessor;
+        colorblend_generic_accessor_type        maGenericColorBlendAccessor;
+        raw_accessor_type                       maRawAccessor;
+        xor_accessor_type                       maXorAccessor;
+        raw_xor_accessor_type                   maRawXorAccessor;
+        masked_accessor_type                    maMaskedAccessor;
+        masked_colorblend_accessor_type         maMaskedColorBlendAccessor;
+        masked_colorblend_generic_accessor_type maGenericMaskedColorBlendAccessor;
+        masked_xoraccessor_type                 maMaskedXorAccessor;
+        raw_maskedaccessor_type                 maRawMaskedAccessor;
+        raw_maskedxor_accessor_type             maRawMaskedXorAccessor;
+        raw_maskedmask_accessor_type            maRawMaskedMaskAccessor;
+
+        // -------------------------------------------------------
+
+        BitmapRenderer( const basegfx::B2IRange&         rBounds,
+                        sal_Int32                        nScanlineFormat,
+                        sal_Int32                        nScanlineStride,
+                        sal_uInt8*                       pFirstScanline,
+                        dest_iterator_type               begin,
+                        raw_accessor_type                rawAccessor,
+                        dest_accessor_type               accessor,
+                        const RawMemorySharedArray&      rMem,
+                        const PaletteMemorySharedVector& rPalette ) :
+            BitmapDevice( rBounds, nScanlineFormat,
+                          nScanlineStride, pFirstScanline, rMem, rPalette ),
+            maBegin( begin ),
+            maColorLookup(),
+            maToUInt32Converter(),
+            maAccessor( accessor ),
+            maColorBlendAccessor( accessor ),
+            maGenericColorBlendAccessor( accessor ),
+            maRawAccessor( rawAccessor ),
+            maXorAccessor( accessor ),
+            maRawXorAccessor( rawAccessor ),
+            maMaskedAccessor( accessor ),
+            maMaskedColorBlendAccessor( maColorBlendAccessor ),
+            maGenericMaskedColorBlendAccessor( maGenericColorBlendAccessor ),
+            maMaskedXorAccessor( accessor ),
+            maRawMaskedAccessor( rawAccessor ),
+            maRawMaskedXorAccessor( rawAccessor ),
+            maRawMaskedMaskAccessor( rawAccessor )
+        {}
+
+    private:
+        boost::shared_ptr<BitmapRenderer> getCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const
+        {
+            return boost::dynamic_pointer_cast< BitmapRenderer >( bmp );
+        }
+
+        virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const
+        {
+            // TODO(P1): dynamic_cast usually called twice for
+            // compatible formats
+            return getCompatibleBitmap(bmp).get() != NULL;
+        }
+
+        boost::shared_ptr<mask_bitmap_type> getCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const
+        {
+            boost::shared_ptr<mask_bitmap_type> pMask( boost::dynamic_pointer_cast<mask_bitmap_type>( bmp ));
+
+            if( !pMask )
+                return pMask;
+
+            if( pMask->getSize() != getSize() )
+                pMask.reset();
+
+            return pMask;
+        }
+
+        virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const
+        {
+            // TODO(P1): dynamic_cast usually called twice for
+            // compatible formats
+            return boost::dynamic_pointer_cast<mask_bitmap_type>( bmp ).get() != NULL;
+        }
+
+        boost::shared_ptr<alphamask_bitmap_type> getCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const
+        {
+            return boost::dynamic_pointer_cast<alphamask_bitmap_type>( bmp );
+        }
+
+        virtual bool isCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const
+        {
+            // TODO(P1): dynamic_cast usually called twice for
+            // compatible formats
+            return getCompatibleAlphaMask( bmp ).get() != NULL;
+        }
+
+        virtual void clear_i( Color                     fillColor,
+                              const basegfx::B2IRange&  rBounds )
+        {
+            fillImage(destIterRange(maBegin,
+                                    maRawAccessor,
+                                    rBounds),
+                      maColorLookup(
+                          maAccessor,
+                          fillColor) );
+        }
+
+        virtual void setPixel_i( const basegfx::B2IPoint& rPt,
+                                 Color                    pixelColor,
+                                 DrawMode                 drawMode )
+        {
+            const DestIterator pixel( maBegin +
+                                      vigra::Diff2D(rPt.getX(),
+                                                    rPt.getY()) );
+            if( drawMode == DrawMode_XOR )
+                maXorAccessor.set( pixelColor,
+                                   pixel );
+            else
+                maAccessor.set( pixelColor,
+                                pixel );
+        }
+
+        virtual void setPixel_i( const basegfx::B2IPoint&     rPt,
+                                 Color                        pixelColor,
+                                 DrawMode                     drawMode,
+                                 const BitmapDeviceSharedPtr& rClip )
+        {
+            boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rClip) );
+            OSL_ASSERT( pMask );
+
+            const vigra::Diff2D offset(rPt.getX(),
+                                       rPt.getY());
+
+            const composite_iterator_type aIter(
+                maBegin + offset,
+                pMask->maBegin + offset );
+
+            if( drawMode == DrawMode_XOR )
+                maMaskedXorAccessor.set( pixelColor,
+                                         aIter );
+            else
+                maMaskedAccessor.set( pixelColor,
+                                      aIter );
+        }
+
+        virtual Color getPixel_i(const basegfx::B2IPoint& rPt )
+        {
+            const DestIterator pixel( maBegin +
+                                      vigra::Diff2D(rPt.getX(),
+                                                    rPt.getY()) );
+            return maAccessor(pixel);
+        }
+
+        virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt )
+        {
+            const DestIterator pixel( maBegin +
+                                      vigra::Diff2D(rPt.getX(),
+                                                    rPt.getY()) );
+            return maToUInt32Converter(maRawAccessor(pixel));
+        }
+
+        template< typename Iterator, typename Col, typename RawAcc >
+        void implRenderLine2( const basegfx::B2IPoint& rPt1,
+                              const basegfx::B2IPoint& rPt2,
+                              const basegfx::B2IRange& rBounds,
+                              Col                      col,
+                              const Iterator&          begin,
+                              const RawAcc&            rawAcc )
+        {
+            renderClippedLine( rPt1,
+                               rPt2,
+                               rBounds,
+                               col,
+                               begin,
+                               rawAcc );
+        }
+
+        template< typename Iterator, typename Accessor, typename RawAcc >
+        void implRenderLine( const basegfx::B2IPoint& rPt1,
+                             const basegfx::B2IPoint& rPt2,
+                             const basegfx::B2IRange& rBounds,
+                             Color                    col,
+                             const Iterator&          begin,
+                             const Accessor&          acc,
+                             const RawAcc&            rawAcc )
+        {
+            implRenderLine2( rPt1,rPt2,rBounds,
+                             maColorLookup( acc,
+                                            col ),
+                             begin,
+                             rawAcc );
+        }
+
+        template< typename Iterator, typename RawAcc, typename XorAcc >
+        void implDrawLine( const basegfx::B2IPoint& rPt1,
+                           const basegfx::B2IPoint& rPt2,
+                           const basegfx::B2IRange& rBounds,
+                           Color                    col,
+                           const Iterator&          begin,
+                           const RawAcc&            rawAcc,
+                           const XorAcc&            xorAcc,
+                           DrawMode                 drawMode )
+        {
+            if( drawMode == DrawMode_XOR )
+                implRenderLine( rPt1, rPt2, rBounds, col,
+                                begin, maAccessor, xorAcc );
+            else
+                implRenderLine( rPt1, rPt2, rBounds, col,
+                                begin, maAccessor, rawAcc );
+        }
+
+        virtual void drawLine_i(const basegfx::B2IPoint& rPt1,
+                                const basegfx::B2IPoint& rPt2,
+                                const basegfx::B2IRange& rBounds,
+                                Color                    lineColor,
+                                DrawMode                 drawMode )
+        {
+            implDrawLine(rPt1,rPt2,rBounds,lineColor,
+                         maBegin,
+                         maRawAccessor,maRawXorAccessor,drawMode);
+        }
+
+        composite_iterator_type getMaskedIter( const BitmapDeviceSharedPtr& rClip ) const
+        {
+            boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rClip) );
+            OSL_ASSERT( pMask );
+
+            return composite_iterator_type( maBegin,
+                                            pMask->maBegin );
+        }
+
+        virtual void drawLine_i(const basegfx::B2IPoint&     rPt1,
+                                const basegfx::B2IPoint&     rPt2,
+                                const basegfx::B2IRange&     rBounds,
+                                Color                        lineColor,
+                                DrawMode                     drawMode,
+                                const BitmapDeviceSharedPtr& rClip )
+        {
+            implDrawLine(rPt1,rPt2,rBounds,lineColor,
+                         getMaskedIter(rClip),
+                         maRawMaskedAccessor,
+                         maRawMaskedXorAccessor,drawMode);
+        }
+
+        template< typename Iterator, typename RawAcc >
+        void implDrawPolygon( const basegfx::B2DPolygon& rPoly,
+                              const basegfx::B2IRange&   rBounds,
+                              Color                      col,
+                              const Iterator&            begin,
+                              const RawAcc&              acc )
+        {
+            basegfx::B2DPolygon aPoly( rPoly );
+            if( rPoly.areControlPointsUsed() )
+                aPoly = basegfx::tools::adaptiveSubdivideByCount( rPoly );
+
+            const typename dest_iterator_type::value_type colorIndex( maColorLookup(
+                                                                          maAccessor,
+                                                                          col));
+            const sal_uInt32                              nVertices( aPoly.count() );
+            for( sal_uInt32 i=1; i<nVertices; ++i )
+                implRenderLine2( basegfx::fround(aPoly.getB2DPoint(i-1)),
+                                 basegfx::fround(aPoly.getB2DPoint(i)),
+                                 rBounds,
+                                 colorIndex,
+                                 begin,
+                                 acc );
+
+            if( nVertices > 1 && aPoly.isClosed() )
+                implRenderLine2( basegfx::fround(aPoly.getB2DPoint(nVertices-1)),
+                                 basegfx::fround(aPoly.getB2DPoint(0)),
+                                 rBounds,
+                                 colorIndex,
+                                 begin,
+                                 acc );
+        }
+
+        virtual void drawPolygon_i(const basegfx::B2DPolygon& rPoly,
+                                   const basegfx::B2IRange&   rBounds,
+                                   Color                      lineColor,
+                                   DrawMode                   drawMode )
+        {
+            if( drawMode == DrawMode_XOR )
+                implDrawPolygon( rPoly, rBounds, lineColor,
+                                 maBegin,
+                                 maRawXorAccessor );
+            else
+                implDrawPolygon( rPoly, rBounds, lineColor,
+                                 maBegin,
+                                 maRawAccessor );
+        }
+
+        virtual void drawPolygon_i(const basegfx::B2DPolygon&   rPoly,
+                                   const basegfx::B2IRange&     rBounds,
+                                   Color                        lineColor,
+                                   DrawMode                     drawMode,
+                                   const BitmapDeviceSharedPtr& rClip )
+        {
+            if( drawMode == DrawMode_XOR )
+                implDrawPolygon( rPoly, rBounds, lineColor,
+                                 getMaskedIter(rClip),
+                                 maRawMaskedXorAccessor );
+            else
+                implDrawPolygon( rPoly, rBounds, lineColor,
+                                 getMaskedIter(rClip),
+                                 maRawMaskedAccessor );
+        }
+
+        template< typename Iterator, typename RawAcc >
+        void implFillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
+                                  Color                          col,
+                                  const Iterator&                begin,
+                                  const RawAcc&                  acc,
+                                  const basegfx::B2IRange&       rBounds )
+        {
+            basegfx::B2DPolyPolygon aPoly( rPoly );
+            if( rPoly.areControlPointsUsed() )
+                aPoly = basegfx::tools::adaptiveSubdivideByCount( rPoly );
+
+            renderClippedPolyPolygon( begin,
+                                      acc,
+                                      maColorLookup( maAccessor,
+                                                     col),
+                                      rBounds,
+                                      aPoly,
+                                      basegfx::FillRule_EVEN_ODD );
+        }
+
+        virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly,
+                                       Color                          fillColor,
+                                       DrawMode                       drawMode,
+                                       const basegfx::B2IRange&       rBounds )
+        {
+            if( drawMode == DrawMode_XOR )
+                implFillPolyPolygon( rPoly, fillColor,
+                                     maBegin,
+                                     maRawXorAccessor,
+                                     rBounds );
+            else
+                implFillPolyPolygon( rPoly, fillColor,
+                                     maBegin,
+                                     maRawAccessor,
+                                     rBounds );
+        }
+
+        virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly,
+                                       Color                          fillColor,
+                                       DrawMode                       drawMode,
+                                       const basegfx::B2IRange&       rBounds,
+                                       const BitmapDeviceSharedPtr&   rClip )
+        {
+            if( drawMode == DrawMode_XOR )
+                implFillPolyPolygon( rPoly, fillColor,
+                                     getMaskedIter(rClip),
+                                     maRawMaskedXorAccessor,
+                                     rBounds );
+            else
+                implFillPolyPolygon( rPoly, fillColor,
+                                     getMaskedIter(rClip),
+                                     maRawMaskedAccessor,
+                                     rBounds );
+        }
+
+        template< typename Iterator, typename RawAcc >
+        void implDrawBitmap(const BitmapDeviceSharedPtr& rSrcBitmap,
+                            const basegfx::B2IRange&     rSrcRect,
+                            const basegfx::B2IRange&     rDstRect,
+                            const Iterator&              begin,
+                            const RawAcc&                acc)
+        {
+            boost::shared_ptr<BitmapRenderer> pSrcBmp( getCompatibleBitmap(rSrcBitmap) );
+            OSL_ASSERT( pSrcBmp );
+
+            scaleImage(
+                srcIterRange(pSrcBmp->maBegin,
+                             pSrcBmp->maRawAccessor,
+                             rSrcRect),
+                destIterRange(begin,
+                              acc,
+                              rDstRect),
+                rSrcBitmap.get() == this );
+        }
+
+        template< typename Iterator, typename Acc >
+        void implDrawBitmapGeneric(const BitmapDeviceSharedPtr& rSrcBitmap,
+                                   const basegfx::B2IRange&     rSrcRect,
+                                   const basegfx::B2IRange&     rDstRect,
+                                   const Iterator&              begin,
+                                   const Acc&                   acc)
+        {
+            GenericColorImageAccessor aSrcAcc( rSrcBitmap );
+
+            scaleImage(
+                srcIterRange(vigra::Diff2D(),
+                             aSrcAcc,
+                             rSrcRect),
+                destIterRange(begin,
+                              acc,
+                              rDstRect));
+        }
+
+        virtual void drawBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
+                                  const basegfx::B2IRange&     rSrcRect,
+                                  const basegfx::B2IRange&     rDstRect,
+                                  DrawMode                     drawMode )
+        {
+            if( isCompatibleBitmap( rSrcBitmap ) )
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawBitmap(rSrcBitmap, rSrcRect, rDstRect,
+                                   maBegin,
+                                   maRawXorAccessor);
+                else
+                    implDrawBitmap(rSrcBitmap, rSrcRect, rDstRect,
+                                   maBegin,
+                                   maRawAccessor);
+            }
+            else
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawBitmapGeneric(rSrcBitmap, rSrcRect, rDstRect,
+                                          maBegin,
+                                          maXorAccessor);
+                else
+                    implDrawBitmapGeneric(rSrcBitmap, rSrcRect, rDstRect,
+                                          maBegin,
+                                          maAccessor);
+            }
+        }
+
+        virtual void drawBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
+                                  const basegfx::B2IRange&     rSrcRect,
+                                  const basegfx::B2IRange&     rDstRect,
+                                  DrawMode                     drawMode,
+                                  const BitmapDeviceSharedPtr& rClip )
+        {
+            if( isCompatibleBitmap( rSrcBitmap ) )
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawBitmap(rSrcBitmap, rSrcRect, rDstRect,
+                                   getMaskedIter(rClip),
+                                   maRawMaskedXorAccessor);
+                else
+                    implDrawBitmap(rSrcBitmap, rSrcRect, rDstRect,
+                                   getMaskedIter(rClip),
+                                   maRawMaskedAccessor);
+            }
+            else
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawBitmapGeneric(rSrcBitmap, rSrcRect, rDstRect,
+                                          getMaskedIter(rClip),
+                                          maMaskedXorAccessor);
+                else
+                    implDrawBitmapGeneric(rSrcBitmap, rSrcRect, rDstRect,
+                                          getMaskedIter(rClip),
+                                          maMaskedAccessor);
+            }
+        }
+
+        virtual void drawMaskedColor_i(Color                        aSrcColor,
+                                       const BitmapDeviceSharedPtr& rAlphaMask,
+                                       const basegfx::B2IRange&     rSrcRect,
+                                       const basegfx::B2IPoint&     rDstPoint )
+        {
+            boost::shared_ptr<mask_bitmap_type>      pMask( getCompatibleClipMask(rAlphaMask) );
+            boost::shared_ptr<alphamask_bitmap_type> pAlpha( getCompatibleAlphaMask(rAlphaMask) );
+
+            if( pAlpha )
+            {
+                maColorBlendAccessor.setColor( aSrcColor );
+
+                vigra::copyImage( srcIterRange(pAlpha->maBegin,
+                                               pAlpha->maRawAccessor,
+                                               rSrcRect),
+                                  destIter(maBegin,
+                                           maColorBlendAccessor,
+                                           rDstPoint) );
+            }
+            else if( pMask )
+            {
+                const composite_iterator_type aBegin(
+                    maBegin + vigra::Diff2D(rDstPoint.getX(),
+                                            rDstPoint.getY()),
+                    pMask->maBegin + topLeft(rSrcRect) );
+
+                fillImage(aBegin,
+                          aBegin + vigra::Diff2D(rSrcRect.getWidth(),
+                                                 rSrcRect.getHeight()),
+                          maRawMaskedAccessor,
+                          maColorLookup(
+                              maAccessor,
+                              aSrcColor) );
+            }
+            else
+            {
+                GenericColorImageAccessor aSrcAcc( rAlphaMask );
+                maGenericColorBlendAccessor.setColor( aSrcColor );
+
+                vigra::copyImage( srcIterRange(vigra::Diff2D(),
+                                               aSrcAcc,
+                                               rSrcRect),
+                                  destIter(maBegin,
+                                           maGenericColorBlendAccessor,
+                                           rDstPoint) );
+            }
+        }
+
+        virtual void drawMaskedColor_i(Color                        aSrcColor,
+                                       const BitmapDeviceSharedPtr& rAlphaMask,
+                                       const basegfx::B2IRange&     rSrcRect,
+                                       const basegfx::B2IPoint&     rDstPoint,
+                                       const BitmapDeviceSharedPtr& rClip )
+        {
+            boost::shared_ptr<mask_bitmap_type>      pMask( getCompatibleClipMask(rAlphaMask) );
+            boost::shared_ptr<alphamask_bitmap_type> pAlpha( getCompatibleAlphaMask(rAlphaMask) );
+
+            if( pAlpha )
+            {
+                const composite_iterator_type aBegin( getMaskedIter(rClip) );
+                maMaskedColorBlendAccessor.get1stWrappedAccessor().setColor(
+                    aSrcColor );
+
+                vigra::copyImage( srcIterRange(pAlpha->maBegin,
+                                               pAlpha->maRawAccessor,
+                                               rSrcRect),
+                                  destIter(aBegin,
+                                           maMaskedColorBlendAccessor,
+                                           rDstPoint) );
+            }
+            else if( pMask )
+            {
+                boost::shared_ptr<mask_bitmap_type> pClipMask( getCompatibleClipMask(rClip) );
+                OSL_ASSERT( pClipMask );
+
+                // setup a ((iter,mask),clipMask) composite composite
+                // iterator, to pass both masks (clip and alpha mask)
+                // to the algorithm
+                const composite_composite_mask_iterator_type aBegin(
+                    composite_iterator_type(
+                        maBegin + vigra::Diff2D(rDstPoint.getX(),
+                                                rDstPoint.getY()),
+                        pMask->maBegin + topLeft(rSrcRect)),
+                    pClipMask->maBegin + vigra::Diff2D(rDstPoint.getX(),
+                                                       rDstPoint.getY()) );
+
+                fillImage(aBegin,
+                          aBegin + vigra::Diff2D(rSrcRect.getWidth(),
+                                                 rSrcRect.getHeight()),
+                          maRawMaskedMaskAccessor,
+                          maColorLookup(
+                              maAccessor,
+                              aSrcColor) );
+            }
+            else
+            {
+                GenericColorImageAccessor aSrcAcc( rAlphaMask );
+                const composite_iterator_type aBegin( getMaskedIter(rClip) );
+                maGenericMaskedColorBlendAccessor.get1stWrappedAccessor().setColor(
+                    aSrcColor );
+
+                vigra::copyImage( srcIterRange(vigra::Diff2D(),
+                                               aSrcAcc,
+                                               rSrcRect),
+                                  destIter(aBegin,
+                                           maGenericMaskedColorBlendAccessor,
+                                           rDstPoint) );
+            }
+        }
+
+        template< typename Iterator, typename Acc >
+        void implDrawMaskedBitmap(const BitmapDeviceSharedPtr& rSrcBitmap,
+                                  const BitmapDeviceSharedPtr& rMask,
+                                  const basegfx::B2IRange&     rSrcRect,
+                                  const basegfx::B2IRange&     rDstRect,
+                                  const Iterator&              begin,
+                                  const Acc&                   acc)
+        {
+            boost::shared_ptr<BitmapRenderer>   pSrcBmp( getCompatibleBitmap(rSrcBitmap) );
+            boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rMask) );
+            OSL_ASSERT( pMask && pSrcBmp );
+
+            scaleImage(
+                srcIterRange(composite_iterator_type(
+                                 pSrcBmp->maBegin,
+                                 pMask->maBegin),
+                             joined_image_accessor_type(
+                                 pSrcBmp->maAccessor,
+                                 pMask->maRawAccessor),
+                             rSrcRect),
+                destIterRange(begin,
+                              typename masked_input_splitting_accessor<
+                                       Acc,
+                                       joined_image_accessor_type,
+                                       Masks::clipmask_polarity,
+                                       FastMask >::type(acc),
+                              rDstRect),
+                rSrcBitmap.get() == this);
+        }
+
+        template< typename Iterator, typename Acc >
+        void implDrawMaskedBitmapGeneric(const BitmapDeviceSharedPtr& rSrcBitmap,
+                                         const BitmapDeviceSharedPtr& rMask,
+                                         const basegfx::B2IRange&     rSrcRect,
+                                         const basegfx::B2IRange&     rDstRect,
+                                         const Iterator&              begin,
+                                         const Acc&                   acc)
+        {
+            GenericColorImageAccessor aSrcAcc( rSrcBitmap );
+            GenericColorImageAccessor aMaskAcc( rMask );
+
+            const vigra::Diff2D aTopLeft(rSrcRect.getMinX(),
+                                         rSrcRect.getMinY());
+            const vigra::Diff2D aBottomRight(rSrcRect.getMaxX(),
+                                             rSrcRect.getMaxY());
+            scaleImage(
+                vigra::make_triple(
+                    generic_composite_iterator_type(
+                        aTopLeft,aTopLeft),
+                    generic_composite_iterator_type(
+                        aBottomRight,aBottomRight),
+                    joined_generic_image_accessor_type(
+                        aSrcAcc,
+                        aMaskAcc)),
+                destIterRange(begin,
+                              typename masked_input_splitting_accessor<
+                                       Acc,
+                                       joined_generic_image_accessor_type,
+                                       Masks::clipmask_polarity,
+                                       NoFastMask >::type(acc),
+                              rDstRect));
+        }
+
+        virtual void drawMaskedBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
+                                        const BitmapDeviceSharedPtr& rMask,
+                                        const basegfx::B2IRange&     rSrcRect,
+                                        const basegfx::B2IRange&     rDstRect,
+                                        DrawMode                     drawMode )
+        {
+            if( isCompatibleClipMask(rMask) &&
+                isCompatibleBitmap(rSrcBitmap) )
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawMaskedBitmap(rSrcBitmap, rMask,
+                                         rSrcRect, rDstRect,
+                                         maBegin,
+                                         maXorAccessor);
+                else
+                    implDrawMaskedBitmap(rSrcBitmap, rMask,
+                                         rSrcRect, rDstRect,
+                                         maBegin,
+                                         maAccessor);
+            }
+            else
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawMaskedBitmapGeneric(rSrcBitmap, rMask,
+                                                rSrcRect, rDstRect,
+                                                maBegin,
+                                                maXorAccessor);
+                else
+                    implDrawMaskedBitmapGeneric(rSrcBitmap, rMask,
+                                                rSrcRect, rDstRect,
+                                                maBegin,
+                                                maAccessor);
+            }
+        }
+
+        virtual void drawMaskedBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
+                                        const BitmapDeviceSharedPtr& rMask,
+                                        const basegfx::B2IRange&     rSrcRect,
+                                        const basegfx::B2IRange&     rDstRect,
+                                        DrawMode                     drawMode,
+                                        const BitmapDeviceSharedPtr& rClip )
+        {
+            if( isCompatibleClipMask(rMask) &&
+                isCompatibleBitmap(rSrcBitmap) )
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawMaskedBitmap(rSrcBitmap, rMask,
+                                         rSrcRect, rDstRect,
+                                         getMaskedIter(rClip),
+                                         maMaskedXorAccessor);
+                else
+                    implDrawMaskedBitmap(rSrcBitmap, rMask,
+                                         rSrcRect, rDstRect,
+                                         getMaskedIter(rClip),
+                                         maMaskedAccessor);
+            }
+            else
+            {
+                if( drawMode == DrawMode_XOR )
+                    implDrawMaskedBitmapGeneric(rSrcBitmap, rMask,
+                                                rSrcRect, rDstRect,
+                                                getMaskedIter(rClip),
+                                                maMaskedXorAccessor);
+                else
+                    implDrawMaskedBitmapGeneric(rSrcBitmap, rMask,
+                                                rSrcRect, rDstRect,
+                                                getMaskedIter(rClip),
+                                                maMaskedAccessor);
+            }
+        }
+    };
+} // namespace
+
+struct ImplBitmapDevice
+{
+    /** Bitmap memory plus deleter.
+
+        Always points to the start of the mem
+     */
+    RawMemorySharedArray      mpMem;
+
+    /// Palette memory plus deleter (might be NULL)
+    PaletteMemorySharedVector mpPalette;
+
+    /** Bounds of the device.
+
+        maBounds.getWidth()/getHeight() yield the true size of the
+        device (i.e. the rectangle given by maBounds covers the device
+        area under the excluding-bottommost-and-rightmost-pixels fill
+        rule)
+     */
+    basegfx::B2IRange         maBounds;
+
+    /** Bounds of the device.
+
+        maBounds.getWidth()/getHeight() yield the true size of the
+        device minus 1 (i.e. the rectangle given by maBounds covers
+        the device area under the
+        including-the-bottommost-and-rightmost-pixels fill rule).
+
+        The member is used to clip line stroking against the device
+        bounds.
+     */
+    basegfx::B2IRange         maLineClipRect;
+
+    /// Scanline format, as provided at the constructor
+    sal_Int32                 mnScanlineFormat;
+
+    /// Scanline stride. Negative for bottom-to-top formats
+    sal_Int32                 mnScanlineStride;
+
+    /// raw ptr to 0th scanline. used for cloning a generic renderer
+    sal_uInt8*                mpFirstScanline;
+
+    /** (Optional) device sharing the same memory, and used for input
+        clip masks/alpha masks/bitmaps that don't match our exact
+        bitmap format.
+
+        This is to avoid the combinatorical explosion when dealing
+        with n bitmap formats, which could be combined with n clip
+        masks, alpha masks and bitmap masks (yielding a total of n^4
+        combinations). Since each BitmapRenderer is specialized for
+        one specific combination of said formats, a lot of duplicate
+        code would be generated, most of which probably never
+        used. Therefore, only the most common combinations are
+        specialized templates, the remainder gets handled by this
+        generic renderer (via runtime polymorphism).
+     */
+    BitmapDeviceSharedPtr     mpGenericRenderer;
+};
+
+
+BitmapDevice::BitmapDevice( const basegfx::B2IRange&         rBounds,
+                            sal_Int32                        nScanlineFormat,
+                            sal_Int32                        nScanlineStride,
+                            sal_uInt8*                       pFirstScanline,
+                            const RawMemorySharedArray&      rMem,
+                            const PaletteMemorySharedVector& rPalette ) :
+    mpImpl( new ImplBitmapDevice )
+{
+    mpImpl->mpMem = rMem;
+    mpImpl->mpPalette = rPalette;
+    mpImpl->maBounds = rBounds;
+    mpImpl->maLineClipRect = basegfx::B2IRange( rBounds.getMinX(),
+                                                rBounds.getMinY(),
+                                                rBounds.getMaxX()-1,
+                                                rBounds.getMaxY()-1 );
+    mpImpl->mnScanlineFormat = nScanlineFormat;
+    mpImpl->mnScanlineStride = nScanlineStride;
+    mpImpl->mpFirstScanline  = pFirstScanline;
+}
+
+BitmapDevice::~BitmapDevice()
+{
+    // outline, because of internal ImplBitmapDevice
+}
+
+basegfx::B2IVector BitmapDevice::getSize() const
+{
+
+    return basegfx::B2IVector(
+        mpImpl->maBounds.getMaxX() - mpImpl->maBounds.getMinX(),
+        mpImpl->maBounds.getMaxY() - mpImpl->maBounds.getMinY() );
+}
+
+bool BitmapDevice::isTopDown() const
+{
+    return mpImpl->mnScanlineStride >= 0;
+}
+
+sal_Int32 BitmapDevice::getScanlineFormat() const
+{
+    return mpImpl->mnScanlineFormat;
+}
+
+sal_Int32 BitmapDevice::getScanlineStride() const
+{
+    return mpImpl->mnScanlineStride < 0 ?
+        -mpImpl->mnScanlineStride : mpImpl->mnScanlineStride;
+}
+
+RawMemorySharedArray BitmapDevice::getBuffer() const
+{
+    return mpImpl->mpMem;
+}
+
+PaletteMemorySharedVector BitmapDevice::getPalette() const
+{
+    return mpImpl->mpPalette;
+}
+
+sal_Int32 BitmapDevice::getPaletteEntryCount() const
+{
+    return mpImpl->mpPalette ? mpImpl->mpPalette->size() : 0;
+}
+
+void BitmapDevice::clear( Color fillColor )
+{
+    clear_i( fillColor, mpImpl->maBounds );
+}
+
+void BitmapDevice::setPixel( const basegfx::B2IPoint& rPt,
+                             Color                    lineColor,
+                             DrawMode                 drawMode )
+{
+    if( mpImpl->maLineClipRect.isInside(rPt) )
+        setPixel_i(rPt,lineColor,drawMode);
+}
+
+void BitmapDevice::setPixel( const basegfx::B2IPoint&     rPt,
+                             Color                        lineColor,
+                             DrawMode                     drawMode,
+                             const BitmapDeviceSharedPtr& rClip )
+{
+    if( !rClip )
+    {
+        setPixel(rPt,lineColor,drawMode);
+        return;
+    }
+
+    if( mpImpl->maLineClipRect.isInside(rPt) )
+    {
+        if( isCompatibleClipMask( rClip ) )
+            setPixel_i(rPt,lineColor,drawMode,rClip);
+        else
+            getGenericRenderer()->setPixel( rPt, lineColor, drawMode, rClip );
+    }
+}
+
+Color BitmapDevice::getPixel( const basegfx::B2IPoint& rPt )
+{
+    if( mpImpl->maLineClipRect.isInside(rPt) )
+        return getPixel_i(rPt);
+
+    return Color();
+}
+
+sal_uInt32 BitmapDevice::getPixelData( const basegfx::B2IPoint& rPt )
+{
+    if( mpImpl->maLineClipRect.isInside(rPt) )
+        return getPixelData_i(rPt);
+
+    return 0;
+}
+
+void BitmapDevice::drawLine( const basegfx::B2IPoint& rPt1,
+                             const basegfx::B2IPoint& rPt2,
+                             Color                    lineColor,
+                             DrawMode                 drawMode )
+{
+    drawLine_i( rPt1,
+                rPt2,
+                mpImpl->maLineClipRect,
+                lineColor,
+                drawMode );
+}
+
+void BitmapDevice::drawLine( const basegfx::B2IPoint&     rPt1,
+                             const basegfx::B2IPoint&     rPt2,
+                             Color                        lineColor,
+                             DrawMode                     drawMode,
+                             const BitmapDeviceSharedPtr& rClip )
+{
+    if( !rClip )
+    {
+        drawLine(rPt1,rPt2,lineColor,drawMode);
+        return;
+    }
+
+    if( isCompatibleClipMask( rClip ) )
+        drawLine_i( rPt1,
+                    rPt2,
+                    mpImpl->maLineClipRect,
+                    lineColor,
+                    drawMode,
+                    rClip );
+    else
+        getGenericRenderer()->drawLine( rPt1, rPt2, lineColor,
+                                        drawMode, rClip );
+}
+
+void BitmapDevice::drawPolygon( const basegfx::B2DPolygon& rPoly,
+                                Color                      lineColor,
+                                DrawMode                   drawMode )
+{
+    const sal_uInt32 numVertices( rPoly.count() );
+    if( numVertices )
+        drawPolygon_i( rPoly,
+                       mpImpl->maLineClipRect,
+                       lineColor, drawMode );
+}
+
+void BitmapDevice::drawPolygon( const basegfx::B2DPolygon&   rPoly,
+                                Color                        lineColor,
+                                DrawMode                     drawMode,
+                                const BitmapDeviceSharedPtr& rClip )
+{
+    if( !rClip )
+    {
+        drawPolygon(rPoly,lineColor,drawMode);
+        return;
+    }
+
+    const sal_uInt32 numVertices( rPoly.count() );
+    if( numVertices )
+    {
+        if( isCompatibleClipMask( rClip ) )
+            drawPolygon_i( rPoly,
+                           mpImpl->maLineClipRect,
+                           lineColor, drawMode, rClip );
+        else
+            getGenericRenderer()->drawPolygon( rPoly, lineColor,
+                                               drawMode, rClip );
+    }
+}
+
+void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
+                                    Color                          fillColor,
+                                    DrawMode                       drawMode )
+{
+    fillPolyPolygon_i( rPoly, fillColor, drawMode, mpImpl->maBounds );
+}
+
+void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly,
+                                    Color                          fillColor,
+                                    DrawMode                       drawMode,
+                                    const BitmapDeviceSharedPtr&   rClip )
+{
+    if( !rClip )
+    {
+        fillPolyPolygon(rPoly,fillColor,drawMode);
+        return;
+    }
+
+    if( isCompatibleClipMask( rClip ) )
+        fillPolyPolygon_i( rPoly, fillColor, drawMode, mpImpl->maBounds, rClip );
+    else
+        getGenericRenderer()->fillPolyPolygon( rPoly, fillColor,
+                                               drawMode, rClip );
+}
+
+
+namespace
+{
+    void assertImagePoint( const basegfx::B2IPoint& rPt,
+                           const basegfx::B2IRange& rPermittedRange )
+    {
+        (void)rPt; (void)rPermittedRange;
+        OSL_ASSERT( rPermittedRange.isInside(rPt) );
+    }
+
+    void assertImageRange( const basegfx::B2IRange& rRange,
+                           const basegfx::B2IRange& rPermittedRange )
+    {
+#if OSL_DEBUG_LEVEL > 0
+        basegfx::B2IRange aRange( rRange );
+        aRange.intersect( rPermittedRange );
+
+        OSL_ASSERT( aRange == rRange );
+#else
+        (void)rRange; (void)rPermittedRange;
+#endif
+    }
+
+    // TODO(Q3): Move canvas/canvastools.hxx clipBlit() down
+    // to basegfx, and use here!
+    bool clipAreaImpl( ::basegfx::B2IRange&       io_rSourceArea,
+                       ::basegfx::B2IPoint&       io_rDestPoint,
+                       const ::basegfx::B2IRange& rSourceBounds,
+                       const ::basegfx::B2IRange& rDestBounds )
+    {
+        const ::basegfx::B2IPoint aSourceTopLeft(
+            io_rSourceArea.getMinimum() );
+
+        ::basegfx::B2IRange aLocalSourceArea( io_rSourceArea );
+
+        // clip source area (which must be inside rSourceBounds)
+        aLocalSourceArea.intersect( rSourceBounds );
+
+        if( aLocalSourceArea.isEmpty() )
+            return false;
+
+        // calc relative new source area points (relative to orig
+        // source area)
+        const ::basegfx::B2IVector aUpperLeftOffset(
+            aLocalSourceArea.getMinimum()-aSourceTopLeft );
+        const ::basegfx::B2IVector aLowerRightOffset(
+            aLocalSourceArea.getMaximum()-aSourceTopLeft );
+
+        ::basegfx::B2IRange aLocalDestArea( io_rDestPoint + aUpperLeftOffset,
+                                            io_rDestPoint + aLowerRightOffset );
+
+        // clip dest area (which must be inside rDestBounds)
+        aLocalDestArea.intersect( rDestBounds );
+
+        if( aLocalDestArea.isEmpty() )
+            return false;
+
+        // calc relative new dest area points (relative to orig
+        // source area)
+        const ::basegfx::B2IVector aDestUpperLeftOffset(
+            aLocalDestArea.getMinimum()-io_rDestPoint );
+        const ::basegfx::B2IVector aDestLowerRightOffset(
+            aLocalDestArea.getMaximum()-io_rDestPoint );
+
+        io_rSourceArea = ::basegfx::B2IRange( aSourceTopLeft + aDestUpperLeftOffset,
+                                              aSourceTopLeft + aDestLowerRightOffset );
+        io_rDestPoint  = aLocalDestArea.getMinimum();
+
+        return true;
+    }
+
+    // TODO(Q3): Move canvas/canvastools.hxx clipBlit() down
+    // to basegfx, and use here!
+    bool clipAreaImpl( ::basegfx::B2IRange&       io_rDestArea,
+                       ::basegfx::B2IRange&       io_rSourceArea,
+                       const ::basegfx::B2IRange& rDestBounds,
+                       const ::basegfx::B2IRange& rSourceBounds )
+    {
+        // extract inherent scale
+        const double nScaleX( io_rDestArea.getWidth() / (double)io_rSourceArea.getWidth() );
+        const double nScaleY( io_rDestArea.getHeight() / (double)io_rSourceArea.getHeight() );
+
+        // extract range origins
+        const basegfx::B2IPoint   aDestTopLeft(
+            io_rDestArea.getMinimum() );
+        const ::basegfx::B2IPoint aSourceTopLeft(
+            io_rSourceArea.getMinimum() );
+
+        ::basegfx::B2IRange aLocalSourceArea( io_rSourceArea );
+
+        // clip source area (which must be inside rSourceBounds)
+        aLocalSourceArea.intersect( rSourceBounds );
+
+        if( aLocalSourceArea.isEmpty() )
+            return false;
+
+        // calc relative new source area points (relative to orig
+        // source area)
+        const ::basegfx::B2IVector aUpperLeftOffset(
+            aLocalSourceArea.getMinimum()-aSourceTopLeft );
+        const ::basegfx::B2IVector aLowerRightOffset(
+            aLocalSourceArea.getMaximum()-aSourceTopLeft );
+
+        ::basegfx::B2IRange aLocalDestArea( basegfx::fround(aDestTopLeft.getX() + nScaleX*aUpperLeftOffset.getX()),
+                                            basegfx::fround(aDestTopLeft.getY() + nScaleY*aUpperLeftOffset.getY()),
+                                            basegfx::fround(aDestTopLeft.getX() + nScaleX*aLowerRightOffset.getX()),
+                                            basegfx::fround(aDestTopLeft.getY() + nScaleY*aLowerRightOffset.getY()) );
+
+        // clip dest area (which must be inside rDestBounds)
+        aLocalDestArea.intersect( rDestBounds );
+
+        if( aLocalDestArea.isEmpty() )
+            return false;
+
+        // calc relative new dest area points (relative to orig
+        // source area)
+        const ::basegfx::B2IVector aDestUpperLeftOffset(
+            aLocalDestArea.getMinimum()-aDestTopLeft );
+        const ::basegfx::B2IVector aDestLowerRightOffset(
+            aLocalDestArea.getMaximum()-aDestTopLeft );
+
+        io_rSourceArea = ::basegfx::B2IRange( basegfx::fround(aSourceTopLeft.getX() + aDestUpperLeftOffset.getX()/nScaleX),
+                                              basegfx::fround(aSourceTopLeft.getY() + aDestUpperLeftOffset.getY()/nScaleY),
+                                              basegfx::fround(aSourceTopLeft.getX() + aDestLowerRightOffset.getX()/nScaleX),
+                                              basegfx::fround(aSourceTopLeft.getY() + aDestLowerRightOffset.getY()/nScaleY) );
+        io_rDestArea   = aLocalDestArea;
+
+        // final source area clip (chopping round-offs)
+        io_rSourceArea.intersect( rSourceBounds );
+
+        if( io_rSourceArea.isEmpty() )
+            return false;
+
+
+        return true;
+    }
+}
+
+void BitmapDevice::drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                               const basegfx::B2IRange&     rSrcRect,
+                               const basegfx::B2IRange&     rDstRect,
+                               DrawMode                     drawMode )
+{
+    const basegfx::B2IVector& rSrcSize( rSrcBitmap->getSize() );
+    const basegfx::B2IRange   aSrcBounds( 0,0,rSrcSize.getX(),rSrcSize.getY() );
+    basegfx::B2IRange         aSrcRange( rSrcRect );
+    basegfx::B2IRange         aDestRange( rDstRect );
+
+    if( clipAreaImpl( aDestRange,
+                      aSrcRange,
+                      mpImpl->maBounds,
+                      aSrcBounds ))
+    {
+        assertImageRange(aDestRange,mpImpl->maBounds);
+        assertImageRange(aSrcRange,aSrcBounds);
+
+        drawBitmap_i( rSrcBitmap, aSrcRange, aDestRange, drawMode );
+    }
+}
+
+void BitmapDevice::drawBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                               const basegfx::B2IRange&     rSrcRect,
+                               const basegfx::B2IRange&     rDstRect,
+                               DrawMode                     drawMode,
+                               const BitmapDeviceSharedPtr& rClip )
+{
+    if( !rClip )
+    {
+        drawBitmap(rSrcBitmap,rSrcRect,rDstRect,drawMode);
+        return;
+    }
+
+    const basegfx::B2IVector& rSrcSize( rSrcBitmap->getSize() );
+    const basegfx::B2IRange   aSrcBounds( 0,0,rSrcSize.getX(),rSrcSize.getY() );
+    basegfx::B2IRange         aSrcRange( rSrcRect );
+    basegfx::B2IRange         aDestRange( rDstRect );
+
+    if( clipAreaImpl( aDestRange,
+                      aSrcRange,
+                      mpImpl->maBounds,
+                      aSrcBounds ))
+    {
+        assertImageRange(aDestRange,mpImpl->maBounds);
+        assertImageRange(aSrcRange,aSrcBounds);
+
+        if( isCompatibleClipMask( rClip ) )
+        {
+            drawBitmap_i( rSrcBitmap, aSrcRange, aDestRange, drawMode, rClip );
+        }
+        else
+        {
+            getGenericRenderer()->drawBitmap( rSrcBitmap, rSrcRect,
+                                              rDstRect, drawMode, rClip );
+        }
+    }
+}
+
+void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
+                                    const BitmapDeviceSharedPtr& rAlphaMask,
+                                    const basegfx::B2IRange&     rSrcRect,
+                                    const basegfx::B2IPoint&     rDstPoint )
+{
+    const basegfx::B2IVector& rSrcSize( rAlphaMask->getSize() );
+    const basegfx::B2IRange   aSrcBounds( 0,0,rSrcSize.getX(),rSrcSize.getY() );
+    basegfx::B2IRange         aSrcRange( rSrcRect );
+    basegfx::B2IPoint         aDestPoint( rDstPoint );
+
+    if( clipAreaImpl( aSrcRange,
+                      aDestPoint,
+                      aSrcBounds,
+                      mpImpl->maBounds ))
+    {
+        assertImagePoint(aDestPoint,mpImpl->maBounds);
+        assertImageRange(aSrcRange,aSrcBounds);
+
+        if( rAlphaMask.get() == this )
+        {
+            // src == dest, copy rAlphaMask beforehand
+            // ---------------------------------------------------
+
+            const basegfx::B2ITuple aSize( aSrcRange.getWidth(),
+                                           aSrcRange.getHeight() );
+            BitmapDeviceSharedPtr pAlphaCopy(
+                cloneBitmapDevice( aSize,
+                                   shared_from_this()) );
+            basegfx::B2ITuple aGcc3WorkaroundTemporary;
+            const basegfx::B2IRange aAlphaRange( aGcc3WorkaroundTemporary,
+                                                 aSize );
+            pAlphaCopy->drawBitmap(rAlphaMask,
+                                   aSrcRange,
+                                   aAlphaRange,
+                                   DrawMode_PAINT);
+            drawMaskedColor_i( aSrcColor, pAlphaCopy, aAlphaRange, aDestPoint );
+        }
+        else
+        {
+            drawMaskedColor_i( aSrcColor, rAlphaMask, aSrcRange, aDestPoint );
+        }
+    }
+}
+
+void BitmapDevice::drawMaskedColor( Color                        aSrcColor,
+                                    const BitmapDeviceSharedPtr& rAlphaMask,
+                                    const basegfx::B2IRange&     rSrcRect,
+                                    const basegfx::B2IPoint&     rDstPoint,
+                                    const BitmapDeviceSharedPtr& rClip )
+{
+    if( !rClip )
+    {
+        drawMaskedColor(aSrcColor,rAlphaMask,rSrcRect,rDstPoint);
+        return;
+    }
+
+    const basegfx::B2IVector& rSrcSize( rAlphaMask->getSize() );
+    const basegfx::B2IRange   aSrcBounds( 0,0,rSrcSize.getX(),rSrcSize.getY() );
+    basegfx::B2IRange         aSrcRange( rSrcRect );
+    basegfx::B2IPoint         aDestPoint( rDstPoint );
+
+    if( clipAreaImpl( aSrcRange,
+                      aDestPoint,
+                      aSrcBounds,
+                      mpImpl->maBounds ))
+    {
+        assertImagePoint(aDestPoint,mpImpl->maBounds);
+        assertImageRange(aSrcRange,aSrcBounds);
+
+        if( isCompatibleClipMask( rClip ) )
+        {
+            if( rAlphaMask.get() == this )
+            {
+                // src == dest, copy rAlphaMask beforehand
+                // ---------------------------------------------------
+
+                const basegfx::B2ITuple aSize( aSrcRange.getWidth(),
+                                               aSrcRange.getHeight() );
+                BitmapDeviceSharedPtr pAlphaCopy(
+                    cloneBitmapDevice( aSize,
+                                       shared_from_this()) );
+                basegfx::B2ITuple aGcc3WorkaroundTemporary;
+                const basegfx::B2IRange aAlphaRange( aGcc3WorkaroundTemporary,
+                                                     aSize );
+                pAlphaCopy->drawBitmap(rAlphaMask,
+                                       aSrcRange,
+                                       aAlphaRange,
+                                       DrawMode_PAINT);
+                drawMaskedColor_i( aSrcColor, pAlphaCopy, aAlphaRange, aDestPoint, rClip );
+            }
+            else
+            {
+                drawMaskedColor_i( aSrcColor, rAlphaMask, aSrcRange, aDestPoint, rClip );
+            }
+        }
+        else
+        {
+            getGenericRenderer()->drawMaskedColor( aSrcColor, rAlphaMask,
+                                                   rSrcRect, rDstPoint, rClip );
+        }
+    }
+}
+
+void BitmapDevice::drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                     const BitmapDeviceSharedPtr& rMask,
+                                     const basegfx::B2IRange&     rSrcRect,
+                                     const basegfx::B2IRange&     rDstRect,
+                                     DrawMode                     drawMode )
+{
+    OSL_ASSERT( rMask->getSize() == rSrcBitmap->getSize() );
+
+    const basegfx::B2IVector& rSrcSize( rSrcBitmap->getSize() );
+    const basegfx::B2IRange   aSrcBounds( 0,0,rSrcSize.getX(),rSrcSize.getY() );
+    basegfx::B2IRange         aSrcRange( rSrcRect );
+    basegfx::B2IRange         aDestRange( rDstRect );
+
+    if( clipAreaImpl( aDestRange,
+                      aSrcRange,
+                      mpImpl->maBounds,
+                      aSrcBounds ))
+    {
+        assertImageRange(aDestRange,mpImpl->maBounds);
+        assertImageRange(aSrcRange,aSrcBounds);
+
+        drawMaskedBitmap_i( rSrcBitmap, rMask, aSrcRange, aDestRange, drawMode );
+    }
+}
+
+void BitmapDevice::drawMaskedBitmap( const BitmapDeviceSharedPtr& rSrcBitmap,
+                                     const BitmapDeviceSharedPtr& rMask,
+                                     const basegfx::B2IRange&     rSrcRect,
+                                     const basegfx::B2IRange&     rDstRect,
+                                     DrawMode                     drawMode,
+                                     const BitmapDeviceSharedPtr& rClip )
+{
+    if( !rClip )
+    {
+        drawMaskedBitmap(rSrcBitmap,rMask,rSrcRect,rDstRect,drawMode);
+        return;
+    }
+
+    OSL_ASSERT( rMask->getSize() == rSrcBitmap->getSize() );
+
+    const basegfx::B2IVector& rSrcSize( rSrcBitmap->getSize() );
+    const basegfx::B2IRange   aSrcBounds( 0,0,rSrcSize.getX(),rSrcSize.getY() );
+    basegfx::B2IRange         aSrcRange( rSrcRect );
+    basegfx::B2IRange         aDestRange( rDstRect );
+
+    if( clipAreaImpl( aDestRange,
+                      aSrcRange,
+                      mpImpl->maBounds,
+                      aSrcBounds ))
+    {
+        assertImageRange(aDestRange,mpImpl->maBounds);
+        assertImageRange(aSrcRange,aSrcBounds);
+
+        if( isCompatibleClipMask( rClip ) )
+        {
+            drawMaskedBitmap_i( rSrcBitmap, rMask, aSrcRange, aDestRange, drawMode, rClip );
+        }
+        else
+        {
+            getGenericRenderer()->drawMaskedBitmap( rSrcBitmap, rMask, rSrcRect,
+                                                    rDstRect, drawMode, rClip );
+        }
+    }
+}
+
+
+//----------------------------------------------------------------------------------
+
+/** Standard clip and alpha masks
+ */
+struct StdMasks
+{
+    typedef PixelFormatTraits_GREY1_MSB   clipmask_format_traits;
+    typedef PixelFormatTraits_GREY8       alphamask_format_traits;
+
+    /// Clipmask: 0 means opaque
+    static const bool clipmask_polarity  = false;
+
+    /// Alpha mask: 0 means fully transparent
+    static const bool alphamask_polarity = true;
+};
+
+#if 0
+/** Clip and alpha masks for the generic renderer (of course, those
+    need to be generic, too)
+ */
+struct MaskTraitsGeneric
+{
+    typedef PixelFormatTraits_GenericInteger   clipmask_format_traits;
+    typedef PixelFormatTraits_GenericInteger   alphamask_format_traits;
+};
+#endif
+
+//----------------------------------------------------------------------------------
+
+// Some compilers don't like the nested template wrap_accessor
+// reference in the parameter list - being slightly less type safe,
+// then.
+#ifndef BASEBMP_NO_NESTED_TEMPLATE_PARAMETER
+
+/// Produces a specialized renderer for the given pixel format
+template< class FormatTraits, class MaskTraits >
+BitmapDeviceSharedPtr createRenderer(
+    const basegfx::B2IRange&                                     rBounds,
+    sal_Int32                                                    nScanlineFormat,
+    sal_Int32                                                    nScanlineStride,
+    sal_uInt8*                                                   pFirstScanline,
+    typename FormatTraits::raw_accessor_type const&              rRawAccessor,
+    typename FormatTraits::accessor_selector::template wrap_accessor<
+          typename FormatTraits::raw_accessor_type>::type const& rAccessor,
+    boost::shared_array< sal_uInt8 >                             pMem,
+    const PaletteMemorySharedVector&                             pPal )
+
+#else
+
+template< class FormatTraits, class MaskTraits, class Accessor >
+BitmapDeviceSharedPtr createRenderer(
+    const basegfx::B2IRange&                                     rBounds,
+    sal_Int32                                                    nScanlineFormat,
+    sal_Int32                                                    nScanlineStride,
+    sal_uInt8*                                                   pFirstScanline,
+    typename FormatTraits::raw_accessor_type const&              rRawAccessor,
+    Accessor const&                                              rAccessor,
+    boost::shared_array< sal_uInt8 >                             pMem,
+    const PaletteMemorySharedVector&                             pPal )
+
+#endif
+{
+    typedef typename FormatTraits::iterator_type                Iterator;
+    typedef BitmapRenderer< Iterator,
+                            typename FormatTraits::raw_accessor_type,
+                            typename FormatTraits::accessor_selector,
+                            MaskTraits >                        Renderer;
+
+    return BitmapDeviceSharedPtr(
+        new Renderer( rBounds,
+                      nScanlineFormat,
+                      nScanlineStride,
+                      pFirstScanline,
+                      Iterator(
+                          reinterpret_cast<typename Iterator::value_type*>(
+                              pFirstScanline),
+                          nScanlineStride),
+                      rRawAccessor,
+                      rAccessor,
+                      pMem,
+                      pPal ));
+}
+
+/// Create standard grey level palette
+PaletteMemorySharedVector createStandardPalette(
+    const PaletteMemorySharedVector& pPal,
+    sal_Int32                        nNumEntries )
+{
+    if( pPal || nNumEntries <= 0 )
+        return pPal;
+
+    boost::shared_ptr< std::vector<Color> > pLocalPal(
+        new std::vector<Color>(nNumEntries) );
+
+    const sal_Int32 nIncrement( 0x00FFFFFF/nNumEntries );
+    --nNumEntries;
+    for( sal_Int32 i=0, c=0; i<nNumEntries; ++i,c+=nIncrement )
+        pLocalPal->at(i) = Color(0xFF000000 | c);
+
+    pLocalPal->at(nNumEntries) = Color(0xFFFFFFFF);
+
+    return pLocalPal;
+}
+
+template< class FormatTraits, class MaskTraits >
+BitmapDeviceSharedPtr createRenderer(
+    const basegfx::B2IRange&                rBounds,
+    sal_Int32                               nScanlineFormat,
+    sal_Int32                               nScanlineStride,
+    sal_uInt8*                              pFirstScanline,
+    boost::shared_array< sal_uInt8 >        pMem,
+    const PaletteMemorySharedVector&        pPal )
+{
+    return createRenderer<FormatTraits,
+                          MaskTraits>(rBounds,
+                                      nScanlineFormat,
+                                      nScanlineStride,
+                                      pFirstScanline,
+                                      typename FormatTraits::raw_accessor_type(),
+                                      typename FormatTraits::accessor_selector::template
+                                      wrap_accessor<
+                                          typename FormatTraits::raw_accessor_type>::type(),
+                                      pMem,
+                                      pPal);
+}
+
+template< class FormatTraits, class MaskTraits >
+BitmapDeviceSharedPtr createRenderer(
+    const basegfx::B2IRange&                rBounds,
+    sal_Int32                               nScanlineFormat,
+    sal_Int32                               nScanlineStride,
+    sal_uInt8*                              pFirstScanline,
+    boost::shared_array< sal_uInt8 >        pMem,
+    PaletteMemorySharedVector               pPal,
+    int                                     nBitsPerPixel )
+{
+    pPal = createStandardPalette(pPal,
+                                 1UL << nBitsPerPixel);
+
+    OSL_ASSERT(pPal);
+    return createRenderer<FormatTraits,
+                          MaskTraits>(rBounds,
+                                      nScanlineFormat,
+                                      nScanlineStride,
+                                      pFirstScanline,
+                                      typename FormatTraits::raw_accessor_type(),
+                                      typename FormatTraits::accessor_selector::template
+                                          wrap_accessor<
+                                      typename FormatTraits::raw_accessor_type>::type(
+                                          &pPal->at(0),
+                                          pPal->size()),
+                                      pMem,
+                                      pPal);
+}
+
+//----------------------------------------------------------------------------------
+
+// TODO(Q3): consolidate with canvas/canvastools.hxx! Best move this
+// to o3tl or sal/bithacks.hxx ...
+
+/** Compute the next highest power of 2 of a 32-bit value
+
+    Code devised by Sean Anderson, in good ole HAKMEM
+    tradition.
+
+    @return 1 << (lg(x - 1) + 1)
+*/
+inline sal_uInt32 nextPow2( sal_uInt32 x )
+{
+    --x;
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+
+    return ++x;
+}
+
+//----------------------------------------------------------------------------------
+
+namespace
+{
+BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector&        rSize,
+                                              bool                             bTopDown,
+                                              sal_Int32                        nScanlineFormat,
+                                              boost::shared_array< sal_uInt8 > pMem,
+                                              PaletteMemorySharedVector        pPal,
+                                              const basegfx::B2IRange*         pSubset )
+{
+    if( nScanlineFormat <= Format::NONE ||
+        nScanlineFormat >  Format::MAX )
+        return BitmapDeviceSharedPtr();
+
+    static const sal_uInt8 bitsPerPixel[] =
+    {
+        0,  // NONE
+        1,  // ONE_BIT_MSB_GREY
+        1,  // ONE_BIT_LSB_GREY
+        1,  // ONE_BIT_MSB_PAL
+        1,  // ONE_BIT_LSB_PAL
+        4,  // FOUR_BIT_MSB_GREY
+        4,  // FOUR_BIT_LSB_GREY
+        4,  // FOUR_BIT_MSB_PAL
+        4,  // FOUR_BIT_LSB_PAL
+        8,  // EIGHT_BIT_PAL
+        8,  // EIGHT_BIT_GREY
+        16, // SIXTEEN_BIT_LSB_TC_MASK
+        16, // SIXTEEN_BIT_MSB_TC_MASK
+        24, // TWENTYFOUR_BIT_TC_MASK
+        32, // THIRTYTWO_BIT_TC_MASK
+        32, // THIRTYTWO_BIT_TC_MASK_ARGB
+    };
+
+    sal_Int32  nScanlineStride(0);
+
+    // round up to full 8 bit, divide by 8
+    nScanlineStride = (rSize.getX()*bitsPerPixel[nScanlineFormat] + 7) >> 3;
+
+    // rounded up to next full power-of-two number of bytes
+    const sal_uInt32 bytesPerPixel = nextPow2(
+        (bitsPerPixel[nScanlineFormat] + 7) >> 3);
+
+    // now make nScanlineStride a multiple of bytesPerPixel
+    nScanlineStride = (nScanlineStride + bytesPerPixel - 1) / bytesPerPixel * bytesPerPixel;
+
+    // factor in bottom-up scanline order case
+    nScanlineStride *= bTopDown ? 1 : -1;
+
+    const std::size_t nMemSize(
+        (nScanlineStride < 0 ? -nScanlineStride : nScanlineStride)*rSize.getY() );
+
+    if( !pMem )
+    {
+        pMem.reset(
+            reinterpret_cast<sal_uInt8*>(rtl_allocateMemory( nMemSize )),
+            &rtl_freeMemory );
+        rtl_zeroMemory(pMem.get(),nMemSize);
+    }
+
+    sal_uInt8* pFirstScanline = nScanlineStride < 0 ?
+        pMem.get() + nMemSize + nScanlineStride : pMem.get();
+
+    // shrink render area to given subset, if given
+    basegfx::B2IRange aBounds(0,0,rSize.getX(),rSize.getY());
+    if( pSubset )
+        aBounds.intersect( *pSubset );
+
+    switch( nScanlineFormat )
+    {
+        // ----------------------------------------------------------------------
+        // one bit formats
+
+        case Format::ONE_BIT_MSB_GREY:
+            return createRenderer<PixelFormatTraits_GREY1_MSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+        case Format::ONE_BIT_LSB_GREY:
+            return createRenderer<PixelFormatTraits_GREY1_LSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+        case Format::ONE_BIT_MSB_PAL:
+            return createRenderer<PixelFormatTraits_PAL1_MSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal,
+                bitsPerPixel[nScanlineFormat] );
+
+        case Format::ONE_BIT_LSB_PAL:
+            return createRenderer<PixelFormatTraits_PAL1_LSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal,
+                bitsPerPixel[nScanlineFormat] );
+
+
+        // ----------------------------------------------------------------------
+        // four bit formats
+
+        case Format::FOUR_BIT_MSB_GREY:
+            return createRenderer<PixelFormatTraits_GREY4_MSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+        case Format::FOUR_BIT_LSB_GREY:
+            return createRenderer<PixelFormatTraits_GREY4_LSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+        case Format::FOUR_BIT_MSB_PAL:
+            return createRenderer<PixelFormatTraits_PAL4_MSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal,
+                bitsPerPixel[nScanlineFormat] );
+
+        case Format::FOUR_BIT_LSB_PAL:
+            return createRenderer<PixelFormatTraits_PAL4_LSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal,
+                bitsPerPixel[nScanlineFormat] );
+
+
+        // ----------------------------------------------------------------------
+        // eight bit formats
+
+        case Format::EIGHT_BIT_GREY:
+            return createRenderer<PixelFormatTraits_GREY8,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+        case Format::EIGHT_BIT_PAL:
+            return createRenderer<PixelFormatTraits_PAL8,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal,
+                bitsPerPixel[nScanlineFormat] );
+
+
+        // ----------------------------------------------------------------------
+        // sixteen bit formats
+
+        case Format::SIXTEEN_BIT_LSB_TC_MASK:
+            return createRenderer<PixelFormatTraits_RGB16_565_LSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+        case Format::SIXTEEN_BIT_MSB_TC_MASK:
+            return createRenderer<PixelFormatTraits_RGB16_565_MSB,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+
+        // ----------------------------------------------------------------------
+        // twentyfour bit formats
+        case Format::TWENTYFOUR_BIT_TC_MASK:
+            return createRenderer<PixelFormatTraits_BGR24,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+
+        // ----------------------------------------------------------------------
+        // thirtytwo bit formats
+
+        case Format::THIRTYTWO_BIT_TC_MASK:
+            return createRenderer<PixelFormatTraits_RGB32_888,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+
+        case Format::THIRTYTWO_BIT_TC_MASK_ARGB:
+            return createRenderer<PixelFormatTraits_BGR32_888,StdMasks>(
+                aBounds, nScanlineFormat, nScanlineStride,
+                pFirstScanline, pMem, pPal );
+    }
+
+    // TODO(F3): other formats not yet implemented
+    return BitmapDeviceSharedPtr();
+}
+} // namespace
+
+
+BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
+                                          bool                      bTopDown,
+                                          sal_Int32                 nScanlineFormat )
+{
+    return createBitmapDeviceImpl( rSize,
+                                   bTopDown,
+                                   nScanlineFormat,
+                                   boost::shared_array< sal_uInt8 >(),
+                                   PaletteMemorySharedVector(),
+                                   NULL );
+}
+
+BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize,
+                                          bool                             bTopDown,
+                                          sal_Int32                        nScanlineFormat,
+                                          const PaletteMemorySharedVector& rPalette )
+{
+    return createBitmapDeviceImpl( rSize,
+                                   bTopDown,
+                                   nScanlineFormat,
+                                   boost::shared_array< sal_uInt8 >(),
+                                   rPalette,
+                                   NULL );
+}
+
+BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize,
+                                          bool                             bTopDown,
+                                          sal_Int32                        nScanlineFormat,
+                                          const RawMemorySharedArray&      rMem,
+                                          const PaletteMemorySharedVector& rPalette )
+{
+    return createBitmapDeviceImpl( rSize,
+                                   bTopDown,
+                                   nScanlineFormat,
+                                   rMem,
+                                   rPalette,
+                                   NULL );
+}
+
+BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr&     rProto,
+                                          const basegfx::B2IRange&         rSubset )
+{
+    return createBitmapDeviceImpl( rProto->getSize(),
+                                   rProto->isTopDown(),
+                                   rProto->getScanlineFormat(),
+                                   rProto->getBuffer(),
+                                   rProto->getPalette(),
+                                   &rSubset );
+}
+
+BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector&        rSize,
+                                         const BitmapDeviceSharedPtr&     rProto )
+{
+    return createBitmapDeviceImpl( rSize,
+                                   rProto->isTopDown(),
+                                   rProto->getScanlineFormat(),
+                                   boost::shared_array< sal_uInt8 >(),
+                                   rProto->getPalette(),
+                                   NULL );
+}
+
+//----------------------------------------------------------------------------------
+
+/// Clone our device, with GenericImageAccessor to handle all formats
+BitmapDeviceSharedPtr BitmapDevice::getGenericRenderer() const
+{
+#if 0
+    // xxx TODO
+    typedef BitmapRenderer< PixelFormatTraits_GenericInteger::iterator_type,
+                            PixelFormatTraits_GenericInteger::raw_accessor_type,
+                            PixelFormatTraits_GenericInteger::accessor_selector,
+                            MaskTraitsGeneric >
+            Renderer;
+
+    if( !mpImpl->mpGenericRenderer )
+    {
+        mpImpl->mpGenericRenderer.reset(
+            new Renderer(
+                mpImpl->maBounds,
+                isTopDown(),
+                getScanlineFormat(),
+                getScanlineStride(),
+                mpImpl->mpFirstScanline,
+                PixelFormatTraits_GenericInteger::iterator_type(),
+                GenericIntegerImageRawAccessor<Color>(
+                    const_cast<BitmapDevice*>(this)->shared_from_this()),
+                GenericIntegerImageAccessor<Color>(
+                    const_cast<BitmapDevice*>(this)->shared_from_this()),
+                getBuffer(),
+                getPalette() ));
+    }
+#endif
+
+    return mpImpl->mpGenericRenderer;
+}
+
+} // namespace basebmp
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
new file mode 100644
index 000000000000..7781e43c19bc
--- /dev/null
+++ b/basebmp/source/debug.cxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <osl/diagnose.h>
+
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/vector/b2ivector.hxx>
+
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/color.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+
+#include <iomanip>
+
+namespace basebmp
+{
+    namespace
+    {
+        static const char* getFormatString( sal_Int32 nScanlineFormat )
+        {
+            switch( nScanlineFormat )
+            {
+                case Format::ONE_BIT_MSB_GREY:
+                    return "ONE_BIT_MSB_GREY";
+                case Format::ONE_BIT_LSB_GREY:
+                    return "ONE_BIT_LSB_GREY";
+                case Format::ONE_BIT_MSB_PAL:
+                    return "ONE_BIT_MSB_PAL";
+                case Format::ONE_BIT_LSB_PAL:
+                    return "ONE_BIT_LSB_PAL";
+                case Format::FOUR_BIT_MSB_GREY:
+                    return "FOUR_BIT_MSB_GREY";
+                case Format::FOUR_BIT_LSB_GREY:
+                    return "FOUR_BIT_LSB_GREY";
+                case Format::FOUR_BIT_MSB_PAL:
+                    return "FOUR_BIT_MSB_PAL";
+                case Format::FOUR_BIT_LSB_PAL:
+                    return "FOUR_BIT_LSB_PAL";
+                case Format::EIGHT_BIT_PAL:
+                    return "EIGHT_BIT_PAL";
+                case Format::EIGHT_BIT_GREY:
+                    return "EIGHT_BIT_GREY";
+                case Format::SIXTEEN_BIT_LSB_TC_MASK:
+                    return "SIXTEEN_BIT_LSB_TC_MASK";
+                case Format::SIXTEEN_BIT_MSB_TC_MASK:
+                    return "SIXTEEN_BIT_MSB_TC_MASK";
+                case Format::TWENTYFOUR_BIT_TC_MASK:
+                    return "TWENTYFOUR_BIT_TC_MASK";
+                case Format::THIRTYTWO_BIT_TC_MASK:
+                    return "THIRTYTWO_BIT_TC_MASK";
+                default:
+                    return "<unknown>";
+            }
+        }
+    }
+
+    void debugDump( const BitmapDeviceSharedPtr& rDevice,
+                    std::ostream&                rOutputStream )
+    {
+        const basegfx::B2IVector aSize( rDevice->getSize() );
+        const bool               bTopDown( rDevice->isTopDown() );
+        const sal_Int32          nScanlineFormat( rDevice->getScanlineFormat() );
+
+        rOutputStream
+            << "/* basebmp::BitmapDevice content dump */" << std::endl
+            << "/* Width   = " << aSize.getX() << " */" << std::endl
+            << "/* Height  = " << aSize.getY() << " */" << std::endl
+            << "/* TopDown = " << bTopDown << " */" << std::endl
+            << "/* Format  = " << getFormatString(nScanlineFormat) << " */" << std::endl
+            << "/* (dumped entries are already mapped RGBA color values) */" << std::endl
+            << std::endl;
+
+        rOutputStream << std::hex;
+        for( int y=0; y<aSize.getY(); ++y )
+        {
+            for( int x=0; x<aSize.getX(); ++x )
+                rOutputStream << std::setw(8) << (sal_uInt32)rDevice->getPixel( basegfx::B2IPoint(x,y) ).toInt32() << " ";
+            rOutputStream << std::endl;
+        }
+    }
+}
diff --git a/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx
new file mode 100644
index 000000000000..0fb7a0bf684a
--- /dev/null
+++ b/basebmp/source/intconversion.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEBMP_INTCONVERSION_HXX
+#define INCLUDED_BASEBMP_INTCONVERSION_HXX
+
+#include <vigra/rgbvalue.hxx>
+#include <functional>
+
+namespace basebmp
+{
+    // metafunctions to retrieve correct POD from/to basebmp::Color
+    //------------------------------------------------------------------------
+
+    /// type-safe conversion from RgbValue to packed int32
+    template< class RgbVal > struct UInt32FromRgbValue
+    {
+        sal_uInt32 operator()( RgbVal const& c ) const
+        {
+            return (c[0] << 16) | (c[1] << 8) | c[2];
+        }
+    };
+
+    /// type-safe conversion from packed int32 to RgbValue
+    template< class RgbVal > struct RgbValueFromUInt32
+    {
+        RgbVal operator()( sal_uInt32 c ) const
+        {
+            return RgbVal((c >> 16) & 0xFF,
+                          (c >> 8) & 0xFF,
+                          c & 0xFF);
+        }
+    };
+
+    /// Get converter from given data type to sal_uInt32
+    template< typename DataType > struct uInt32Converter
+    {
+        typedef std::identity<DataType> to;
+        typedef std::identity<DataType> from;
+    };
+    template< unsigned int RedIndex,
+              unsigned int GreenIndex,
+              unsigned int BlueIndex > struct uInt32Converter<
+                  vigra::RGBValue< sal_uInt8,
+                                   RedIndex,
+                                   GreenIndex,
+                                   BlueIndex > >
+    {
+        typedef UInt32FromRgbValue<
+            vigra::RGBValue< sal_uInt8,
+                             RedIndex,
+                             GreenIndex,
+                             BlueIndex > >
+            to;
+        typedef RgbValueFromUInt32<
+            vigra::RGBValue< sal_uInt8,
+                             RedIndex,
+                             GreenIndex,
+                             BlueIndex > >
+            from;
+    };
+}
+
+#endif /* INCLUDED_BASEBMP_INTCONVERSION_HXX */
diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
new file mode 100644
index 000000000000..55b27cfa7565
--- /dev/null
+++ b/basebmp/source/makefile.mk
@@ -0,0 +1,76 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/
+
+PRJNAME=basebmp
+TARGET=wrapper
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+
+# TODO(F3) unify BASEBMP_NO_NESTED_TEMPLATE_PARAMETER and
+# VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS
+#
+# - VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS avoids template parameters
+#   to templates - the template keyword is broken for SunCC
+# - VIGRA_HAS_LONG_LONG enables long long overloads (but appears to not work
+#   reliably in some environments, and is thus not enabled)
+# - VIGRA_HAS_LONG_DOUBLE enables long double overloads 
+
+.IF "$(OS)"!="WNT"
+CDEFS+= -DVIGRA_HAS_LONG_DOUBLE
+.ENDIF
+
+.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
+CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER -DVIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
+.ENDIF
+
+# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail 
+# if compiled with default -xalias_level (and optimization level -xO3)
+.IF "$(OS)"=="SOLARIS"
+# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
+.IF "$(CCNUMVER)"!="00050005"
+CDEFS+=-xalias_level=compatible
+.ENDIF
+.ENDIF
+
+# --- Common ----------------------------------------------------------
+
+SLOFILES =	\
+    $(SLO)$/bitmapdevice.obj \
+    $(SLO)$/debug.obj \
+    $(SLO)$/polypolygonrenderer.obj
+
+#	$(SLO)$/genericintegerimageaccessor.obj \
+
+# ==========================================================================
+
+.INCLUDE :	target.mk
diff --git a/basebmp/source/polypolygonrenderer.cxx b/basebmp/source/polypolygonrenderer.cxx
new file mode 100644
index 000000000000..79453402ef4c
--- /dev/null
+++ b/basebmp/source/polypolygonrenderer.cxx
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "basebmp/polypolygonrenderer.hxx"
+
+#include <algorithm>
+
+
+namespace basebmp
+{
+namespace detail
+{
+    sal_uInt32 setupGlobalEdgeTable( VectorOfVectorOfVertices&      rGET,
+                                     basegfx::B2DPolyPolygon const& rPolyPoly,
+                                     sal_Int32                      nMinY )
+    {
+        sal_Int32 const nNumScanlines( (sal_Int32)rGET.size() );
+
+        // add all polygons to GET
+        for( sal_uInt32 i(0), nCount(rPolyPoly.count());
+             i<nCount;
+             ++i )
+        {
+            // add all vertices to GET
+            const basegfx::B2DPolygon& rPoly( rPolyPoly.getB2DPolygon(i) );
+            for( sal_uInt32 k(0), nVertices(rPoly.count());
+                 k<nVertices;
+                 ++k )
+            {
+                const basegfx::B2DPoint& rP1( rPoly.getB2DPoint(k) );
+                const basegfx::B2DPoint& rP2( rPoly.getB2DPoint( (k + 1) % nVertices ) );
+
+                const sal_Int32 nVertexYP1( basegfx::fround(rP1.getY()) );
+                const sal_Int32 nVertexYP2( basegfx::fround(rP2.getY()) );
+
+                // insert only vertices which are not strictly
+                // horizontal. Strictly horizontal vertices don't add
+                // any information that is not already present - due
+                // to their adjacent vertices.
+                if(nVertexYP1 != nVertexYP2)
+                {
+                    if( nVertexYP2 < nVertexYP1 )
+                    {
+                        const sal_Int32 nStartScanline(nVertexYP2 - nMinY);
+
+                        // edge direction is upwards - add with swapped vertices
+                        if( nStartScanline < nNumScanlines )
+                            rGET[ nStartScanline ].push_back( Vertex(rP2, rP1, false) );
+                    }
+                    else
+                    {
+                        const sal_Int32 nStartScanline(nVertexYP1 - nMinY);
+
+                        if( nStartScanline < nNumScanlines )
+                            rGET[ nStartScanline ].push_back( Vertex(rP1, rP2, true) );
+                    }
+                }
+            }
+        }
+
+        // now sort all scanlines individually, with increasing x
+        // coordinates
+        VectorOfVectorOfVertices::iterator       aIter( rGET.begin() );
+        const VectorOfVectorOfVertices::iterator aEnd( rGET.end() );
+        sal_uInt32                               nVertexCount(0);
+        RasterConvertVertexComparator            aComp;
+        while( aIter != aEnd )
+        {
+            std::sort( aIter->begin(),
+                       aIter->end(),
+                       aComp );
+            nVertexCount += aIter->size();
+
+            ++aIter;
+        }
+
+        return nVertexCount;
+    }
+
+    void sortAET( VectorOfVertexPtr& rAETSrc,
+                  VectorOfVertexPtr& rAETDest )
+    {
+        static RasterConvertVertexComparator aComp;
+
+        rAETDest.clear();
+
+        // prune AET from ended edges
+        VectorOfVertexPtr::iterator iter( rAETSrc.begin() );
+        VectorOfVertexPtr::iterator const end( rAETSrc.end() );
+        while( iter != end )
+        {
+            if( (*iter)->mnYCounter > 0 )
+                rAETDest.push_back( *iter );
+            ++iter;
+        }
+
+        // stable sort is necessary, to avoid segment crossing where
+        // none was intended.
+        std::stable_sort( rAETDest.begin(), rAETDest.end(), aComp );
+    }
+
+} // namespace detail
+} // namespace basebmp
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
new file mode 100644
index 000000000000..6f96cf56f492
--- /dev/null
+++ b/basebmp/test/basictest.cxx
@@ -0,0 +1,300 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+  std::ofstream output("32bpp_test.dump");
+  debugDump( mpDevice32bpp, output );
+*/
+
+class BasicTest : public CppUnit::TestFixture
+{
+public:
+    void colorTest()
+    {
+        Color aTestColor;
+
+        aTestColor = Color(0xDEADBEEF);
+        CPPUNIT_ASSERT_MESSAGE("unary constructor",
+                               aTestColor.toInt32() == 0xDEADBEEF );
+
+        aTestColor = Color( 0x10, 0x20, 0xFF );
+        CPPUNIT_ASSERT_MESSAGE("ternary constructor",
+                               aTestColor.toInt32() == 0x001020FF );
+
+        aTestColor.setRed( 0x0F );
+        CPPUNIT_ASSERT_MESSAGE("setRed()",
+                               aTestColor.toInt32() == 0x00F20FF );
+
+        aTestColor.setGreen( 0x0F );
+        CPPUNIT_ASSERT_MESSAGE("setGreen()",
+                               aTestColor.toInt32() == 0x00F0FFF );
+
+        aTestColor.setBlue( 0x10 );
+        CPPUNIT_ASSERT_MESSAGE("setBlue()",
+                               aTestColor.toInt32() == 0x00F0F10 );
+
+        aTestColor.setGrey( 0x13 );
+        CPPUNIT_ASSERT_MESSAGE("setGrey()",
+                               aTestColor.toInt32() == 0x00131313 );
+
+        aTestColor = Color( 0x10, 0x20, 0xFF );
+        CPPUNIT_ASSERT_MESSAGE("getRed()",
+                               aTestColor.getRed() == 0x10 );
+        CPPUNIT_ASSERT_MESSAGE("getGreen()",
+                               aTestColor.getGreen() == 0x20 );
+        CPPUNIT_ASSERT_MESSAGE("getBlue()",
+                               aTestColor.getBlue() == 0xFF );
+
+    }
+
+    void testConstruction()
+    {
+        const basegfx::B2ISize aSize(101,101);
+        basegfx::B2ISize       aSize2(aSize);
+        BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
+                                                           true,
+                                                           Format::ONE_BIT_MSB_PAL ));
+        CPPUNIT_ASSERT_MESSAGE("right size",
+                               pDevice->getSize() == aSize2 );
+        CPPUNIT_ASSERT_MESSAGE("Top down format",
+                               pDevice->isTopDown() == true );
+        CPPUNIT_ASSERT_MESSAGE("Scanline format",
+                               pDevice->getScanlineFormat() == Format::ONE_BIT_MSB_PAL );
+        CPPUNIT_ASSERT_MESSAGE("Scanline len",
+                               pDevice->getScanlineStride() == (aSize2.getY() + 7)/8 );
+        CPPUNIT_ASSERT_MESSAGE("Palette existence",
+                               pDevice->getPalette() );
+        CPPUNIT_ASSERT_MESSAGE("Palette entry 0 is black",
+                               (*pDevice->getPalette())[0] == Color(0) );
+        CPPUNIT_ASSERT_MESSAGE("Palette entry 1 is white",
+                               (*pDevice->getPalette())[1] == Color(0xFFFFFFFF) );
+    }
+
+    void testPixelFuncs()
+    {
+        // 1bpp
+        const basegfx::B2ISize aSize(64,64);
+        BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
+                                                           true,
+                                                           Format::ONE_BIT_MSB_PAL ));
+
+        const basegfx::B2IPoint aPt(3,3);
+        const Color aCol(0xFFFFFFFF);
+        pDevice->setPixel( aPt, aCol, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #1",
+                               pDevice->getPixel(aPt) == aCol);
+
+        const basegfx::B2IPoint aPt2(0,0);
+        const Color aCol2(0xFFFFFFFF);
+        pDevice->setPixel( aPt2, aCol2, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #2",
+                               pDevice->getPixel(aPt2) == aCol2);
+
+        const basegfx::B2IPoint aPt3(aSize.getX()-1,aSize.getY()-1);
+        const Color aCol3(0x00000000);
+        pDevice->setPixel( aPt3, aCol3, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #3",
+                               pDevice->getPixel(aPt3) == aCol3);
+
+        pDevice->setPixel( aPt3, aCol2, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #3.5",
+                               pDevice->getPixel(aPt3) == aCol2);
+
+        const basegfx::B2IPoint aPt4(-100000,-100000);
+        pDevice->setPixel( aPt4, aCol3, DrawMode_PAINT );
+        const basegfx::B2IPoint aPt5(100000,100000);
+        pDevice->setPixel( aPt5, aCol3, DrawMode_PAINT );
+
+        sal_Int32 nPixel(countPixel(pDevice, aCol2));
+        const basegfx::B2IPoint aPt6(aSize.getX(),aSize.getY());
+        pDevice->setPixel( aPt6, aCol2, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("setPixel clipping",
+                               countPixel(pDevice, aCol2) == nPixel);
+
+        CPPUNIT_ASSERT_MESSAGE("raw pixel value #1",
+                               pDevice->getBuffer()[0] == 0x80);
+
+        // 1bit LSB
+        {
+            pDevice = createBitmapDevice( aSize,
+                                          true,
+                                          Format::ONE_BIT_LSB_PAL );
+
+            pDevice->setPixel( aPt2, aCol, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #4",
+                                   pDevice->getPixel(aPt2) == aCol);
+
+            const basegfx::B2IPoint aPt222(1,1);
+            pDevice->setPixel( aPt222, aCol, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #5",
+                                   pDevice->getPixel(aPt222) == aCol);
+
+            pDevice->setPixel( aPt3, aCol, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #6",
+                                   pDevice->getPixel(aPt3) == aCol);
+
+            CPPUNIT_ASSERT_MESSAGE("raw pixel value #2",
+                                   pDevice->getBuffer()[0] == 0x01);
+            CPPUNIT_ASSERT_MESSAGE("raw pixel value #3",
+                                   pDevice->getBuffer()[8] == 0x02);
+        }
+
+        // 8bit alpha
+        {
+            pDevice = createBitmapDevice( aSize,
+                                          true,
+                                          Format::EIGHT_BIT_GREY );
+
+            const Color aCol4(0x010101);
+            pDevice->setPixel( aPt, aCol4, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #4",
+                                   pDevice->getPixel(aPt) == aCol4);
+
+            const Color aCol5(0x0F0F0F);
+            pDevice->setPixel( aPt2, aCol5, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #5",
+                                   pDevice->getPixel(aPt2) == aCol5);
+
+            const Color aCol6(0xFFFFFF);
+            pDevice->setPixel( aPt3, aCol6, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #6",
+                                   pDevice->getPixel(aPt3) == aCol6);
+        }
+
+        // 16bpp
+        {
+            pDevice = createBitmapDevice( aSize,
+                                          true,
+                                          Format::SIXTEEN_BIT_LSB_TC_MASK );
+            const Color aCol7(0);
+            pDevice->clear( aCol7 );
+
+            const Color aCol4(0x00101010);
+            pDevice->setPixel( aPt, aCol4, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #7",
+                                   pDevice->getPixel(aPt) == aCol4);
+
+            const Color aCol5(0x00F0F0F0);
+            pDevice->setPixel( aPt2, aCol5, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #8",
+                                   pDevice->getPixel(aPt2) != aCol7);
+
+            const Color aCol6(0x00FFFFFF);
+            pDevice->setPixel( aPt3, aCol6, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #9",
+                                   pDevice->getPixel(aPt3) == aCol6);
+        }
+
+        // 24bpp
+        {
+            pDevice = createBitmapDevice( aSize,
+                                          true,
+                                          Format::TWENTYFOUR_BIT_TC_MASK );
+
+            const Color aCol4(0x01010101);
+            pDevice->setPixel( aPt, aCol4, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #10",
+                                   pDevice->getPixel(aPt) == aCol4);
+
+            const Color aCol5(0x0F3F2F1F);
+            pDevice->setPixel( aPt2, aCol5, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #11",
+                                   pDevice->getPixel(aPt2) == aCol5);
+
+            const Color aCol6(0xFFFFFFFF);
+            pDevice->setPixel( aPt3, aCol6, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #12",
+                                   pDevice->getPixel(aPt3) == aCol6);
+
+            CPPUNIT_ASSERT_MESSAGE("raw pixel value #4",
+                                   pDevice->getBuffer()[2] == 0x3F
+                                   && pDevice->getBuffer()[1] == 0x2F
+                                   && pDevice->getBuffer()[0] == 0x1F);
+        }
+
+        // 32bpp
+        {
+            pDevice = createBitmapDevice( aSize,
+                                          true,
+                                          Format::THIRTYTWO_BIT_TC_MASK );
+
+            const Color aCol4(0x01010101);
+            pDevice->setPixel( aPt, aCol4, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #13",
+                                   pDevice->getPixel(aPt) == aCol4);
+
+            const Color aCol5(0x0F0F0F0F);
+            pDevice->setPixel( aPt2, aCol5, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #14",
+                                   pDevice->getPixel(aPt2) == aCol5);
+
+            const Color aCol6(0xFFFFFFFF);
+            pDevice->setPixel( aPt3, aCol6, DrawMode_PAINT );
+            CPPUNIT_ASSERT_MESSAGE("get/setPixel roundtrip #15",
+                                   pDevice->getPixel(aPt3) == aCol6);
+        }
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(BasicTest);
+    CPPUNIT_TEST(colorTest);
+    CPPUNIT_TEST(testConstruction);
+    CPPUNIT_TEST(testPixelFuncs);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest);
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
new file mode 100644
index 000000000000..99aa1bac2c5c
--- /dev/null
+++ b/basebmp/test/bmpdemo.cxx
@@ -0,0 +1,1256 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef  _USE_MATH_DEFINES
+#define  _USE_MATH_DEFINES  // needed by Visual C++ for math constants
+#endif
+#include <math.h>
+
+#include <comphelper/processfactory.hxx>
+#include <comphelper/regpathhelper.hxx>
+#include <cppuhelper/servicefactory.hxx>
+#include <cppuhelper/bootstrap.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/registry/XSimpleRegistry.hpp>
+
+#include <ucbhelper/contentbroker.hxx>
+#include <ucbhelper/configurationkeys.hxx>
+
+#include <vcl/window.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/unowrap.hxx>
+#include <vcl/bitmap.hxx>
+#include <vcl/bmpacc.hxx>
+
+#include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygonrasterconverter.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+
+#include <rtl/bootstrap.hxx>
+
+#include <vigra/metaprogramming.hxx>
+#include <vigra/static_assert.hxx>
+#include <vigra/basicimageview.hxx>
+
+#include <boost/static_assert.hpp>
+#include <algorithm>
+#include <iostream>
+#include <fstream>
+
+using namespace ::com::sun::star;
+
+
+namespace
+{
+
+/// template meta function: add const qualifier, if given 2nd type has it
+template<typename A, typename B> struct clone_const
+{
+    typedef B type;
+};
+template<typename A, typename B> struct clone_const<const A,B>
+{
+    typedef const B type;
+};
+
+template< class DestIterator, class DestAccessor > class Renderer :
+        public basegfx::B2DPolyPolygonRasterConverter
+{
+private:
+    typename DestIterator::value_type fillColor_;
+    typename DestIterator::value_type clearColor_;
+    DestIterator                      begin_;
+    DestAccessor                      accessor_;
+
+public:
+    Renderer(const basegfx::B2DPolyPolygon&     rPolyPolyRaster,
+             typename DestIterator::value_type  fillColor,
+             typename DestIterator::value_type  clearColor,
+             DestIterator                       begin,
+             DestIterator                       end,
+             DestAccessor                       accessor ) :
+        B2DPolyPolygonRasterConverter(rPolyPolyRaster,
+                                      basegfx::B2DRange(0,0,
+                                                        end.x - end.x,
+                                                        begin.y - begin.y )),
+        fillColor_( fillColor ),
+        clearColor_( clearColor ),
+        begin_( begin ),
+        accessor_( accessor )
+    {
+    }
+
+    virtual void span(const double& rfXLeft,
+                      const double& rfXRight,
+                      sal_Int32     nY,
+                      bool          bOn )
+    {
+        DestIterator currIter( begin_ + vigra::Diff2D(0,nY) );
+        typename DestIterator::row_iterator rowIter( currIter.rowIterator() +
+                                                     basegfx::fround(rfXLeft) );
+        typename DestIterator::row_iterator rowEnd( currIter.rowIterator() +
+                                                    basegfx::fround(rfXRight) );
+        if( bOn )
+            while( rowIter != rowEnd )
+            {
+                accessor_.set(fillColor_, rowIter);
+                ++rowIter;
+            }
+        else
+            while( rowIter != rowEnd )
+            {
+                accessor_.set(accessor_(rowIter)*clearColor_, rowIter);
+                ++rowIter;
+            }
+    }
+};
+
+template< class DestIterator, class DestAccessor >
+    std::auto_ptr< Renderer< DestIterator, DestAccessor > > makeRenderer(
+        const basegfx::B2DPolyPolygon&                          rPolyPolyRaster,
+        typename DestIterator::value_type                       fillColor,
+        typename DestIterator::value_type                       clearColor,
+        vigra::triple<DestIterator, DestIterator, DestAccessor> dest )
+{
+    return std::auto_ptr< Renderer< DestIterator, DestAccessor > >(
+        new Renderer< DestIterator, DestAccessor >(rPolyPolyRaster,
+                                                   fillColor,
+                                                   clearColor,
+                                                   dest.first,
+                                                   dest.second,
+                                                   dest.third));
+}
+
+
+// changed semantics re. DirectionSelector<StridedArrayTag>: stride
+// now counts in <em>raw</em> bytes!
+template< typename T > class StridedArrayIterator
+{
+public:
+    typedef typename clone_const<T, unsigned char>::type  internal_type;
+
+    StridedArrayIterator(int stride, T* ptr = 0) :
+        stride_(stride),
+        current_(reinterpret_cast<internal_type*>(ptr))
+    {}
+
+    /// Copy from other StridedArrayIterator, plus given offset
+    StridedArrayIterator( StridedArrayIterator const& rSrc,
+                          int                         offset ) :
+        stride_(rSrc.stride_),
+        current_(reinterpret_cast<internal_type*>(
+                     reinterpret_cast<T*>(rSrc.current_)+offset))
+    {}
+
+    void operator++() {current_ += stride_; }
+    void operator++(int) {current_ += stride_; }
+    void operator--() {current_ -= stride_; }
+    void operator--(int) {current_ -= stride_; }
+    void operator+=(int dy) {current_ += dy*stride_; }
+    void operator-=(int dy) {current_ -= dy*stride_; }
+
+    bool operator==(StridedArrayIterator const & rhs) const
+    { return (current_ == rhs.current_); }
+
+    bool operator!=(StridedArrayIterator const & rhs) const
+    { return (current_ != rhs.current_); }
+
+    bool operator<(StridedArrayIterator const & rhs) const
+    { return (current_ < rhs.current_); }
+
+    bool operator<=(StridedArrayIterator const & rhs) const
+    { return (current_ <= rhs.current_); }
+
+    bool operator>(StridedArrayIterator const & rhs) const
+    { return (current_ > rhs.current_); }
+
+    bool operator>=(StridedArrayIterator const & rhs) const
+    { return (current_ >= rhs.current_); }
+
+    int operator-(StridedArrayIterator const & rhs) const
+    { return (current_ - rhs.current_) / stride_; }
+
+    T* operator()() const
+    { return reinterpret_cast<T*>(current_); }
+
+    T* operator()(int d) const
+    { return reinterpret_cast<T*>(current_ + d*stride_); }
+
+    int            stride_;
+    internal_type* current_;
+};
+
+/// template meta function: remove const qualifier from plain type
+template <typename T> struct remove_const
+{
+    typedef T type;
+};
+template <typename T> struct remove_const<const T>
+{
+    typedef T type;
+};
+
+/// returns true, if given number is strictly less than 0
+template< typename T > inline bool is_negative( T x )
+{
+    return x < 0;
+}
+
+/// Overload for ints (branch-free)
+inline bool is_negative( int x )
+{
+    // force logic shift (result for signed shift right is undefined)
+    return static_cast<unsigned int>(x) >> (sizeof(int)*8-1);
+}
+
+/// Get bitmask for data at given intra-word position, for given bit depth
+template< typename data_type, int bits_per_pixel, bool MsbFirst, typename difference_type > inline data_type get_mask( difference_type d )
+{
+    BOOST_STATIC_ASSERT(bits_per_pixel > 0);
+    BOOST_STATIC_ASSERT(sizeof(data_type)*8 % bits_per_pixel == 0);
+    BOOST_STATIC_ASSERT(sizeof(data_type)*8 / bits_per_pixel > 1);
+    BOOST_STATIC_ASSERT(vigra::TypeTraits<data_type>::isPOD::asBool);
+
+    const unsigned int nIntraWordPositions( sizeof(data_type)*8 / bits_per_pixel );
+
+    //      create bits_per_pixel 1s      shift to intra-word position
+    return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
+                                                         (nIntraWordPositions-1 - (d % nIntraWordPositions)) :
+                                                         (d % nIntraWordPositions)));
+}
+
+template< int num_intraword_positions, int bits_per_pixel, bool MsbFirst, typename difference_type > inline difference_type get_shift( difference_type remainder )
+{
+    return bits_per_pixel*(MsbFirst ?
+                           (num_intraword_positions - 1 - remainder) :
+                           remainder);
+}
+
+template< typename Datatype,
+          typename Valuetype,
+          int      bits_per_pixel,
+          bool     MsbFirst > class PackedPixelColumnIterator
+{
+public:
+    // no reference, no index_reference type here
+    typedef Datatype                                    data_type;
+    typedef Valuetype                                   value_type;
+    typedef int                                         difference_type;
+    typedef image_traverser_tag                         iterator_category;
+
+    typedef typename remove_const<data_type>::type      mask_type;
+    typedef data_type*                                  pointer;
+    typedef StridedArrayIterator< data_type >           MoveY;
+
+    enum {
+        /** The number of pixel within a single data_type value
+         */
+        num_intraword_positions=sizeof(data_type)*8/bits_per_pixel,
+        /** Bit mask for one pixel (least significant bits)
+         */
+        bit_mask=~(~0 << bits_per_pixel)
+    };
+
+private:
+    MoveY           y;
+    mask_type       mask_;
+    difference_type shift_;
+
+    void inc()
+    {
+        ++y;
+    }
+
+    void dec()
+    {
+        --y;
+    }
+
+    bool equal( PackedPixelColumnIterator const & rhs ) const
+    {
+        return rhs.y == y;
+    }
+
+    bool less( PackedPixelColumnIterator const & rhs ) const
+    {
+        return y < rhs.y;
+    }
+
+public:
+    PackedPixelColumnIterator() :
+        y(0),
+        mask_( get_mask<data_type, bits_per_pixel, MsbFirst, difference_type>(0) ),
+        shift_( get_shift<num_intraword_positions, bits_per_pixel, MsbFirst, difference_type>(0) )
+    {}
+
+    PackedPixelColumnIterator( const MoveY& base, difference_type remainder ) :
+        y(base),
+        mask_( get_mask<data_type, bits_per_pixel, MsbFirst>(remainder) ),
+        shift_( get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder) )
+    {}
+
+    PackedPixelColumnIterator& operator+=( difference_type d )
+    {
+        y += d;
+        return *this;
+    }
+
+    PackedPixelColumnIterator& operator-=( difference_type d )
+    {
+        y -= d;
+        return *this;
+    }
+
+    PackedPixelColumnIterator operator+( difference_type d )
+    {
+        PackedPixelColumnIterator res(*this);
+        res += d;
+        return res;
+    }
+
+    PackedPixelColumnIterator operator-( difference_type d )
+    {
+        PackedPixelColumnIterator res(*this);
+        res -= d;
+        return res;
+    }
+
+    PackedPixelColumnIterator& operator++()
+    {
+        inc();
+        return *this;
+    }
+
+    PackedPixelColumnIterator& operator--()
+    {
+        dec();
+        return *this;
+    }
+
+    PackedPixelColumnIterator operator++(int)
+    {
+        PackedPixelColumnIterator res(*this);
+        res.inc();
+        return res;
+    }
+
+    PackedPixelColumnIterator operator--(int)
+    {
+        PackedPixelColumnIterator res(*this);
+        res.dec();
+        return res;
+    }
+
+    bool operator==(PackedPixelColumnIterator const & rhs) const
+    {
+        return equal( rhs );
+    }
+
+    bool operator!=(PackedPixelColumnIterator const & rhs) const
+    {
+        return !equal( rhs );
+    }
+
+    bool operator<(PackedPixelColumnIterator const & rhs) const
+    {
+        return less(rhs);
+    }
+
+    bool operator<=(PackedPixelColumnIterator const & rhs) const
+    {
+        return !less(rhs);
+    }
+
+    bool operator>(PackedPixelColumnIterator const & rhs) const
+    {
+        return rhs.less(*this);
+    }
+
+    bool operator>=(PackedPixelColumnIterator const & rhs) const
+    {
+        return !rhs.less(*this);
+    }
+
+    difference_type operator-(PackedPixelColumnIterator const & rhs) const
+    {
+        return y - rhs.y;
+    }
+
+    value_type get() const
+    {
+        // TODO(Q3): use traits to get unsigned type for data_type (if
+        // not already)
+        return static_cast<unsigned int>(*y() & mask_) >> shift_;
+    }
+
+    value_type get(difference_type d) const
+    {
+        // TODO(Q3): use traits to get unsigned type for data_type (if
+        // not already)
+        return static_cast<unsigned int>(*y(d) & mask_) >> shift_;
+    }
+
+    void set( value_type v ) const
+    {
+        const value_type pixel_value( (v << shift_) & mask_ );
+        *y() = (*y() & ~mask_) | pixel_value;
+    }
+
+    void set( value_type v, difference_type d ) const
+    {
+        const value_type pixel_value( (v << shift_) & mask_ );
+        *y(d) = (*y(d) & ~mask_) | pixel_value;
+    }
+};
+
+template< typename Datatype,
+          typename Valuetype,
+          int      bits_per_pixel,
+          bool     MsbFirst > class PackedPixelRowIterator
+{
+public:
+    // no reference, no index_reference type here
+    typedef Datatype                                    data_type;
+    typedef Valuetype                                   value_type;
+    typedef int                                         difference_type;
+    typedef image_traverser_tag                         iterator_category;
+
+    typedef typename remove_const<data_type>::type      mask_type;
+    typedef data_type*                                  pointer;
+
+    enum {
+        /** The number of pixel within a single data_type value
+         */
+        num_intraword_positions=sizeof(data_type)*8/bits_per_pixel,
+        /** Bit mask for one pixel (least significant bits)
+         */
+        bit_mask=~(~0 << bits_per_pixel)
+    };
+
+private:
+    pointer         data_;
+    mask_type       mask_;
+    difference_type remainder_;
+
+    void update_mask()
+    {
+        mask_ = get_mask<data_type, bits_per_pixel, MsbFirst>(remainder_);
+    }
+
+    void inc()
+    {
+        const difference_type newValue( remainder_ + 1 );
+        const difference_type data_offset( newValue / num_intraword_positions );
+
+        data_ += data_offset;
+        remainder_ = newValue % num_intraword_positions;
+
+        const mask_type shifted_mask(
+            MsbFirst ?
+            // TODO(Q3): use traits to get unsigned type for data_type
+            // (if not already)
+            static_cast<unsigned int>(mask_) >> bits_per_pixel :
+            mask_ << bits_per_pixel );
+
+        // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+                                                            bit_mask << bits_per_pixel*(num_intraword_positions-1) :
+                                                            bit_mask);
+    }
+
+    void dec()
+    {
+        const difference_type newValue( remainder_ - 1 );
+        const bool            isNegative( is_negative(newValue) );
+        const difference_type newRemainder( newValue % num_intraword_positions );
+
+        // calc  data_ += newValue / num_intraword_positions;
+        //       remainder_ = newRemainder;
+        // for newValue >= 0, and
+        //       data_ += newValue / num_intraword_positions - 1;
+        //       remainder_ = num_intraword_positions - newRemainder;
+        // (to force remainder_ to be positive).
+        // This is branch-free, if is_negative() is branch-free
+        const difference_type data_offset( newValue / num_intraword_positions - isNegative );
+        data_     += data_offset;
+        remainder_ = newRemainder + isNegative*num_intraword_positions;
+
+        const mask_type shifted_mask(
+            MsbFirst ?
+            mask_ << bits_per_pixel :
+            // TODO(Q3): use traits to get unsigned type for data_type
+            // (if not already)
+            static_cast<unsigned int>(mask_) >> bits_per_pixel );
+
+        // data_offset is 0 for shifted mask, and 1 for wrapped-around mask
+        mask_ = (1-data_offset)*shifted_mask + data_offset*(MsbFirst ?
+                                                            bit_mask :
+                                                            bit_mask << bits_per_pixel*(num_intraword_positions-1));
+    }
+
+    bool equal( PackedPixelRowIterator const & rhs ) const
+    {
+        return rhs.data_ == data_ && rhs.remainder_ == remainder_;
+    }
+
+    bool less( PackedPixelRowIterator const & rhs ) const
+    {
+        return data_ == rhs.data_ ?
+            (remainder_ < rhs.remainder_) :
+            (data_ < rhs.data_);
+    }
+
+public:
+    PackedPixelRowIterator() :
+        data_(0),
+        mask_( get_mask<data_type, bits_per_pixel, MsbFirst, difference_type>(0) ),
+        remainder_(0)
+    {}
+
+    explicit PackedPixelRowIterator( pointer base ) :
+        data_(base),
+        mask_( get_mask<data_type, bits_per_pixel, MsbFirst, difference_type>(0) ),
+        remainder_(0)
+    {}
+
+    PackedPixelRowIterator& operator+=( difference_type d )
+    {
+        const difference_type newValue( remainder_ + d );
+
+        data_ += newValue / num_intraword_positions;
+        remainder_ = newValue % num_intraword_positions;
+        update_mask();
+
+        return *this;
+    }
+
+    PackedPixelRowIterator& operator-=( difference_type d )
+    {
+        const difference_type newValue( remainder_ - d );
+        const bool            isNegative( is_negative(newValue) );
+        const difference_type newRemainder( newValue % num_intraword_positions );
+
+        // calc  data_ += newValue / num_intraword_positions;
+        //       remainder_ = newRemainder;
+        // for newValue >= 0, and
+        //       data_ += newValue / num_intraword_positions - 1;
+        //       remainder_ = num_intraword_positions - newRemainder;
+        // (to force remainder_ to be positive).
+        // This is branch-free, if is_negative() is branch-free
+        data_     += newValue / num_intraword_positions - isNegative;
+        remainder_ = newRemainder + isNegative*(num_intraword_positions - 2*newRemainder);
+        update_mask();
+
+        return *this;
+    }
+
+    PackedPixelRowIterator operator+( difference_type d )
+    {
+        PackedPixelRowIterator res(*this);
+        res += d;
+        return res;
+    }
+
+    PackedPixelRowIterator operator-( difference_type d )
+    {
+        PackedPixelRowIterator res(*this);
+        res -= d;
+        return res;
+    }
+
+    PackedPixelRowIterator& operator++()
+    {
+        inc();
+        return *this;
+    }
+
+    PackedPixelRowIterator& operator--()
+    {
+        dec();
+        return *this;
+    }
+
+    PackedPixelRowIterator operator++(int)
+    {
+        PackedPixelRowIterator res(*this);
+        res.inc();
+        return res;
+    }
+
+    PackedPixelRowIterator operator--(int)
+    {
+        PackedPixelRowIterator res(*this);
+        res.dec();
+        return res;
+    }
+
+    bool operator==(PackedPixelRowIterator const & rhs) const
+    {
+        return equal( rhs );
+    }
+
+    bool operator!=(PackedPixelRowIterator const & rhs) const
+    {
+        return !equal( rhs );
+    }
+
+    bool operator<(PackedPixelRowIterator const & rhs) const
+    {
+        return less(rhs);
+    }
+
+    bool operator<=(PackedPixelRowIterator const & rhs) const
+    {
+        return !less(rhs);
+    }
+
+    bool operator>(PackedPixelRowIterator const & rhs) const
+    {
+        return rhs.less(*this);
+    }
+
+    bool operator>=(PackedPixelRowIterator const & rhs) const
+    {
+        return !rhs.less(*this);
+    }
+
+    difference_type operator-(PackedPixelRowIterator const & rhs) const
+    {
+        return (data_ - rhs.data_)*num_intraword_positions + (remainder_ - rhs.remainder_);
+    }
+
+    value_type get() const
+    {
+        // TODO(Q3): use traits to get unsigned type for data_type (if
+        // not already)
+        return static_cast<unsigned int>(*data_ & mask_) >>
+            get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_);
+    }
+
+    value_type get(difference_type d) const
+    {
+        PackedPixelRowIterator tmp(*this);
+        tmp += d;
+        return tmp.get();
+    }
+
+    void set( value_type v ) const
+    {
+        const value_type pixel_value(
+            (v <<
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder_))
+            & mask_ );
+        *data_ = (*data_ & ~mask_) | pixel_value;
+    }
+
+    void set( value_type v, difference_type d ) const
+    {
+        PackedPixelRowIterator tmp(*this);
+        tmp += d;
+        tmp.set(v);
+    }
+};
+
+template< typename Datatype,
+          typename Valuetype,
+          int      bits_per_pixel,
+          bool     MsbFirst > class PackedPixelIterator
+{
+public:
+    // no reference, no index_reference type here
+    typedef Datatype                                    data_type;
+    typedef Valuetype                                   value_type;
+    typedef vigra::Diff2D                               difference_type;
+    typedef image_traverser_tag                         iterator_category;
+    typedef PackedPixelRowIterator<data_type,
+                                   value_type,
+                                   bits_per_pixel,
+                                   MsbFirst>            row_iterator;
+    typedef PackedPixelColumnIterator<data_type,
+                                      value_type,
+                                      bits_per_pixel,
+                                      MsbFirst>         column_iterator;
+
+    typedef data_type*                                  pointer;
+    typedef int                                         MoveX;
+    typedef StridedArrayIterator< data_type >           MoveY;
+
+    enum {
+        /** The number of pixel within a single data_type value
+         */
+        num_intraword_positions=sizeof(data_type)*8/bits_per_pixel,
+        /** Bit mask for one pixel (least significant bits)
+         */
+        bit_mask=~(~0 << bits_per_pixel)
+    };
+
+    // TODO(F2): direction of iteration (ImageIterator can be made to
+    // run backwards)
+
+private:
+    pointer current() const
+    {
+        return y() + (x / num_intraword_positions);
+    }
+
+    pointer current(int dx, int dy) const
+    {
+        return y(dy) + ((x+dx)/num_intraword_positions);
+    }
+
+    bool equal(PackedPixelIterator const & rhs) const
+    {
+        return (x == rhs.x) && (y == rhs.y);
+    }
+
+public:
+    PackedPixelIterator() :
+        x(0),
+        y(0)
+    {}
+
+    PackedPixelIterator(pointer base, int ystride) :
+        x(0),
+        y(ystride,base)
+    {}
+
+    bool operator==(PackedPixelIterator const & rhs) const
+    {
+        return equal(rhs);
+    }
+
+    bool operator!=(PackedPixelIterator const & rhs) const
+    {
+        return !equal(rhs);
+    }
+
+    difference_type operator-(PackedPixelIterator const & rhs) const
+    {
+        return difference_type(x - rhs.x, y - rhs.y);
+    }
+
+    MoveX x;
+    MoveY y;
+
+    PackedPixelIterator & operator+=(difference_type const & s)
+    {
+        x += s.x;
+        y += s.y;
+        return *this;
+    }
+
+    PackedPixelIterator & operator-=(difference_type const & s)
+    {
+        x -= s.x;
+        y -= s.y;
+        return *this;
+    }
+
+    PackedPixelIterator operator+(difference_type const & s) const
+    {
+        PackedPixelIterator ret(*this);
+        ret += s;
+        return ret;
+    }
+
+    PackedPixelIterator operator-(difference_type const & s) const
+    {
+        PackedPixelIterator ret(*this);
+        ret -= s;
+        return ret;
+    }
+
+    row_iterator rowIterator() const
+    {
+        return row_iterator(current());
+    }
+
+    column_iterator columnIterator() const
+    {
+        return column_iterator(MoveY(y,
+                                     x / num_intraword_positions),
+                               x % num_intraword_positions);
+    }
+
+    value_type get() const
+    {
+        const int remainder( x() % num_intraword_positions );
+
+        // TODO(Q3): use traits to get unsigned type for data_type (if
+        // not already)
+        return (static_cast<unsigned int>(*current() &
+                                          get_mask<data_type, bits_per_pixel, MsbFirst>(remainder))
+                >> (MsbFirst ?
+                    (num_intraword_positions - remainder) :
+                    remainder));
+    }
+
+    value_type get(difference_type const & d) const
+    {
+        const int remainder( x(d.x) % num_intraword_positions );
+
+        // TODO(Q3): use traits to get unsigned type for data_type (if
+        // not already)
+        return (static_cast<unsigned int>(*current(d.x,d.y) &
+                                          get_mask<data_type, bits_per_pixel, MsbFirst>(remainder))
+                >> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
+    }
+
+    void set( value_type v ) const
+    {
+        const int remainder( x() % num_intraword_positions );
+        const int mask( get_mask<data_type, bits_per_pixel, MsbFirst>(remainder) );
+        const value_type pixel_value(
+            (v <<
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+            & mask );
+        pointer p = current();
+        *p = (*p & ~mask) | pixel_value;
+    }
+
+    void set( value_type v, difference_type const & d ) const
+    {
+        const int remainder( x(d.x) % num_intraword_positions );
+        const int mask( get_mask<data_type, bits_per_pixel, MsbFirst>(remainder) );
+        const value_type pixel_value(
+            (v <<
+             get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder))
+             & mask );
+        pointer p = current(d.x,d.y);
+        *p = (*p & ~mask) | pixel_value;
+    }
+};
+
+
+/** Access (possibly packed-pixel) data via palette indirection
+ */
+template< typename Valuetype, typename Datatype > class PaletteImageAccessor
+{
+  public:
+    typedef Valuetype                                   value_type;
+    typedef Datatype                                    data_type;
+    typedef typename remove_const<data_type>::type      count_type;
+
+
+private:
+    const BitmapColor* palette;
+    count_type         num_entries;
+
+    double norm( BitmapColor const& rLHS,
+                 BitmapColor const& rRHS ) const
+    {
+        // convert RGBValue's linear space to a normed linear space
+        return sqrt(
+            vigra::sq(rLHS.GetRed()-rRHS.GetRed()) +
+            vigra::sq(rLHS.GetGreen()-rRHS.GetGreen()) +
+            vigra::sq(rLHS.GetBlue()-rRHS.GetBlue()) );
+    }
+
+    data_type find_best_match(value_type const& v) const
+    {
+        // TODO(F3): not generic!!!
+        const BitmapColor aTmpCol(v.red(),
+                                  v.green(),
+                                  v.blue());
+
+        // TODO(P3): use table-based/octree approach here!
+        const BitmapColor* best_entry;
+        const BitmapColor* palette_end( palette+num_entries );
+        if( (best_entry=std::find( palette, palette_end, aTmpCol)) != palette_end )
+            return best_entry-palette;
+
+        // TODO(F3): HACK. Need palette traits, and an error function
+        // here. We blatantly assume value_type is a normed linear
+        // space.
+        const BitmapColor* curr_entry( palette );
+        best_entry = curr_entry;
+        while( curr_entry != palette_end )
+        {
+            if( norm(*curr_entry,*best_entry) > norm(*curr_entry,aTmpCol) )
+                best_entry = curr_entry;
+
+            ++curr_entry;
+        }
+
+        return best_entry-palette;
+    }
+
+    value_type toCol( BitmapColor const& rCol ) const
+    {
+        return value_type(rCol.GetRed(),rCol.GetGreen(),rCol.GetBlue());
+    }
+
+public:
+    PaletteImageAccessor() :
+        palette(0),
+        num_entries(0)
+    {}
+
+    PaletteImageAccessor( const BitmapColor* pPalette,
+                          data_type          entries ) :
+        palette(pPalette),
+        num_entries(entries)
+    {}
+
+    template< class Iterator >
+    value_type operator()(Iterator const& i) const { return toCol(palette[i.get()]); }
+    value_type operator()(data_type const* i) const { return toCol(palette[*i]); }
+
+    template< class Iterator, class Difference >
+    value_type operator()(Iterator const& i, Difference const& diff) const
+    {
+        return toCol(palette[i.get(diff)]);
+    }
+
+    template< typename V, class Iterator >
+    void set(V const& value, Iterator const& i) const
+    {
+        i.set(
+            find_best_match(
+                vigra::detail::RequiresExplicitCast<value_type>::cast(value) ));
+    }
+
+    template< typename V, class Iterator, class Difference >
+    void set(V const& value, Iterator const& i, Difference const& diff) const
+    {
+        i.set(
+            find_best_match(
+                vigra::detail::RequiresExplicitCast<value_type>::cast(value)),
+            diff );
+    }
+};
+
+}
+
+
+class TestApp : public Application
+{
+public:
+    virtual void Main();
+    virtual USHORT  Exception( USHORT nError );
+};
+
+class TestWindow : public Dialog
+{
+    public:
+        TestWindow() : Dialog( (Window *) NULL )
+        {
+            SetText( rtl::OUString::createFromAscii( "VIGRA test" ) );
+            SetSizePixel( Size( 1024, 1024 ) );
+            EnablePaint( true );
+            Show();
+        }
+        virtual ~TestWindow() {}
+        virtual void MouseButtonUp( const MouseEvent& /*rMEvt*/ )
+        {
+            //TODO: do something cool
+            EndDialog();
+        }
+        virtual void Paint( const Rectangle& rRect );
+};
+
+
+static basegfx::B2IPoint project( const basegfx::B2IPoint& rPoint )
+{
+    const double angle_x = M_PI / 6.0;
+    const double angle_z = M_PI / 6.0;
+
+    // transform planar coordinates to 3d
+    double x = rPoint.getX();
+    double y = rPoint.getY();
+    //double z = 0;
+
+    // rotate around X axis
+    double x1 = x;
+    double y1 = y * cos( angle_x );
+    double z1 = y * sin( angle_x );
+
+    // rotate around Z axis
+    double x2 = x1 * cos( angle_z ) + y1 * sin( angle_z );
+    //double y2 = y1 * cos( angle_z ) - x1 * sin( angle_z );
+    double z2 = z1;
+
+    //return basegfx::B2IPoint( (sal_Int32)3*x2, (sal_Int32)3*z2 );
+    return basegfx::B2IPoint( (sal_Int32)(6*x2), (sal_Int32)(6*z2) );
+}
+
+static basebmp::Color approachColor( const basebmp::Color& rFrom, const basebmp::Color& rTo )
+{
+    basebmp::Color aColor;
+    UINT8 nDiff;
+    // approach red
+    if( rFrom.getRed() < rTo.getRed() )
+    {
+        nDiff = rTo.getRed() - rFrom.getRed();
+        aColor.setRed( rFrom.getRed() + ( nDiff < 10 ? nDiff : 10 ) );
+    }
+    else if( rFrom.getRed() > rTo.getRed() )
+    {
+        nDiff = rFrom.getRed() - rTo.getRed();
+        aColor.setRed( rFrom.getRed() - ( nDiff < 10 ? nDiff : 10 ) );
+    }
+    else
+        aColor.setRed( rFrom.getRed() );
+
+    // approach Green
+    if( rFrom.getGreen() < rTo.getGreen() )
+    {
+        nDiff = rTo.getGreen() - rFrom.getGreen();
+        aColor.setGreen( rFrom.getGreen() + ( nDiff < 10 ? nDiff : 10 ) );
+    }
+    else if( rFrom.getGreen() > rTo.getGreen() )
+    {
+        nDiff = rFrom.getGreen() - rTo.getGreen();
+        aColor.setGreen( rFrom.getGreen() - ( nDiff < 10 ? nDiff : 10 ) );
+    }
+    else
+        aColor.setGreen( rFrom.getGreen() );
+
+    // approach blue
+    if( rFrom.getBlue() < rTo.getBlue() )
+    {
+        nDiff = rTo.getBlue() - rFrom.getBlue();
+        aColor.setBlue( rFrom.getBlue() + ( nDiff < 10 ? nDiff : 10 ) );
+    }
+    else if( rFrom.getBlue() > rTo.getBlue() )
+    {
+        nDiff = rFrom.getBlue() - rTo.getBlue();
+        aColor.setBlue( rFrom.getBlue() - ( nDiff < 10 ? nDiff : 10 ) );
+    }
+    else
+        aColor.setBlue( rFrom.getBlue() );
+
+    return aColor;
+}
+
+#define DELTA 5.0
+
+
+
+void TestWindow::Paint( const Rectangle& /*rRect*/ )
+{
+    basegfx::B2ISize aTestSize(1000,1000);
+    basebmp::BitmapDeviceSharedPtr pDevice( basebmp::createBitmapDevice( aTestSize,
+                                                                         false,
+                                                                         basebmp::Format::THIRTYTWO_BIT_TC_MASK ));
+
+    {
+        ::rtl::OUString aSvg;
+        basegfx::B2DPolyPolygon aPoly;
+
+        basegfx::tools::importFromSvgD( aPoly,
+                                        ::rtl::OUString::createFromAscii(
+                                            "m0 0 h7 v7 h-7 z" ) );
+        basegfx::tools::importFromSvgD( aPoly,
+                                        ::rtl::OUString::createFromAscii(
+                                            "m2 2 h3 v3 h-3 z" ) );
+
+        pDevice->fillPolyPolygon(
+            aPoly,
+            basebmp::Color(0xFFFFFFFF),
+            basebmp::DrawMode_PAINT );
+    }
+
+#if 0
+    {
+        basebmp::BitmapDeviceSharedPtr pMask( basebmp::createBitmapDevice( aTestSize,
+                                                                           false,
+                                                                           basebmp::Format::ONE_BIT_MSB_GREY ));
+
+        const basegfx::B2IPoint aPt111(10,10);
+        const basegfx::B2IPoint aPt222(0,10);
+        const basebmp::Color aCol333(0xFFFFFFFF);
+        pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT );
+
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        pMask->clear(basebmp::Color(0xFFFFFFFF));
+        pMask->drawPolygon(
+            aPoly.getB2DPolygon(0),
+            basebmp::Color(0),
+            basebmp::DrawMode_PAINT );
+
+        basebmp::BitmapDeviceSharedPtr pSubsetDevice =
+            basebmp::subsetBitmapDevice( pDevice,
+                                         basegfx::B2IRange(3,3,7,7) );
+
+        const basegfx::B2IPoint aPt1(0,0);
+        const basegfx::B2IPoint aPt2(1,9);
+        const basebmp::Color aCol(0xFFFFFFFF);
+        pDevice->drawLine( aPt1, aPt2, aCol, basebmp::DrawMode_PAINT, pMask );
+    }
+
+    {
+        const basebmp::Color aCol(0xFFFFFFFF);
+        basegfx::B2DPolygon aRect = basegfx::tools::createPolygonFromRect(
+            basegfx::B2DRange( 0,0,1001,1001 ));
+        pDevice->drawPolygon( aRect, aCol, basebmp::DrawMode_PAINT );
+
+        const basegfx::B2IPoint aPt1(0,0);
+        const basegfx::B2IPoint aPt2(0,800);
+        pDevice->drawLine( aPt1, aPt2, aCol, basebmp::DrawMode_PAINT );
+
+        const basegfx::B2IPoint aPt3(0,1001);
+        pDevice->drawLine( aPt1, aPt3, aCol, basebmp::DrawMode_PAINT );
+    }
+#endif
+
+    {
+        pDevice->clear(basebmp::Color(0));
+
+        basegfx::B2IPoint aCenter( aTestSize.getX()/2,
+                                   aTestSize.getY()/2 );
+        //basegfx::B2IPoint aP1( aTestSize.getX()/48, 0), aP2( aTestSize.getX()/40, 0 ), aPoint;
+        //basegfx::B2IPoint aP1( aTestSize.getX()/7, 0), aP2( aTestSize.getX()/6, 0 ), aPoint;
+        //basegfx::B2IPoint aP1( aTestSize.getX()/5, 0), aP2( aTestSize.getX()/4, 0 ), aPoint;
+        basegfx::B2IPoint aP1( aTestSize.getX()/12, 0), aP2( aTestSize.getX()/11, 0 ), aPoint;
+
+        double sind = sin( DELTA*M_PI/180.0 );
+        double cosd = cos( DELTA*M_PI/180.0 );
+        double factor = 1 + (DELTA/1000.0);
+        int n=0;
+        basebmp::Color aLineColor( 0, 0, 0 );
+        basebmp::Color aApproachColor( 0, 0, 200 );
+        while ( aP2.getX() < aCenter.getX() && n++ < 680 )
+        {
+            aLineColor = approachColor( aLineColor, aApproachColor );
+
+            // switch aproach color
+            if( aApproachColor == aLineColor )
+            {
+                if( aApproachColor.getRed() )
+                    aApproachColor = basebmp::Color( 0, 0, 200 );
+                else if( aApproachColor.getGreen() )
+                    aApproachColor = basebmp::Color( 200, 0, 0 );
+                else
+                    aApproachColor = basebmp::Color( 0, 200, 0 );
+            }
+
+            basegfx::B2DPolygon aPoly;
+            aPoly.append( basegfx::B2DPoint(project( aP1 ) + aCenter) );
+            aPoly.append( basegfx::B2DPoint(project( aP2 ) + aCenter) );
+            pDevice->fillPolyPolygon(
+                basegfx::tools::createAreaGeometryForPolygon(
+                    aPoly,
+//                    std::max(1,n/30),
+//                    std::max(1,n/60),
+                    std::max(1,n/30),
+                    basegfx::tools::B2DLINEJOIN_NONE),
+                aLineColor,
+                basebmp::DrawMode_PAINT);
+
+            aPoint.setX( (int)((((double)aP1.getX())*cosd - ((double)aP1.getY())*sind)*factor) );
+            aPoint.setY( (int)((((double)aP1.getY())*cosd + ((double)aP1.getX())*sind)*factor) );
+            aP1 = aPoint;
+            aPoint.setX( (int)((((double)aP2.getX())*cosd - ((double)aP2.getY())*sind)*factor) );
+            aPoint.setY( (int)((((double)aP2.getY())*cosd + ((double)aP2.getX())*sind)*factor) );
+            aP2 = aPoint;
+        }
+    }
+
+    Bitmap aBitmap( Size(aTestSize.getX(),
+                         aTestSize.getY()), 24 );
+
+    // Fill bitmap with generated content
+    {
+        ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(),
+                                              aBitmap );
+        for( int y=0; y<aTestSize.getY(); ++y )
+            for( int x=0; x<aTestSize.getX(); ++x )
+                pWriteAccess->SetPixel(y,x,
+                                       Color(pDevice->getPixelData(basegfx::B2IPoint(x,y))) );
+    }
+
+    DrawBitmap( Point(), aBitmap );
+}
+
+USHORT TestApp::Exception( USHORT nError )
+{
+    switch( nError & EXC_MAJORTYPE )
+    {
+        case EXC_RSCNOTLOADED:
+            Abort( String::CreateFromAscii( "Error: could not load language resources.\nPlease check your installation.\n" ) );
+            break;
+    }
+    return 0;
+}
+
+void TestApp::Main()
+{
+    //-------------------------------------------------
+    // create the global service-manager
+    //-------------------------------------------------
+    uno::Reference< lang::XMultiServiceFactory > xFactory;
+    try
+    {
+        uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext();
+        xFactory = uno::Reference< lang::XMultiServiceFactory >(  xCtx->getServiceManager(),
+                                                                  uno::UNO_QUERY );
+        if( xFactory.is() )
+            ::comphelper::setProcessServiceFactory( xFactory );
+    }
+    catch( uno::Exception& )
+    {
+    }
+
+    if( !xFactory.is() )
+    {
+        OSL_TRACE( "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
+        exit( 1 );
+    }
+
+    // Create UCB.
+    uno::Sequence< uno::Any > aArgs( 2 );
+    aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
+    aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    ::ucb::ContentBroker::initialize( xFactory, aArgs );
+
+    TestWindow pWindow;
+    pWindow.Execute();
+
+    // clean up UCB
+    ::ucb::ContentBroker::deinitialize();
+}
+
+TestApp aDemoApp;
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
new file mode 100644
index 000000000000..9be504819fe8
--- /dev/null
+++ b/basebmp/test/bmpmasktest.cxx
@@ -0,0 +1,191 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+        std::ofstream output("32bpp_test.dump");
+        debugDump( rDevice, output );
+        std::ofstream output2("32bpp_bmp.dump");
+        debugDump( rBmp, output2 );
+*/
+
+class BmpMaskTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpMaskBmp1bpp;
+    BitmapDeviceSharedPtr mpBmp1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+    BitmapDeviceSharedPtr mpBmp32bpp;
+
+    void implTestBmpBasics(const BitmapDeviceSharedPtr& rDevice,
+                           const BitmapDeviceSharedPtr& rBmp)
+    {
+        rDevice->clear(Color(0));
+        const Color aCol(0xFFFFFFFF);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IRange aDestAll(0,0,10,10);
+
+        rDevice->drawMaskedBitmap(
+            rBmp,
+            mpMaskBmp1bpp,
+            aSourceRect,
+            aDestAll,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 30",
+                               countPixel( rDevice, aCol ) == 30);
+    }
+
+    void implTestBmpScaledClip(const BitmapDeviceSharedPtr& rDevice,
+                               const BitmapDeviceSharedPtr& rBmp)
+    {
+        rDevice->clear(Color(0));
+        const Color aCol(0xFFFFFFFF);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IRange aDestLeftTop(0,0,6,6);
+
+        rDevice->drawMaskedBitmap(
+            rBmp,
+            mpMaskBmp1bpp,
+            aSourceRect,
+            aDestLeftTop,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 12",
+                               countPixel( rDevice, aCol ) == 12);
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(10,10);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                            true,
+                                            Format::THIRTYTWO_BIT_TC_MASK );
+
+        mpMaskBmp1bpp = createBitmapDevice( aSize,
+                                            true,
+                                            Format::ONE_BIT_MSB_GREY );
+
+        mpBmp1bpp = createBitmapDevice( aSize,
+                                        true,
+                                        Format::ONE_BIT_MSB_PAL );
+        mpBmp32bpp = createBitmapDevice( aSize,
+                                         true,
+                                         Format::THIRTYTWO_BIT_TC_MASK );
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0h5v10h5v-5h-10z" );
+
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        const Color aColWhite(0xFFFFFFFF);
+        const Color aColBlack(0);
+        mpBmp1bpp->fillPolyPolygon(
+            aPoly,
+            aColWhite,
+            DrawMode_PAINT );
+        mpBmp32bpp->fillPolyPolygon(
+            aPoly,
+            aColWhite,
+            DrawMode_PAINT );
+
+        aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0 h6 v10 h-6z" );
+
+        aPoly.clear();
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        mpMaskBmp1bpp->clear(aColWhite);
+        mpMaskBmp1bpp->fillPolyPolygon(
+            aPoly,
+            aColBlack,
+            DrawMode_PAINT );
+    }
+
+    void testBmpBasics()
+    {
+        implTestBmpBasics( mpDevice1bpp, mpBmp1bpp );
+        implTestBmpBasics( mpDevice32bpp, mpBmp32bpp );
+    }
+
+    void testBmpClip()
+    {
+        implTestBmpScaledClip( mpDevice1bpp, mpBmp1bpp );
+        implTestBmpScaledClip( mpDevice32bpp, mpBmp32bpp );
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(BmpMaskTest);
+    CPPUNIT_TEST(testBmpBasics);
+    CPPUNIT_TEST(testBmpClip);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest);
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
new file mode 100644
index 000000000000..9e33f0a8d713
--- /dev/null
+++ b/basebmp/test/bmptest.cxx
@@ -0,0 +1,218 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+        std::ofstream output("32bpp_test.dump");
+        debugDump( rDevice, output );
+        std::ofstream output2("32bpp_bmp.dump");
+        debugDump( rBmp, output2 );
+*/
+
+class BmpTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpBmp1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+    BitmapDeviceSharedPtr mpBmp32bpp;
+
+    void implTestBmpBasics(const BitmapDeviceSharedPtr& rDevice,
+                           const BitmapDeviceSharedPtr& rBmp)
+    {
+        rDevice->clear(Color(0));
+        const Color aCol(0xFFFFFFFF);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IRange aDestLeftTop(0,0,4,4);
+        const basegfx::B2IRange aDestRightTop(6,0,10,4);
+        const basegfx::B2IRange aDestLeftBottom(0,6,4,10);
+        const basegfx::B2IRange aDestRightBottom(6,6,10,10);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftTop,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 8",
+                               countPixel( rDevice, aCol ) == 8);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestRightTop,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 16",
+                               countPixel( rDevice, aCol ) == 16);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 24",
+                               countPixel( rDevice, aCol ) == 24);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestRightBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 32",
+                               countPixel( rDevice, aCol ) == 32);
+    }
+
+    void implTestBmpClip(const BitmapDeviceSharedPtr& rDevice,
+                         const BitmapDeviceSharedPtr& rBmp)
+    {
+        rDevice->clear(Color(0));
+        const Color aCol(0xFFFFFFFF);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IRange aDestLeftTop(-2,-2,2,2);
+        const basegfx::B2IRange aDestRightTop(8,-2,12,2);
+        const basegfx::B2IRange aDestLeftBottom(-2,8,2,12);
+        const basegfx::B2IRange aDestRightBottom(8,8,12,12);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftTop,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 4",
+                               countPixel( rDevice, aCol ) == 4);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestLeftBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 4(c)",
+                               countPixel( rDevice, aCol ) == 4);
+
+        rDevice->drawBitmap(
+            rBmp,
+            aSourceRect,
+            aDestRightBottom,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 8",
+                               countPixel( rDevice, aCol ) == 8);
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(10,10);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                            true,
+                                            Format::THIRTYTWO_BIT_TC_MASK );
+
+        mpBmp1bpp = createBitmapDevice( aSize,
+                                        true,
+                                        Format::ONE_BIT_MSB_PAL );
+        mpBmp32bpp = createBitmapDevice( aSize,
+                                         true,
+                                         Format::THIRTYTWO_BIT_TC_MASK );
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0h5v10h5v-5h-10z" );
+
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        const Color aCol(0xFFFFFFFF);
+        mpBmp1bpp->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        mpBmp32bpp->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+    }
+
+    void testBmpBasics()
+    {
+        implTestBmpBasics( mpDevice1bpp, mpBmp1bpp );
+        implTestBmpBasics( mpDevice32bpp, mpBmp32bpp );
+    }
+
+    void testBmpClip()
+    {
+        implTestBmpClip( mpDevice1bpp, mpBmp1bpp );
+        implTestBmpClip( mpDevice32bpp, mpBmp32bpp );
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(BmpTest);
+    CPPUNIT_TEST(testBmpBasics);
+    CPPUNIT_TEST(testBmpClip);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest);
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
new file mode 100644
index 000000000000..875016d878cc
--- /dev/null
+++ b/basebmp/test/cliptest.cxx
@@ -0,0 +1,285 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+  std::ofstream output("32bpp_test.dump");
+  debugDump( mpDevice32bpp, output );
+*/
+
+class ClipTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpClipMask;
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+
+    void implTestPixelClip(const BitmapDeviceSharedPtr& rDevice)
+    {
+        const Color aBgCol(0);
+        rDevice->clear(aBgCol);
+
+        const basegfx::B2IPoint aPt(0,0);
+        const Color aCol(0xFFFFFFFF);
+        rDevice->setPixel( aPt, aCol, DrawMode_PAINT, mpClipMask );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel clip #1",
+                               rDevice->getPixel(aPt) == aBgCol);
+
+        const basegfx::B2IPoint aPt2(10,10);
+        rDevice->setPixel( aPt2, aCol, DrawMode_PAINT, mpClipMask );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel clip #2",
+                               rDevice->getPixel(aPt2) == aBgCol);
+
+        const basegfx::B2IPoint aPt1(10,0);
+        rDevice->setPixel( aPt1, aCol, DrawMode_PAINT, mpClipMask );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel clip #3",
+                               rDevice->getPixel(aPt1) != aBgCol);
+
+        const basegfx::B2IPoint aPt3(0,10);
+        rDevice->setPixel( aPt3, aCol, DrawMode_PAINT, mpClipMask );
+        CPPUNIT_ASSERT_MESSAGE("get/setPixel clip #4",
+                               rDevice->getPixel(aPt3) != aBgCol);
+    }
+
+    void implTestLineClip(const BitmapDeviceSharedPtr& rDevice)
+    {
+        const Color aBgCol(0);
+        rDevice->clear(aBgCol);
+
+        const basegfx::B2IPoint aPt1(0,0);
+        const basegfx::B2IPoint aPt2(1,9);
+        const Color aCol(0xFFFFFFFF);
+        rDevice->drawLine( aPt1, aPt2, aCol, DrawMode_PAINT, mpClipMask );
+
+        const basegfx::B2IPoint aPt3(1,5);
+        CPPUNIT_ASSERT_MESSAGE("get line pixel",
+                               rDevice->getPixel(aPt3) != aBgCol);
+        CPPUNIT_ASSERT_MESSAGE("number of rendered line pixel is not 4",
+                               countPixel( rDevice,
+                                           rDevice->getPixel(aPt3) ) == 4);
+
+        rDevice->drawLine( aPt1, aPt2, aCol, DrawMode_XOR, mpClipMask );
+        CPPUNIT_ASSERT_MESSAGE("number of xor-rendered line pixel is not 0",
+                               countPixel( rDevice,
+                                           rDevice->getPixel(aPt3) ) == 121);
+    }
+
+    void implTestFillClip(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2DRange aAllOver(-10,-10,20,20);
+        const Color aCol(0xFFFFFFFF);
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aAllOver)),
+                                  aCol,
+                                  DrawMode_PAINT,
+                                  mpClipMask );
+        const basegfx::B2IPoint aPt(0,10);
+        CPPUNIT_ASSERT_MESSAGE("number of clipped pixel is not 30",
+                               countPixel( rDevice, rDevice->getPixel(aPt) ) == 121-30);
+
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aAllOver)),
+                                  aCol,
+                                  DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of filled pixel is not 121",
+                               countPixel( rDevice, rDevice->getPixel(aPt) ) == 121);
+
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aAllOver)),
+                                  aCol,
+                                  DrawMode_XOR,
+                                  mpClipMask );
+        CPPUNIT_ASSERT_MESSAGE("number of xor-cleared pixel is not 91",
+                               countPixel( rDevice, rDevice->getPixel(aPt) ) == 121-30);
+    }
+
+    void implTestBmpClip(const BitmapDeviceSharedPtr& rDevice)
+    {
+        BitmapDeviceSharedPtr pBmp( cloneBitmapDevice(
+                                        basegfx::B2IVector(3,3),
+                                        rDevice ));
+        Color aCol1(0);
+        Color aCol2(0xFFFFFFFF);
+        pBmp->clear(aCol1);
+        pBmp->setPixel(basegfx::B2IPoint(0,0),aCol2,DrawMode_PAINT);
+        pBmp->setPixel(basegfx::B2IPoint(1,1),aCol2,DrawMode_PAINT);
+        pBmp->setPixel(basegfx::B2IPoint(2,2),aCol2,basebmp::DrawMode_PAINT);
+
+        rDevice->clear(aCol1);
+        rDevice->drawBitmap(pBmp,
+                            basegfx::B2IRange(0,0,3,3),
+                            basegfx::B2IRange(-1,-1,4,4),
+                            DrawMode_PAINT,
+                            mpClipMask);
+
+        const basegfx::B2IPoint aPt(1,1);
+        CPPUNIT_ASSERT_MESSAGE("number of clipped pixel is not 5",
+                               countPixel( rDevice,
+                                           rDevice->getPixel(aPt) ) == 5);
+    }
+
+    void implTestMaskColorClip(const BitmapDeviceSharedPtr& rDevice)
+    {
+        BitmapDeviceSharedPtr pBmp( createBitmapDevice( rDevice->getSize(),
+                                                        true,
+                                                        Format::EIGHT_BIT_GREY ));
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0h5v10h5v-5h-10z" );
+
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        const basebmp::Color aCol(0xFF);
+        pBmp->clear( basebmp::Color(0) );
+        pBmp->fillPolyPolygon(
+            aPoly,
+            aCol,
+            basebmp::DrawMode_PAINT );
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IPoint aDestLeftTop(0,0);
+        const Color aCol2(0xF0F0F0F0);
+        rDevice->drawMaskedColor(
+            aCol2,
+            pBmp,
+            aSourceRect,
+            aDestLeftTop,
+            mpClipMask );
+        const basegfx::B2IPoint aPt(1,1);
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 41",
+                               countPixel( rDevice, rDevice->getPixel(aPt) ) == 41);
+
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(11,11);
+        mpClipMask = createBitmapDevice( aSize,
+                                         true,
+                                         Format::ONE_BIT_MSB_GREY );
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::THIRTYTWO_BIT_TC_MASK );
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        mpClipMask->clear(Color(0));
+        mpClipMask->drawPolygon(
+            aPoly.getB2DPolygon(0),
+            Color(0xFFFFFFFF),
+            DrawMode_PAINT );
+    }
+
+    void testPixelClip()
+    {
+        implTestPixelClip( mpDevice1bpp );
+        implTestPixelClip( mpDevice32bpp );
+    }
+
+    void testLineClip()
+    {
+        implTestLineClip( mpDevice1bpp );
+        implTestLineClip( mpDevice32bpp );
+    }
+
+    void testFillClip()
+    {
+        implTestFillClip( mpDevice1bpp );
+        implTestFillClip( mpDevice32bpp );
+    }
+
+    void testBmpClip()
+    {
+        implTestBmpClip( mpDevice1bpp );
+        implTestBmpClip( mpDevice32bpp );
+    }
+
+    void testMaskColorClip()
+    {
+        implTestMaskColorClip( mpDevice1bpp );
+        implTestMaskColorClip( mpDevice32bpp );
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(ClipTest);
+    CPPUNIT_TEST(testPixelClip);
+    CPPUNIT_TEST(testLineClip);
+    CPPUNIT_TEST(testFillClip);
+    CPPUNIT_TEST(testBmpClip);
+    CPPUNIT_TEST(testMaskColorClip);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest);
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/export.map b/basebmp/test/export.map
new file mode 100644
index 000000000000..3308588ef6f8
--- /dev/null
+++ b/basebmp/test/export.map
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+UDK_3_0_0 {
+    global:
+        cppunitTestPlugIn;
+
+    local:
+        *;
+};
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
new file mode 100644
index 000000000000..150fa11b3a72
--- /dev/null
+++ b/basebmp/test/filltest.cxx
@@ -0,0 +1,279 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+  std::ofstream output("32bpp_test.dump");
+  debugDump( mpDevice32bpp, output );
+*/
+
+class FillTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+
+    void implTestRectFill(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2DRange   aRect(1,1,10,10);
+
+        const Color aCol(0xFFFFFFFF);
+        rDevice->fillPolyPolygon(
+            basegfx::B2DPolyPolygon(
+                basegfx::tools::createPolygonFromRect( aRect )),
+            aCol,
+            DrawMode_PAINT );
+
+        const basegfx::B2IPoint aPt1(1,1);
+        CPPUNIT_ASSERT_MESSAGE("first pixel set",
+                               rDevice->getPixel(aPt1) == aCol);
+        const basegfx::B2IPoint aPt2(9,9);
+        CPPUNIT_ASSERT_MESSAGE("last pixel set",
+                               rDevice->getPixel(aPt2) == aCol);
+        const basegfx::B2IPoint aPt3(0,0);
+        CPPUNIT_ASSERT_MESSAGE("topmost pixel not set",
+                               rDevice->getPixel(aPt3) != aCol);
+        const basegfx::B2IPoint aPt4(10,10);
+        CPPUNIT_ASSERT_MESSAGE("bottommost pixel not set",
+                               rDevice->getPixel(aPt4) != aCol);
+
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 81",
+                               countPixel( rDevice, aCol ) == 81);
+    }
+
+    void implTestCornerCases(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2DRange aEmpty1(0,0,0,11);
+        const basegfx::B2DRange aEmpty2(0,0,11,0);
+        const basegfx::B2DRange aVertLineLeft(0,0,1,11);
+        const basegfx::B2DRange aVertLineRight(10,0,11,11);
+        const basegfx::B2DRange aHorzLineTop(0,0,11,1);
+        const basegfx::B2DRange aHorzLineBottom(0,10,11,11);
+
+        const Color aCol(0xFFFFFFFF);
+        rDevice->fillPolyPolygon(
+            basegfx::B2DPolyPolygon(
+                basegfx::tools::createPolygonFromRect( aEmpty1 )),
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 0",
+                               countPixel( rDevice, aCol ) == 0);
+
+        rDevice->fillPolyPolygon(
+            basegfx::B2DPolyPolygon(
+                basegfx::tools::createPolygonFromRect( aEmpty2 )),
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 0",
+                               countPixel( rDevice, aCol ) == 0);
+
+        rDevice->fillPolyPolygon(
+            basegfx::B2DPolyPolygon(
+                basegfx::tools::createPolygonFromRect( aVertLineLeft )),
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 11",
+                               countPixel( rDevice, aCol ) == 11);
+        const basegfx::B2IPoint aPt1(0,0);
+        CPPUNIT_ASSERT_MESSAGE("first pixel set",
+                               rDevice->getPixel(aPt1) == aCol);
+
+        rDevice->fillPolyPolygon(
+            basegfx::B2DPolyPolygon(
+                basegfx::tools::createPolygonFromRect( aVertLineRight )),
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 22",
+                               countPixel( rDevice, aCol ) == 22);
+        const basegfx::B2IPoint aPt2(10,10);
+        CPPUNIT_ASSERT_MESSAGE("last pixel set",
+                               rDevice->getPixel(aPt2) == aCol);
+
+        rDevice->fillPolyPolygon(
+            basegfx::B2DPolyPolygon(
+                basegfx::tools::createPolygonFromRect( aHorzLineTop )),
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 31",
+                               countPixel( rDevice, aCol ) == 31);
+        const basegfx::B2IPoint aPt3(5,0);
+        CPPUNIT_ASSERT_MESSAGE("top-middle pixel set",
+                               rDevice->getPixel(aPt3) == aCol);
+
+        rDevice->fillPolyPolygon(
+            basegfx::B2DPolyPolygon(
+                basegfx::tools::createPolygonFromRect( aHorzLineBottom )),
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 40",
+                               countPixel( rDevice, aCol ) == 40);
+        const basegfx::B2IPoint aPt4(5,10);
+        CPPUNIT_ASSERT_MESSAGE("bottom-middle pixel set",
+                               rDevice->getPixel(aPt4) == aCol);
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0l7 7h-1z" );
+
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 43",
+                               countPixel( rDevice, aCol ) == 43);
+    }
+
+    void implTestClipping(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2DRange   aLeftTop(-10,-10,1,1);
+        const basegfx::B2DRange   aRightTop(10,-10,20,1);
+        const basegfx::B2DRange   aLeftBottom(-10,10,1,20);
+        const basegfx::B2DRange   aRightBottom(10,10,20,20);
+        const basegfx::B2DRange   aAllOver(-10,-10,20,20);
+
+        const Color aCol(0xFFFFFFFF);
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aLeftTop)),
+                                  aCol,
+                                  DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 1",
+                               countPixel( rDevice, aCol ) == 1);
+
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aRightTop)),
+                                  aCol,
+                                  DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 2",
+                               countPixel( rDevice, aCol ) == 2);
+
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aLeftBottom)),
+                                  aCol,
+                                  DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 3",
+                               countPixel( rDevice, aCol ) == 3);
+
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aRightBottom)),
+                                  aCol,
+                                  DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 4",
+                               countPixel( rDevice, aCol ) == 4);
+
+        rDevice->fillPolyPolygon( basegfx::B2DPolyPolygon(
+                                      basegfx::tools::createPolygonFromRect(aAllOver)),
+                                  aCol,
+                                  DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 121",
+                               countPixel( rDevice, aCol ) == 121);
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(11,11);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::THIRTYTWO_BIT_TC_MASK );
+    }
+
+    void testRectFill()
+    {
+        implTestRectFill( mpDevice1bpp );
+        implTestRectFill( mpDevice32bpp );
+    }
+
+    void testClipping()
+    {
+        implTestClipping( mpDevice1bpp );
+        implTestClipping( mpDevice32bpp );
+    }
+
+    void testCornerCases()
+    {
+        implTestCornerCases( mpDevice1bpp );
+        implTestCornerCases( mpDevice32bpp );
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(FillTest);
+    CPPUNIT_TEST(testRectFill);
+    CPPUNIT_TEST(testClipping);
+    CPPUNIT_TEST(testCornerCases);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(FillTest);
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
new file mode 100644
index 000000000000..fcd383fccdb0
--- /dev/null
+++ b/basebmp/test/linetest.cxx
@@ -0,0 +1,227 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+  std::ofstream output("32bpp_test.dump");
+  debugDump( mpDevice32bpp, output );
+*/
+
+class LineTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+
+    void implTestBasicDiagonalLines(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2IPoint aPt1(1,1);
+        const basegfx::B2IPoint aPt2(9,9);
+        const Color aCol(0xFFFFFFFF);
+        rDevice->drawLine( aPt1, aPt2, aCol, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("first pixel set",
+                               rDevice->getPixel(aPt1) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("last pixel set",
+                               rDevice->getPixel(aPt2) == aCol);
+        const basegfx::B2IPoint aPt3(0,0);
+        CPPUNIT_ASSERT_MESSAGE("topmost pixel not set",
+                               rDevice->getPixel(aPt3) != aCol);
+        const basegfx::B2IPoint aPt4(10,10);
+        CPPUNIT_ASSERT_MESSAGE("bottommost pixel not set",
+                               rDevice->getPixel(aPt4) != aCol);
+
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 9",
+                               countPixel( rDevice, aCol ) == 9);
+
+        rDevice->drawLine( aPt2, aPt1, aCol, DrawMode_PAINT );
+
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel after "
+                               "reversed paint is not 9",
+                               countPixel( rDevice, aCol ) == 9);
+    }
+
+    void implTestBasicHorizontalLines(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2IPoint aPt1(10,10);
+        const basegfx::B2IPoint aPt2(0,10);
+        const Color aCol(0xFFFFFFFF);
+        rDevice->drawLine( aPt1, aPt2, aCol, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("first pixel set",
+                               rDevice->getPixel(aPt1) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("last pixel set",
+                               rDevice->getPixel(aPt2) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 11",
+                               countPixel( rDevice, aCol ) == 11);
+
+        rDevice->clear(Color(0));
+        rDevice->drawLine( aPt2, aPt1, aCol, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("first pixel set",
+                               rDevice->getPixel(aPt1) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("last pixel set",
+                               rDevice->getPixel(aPt2) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 11",
+                               countPixel( rDevice, aCol ) == 11);
+    }
+
+    void implTestBasicVerticalLines(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2IPoint aPt1(1,1);
+        const basegfx::B2IPoint aPt2(1,9);
+        const Color aCol(0xFFFFFFFF);
+        rDevice->drawLine( aPt1, aPt2, aCol, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("first pixel set",
+                               rDevice->getPixel(aPt1) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("last pixel set",
+                               rDevice->getPixel(aPt2) == aCol);
+        const basegfx::B2IPoint aPt3(0,0);
+        CPPUNIT_ASSERT_MESSAGE("topmost pixel not set",
+                               rDevice->getPixel(aPt3) != aCol);
+        const basegfx::B2IPoint aPt4(0,10);
+        CPPUNIT_ASSERT_MESSAGE("bottommost pixel not set",
+                               rDevice->getPixel(aPt4) != aCol);
+
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 9",
+                               countPixel( rDevice, aCol ) == 9);
+    }
+
+    // test pixel rounding (should always tend towards start point of
+    // the line)
+    void implTestTieBreaking(const BitmapDeviceSharedPtr& rDevice)
+    {
+        rDevice->clear(Color(0));
+
+        const basegfx::B2IPoint aPt1(1,1);
+        const basegfx::B2IPoint aPt2(3,2);
+        const Color aCol(0xFFFFFFFF);
+        rDevice->drawLine( aPt1, aPt2, aCol, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("first pixel set",
+                               rDevice->getPixel(aPt1) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("second pixel set",
+                               rDevice->getPixel(basegfx::B2IPoint(2,1)) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("last pixel set",
+                               rDevice->getPixel(aPt2) == aCol);
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel after "
+                               "reversed paint is not 3",
+                               countPixel( rDevice, aCol ) == 3);
+
+        rDevice->drawLine( aPt2, aPt1, aCol, DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("alternate second pixel set",
+                               rDevice->getPixel(basegfx::B2IPoint(2,2)) == aCol);
+
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel after "
+                               "reversed paint is not 4",
+                               countPixel( rDevice, aCol ) == 4);
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(11,11);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::THIRTYTWO_BIT_TC_MASK );
+    }
+
+    void testBasicDiagonalLines()
+    {
+        implTestBasicDiagonalLines( mpDevice1bpp );
+        implTestBasicDiagonalLines( mpDevice32bpp );
+    }
+
+    void testBasicHorizontalLines()
+    {
+        implTestBasicHorizontalLines( mpDevice1bpp );
+        implTestBasicHorizontalLines( mpDevice32bpp );
+    }
+
+    void testBasicVerticalLines()
+    {
+        implTestBasicVerticalLines( mpDevice1bpp );
+        implTestBasicVerticalLines( mpDevice32bpp );
+    }
+
+    // test pixel rounding (should always tend towards start point of
+    // the line)
+    void testTieBreaking()
+    {
+        implTestTieBreaking( mpDevice1bpp );
+        implTestTieBreaking( mpDevice32bpp );
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(LineTest);
+    CPPUNIT_TEST(testBasicDiagonalLines);
+    CPPUNIT_TEST(testBasicHorizontalLines);
+    CPPUNIT_TEST(testBasicVerticalLines);
+    CPPUNIT_TEST(testTieBreaking);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(LineTest);
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
new file mode 100644
index 000000000000..ca77721716f7
--- /dev/null
+++ b/basebmp/test/makefile.mk
@@ -0,0 +1,125 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=basebmp
+TARGET=tests
+TARGETTYPE=GUI
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(debug)"!="" || "$(DEBUG)"!=""
+
+.IF "$(COM)"=="MSC"
+# disable inlining for MSVC
+CFLAGS += -Ob0
+.ENDIF
+
+.IF "$(COM)"=="GCC"
+# disable inlining for gcc
+CFLAGS += -fno-inline
+.ENDIF
+
+.ENDIF
+
+# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
+# if compiled with default -xalias_level (and optimization level -xO3)
+.IF "$(OS)"=="SOLARIS"
+# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
+.IF "$(CCNUMVER)"!="00050005"
+CDEFS+=-xalias_level=compatible
+.ENDIF
+.ENDIF
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+# --- Common ----------------------------------------------------------
+.IF "$(L10N_framework)"==""
+
+# BEGIN ----------------------------------------------------------------
+# auto generated Target:tests by codegen.pl
+SHL1OBJS=  \
+    $(SLO)$/basictest.obj		\
+    $(SLO)$/bmpmasktest.obj		\
+    $(SLO)$/bmptest.obj		    \
+    $(SLO)$/cliptest.obj		\
+    $(SLO)$/filltest.obj		\
+    $(SLO)$/linetest.obj		\
+    $(SLO)$/masktest.obj		\
+    $(SLO)$/polytest.obj		\
+    $(SLO)$/tools.obj
+SHL1TARGET= tests
+SHL1STDLIBS=    $(BASEBMPLIB) \
+                $(SALLIB)		 \
+                $(CPPUNITLIB)	 \
+                $(BASEGFXLIB)
+
+SHL1IMPLIB= i$(SHL1TARGET)
+
+DEF1NAME    =$(SHL1TARGET)
+SHL1VERSIONMAP = export.map
+SHL1RPATH = NONE
+
+.ENDIF
+# END ------------------------------------------------------------------
+
+#APP2TARGET= bmpdemo
+
+#APP2OBJS=	\
+#	$(OBJ)$/bmpdemo.obj
+
+#APP2STDLIBS=$(TOOLSLIB) 		\
+#			$(COMPHELPERLIB)	\
+#			$(BASEGFXLIB)	    \
+#			$(BASEBMPLIB)	    \
+#			$(CPPULIB)			\
+#			$(CPPUHELPERLIB)	\
+#			$(UCBHELPERLIB)		\
+#			$(SALLIB)			\
+#			$(VCLLIB)
+#
+#.IF "$(GUI)"!="UNX"
+#APP2DEF=	$(MISC)$/$(TARGET).def
+#.ENDIF
+
+#------------------------------- All object files -------------------------------
+# do this here, so we get right dependencies
+SLOFILES=$(SHL1OBJS)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
+# --- Enable test execution in normal build ------------------------
+.IF "$(L10N_framework)"==""
+.INCLUDE : _cppunit.mk
+.ENDIF
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
new file mode 100644
index 000000000000..77cd05588d5a
--- /dev/null
+++ b/basebmp/test/masktest.cxx
@@ -0,0 +1,179 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+        std::ofstream output("32bpp_test.dump");
+        debugDump( rDevice, output );
+        std::ofstream output2("32bpp_bmp.dump");
+        debugDump( rBmp, output2 );
+*/
+
+class MaskTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+    BitmapDeviceSharedPtr mpMask;
+
+    void implTestMaskBasics(const BitmapDeviceSharedPtr& rDevice,
+                            const BitmapDeviceSharedPtr& rBmp)
+    {
+        const Color aCol(0);
+        const Color aCol2(0xF0F0F0F0);
+
+        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IPoint aDestLeftTop(0,0);
+        const basegfx::B2IPoint aDestRightTop(5,0);
+        const basegfx::B2IPoint aDestLeftBottom(0,5);
+        const basegfx::B2IPoint aDestRightBottom(5,5);
+
+        rDevice->clear(aCol);
+        rDevice->setPixel(
+            basegfx::B2IPoint(1,1),
+            aCol2,
+            DrawMode_PAINT);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestLeftTop );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 50",
+                               countPixel( rDevice, aCol ) == 100-50);
+
+        rDevice->clear(aCol);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestRightTop );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 25",
+                               countPixel( rDevice, aCol ) == 100-25);
+
+        rDevice->clear(aCol);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestLeftBottom );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 25(b)",
+                               countPixel( rDevice, aCol ) == 100-25);
+
+        rDevice->clear(aCol);
+        rDevice->drawMaskedColor(
+            aCol2,
+            rBmp,
+            aSourceRect,
+            aDestRightBottom );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 25(c)",
+                               countPixel( rDevice, aCol ) == 100-25);
+    }
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(10,10);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                            true,
+                                            Format::THIRTYTWO_BIT_TC_MASK );
+
+        mpMask = createBitmapDevice( aSize,
+                                     true,
+                                     Format::EIGHT_BIT_GREY );
+
+        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
+            "m 0 0h5v10h5v-5h-10z" );
+
+        basegfx::B2DPolyPolygon aPoly;
+        basegfx::tools::importFromSvgD( aPoly, aSvg );
+        const Color aCol(0xFF);
+        mpMask->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+    }
+
+    void testMaskBasics()
+    {
+        implTestMaskBasics( mpDevice32bpp, mpMask );
+        implTestMaskBasics( mpDevice1bpp, mpMask );
+    }
+
+    void testMaskClip()
+    {
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(MaskTest);
+    CPPUNIT_TEST(testMaskBasics);
+    CPPUNIT_TEST(testMaskClip);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest);
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
new file mode 100644
index 000000000000..f3b1f0018e17
--- /dev/null
+++ b/basebmp/test/polytest.cxx
@@ -0,0 +1,299 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/scanlineformats.hxx>
+#include <basebmp/bitmapdevice.hxx>
+#include <basebmp/debug.hxx>
+#include "tools.hxx"
+
+#include <iostream>
+#include <fstream>
+
+using namespace ::basebmp;
+
+namespace
+{
+/*
+        std::ofstream output("32bpp_test.dump");
+        debugDump( rDevice, output );
+*/
+
+class PolyTest : public CppUnit::TestFixture
+{
+private:
+    BitmapDeviceSharedPtr mpDevice1bpp;
+    BitmapDeviceSharedPtr mpDevice32bpp;
+
+    void implTestEmpty(const BitmapDeviceSharedPtr& rDevice)
+    {
+        const Color aCol(0xFFFFFFFF);
+        const Color aBgCol(0);
+        rDevice->clear(aBgCol);
+        basegfx::B2DPolyPolygon aPoly;
+        ::rtl::OUString aSvg;
+
+        basegfx::tools::importFromSvgD(
+            aPoly,
+            rtl::OUString::createFromAscii(
+                "M2 2 l7 7 z" ) );
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 0",
+                               countPixel( rDevice, aCol ) == 0);
+
+        // --------------------------------------------------
+
+        rDevice->clear(aBgCol);
+        aPoly.clear();
+        basegfx::tools::importFromSvgD(
+            aPoly,
+            rtl::OUString::createFromAscii(
+            "M7 2 l-6 6 z" ) );
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 0(b)",
+                               countPixel( rDevice, aCol ) == 0);
+    }
+
+    void implTestHairline(const BitmapDeviceSharedPtr& rDevice)
+    {
+        const Color aCol(0xFFFFFFFF);
+        const Color aBgCol(0);
+        rDevice->clear(aBgCol);
+        basegfx::B2DPolyPolygon aPoly;
+        ::rtl::OUString aSvg;
+
+        basegfx::tools::importFromSvgD(
+            aPoly,
+            rtl::OUString::createFromAscii(
+                "M2 2 h1 l7 7 h-1 z" ) );
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 7",
+                               countPixel( rDevice, aCol ) == 7);
+
+        // --------------------------------------------------
+
+        rDevice->clear(aBgCol);
+        aPoly.clear();
+        basegfx::tools::importFromSvgD(
+            aPoly,
+            rtl::OUString::createFromAscii(
+            "M7 2 h-1 l-6 6 h1 z" ) );
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 6",
+                               countPixel( rDevice, aCol ) == 6);
+
+        // --------------------------------------------------
+
+        rDevice->clear(aBgCol);
+        aPoly.clear();
+        basegfx::tools::importFromSvgD(
+            aPoly,
+            rtl::OUString::createFromAscii(
+            "M0 0 l7 7 h-1 l-5-7 z" ) );
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 3",
+                               countPixel( rDevice, aCol ) == 3);
+    }
+
+    void implTestPolyPoly(const BitmapDeviceSharedPtr& rDevice)
+    {
+        const Color aCol(0xFFFFFFFF);
+        const Color aBgCol(0);
+        rDevice->clear(aBgCol);
+        basegfx::B2DPolyPolygon aPoly;
+        ::rtl::OUString aSvg;
+
+        basegfx::tools::importFromSvgD( aPoly,
+                                        ::rtl::OUString::createFromAscii(
+                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
+
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 40",
+                               countPixel( rDevice, aCol ) == 40);
+    }
+
+    void implTestPolyPolyClip(const BitmapDeviceSharedPtr& rDevice)
+    {
+        const Color aCol(0xFFFFFFFF);
+        const Color aBgCol(0);
+        rDevice->clear(aBgCol);
+        basegfx::B2DPolyPolygon aPoly;
+        ::rtl::OUString aSvg;
+
+        basegfx::tools::importFromSvgD( aPoly,
+                                        ::rtl::OUString::createFromAscii(
+                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
+        basegfx::B2DHomMatrix aMat;
+        aMat.translate(-3,-3);
+        aMat.rotate( 1.7 );
+        aMat.translate(6,5);
+        aPoly.transform(aMat);
+
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 39",
+                               countPixel( rDevice, aCol ) == 39);
+
+        BitmapDeviceSharedPtr pClippedDevice(
+            subsetBitmapDevice( rDevice,
+                                basegfx::B2IRange(3,3,5,8) ));
+
+        rDevice->clear(aBgCol);
+        pClippedDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 7",
+                               countPixel( rDevice, aCol ) == 7);
+    }
+
+    void implTestPolyPolyCrissCross(const BitmapDeviceSharedPtr& rDevice)
+    {
+        const Color aCol(0xFFFFFFFF);
+        const Color aBgCol(0);
+        rDevice->clear(aBgCol);
+        basegfx::B2DPolyPolygon aPoly;
+        ::rtl::OUString aSvg;
+
+        basegfx::tools::importFromSvgD( aPoly,
+                                        ::rtl::OUString::createFromAscii(
+                                            "M0 0 v2 l10 2 v-2 z"
+                                            "M10 6 v-2 l-10 2 v2 z"
+                                            "M1 0 h1 v10 h-1 z"
+                                            "M4 0 h1 v10 h-1 z"
+                                            "M8 0 h1 v10 h-1 z" ) );
+        rDevice->fillPolyPolygon(
+            aPoly,
+            aCol,
+            DrawMode_PAINT );
+        CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 46",
+                               countPixel( rDevice, aCol ) == 46);
+    }
+
+
+public:
+    void setUp()
+    {
+        const basegfx::B2ISize aSize(10,10);
+        mpDevice1bpp = createBitmapDevice( aSize,
+                                           true,
+                                           Format::ONE_BIT_MSB_PAL );
+        mpDevice32bpp = createBitmapDevice( aSize,
+                                            true,
+                                            Format::THIRTYTWO_BIT_TC_MASK );
+    }
+
+    void testEmpty()
+    {
+        implTestEmpty( mpDevice1bpp );
+        implTestEmpty( mpDevice32bpp );
+    }
+
+    void testHairline()
+    {
+        implTestHairline( mpDevice1bpp );
+        implTestHairline( mpDevice32bpp );
+    }
+
+    void testPolyPoly()
+    {
+        implTestPolyPoly( mpDevice1bpp );
+        implTestPolyPoly( mpDevice32bpp );
+    }
+
+    void testPolyPolyClip()
+    {
+        implTestPolyPolyClip(mpDevice1bpp);
+        implTestPolyPolyClip(mpDevice32bpp);
+    }
+
+    void testPolyPolyCrissCross()
+    {
+        implTestPolyPolyCrissCross(mpDevice1bpp);
+        implTestPolyPolyCrissCross(mpDevice32bpp);
+    }
+
+    // Change the following lines only, if you add, remove or rename
+    // member functions of the current class,
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(PolyTest);
+    CPPUNIT_TEST(testEmpty);
+    CPPUNIT_TEST(testHairline);
+    CPPUNIT_TEST(testPolyPoly);
+    CPPUNIT_TEST(testPolyPolyClip);
+    CPPUNIT_TEST(testPolyPolyCrissCross);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest);
+}
+
+
+// -----------------------------------------------------------------------------
+
+// this macro creates an empty function, which will called by the RegisterAllFunctions()
+// to let the user the possibility to also register some functions by hand.
+//NOADDITIONAL;
+
diff --git a/basebmp/test/tools.cxx b/basebmp/test/tools.cxx
new file mode 100644
index 000000000000..dbc11395d715
--- /dev/null
+++ b/basebmp/test/tools.cxx
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// autogenerated file with codegen.pl
+
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+
+#include <basebmp/color.hxx>
+#include <basebmp/bitmapdevice.hxx>
+
+using namespace ::basebmp;
+
+int countPixel( const BitmapDeviceSharedPtr& rDevice,
+                Color                        checkColor )
+{
+    int count(0);
+    const basegfx::B2ISize& rSize( rDevice->getSize() );
+    for( sal_Int32 y=0; y<rSize.getY(); ++y )
+        for( sal_Int32 x=0; x<rSize.getX(); ++x )
+            if( rDevice->getPixel( basegfx::B2IPoint(x,y) ) == checkColor )
+                ++count;
+
+    return count;
+}
diff --git a/basebmp/test/tools.hxx b/basebmp/test/tools.hxx
new file mode 100644
index 000000000000..254a988fc1bb
--- /dev/null
+++ b/basebmp/test/tools.hxx
@@ -0,0 +1,31 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "basebmp/bitmapdevice.hxx"
+
+int countPixel( const basebmp::BitmapDeviceSharedPtr& rDevice,
+                basebmp::Color                        checkColor );
diff --git a/basebmp/util/basebmp.flt b/basebmp/util/basebmp.flt
new file mode 100644
index 000000000000..28a1dd1b65c6
--- /dev/null
+++ b/basebmp/util/basebmp.flt
@@ -0,0 +1,4 @@
+__CT
+Impl
+IMP
+internal
\ No newline at end of file
diff --git a/basebmp/util/makefile.mk b/basebmp/util/makefile.mk
new file mode 100644
index 000000000000..bc86ebd6bac4
--- /dev/null
+++ b/basebmp/util/makefile.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=basebmp
+TARGET=basebmp
+
+# --- Settings ---------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Allgemein ---------------------------------------------------
+
+LIB1TARGET=$(SLB)$/basebmp.lib
+LIB1FILES=\
+    $(SLB)$/wrapper.lib
+
+SHL1TARGET= basebmp$(DLLPOSTFIX)
+SHL1IMPLIB= ibasebmp
+
+SHL1STDLIBS=\
+        $(SALLIB)	  \
+        $(BASEGFXLIB)
+
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+SHL1LIBS=	$(SLB)$/basebmp.lib
+
+DEF1NAME	=$(SHL1TARGET)
+DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt \
+        $(LIB1TARGET)
+
+DEF1DES		=BaseBMP
+DEFLIB1NAME	=basebmp
+
+# --- Targets -----------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+$(MISC)$/$(SHL1TARGET).flt : makefile.mk
+    @$(TYPE) $(TARGET).flt > $@
+
diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/basegfx/inc/basegfx/color/bcolor.hxx
new file mode 100644
index 000000000000..db66dd8dbdee
--- /dev/null
+++ b/basegfx/inc/basegfx/color/bcolor.hxx
@@ -0,0 +1,237 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_COLOR_BCOLOR_HXX
+#define _BGFX_COLOR_BCOLOR_HXX
+
+#include <basegfx/tuple/b3dtuple.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+
+namespace com { namespace sun { namespace star { namespace rendering {
+    class XGraphicDevice;
+}}}}
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** Base Color class with three double values
+
+        This class derives all operators and common handling for
+        a 3D data class from B3DTuple. All necessary extensions
+        which are special for colors will be added here.
+
+        @see B3DTuple
+    */
+    class BColor : public B3DTuple
+    {
+    public:
+        /** Create a Color with red, green and blue components from [0.0 to 1.0]
+
+            The color is initialized to (0.0, 0.0, 0.0)
+        */
+        BColor()
+        :   B3DTuple()
+        {}
+
+        /** Create a 3D Color
+
+            @param fRed
+            @param fGreen
+            @param fBlue
+            These parameters are used to initialize the red, green and blue intensities of the color
+        */
+        BColor(double fRed, double fGreen, double fBlue)
+        :   B3DTuple(fRed, fGreen, fBlue)
+        {}
+
+        /** Create a 3D Color
+
+            @param fLuminosity
+            The parameter is used to initialize the red, green and blue intensities of the color
+        */
+        BColor(double fLuminosity)
+        :   B3DTuple(fLuminosity, fLuminosity, fLuminosity)
+        {}
+
+        /** Create a copy of a Color
+
+            @param rVec
+            The Color which will be copied.
+        */
+        BColor(const BColor& rVec)
+        :   B3DTuple(rVec)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B3DTuple-based classes
+        */
+        BColor(const ::basegfx::B3DTuple& rTuple)
+        :   B3DTuple(rTuple)
+        {}
+
+        ~BColor()
+        {}
+
+        // data access read
+        double getRed() const { return mfX; }
+        double getGreen() const { return mfY; }
+        double getBlue() const { return mfZ; }
+
+        // data access write
+        void setRed(double fNew) { mfX = fNew; }
+        void setGreen(double fNew) { mfY = fNew; }
+        void setBlue(double fNew) { mfZ = fNew; }
+
+        /** *=operator to allow usage from BColor, too
+        */
+        BColor& operator*=( const BColor& rPnt )
+        {
+            mfX *= rPnt.mfX;
+            mfY *= rPnt.mfY;
+            mfZ *= rPnt.mfZ;
+            return *this;
+        }
+
+        /** *=operator to allow usage from BColor, too
+        */
+        BColor& operator*=(double t)
+        {
+            mfX *= t;
+            mfY *= t;
+            mfZ *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B3DTuple calculations
+        */
+        BColor& operator=( const ::basegfx::B3DTuple& rVec )
+        {
+            mfX = rVec.getX();
+            mfY = rVec.getY();
+            mfZ = rVec.getZ();
+            return *this;
+        }
+
+        // blend to another color using luminance
+        void blend(const BColor& rColor)
+        {
+            const double fLuminance(luminance());
+            mfX = rColor.getRed() * fLuminance;
+            mfY = rColor.getGreen() * fLuminance;
+            mfZ = rColor.getBlue() * fLuminance;
+        }
+
+        // luminance
+        double luminance() const
+        {
+            const double fRedWeight(77.0 / 256.0);
+            const double fGreenWeight(151.0 / 256.0);
+            const double fBlueWeight(28.0 / 256.0);
+
+            return (mfX * fRedWeight + mfY * fGreenWeight + mfZ * fBlueWeight);
+        }
+
+        // distances in color space
+        double getDistanceRed(const BColor& rColor) const { return (getRed() > rColor.getRed() ? getRed() - rColor.getRed() : rColor.getRed() - getRed()); }
+        double getDistanceGreen(const BColor& rColor) const { return (getGreen() > rColor.getGreen() ? getGreen() - rColor.getGreen() : rColor.getGreen() - getGreen()); }
+        double getDistanceBlue(const BColor& rColor) const { return (getBlue() > rColor.getBlue() ? getBlue() - rColor.getBlue() : rColor.getBlue() - getBlue()); }
+
+        double getDistance(const BColor& rColor) const
+        {
+            const double fDistR(getDistanceRed(rColor));
+            const double fDistG(getDistanceGreen(rColor));
+            const double fDistB(getDistanceBlue(rColor));
+
+            return sqrt(fDistR * fDistR + fDistG * fDistG + fDistB * fDistB);
+        }
+
+        double getMinimumDistance(const BColor& rColor) const
+        {
+            const double fDistR(getDistanceRed(rColor));
+            const double fDistG(getDistanceGreen(rColor));
+            const double fDistB(getDistanceBlue(rColor));
+
+            double fRetval(fDistR < fDistG ? fDistR : fDistG);
+            return (fRetval < fDistB ? fRetval : fDistB);
+        }
+
+        double getMaximumDistance(const BColor& rColor) const
+        {
+            const double fDistR(getDistanceRed(rColor));
+            const double fDistG(getDistanceGreen(rColor));
+            const double fDistB(getDistanceBlue(rColor));
+
+            double fRetval(fDistR > fDistG ? fDistR : fDistG);
+            return (fRetval > fDistB ? fRetval : fDistB);
+        }
+
+        // clamp color to [0.0..1.0] values in all three intensity components
+        void clamp()
+        {
+            mfX = basegfx::clamp(mfX, 0.0, 1.0);
+            mfY = basegfx::clamp(mfY, 0.0, 1.0);
+            mfZ = basegfx::clamp(mfZ, 0.0, 1.0);
+        }
+
+        void invert()
+        {
+            mfX = 1.0 - mfX;
+            mfY = 1.0 - mfY;
+            mfZ = 1.0 - mfZ;
+        }
+
+        static const BColor& getEmptyBColor()
+        {
+            return (const BColor&) ::basegfx::B3DTuple::getEmptyTuple();
+        }
+
+        com::sun::star::uno::Sequence< double > colorToDoubleSequence(const com::sun::star::uno::Reference< com::sun::star::rendering::XGraphicDevice >& /*xGraphicDevice*/) const
+        {
+            com::sun::star::uno::Sequence< double > aRet(4);
+            double* pRet = aRet.getArray();
+
+            pRet[0] = mfX;
+            pRet[1] = mfY;
+            pRet[2] = mfZ;
+            pRet[3] = 1.0;
+
+            return aRet;
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_COLOR_BCOLOR_HXX */
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/inc/basegfx/color/bcolormodifier.hxx b/basegfx/inc/basegfx/color/bcolormodifier.hxx
new file mode 100644
index 000000000000..962da760f850
--- /dev/null
+++ b/basegfx/inc/basegfx/color/bcolormodifier.hxx
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_COLOR_BCOLORMODIFIER_HXX
+#define _BGFX_COLOR_BCOLORMODIFIER_HXX
+
+#include <basegfx/color/bcolor.hxx>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** Descriptor for type of color modification
+    */
+    enum BColorModifyMode
+    {
+        BCOLORMODIFYMODE_REPLACE,       // replace all color with local color
+        BCOLORMODIFYMODE_INTERPOLATE,   // interpolate color between given and local with local value
+        BCOLORMODIFYMODE_GRAY,          // convert color to gray
+        BCOLORMODIFYMODE_BLACKANDWHITE  // convert color to B&W, local value is treshhold
+    };
+
+    /** Class to hold a color, value and mode for a color modification. Color modification is
+        done calling the getModifiedColor() method
+    */
+    class BColorModifier
+    {
+    protected:
+        ::basegfx::BColor                           maBColor;
+        double                                      mfValue;
+        BColorModifyMode                            meMode;
+
+    public:
+        BColorModifier(
+            const ::basegfx::BColor& rBColor,
+            double fValue = 0.5,
+            BColorModifyMode eMode = BCOLORMODIFYMODE_REPLACE)
+        :   maBColor(rBColor),
+            mfValue(fValue),
+            meMode(eMode)
+        {}
+
+        // compare operator(s)
+        bool operator==(const BColorModifier& rCompare) const
+        {
+            return (maBColor == rCompare.maBColor && mfValue == rCompare.mfValue && meMode == rCompare.meMode);
+        }
+
+        bool operator!=(const BColorModifier& rCompare) const
+        {
+            return !(operator==(rCompare));
+        }
+
+        // data access
+        const ::basegfx::BColor& getBColor() const { return maBColor; }
+        double getValue() const { return mfValue; }
+        BColorModifyMode getMode() const { return meMode; }
+
+        // compute modified color
+        ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+
+    /** Class to hold a stack of BColorModifiers and to get the modified color with
+        applying all existing entry changes
+    */
+    class BColorModifierStack
+    {
+    protected:
+        ::std::vector< BColorModifier >             maBColorModifiers;
+
+    public:
+        sal_uInt32 count() const
+        {
+            return maBColorModifiers.size();
+        }
+
+        const BColorModifier& getBColorModifier(sal_uInt32 nIndex) const
+        {
+            OSL_ENSURE(nIndex < count(), "BColorModifierStack: Access out of range (!)");
+            return maBColorModifiers[nIndex];
+        }
+
+        ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& rSource) const
+        {
+            if(count())
+            {
+                ::basegfx::BColor aRetval(rSource);
+                ::std::vector< BColorModifier >::const_iterator aEnd(maBColorModifiers.end());
+
+                while(aEnd != maBColorModifiers.begin())
+                {
+                    aRetval = (--aEnd)->getModifiedColor(aRetval);
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rSource;
+            }
+        }
+
+        void push(const BColorModifier& rNew)
+        {
+            maBColorModifiers.push_back(rNew);
+        }
+
+        void pop()
+        {
+            maBColorModifiers.pop_back();
+        }
+    };
+} // end of namespace basegfx
+
+#endif // _BGFX_COLOR_BCOLORMODIFIER_HXX
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx
new file mode 100644
index 000000000000..9121b145afa7
--- /dev/null
+++ b/basegfx/inc/basegfx/color/bcolortools.hxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_COLOR_BCOLORTOOLS_HXX
+#define _BGFX_COLOR_BCOLORTOOLS_HXX
+
+#include <sal/types.h>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class BColor;
+
+    namespace tools
+    {
+        /// Transform from RGB to HSL
+        BColor rgb2hsl(const BColor& rRGBColor);
+        /// Transform from HSL to RGB
+        BColor hsl2rgb(const BColor& rHSLColor);
+
+        /// Transform from RGB to HSV
+        BColor rgb2hsv(const BColor& rRGBColor);
+        /// Transform from HSV to RGB
+        BColor hsv2rgb(const BColor& rHSVColor);
+
+        /// Transform from R'G'B' to YIQ (NTSC color model - Y is used in monochrome mode)
+        BColor rgb2yiq(const BColor& rRGBColor);
+        /// Transform from YIQ to R'G'B' (NTSC color model - Y is used in monochrome mode)
+        BColor yiq2rgb(const BColor& rYIQColor);
+
+        /// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit))
+        BColor rgb2ypbpr(const BColor& rRGBColor);
+        /// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) into R'G'B'
+        BColor ypbpr2rgb(const BColor& rYPbPrColor);
+
+        /// Transform from CIE XYZ into Rec. 709 RGB (D65 white point)
+        BColor ciexyz2rgb( const BColor& rXYZColor );
+        /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ
+        BColor rgb2ciexyz( const BColor& rRGBColor );
+
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_COLOR_BCOLORTOOLS_HXX */
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
new file mode 100644
index 000000000000..3cc34fec5482
--- /dev/null
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_CURVE_B2DBEZIERTOOLS_HXX
+#define _BGFX_CURVE_B2DBEZIERTOOLS_HXX
+
+#include <sal/types.h>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+// predefines
+
+namespace basegfx
+{
+    class B2DCubicBezier;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B2DCubicBezierHelper
+    {
+    private:
+        ::std::vector< double >         maLengthArray;
+        sal_uInt32                      mnEdgeCount;
+
+    public:
+        B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions = 9);
+
+        double getLength() const { if(maLengthArray.size()) return maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
+        double distanceToRelative(double fDistance) const;
+        double relativeToDistance(double fRelative) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_CURVE_B2DBEZIERTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
new file mode 100644
index 000000000000..ea58a0a50b80
--- /dev/null
+++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
@@ -0,0 +1,222 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_CURVE_B2DCUBICBEZIER_HXX
+#define _BGFX_CURVE_B2DCUBICBEZIER_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+
+namespace basegfx
+{
+    class B2DPolygon;
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B2DCubicBezier
+    {
+        B2DPoint                                        maStartPoint;
+        B2DPoint                                        maEndPoint;
+        B2DPoint                                        maControlPointA;
+        B2DPoint                                        maControlPointB;
+
+    public:
+        B2DCubicBezier();
+        B2DCubicBezier(const B2DCubicBezier& rBezier);
+        B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rEnd);
+        B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rControlPointA, const B2DPoint& rControlPointB, const B2DPoint& rEnd);
+        ~B2DCubicBezier();
+
+        // assignment operator
+        B2DCubicBezier& operator=(const B2DCubicBezier& rBezier);
+
+        // compare operators
+        bool operator==(const B2DCubicBezier& rBezier) const;
+        bool operator!=(const B2DCubicBezier& rBezier) const;
+        bool equal(const B2DCubicBezier& rBezier) const;
+
+        // test if vectors are used
+        bool isBezier() const;
+
+        // test if contained bezier is trivial and reset vectors accordingly
+        void testAndSolveTrivialBezier();
+
+        /** get length of edge
+
+            This method handles beziers and simple edges. For
+            beziers, the deviation describes the maximum allowed
+            deviation from the real edge length. The default
+            allows a deviation of 1% from the correct length.
+
+            For beziers, there is no direct way to get the length,
+            thus this method may subdivide the bezier edge and may
+            not be cheap.
+
+            @param fDeviation
+            The maximal allowed deviation between correct length
+            and bezier edge length
+
+            @return
+            The length of the edge
+        */
+        double getLength(double fDeviation = 0.01) const;
+
+        // get distance between start and end point
+        double getEdgeLength() const;
+
+        // get length of control polygon
+        double getControlPolygonLength() const;
+
+        // data interface
+        B2DPoint getStartPoint() const { return maStartPoint; }
+        void setStartPoint(const B2DPoint& rValue) { maStartPoint = rValue; }
+
+        B2DPoint getEndPoint() const { return maEndPoint; }
+        void setEndPoint(const B2DPoint& rValue) { maEndPoint = rValue; }
+
+        B2DPoint getControlPointA() const { return maControlPointA; }
+        void setControlPointA(const B2DPoint& rValue) { maControlPointA = rValue; }
+
+        B2DPoint getControlPointB() const { return maControlPointB; }
+        void setControlPointB(const B2DPoint& rValue) { maControlPointB = rValue; }
+
+        /** get the tangent in point t
+
+            This method handles all the exceptions, e.g. when control point
+            A is equal to start point and/or control point B is equal to end
+            point
+
+            @param t
+            The bezier index in the range [0.0 .. 1.0]. It will be truncated.
+
+            @return
+            The tangent vector in point t
+        */
+        B2DVector getTangent(double t) const;
+
+        /** adaptive subdivide by angle criteria
+            no start point is added, but all necessary created edges
+            and the end point
+            #i37443# allow the criteria to get unsharp in recursions
+        */
+        void adaptiveSubdivideByAngle(B2DPolygon& rTarget, double fAngleBound, bool bAllowUnsharpen) const;
+
+        /** #i37443# adaptive subdivide by nCount subdivisions
+            no start point is added, but all necessary created edges
+            and the end point
+        */
+        void adaptiveSubdivideByCount(B2DPolygon& rTarget, sal_uInt32 nCount) const;
+
+        /** Subdivide cubic bezier segment.
+
+            This function adaptively subdivides the bezier
+            segment into as much straight line segments as necessary,
+            such that the maximal orthogonal distance from any of the
+            segments to the true curve is less than the given error
+            value.
+            No start point is added, but all necessary created edges
+            and the end point
+
+            @param rPoly
+            Output polygon. The subdivided bezier segment is added to
+            this polygon via B2DPolygon::append().
+
+            @param rCurve
+            The cubic bezier curve to subdivide
+
+            @param fDistanceBound
+            Bound on the maximal distance of the approximation to the
+            true curve.
+        */
+        void adaptiveSubdivideByDistance(B2DPolygon& rTarget, double fDistanceBound) const;
+
+        // get point at given relative position
+        B2DPoint interpolatePoint(double t) const;
+
+        // calculate the smallest distance from given point to this cubic bezier segment
+        // and return the value. The relative position on the segment is returned in rCut.
+        double getSmallestDistancePointToBezierSegment(const B2DPoint& rTestPoint, double& rCut) const;
+
+        // do a split at position t and fill both resulting segments
+        void split(double t, B2DCubicBezier* pBezierA, B2DCubicBezier* pBezierB) const;
+
+        // extract snippet from fStart to fEnd from this bezier
+        B2DCubicBezier snippet(double fStart, double fEnd) const;
+
+        // get range including conrol points
+        B2DRange getRange() const;
+
+        /** Get the minimum extremum position t
+
+            @param rfResult
+            Will be changed and set to a eventually found split value which should be in the
+            range [0.0 .. 1.0]. It will be the smallest current extremum; there may be more
+
+            @return
+            Returns true if there was at least one extremum found
+        */
+        bool getMinimumExtremumPosition(double& rfResult) const;
+
+        /** Get all extremum pos of this segment
+
+            This method will calculate all extremum positions of the segment
+            and add them to rResults if they are in the range ]0.0 .. 1.0[
+
+            @param rResults
+            The vector of doubles where the results will be added. Evtl.
+            existing contents will be removed since an empty vector is a
+            necessary result to express that there are no extreme positions
+            anymore. Since there is an upper maximum of 4 values, it makes
+            sense to use reserve(4) at the vector as preparation.
+        */
+        void getAllExtremumPositions(::std::vector< double >& rResults) const;
+
+        /** Get optimum-split position on this segment
+
+            This method calculates the positions of all points of the segment
+            that have the maximimum distance to the corresponding line from
+            startpoint-endpoint. This helps to approximate the bezier curve
+            with a minimum number of line segments
+
+            @param fResults
+             Result positions are in the range ]0.0 .. 1.0[
+            Cubic beziers have at most two of these positions
+
+            @return
+            Returns the number of split positions found
+        */
+        int getMaxDistancePositions( double fResults[2]) const;
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_CURVE_B2DCUBICBEZIER_HXX */
diff --git a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
new file mode 100644
index 000000000000..08cd6be59c78
--- /dev/null
+++ b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_CURVE_B2DQUADRATICBEZIER_HXX
+#define _BGFX_CURVE_B2DQUADRATICBEZIER_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B2DQuadraticBezier
+    {
+        ::basegfx::B2DPoint                         maStartPoint;
+        ::basegfx::B2DPoint                         maEndPoint;
+        ::basegfx::B2DPoint                         maControlPoint;
+
+    public:
+        B2DQuadraticBezier();
+        B2DQuadraticBezier(const B2DQuadraticBezier& rBezier);
+        B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd);
+        B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart,
+            const ::basegfx::B2DPoint& rControlPoint, const ::basegfx::B2DPoint& rEnd);
+        ~B2DQuadraticBezier();
+
+        // assignment operator
+        B2DQuadraticBezier& operator=(const B2DQuadraticBezier& rBezier);
+
+        // compare operators
+        bool operator==(const B2DQuadraticBezier& rBezier) const;
+        bool operator!=(const B2DQuadraticBezier& rBezier) const;
+
+        // test if control point is placed on the edge
+        bool isBezier() const;
+
+        // data interface
+        ::basegfx::B2DPoint getStartPoint() const { return maStartPoint; }
+        void setStartPoint(const ::basegfx::B2DPoint& rValue) { maStartPoint = rValue; }
+
+        ::basegfx::B2DPoint getEndPoint() const { return maEndPoint; }
+        void setEndPoint(const ::basegfx::B2DPoint& rValue) { maEndPoint = rValue; }
+
+        ::basegfx::B2DPoint getControlPoint() const { return maControlPoint; }
+        void setControlPoint(const ::basegfx::B2DPoint& rValue) { maControlPoint = rValue; }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_CURVE_B2DQUADRATICBEZIER_HXX */
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
new file mode 100644
index 000000000000..910224897301
--- /dev/null
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
@@ -0,0 +1,168 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
+#define _BGFX_MATRIX_B2DHOMMATRIX_HXX
+
+#include <sal/types.h>
+#include <o3tl/cow_wrapper.hxx>
+
+namespace basegfx
+{
+    class B2DTuple;
+    class Impl2DHomMatrix;
+
+    class B2DHomMatrix
+    {
+    public:
+        typedef o3tl::cow_wrapper< Impl2DHomMatrix > ImplType;
+
+    private:
+        ImplType                                     mpImpl;
+
+    public:
+        B2DHomMatrix();
+        B2DHomMatrix(const B2DHomMatrix& rMat);
+        ~B2DHomMatrix();
+
+        /** constructor to allow setting all needed values for a 3x2 matrix at once. The
+            parameter f_0x1 e.g. is the same as using set(0, 1, f)
+         */
+        B2DHomMatrix(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2);
+
+        /// unshare this matrix with all internally shared instances
+        void makeUnique();
+
+        double get(sal_uInt16 nRow, sal_uInt16 nColumn) const;
+        void set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue);
+
+        /** allow setting all needed values for a 3x2 matrix in one call. The
+            parameter f_0x1 e.g. is the same as using set(0, 1, f)
+         */
+        void set3x2(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2);
+
+        // test if last line is default to see if last line needs to be
+        // involved in calculations
+        bool isLastLineDefault() const;
+
+        // Auf Einheitsmatrix zuruecksetzen
+        bool isIdentity() const;
+        void identity();
+
+        // Invertierung
+        bool isInvertible() const;
+        bool invert();
+
+        // Normalisierung
+        bool isNormalized() const;
+        void normalize();
+
+        // Determinante
+        double determinant() const;
+
+        // Trace
+        double trace() const;
+
+        // Transpose
+        void transpose();
+
+        // Rotation
+        void rotate(double fRadiant);
+
+        // Translation
+        void translate(double fX, double fY);
+
+        // Skalierung
+        void scale(double fX, double fY);
+
+        // Shearing-Matrices
+        void shearX(double fSx);
+        void shearY(double fSy);
+
+        // Addition, Subtraktion
+        B2DHomMatrix& operator+=(const B2DHomMatrix& rMat);
+        B2DHomMatrix& operator-=(const B2DHomMatrix& rMat);
+
+        // Vergleichsoperatoren
+        bool operator==(const B2DHomMatrix& rMat) const;
+        bool operator!=(const B2DHomMatrix& rMat) const;
+
+        // Multiplikation, Division mit Konstante
+        B2DHomMatrix& operator*=(double fValue);
+        B2DHomMatrix& operator/=(double fValue);
+
+        // Matritzenmultiplikation von links auf die lokale
+        B2DHomMatrix& operator*=(const B2DHomMatrix& rMat);
+
+        // assignment operator
+        B2DHomMatrix& operator=(const B2DHomMatrix& rMat);
+
+        // Help routine to decompose given homogen 3x3 matrix to components. A correction of
+        // the components is done to avoid inaccuracies.
+        // Zerlegung
+        bool decompose(B2DTuple& rScale, B2DTuple& rTranslate, double& rRotate, double& rShearX) const;
+    };
+
+    // Addition, Subtraktion
+    inline B2DHomMatrix operator+(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+    {
+        B2DHomMatrix aSum(rMatA);
+        aSum += rMatB;
+        return aSum;
+    }
+
+    inline B2DHomMatrix operator-(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+    {
+        B2DHomMatrix aDiv(rMatA);
+        aDiv -= rMatB;
+        return aDiv;
+    }
+
+    // Multiplikation, Division mit Konstante
+    inline B2DHomMatrix operator*(const B2DHomMatrix& rMat, double fValue)
+    {
+        B2DHomMatrix aNew(rMat);
+        aNew *= fValue;
+        return aNew;
+    }
+
+    inline B2DHomMatrix operator/(const B2DHomMatrix& rMat, double fValue)
+    {
+        B2DHomMatrix aNew(rMat);
+        aNew *= 1.0 / fValue;
+        return aNew;
+    }
+
+    inline B2DHomMatrix operator*(const B2DHomMatrix& rMatA, const B2DHomMatrix& rMatB)
+    {
+        B2DHomMatrix aMul(rMatB);
+        aMul *= rMatA;
+        return aMul;
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_MATRIX_B2DHOMMATRIX_HXX */
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
new file mode 100644
index 000000000000..7ce9e75c3058
--- /dev/null
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
@@ -0,0 +1,234 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
+#define _BGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX
+
+#include <sal/types.h>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+
+namespace rtl { class OUString; }
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        /** If the rotation angle is an approximate multiple of pi/2,
+            force fSin/fCos to -1/0/1, to maintain orthogonality (which
+            might also be advantageous for the other cases, but: for
+            multiples of pi/2, the exact values _can_ be attained. It
+            would be largely unintuitive, if a 180 degrees rotation
+            would introduce slight roundoff errors, instead of exactly
+            mirroring the coordinate system)
+         */
+        void createSinCosOrthogonal(double& o_rSin, double& rCos, double fRadiant);
+
+        /** Tooling methods for on-the-fly matrix generation e.g. for inline
+            multiplications
+         */
+        B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double fScaleY);
+        B2DHomMatrix createShearXB2DHomMatrix(double fShearX);
+        B2DHomMatrix createShearYB2DHomMatrix(double fShearY);
+        B2DHomMatrix createRotateB2DHomMatrix(double fRadiant);
+        B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY);
+
+        /// inline versions for parameters as tuples
+        inline B2DHomMatrix createScaleB2DHomMatrix(const B2DTuple& rScale)
+        {
+            return createScaleB2DHomMatrix(rScale.getX(), rScale.getY());
+        }
+
+        inline B2DHomMatrix createTranslateB2DHomMatrix(const B2DTuple& rTranslate)
+        {
+            return createTranslateB2DHomMatrix(rTranslate.getX(), rTranslate.getY());
+        }
+
+        /** Tooling methods for faster completely combined matrix creation
+            when scale, shearX, rotation and translation needs to be done in
+            exactly that order. It's faster since it direcly calculates
+            each matrix value based on a symbolic calculation of the three
+            matrix multiplications.
+            Inline versions for parameters as tuples added, too.
+         */
+        B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix(
+            double fScaleX, double fScaleY,
+            double fShearX,
+            double fRadiant,
+            double fTranslateX, double fTranslateY);
+        inline B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix(
+            const B2DTuple& rScale,
+            double fShearX,
+            double fRadiant,
+            const B2DTuple& rTranslate)
+        {
+            return createScaleShearXRotateTranslateB2DHomMatrix(
+                rScale.getX(), rScale.getY(),
+                fShearX,
+                fRadiant,
+                rTranslate.getX(), rTranslate.getY());
+        }
+
+        B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
+            double fShearX,
+            double fRadiant,
+            double fTranslateX, double fTranslateY);
+        inline B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
+            double fShearX,
+            double fRadiant,
+            const B2DTuple& rTranslate)
+        {
+            return createShearXRotateTranslateB2DHomMatrix(
+                fShearX,
+                fRadiant,
+                rTranslate.getX(), rTranslate.getY());
+        }
+
+        B2DHomMatrix createScaleTranslateB2DHomMatrix(
+            double fScaleX, double fScaleY,
+            double fTranslateX, double fTranslateY);
+        inline B2DHomMatrix createScaleTranslateB2DHomMatrix(
+            const B2DTuple& rScale,
+            const B2DTuple& rTranslate)
+        {
+            return createScaleTranslateB2DHomMatrix(
+                rScale.getX(), rScale.getY(),
+                rTranslate.getX(), rTranslate.getY());
+        }
+
+        /// special for the often used case of rotation around a point
+        B2DHomMatrix createRotateAroundPoint(
+            double fPointX, double fPointY,
+            double fRadiant);
+        inline B2DHomMatrix createRotateAroundPoint(
+            const B2DTuple& rPoint,
+            double fRadiant)
+        {
+            return createRotateAroundPoint(
+                rPoint.getX(), rPoint.getY(),
+                fRadiant);
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        class B2DHomMatrixBufferedDecompose
+        {
+        private:
+            B2DVector              maScale;
+            B2DVector              maTranslate;
+            double                 mfRotate;
+            double                 mfShearX;
+
+        public:
+            B2DHomMatrixBufferedDecompose(const B2DHomMatrix& rB2DHomMatrix)
+            :   maScale(),
+                maTranslate(),
+                mfRotate(0.0),
+                mfShearX(0.0)
+            {
+                rB2DHomMatrix.decompose(maScale, maTranslate, mfRotate, mfShearX);
+            }
+
+            // data access
+            B2DHomMatrix getB2DHomMatrix() const
+            {
+                return createScaleShearXRotateTranslateB2DHomMatrix(
+                    maScale, mfShearX, mfRotate, maTranslate);
+            }
+
+            const B2DVector& getScale() const { return maScale; }
+            const B2DVector& getTranslate() const { return maTranslate; }
+            double getRotate() const { return mfRotate; }
+            double getShearX() const { return mfShearX; }
+        };
+    } // end of namespace tools
+} // end of namespace basegfx
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        class B2DHomMatrixBufferedOnDemandDecompose
+        {
+        private:
+            B2DHomMatrix           maB2DHomMatrix;
+            B2DVector              maScale;
+            B2DVector              maTranslate;
+            double                 mfRotate;
+            double                 mfShearX;
+
+            // bitfield
+            unsigned               mbDecomposed : 1;
+
+            void impCheckDecompose()
+            {
+                if(!mbDecomposed)
+                {
+                    maB2DHomMatrix.decompose(maScale, maTranslate, mfRotate, mfShearX);
+                    mbDecomposed = true;
+                }
+            }
+
+        public:
+            B2DHomMatrixBufferedOnDemandDecompose(const B2DHomMatrix& rB2DHomMatrix)
+            :   maB2DHomMatrix(rB2DHomMatrix),
+                maScale(),
+                maTranslate(),
+                mfRotate(0.0),
+                mfShearX(0.0),
+                mbDecomposed(false)
+            {
+            }
+
+            // data access
+            const B2DHomMatrix& getB2DHomMatrix() const { return maB2DHomMatrix; }
+            const B2DVector& getScale() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maScale; }
+            const B2DVector& getTranslate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return maTranslate; }
+            double getRotate() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfRotate; }
+            double getShearX() const { const_cast< B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return mfShearX; }
+        };
+    } // end of namespace tools
+
+    /// Returns a string with svg's "matrix(m00,m10,m01,m11,m02,m12)" representation
+    ::rtl::OUString exportToSvg( const B2DHomMatrix& rMatrix );
+
+} // end of namespace basegfx
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
new file mode 100644
index 000000000000..bc35fcde321e
--- /dev/null
+++ b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
@@ -0,0 +1,175 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_MATRIX_B3DHOMMATRIX_HXX
+#define _BGFX_MATRIX_B3DHOMMATRIX_HXX
+
+#include <sal/types.h>
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/vector/b3dvector.hxx>
+#include <o3tl/cow_wrapper.hxx>
+
+namespace basegfx
+{
+    class B3DTuple;
+    class Impl3DHomMatrix;
+
+    class B3DHomMatrix
+    {
+    public:
+        typedef o3tl::cow_wrapper< Impl3DHomMatrix > ImplType;
+
+    private:
+        ImplType                                     mpImpl;
+
+    public:
+        B3DHomMatrix();
+        B3DHomMatrix(const B3DHomMatrix& rMat);
+        ~B3DHomMatrix();
+
+        /// unshare this matrix with all internally shared instances
+        void makeUnique();
+
+        double get(sal_uInt16 nRow, sal_uInt16 nColumn) const;
+        void set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue);
+
+        // test if last line is default to see if last line needs to be
+        // involved in calculations
+        bool isLastLineDefault() const;
+
+        bool isIdentity() const;
+        /// Reset to the identity matrix
+        void identity();
+
+        bool isInvertible() const;
+        /// Invert the matrix (if possible)
+        bool invert();
+
+        bool isNormalized() const;
+        /// Normalize (i.e. force w=1) the matrix
+        void normalize();
+
+        /// Calc the matrix determinant
+        double determinant() const;
+
+        /// Calc the matrix trace
+        double trace() const;
+
+        /// Transpose the matrix
+        void transpose();
+
+        /// Rotation
+        void rotate(double fAngleX,double fAngleY,double fAngleZ);
+
+        /// Translation
+        void translate(double fX, double fY, double fZ);
+
+        /// Scaling
+        void scale(double fX, double fY, double fZ);
+
+        // Shearing-Matrices
+        void shearXY(double fSx, double fSy);
+        void shearYZ(double fSy, double fSz);
+        void shearXZ(double fSx, double fSz);
+
+        // Projection matrices, used for converting between eye and
+        // clip coordinates
+        void frustum(double fLeft = -1.0, double fRight = 1.0,
+            double fBottom = -1.0, double fTop = 1.0,
+            double fNear = 0.001, double fFar = 1.0);
+
+        void ortho(double fLeft = -1.0, double fRight = 1.0,
+            double fBottom = -1.0, double fTop = 1.0,
+            double fNear = 0.0, double fFar = 1.0);
+
+        // build orientation matrix
+        void orientation(
+            B3DPoint aVRP = B3DPoint(0.0,0.0,1.0),
+            B3DVector aVPN = B3DVector(0.0,0.0,1.0),
+            B3DVector aVUV = B3DVector(0.0,1.0,0.0));
+
+        // addition, subtraction
+        B3DHomMatrix& operator+=(const B3DHomMatrix& rMat);
+        B3DHomMatrix& operator-=(const B3DHomMatrix& rMat);
+
+        // comparison
+        bool operator==(const B3DHomMatrix& rMat) const;
+        bool operator!=(const B3DHomMatrix& rMat) const;
+
+        // multiplication, division by constant value
+        B3DHomMatrix& operator*=(double fValue);
+        B3DHomMatrix& operator/=(double fValue);
+
+        // matrix multiplication (from the left)
+        B3DHomMatrix& operator*=(const B3DHomMatrix& rMat);
+
+        // assignment operator
+        B3DHomMatrix& operator=(const B3DHomMatrix& rMat);
+
+        // decomposition
+        bool decompose(B3DTuple& rScale, B3DTuple& rTranslate, B3DTuple& rRotate, B3DTuple& rShear) const;
+    };
+
+    // addition, subtraction
+    inline B3DHomMatrix operator+(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+    {
+        B3DHomMatrix aSum(rMatA);
+        aSum += rMatB;
+        return aSum;
+    }
+
+    inline B3DHomMatrix operator-(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+    {
+        B3DHomMatrix aDiv(rMatA);
+        aDiv -= rMatB;
+        return aDiv;
+    }
+
+    // multiplication, division by constant value
+    inline B3DHomMatrix operator*(const B3DHomMatrix& rMat, double fValue)
+    {
+        B3DHomMatrix aNew(rMat);
+        aNew *= fValue;
+        return aNew;
+    }
+
+    inline B3DHomMatrix operator/(const B3DHomMatrix& rMat, double fValue)
+    {
+        B3DHomMatrix aNew(rMat);
+        aNew *= 1.0 / fValue;
+        return aNew;
+    }
+
+    inline B3DHomMatrix operator*(const B3DHomMatrix& rMatA, const B3DHomMatrix& rMatB)
+    {
+        B3DHomMatrix aMul(rMatB);
+        aMul *= rMatA;
+        return aMul;
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_MATRIX_B3DHOMMATRIX_HXX */
diff --git a/basegfx/inc/basegfx/numeric/ftools.hxx b/basegfx/inc/basegfx/numeric/ftools.hxx
new file mode 100644
index 000000000000..65a6566dae25
--- /dev/null
+++ b/basegfx/inc/basegfx/numeric/ftools.hxx
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_NUMERIC_FTOOLS_HXX
+#define _BGFX_NUMERIC_FTOOLS_HXX
+
+#include <rtl/math.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// standard PI defines from solar.h, but we do not want to link against tools
+
+#ifndef F_PI
+#define F_PI        M_PI
+#endif
+#ifndef F_PI2
+#define F_PI2       M_PI_2
+#endif
+#ifndef F_PI4
+#define F_PI4       M_PI_4
+#endif
+#ifndef F_PI180
+#define F_PI180     (M_PI/180.0)
+#endif
+#ifndef F_PI1800
+#define F_PI1800    (M_PI/1800.0)
+#endif
+#ifndef F_PI18000
+#define F_PI18000   (M_PI/18000.0)
+#endif
+#ifndef F_2PI
+#define F_2PI       (2.0*M_PI)
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+// fTools defines
+
+namespace basegfx
+{
+    /** Round double to nearest integer
+
+        @return the nearest integer
+    */
+    inline sal_Int32 fround( double fVal )
+    {
+        return fVal > 0.0 ? static_cast<sal_Int32>( fVal + .5 ) : -static_cast<sal_Int32>( -fVal + .5 );
+    }
+
+    /** Round double to nearest integer
+
+        @return the nearest 64 bit integer
+    */
+    inline sal_Int64 fround64( double fVal )
+    {
+        return fVal > 0.0 ? static_cast<sal_Int64>( fVal + .5 ) : -static_cast<sal_Int64>( -fVal + .5 );
+    }
+
+    /** Prune a small epsilon range around zero.
+
+        Use this method e.g. for calculating scale values. There, it
+        is usually advisable not to set a scaling to 0.0, because that
+        yields singular transformation matrices.
+
+        @param fVal
+        An arbitrary, but finite and valid number
+
+        @return either fVal, or a small value slightly above (when
+        fVal>0) or below (when fVal<0) zero.
+     */
+    inline double pruneScaleValue( double fVal )
+    {
+        // old version used ::std::min/max, but this collides if min is defined as preprocessor
+        // macro which is the case e.g with windows.h headers. The simplest way to avoid this is to
+        // just use the full comparison. I keep the original here, maybe there will be a better
+        // solution some day.
+        //
+        //return fVal < 0.0 ?
+        //    (::std::min(fVal,-0.00001)) :
+        //    (::std::max(fVal,0.00001));
+
+        if(fVal < 0.0)
+            return (fVal < -0.00001 ? fVal : -0.00001);
+        else
+            return (fVal > 0.00001 ? fVal : 0.00001);
+    }
+
+    /** clamp given value against given minimum and maximum values
+    */
+    template <class T> inline const T& clamp(const T& value, const T& minimum, const T& maximum)
+    {
+        if(value < minimum)
+        {
+            return minimum;
+        }
+        else if(value > maximum)
+        {
+            return maximum;
+        }
+        else
+        {
+            return value;
+        }
+    }
+
+    /** Convert value from degrees to radians
+     */
+    inline double deg2rad( double v )
+    {
+        // divide first, to get exact values for v being a multiple of
+        // 90 degrees
+        return v / 90.0 * M_PI_2;
+    }
+
+    /** Convert value radians to degrees
+     */
+    inline double rad2deg( double v )
+    {
+        // divide first, to get exact values for v being a multiple of
+        // pi/2
+        return v / M_PI_2 * 90.0;
+    }
+
+
+    class fTools
+    {
+        /// Threshold value for equalZero()
+        static double                                   mfSmallValue;
+
+    public:
+        /// Get threshold value for equalZero and friends
+        static double getSmallValue() { return mfSmallValue; }
+        /// Set threshold value for equalZero and friends
+        static void setSmallValue(const double& rfNew) { mfSmallValue = rfNew; }
+
+        /// Compare against small value
+        static bool equalZero(const double& rfVal)
+        {
+            return (fabs(rfVal) <= getSmallValue());
+        }
+
+        /// Compare against given small value
+        static bool equalZero(const double& rfVal, const double& rfSmallValue)
+        {
+            return (fabs(rfVal) <= rfSmallValue);
+        }
+
+        static bool equal(const double& rfValA, const double& rfValB)
+        {
+            // changed to approxEqual usage for better numerical correctness
+            return rtl::math::approxEqual(rfValA, rfValB);
+        }
+
+        static bool equal(const double& rfValA, const double& rfValB, const double& rfSmallValue)
+        {
+            return (fabs(rfValA - rfValB) <= rfSmallValue);
+        }
+
+        static bool less(const double& rfValA, const double& rfValB)
+        {
+            return (rfValA < rfValB && !equal(rfValA, rfValB));
+        }
+
+        static bool lessOrEqual(const double& rfValA, const double& rfValB)
+        {
+            return (rfValA < rfValB || equal(rfValA, rfValB));
+        }
+
+        static bool more(const double& rfValA, const double& rfValB)
+        {
+            return (rfValA > rfValB && !equal(rfValA, rfValB));
+        }
+
+        static bool moreOrEqual(const double& rfValA, const double& rfValB)
+        {
+            return (rfValA > rfValB || equal(rfValA, rfValB));
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_NUMERIC_FTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/basegfx/inc/basegfx/pixel/bpixel.hxx
new file mode 100644
index 000000000000..2684ff44e5d6
--- /dev/null
+++ b/basegfx/inc/basegfx/pixel/bpixel.hxx
@@ -0,0 +1,222 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_PIXEL_BPIXEL_HXX
+#define _BGFX_PIXEL_BPIXEL_HXX
+
+#include <sal/types.h>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/color/bcolor.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class BPixel
+    {
+    protected:
+        union
+        {
+            struct
+            {
+                // bitfield
+                unsigned                                mnR : 8;        // red intensity
+                unsigned                                mnG : 8;        // green intensity
+                unsigned                                mnB : 8;        // blue intensity
+                unsigned                                mnO : 8;        // opacity, 0 == full transparence
+            } maRGBO;
+
+            struct
+            {
+                // bitfield
+                unsigned                                mnValue : 32;   // all values
+            } maCombinedRGBO;
+        } maPixelUnion;
+
+    public:
+        BPixel()
+        {
+            maPixelUnion.maCombinedRGBO.mnValue = 0L;
+        }
+
+        // use explicit here to make sure everyone knows what he is doing. Values range from
+        // 0..255 integer here.
+        explicit BPixel(sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue, sal_uInt8 nOpacity)
+        {
+            maPixelUnion.maRGBO.mnR = nRed;
+            maPixelUnion.maRGBO.mnG = nGreen;
+            maPixelUnion.maRGBO.mnB = nBlue;
+            maPixelUnion.maRGBO.mnO = nOpacity;
+        }
+
+        // constructor from BColor which uses double precision color, so change it
+        // to local integer format. It will also be clamped here.
+        BPixel(const BColor& rColor, sal_uInt8 nOpacity)
+        {
+            maPixelUnion.maRGBO.mnR = sal_uInt8((rColor.getRed() * 255.0) + 0.5);
+            maPixelUnion.maRGBO.mnG = sal_uInt8((rColor.getGreen() * 255.0) + 0.5);
+            maPixelUnion.maRGBO.mnB = sal_uInt8((rColor.getBlue() * 255.0) + 0.5);
+            maPixelUnion.maRGBO.mnO = nOpacity;
+        }
+
+        // copy constructor
+        BPixel(const BPixel& rPixel)
+        {
+            maPixelUnion.maCombinedRGBO.mnValue = rPixel.maPixelUnion.maCombinedRGBO.mnValue;
+        }
+
+        ~BPixel()
+        {}
+
+        // assignment operator
+        BPixel& operator=( const BPixel& rPixel )
+        {
+            maPixelUnion.maCombinedRGBO.mnValue = rPixel.maPixelUnion.maCombinedRGBO.mnValue;
+            return *this;
+        }
+
+        // data access read
+        sal_uInt8 getRed() const { return maPixelUnion.maRGBO.mnR; }
+        sal_uInt8 getGreen() const { return maPixelUnion.maRGBO.mnG; }
+        sal_uInt8 getBlue() const { return maPixelUnion.maRGBO.mnB; }
+        sal_uInt8 getOpacity() const { return maPixelUnion.maRGBO.mnO; }
+        sal_uInt32 getRedGreenBlueOpacity() const { return maPixelUnion.maCombinedRGBO.mnValue; }
+
+        // data access write
+        void setRed(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnR = nNew; }
+        void setGreen(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnG = nNew; }
+        void setBlue(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnB = nNew; }
+        void setOpacity(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnO = nNew; }
+        void setRedGreenBlueOpacity(sal_uInt32 nRedGreenBlueOpacity) { maPixelUnion.maCombinedRGBO.mnValue = nRedGreenBlueOpacity; }
+        void setRedGreenBlue(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB) { maPixelUnion.maRGBO.mnR = nR; maPixelUnion.maRGBO.mnG = nG; maPixelUnion.maRGBO.mnB = nB; }
+
+        // comparators
+        bool isInvisible() const { return (0 == maPixelUnion.maRGBO.mnO); }
+        bool isVisible() const { return (0 != maPixelUnion.maRGBO.mnO); }
+        bool isEmpty() const { return isInvisible(); }
+        bool isUsed() const { return isVisible(); }
+
+        bool operator==( const BPixel& rPixel ) const
+        {
+            return (rPixel.maPixelUnion.maCombinedRGBO.mnValue == maPixelUnion.maCombinedRGBO.mnValue);
+        }
+
+        bool operator!=( const BPixel& rPixel ) const
+        {
+            return (rPixel.maPixelUnion.maCombinedRGBO.mnValue != maPixelUnion.maCombinedRGBO.mnValue);
+        }
+
+        // empty element
+        static const BPixel& getEmptyBPixel();
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // external operators
+
+    inline BPixel minimum(const BPixel& rTupA, const BPixel& rTupB)
+    {
+        BPixel aMin(
+            (rTupB.getRed() < rTupA.getRed()) ? rTupB.getRed() : rTupA.getRed(),
+            (rTupB.getGreen() < rTupA.getGreen()) ? rTupB.getGreen() : rTupA.getGreen(),
+            (rTupB.getBlue() < rTupA.getBlue()) ? rTupB.getBlue() : rTupA.getBlue(),
+            (rTupB.getOpacity() < rTupA.getOpacity()) ? rTupB.getOpacity() : rTupA.getOpacity());
+        return aMin;
+    }
+
+    inline BPixel maximum(const BPixel& rTupA, const BPixel& rTupB)
+    {
+        BPixel aMax(
+            (rTupB.getRed() > rTupA.getRed()) ? rTupB.getRed() : rTupA.getRed(),
+            (rTupB.getGreen() > rTupA.getGreen()) ? rTupB.getGreen() : rTupA.getGreen(),
+            (rTupB.getBlue() > rTupA.getBlue()) ? rTupB.getBlue() : rTupA.getBlue(),
+            (rTupB.getOpacity() > rTupA.getOpacity()) ? rTupB.getOpacity() : rTupA.getOpacity());
+        return aMax;
+    }
+
+    inline BPixel interpolate(const BPixel& rOld1, const BPixel& rOld2, double t)
+    {
+        if(rOld1 == rOld2)
+        {
+            return rOld1;
+        }
+        else if(0.0 >= t)
+        {
+            return rOld1;
+        }
+        else if(1.0 <= t)
+        {
+            return rOld2;
+        }
+        else
+        {
+            const sal_uInt32 nFactor(fround(256.0 * t));
+            const sal_uInt32 nNegFac(256L - nFactor);
+            return BPixel(
+                (sal_uInt8)(((sal_uInt32)rOld1.getRed() * nNegFac + (sal_uInt32)rOld2.getRed() * nFactor) >> 8L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getGreen() * nNegFac + (sal_uInt32)rOld2.getGreen() * nFactor) >> 8L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getBlue() * nNegFac + (sal_uInt32)rOld2.getBlue() * nFactor) >> 8L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getOpacity() * nNegFac + (sal_uInt32)rOld2.getOpacity() * nFactor) >> 8L));
+        }
+    }
+
+    inline BPixel average(const BPixel& rOld1, const BPixel& rOld2)
+    {
+        if(rOld1 == rOld2)
+        {
+            return rOld1;
+        }
+        else
+        {
+            return BPixel(
+                (sal_uInt8)(((sal_uInt32)rOld1.getRed() + (sal_uInt32)rOld2.getRed()) >> 1L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getGreen() + (sal_uInt32)rOld2.getGreen()) >> 1L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getBlue() + (sal_uInt32)rOld2.getBlue()) >> 1L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getOpacity() + (sal_uInt32)rOld2.getOpacity()) >> 1L));
+        }
+    }
+
+    inline BPixel average(const BPixel& rOld1, const BPixel& rOld2, const BPixel& rOld3)
+    {
+        if(rOld1 == rOld2 && rOld2 == rOld3)
+        {
+            return rOld1;
+        }
+        else
+        {
+            return BPixel(
+                (sal_uInt8)(((sal_uInt32)rOld1.getRed() + (sal_uInt32)rOld2.getRed() + (sal_uInt32)rOld3.getRed()) / 3L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getGreen() + (sal_uInt32)rOld2.getGreen() + (sal_uInt32)rOld3.getGreen()) / 3L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getBlue() + (sal_uInt32)rOld2.getBlue() + (sal_uInt32)rOld3.getBlue()) / 3L),
+                (sal_uInt8)(((sal_uInt32)rOld1.getOpacity() + (sal_uInt32)rOld2.getOpacity() + (sal_uInt32)rOld3.getOpacity()) / 3L));
+        }
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_PIXEL_BPIXEL_HXX */
diff --git a/basegfx/inc/basegfx/point/b2dhompoint.hxx b/basegfx/inc/basegfx/point/b2dhompoint.hxx
new file mode 100644
index 000000000000..254ee9251dd3
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b2dhompoint.hxx
@@ -0,0 +1,235 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B2DHOMPOINT_HXX
+#define _BGFX_POINT_B2DHOMPOINT_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+
+namespace basegfx
+{
+    /** Basic homogen Point class with two double values and one homogen factor
+
+        This class provides access to homogen coordinates in 2D.
+        For this purpose all the operators which need to do specific
+        action due to their homogenity are implemented here.
+        The only caveat are member methods which are declared as const
+        but do change the content. These are documented for that reason.
+        The class is designed to provide homogenous coordinates without
+        direct access to the homogen part (mfW). This is also the reason
+        for leaving out the [] operators which return references to members.
+
+        @see B2DTuple
+    */
+    class B2DHomPoint
+    {
+    protected:
+        /// This member contains the coordinate part of the point
+        ::basegfx::B2DTuple                 maTuple;
+
+        /// This Member holds the homogenous part of the point
+        double                                      mfW;
+
+        /** Test if this homogen point does have a homogenous part
+
+            @return Returns true if this point has no homogenous part
+        */
+        bool implIsHomogenized() const;
+
+        /** Remove homogenous part of this Point
+
+            This method does necessary calculations to remove
+            the evtl. homogenous part of this Point. This may
+            change all members.
+        */
+        void implHomogenize();
+
+        /** Test and on demand remove homogenous part
+
+            This method tests if this Point does have a homogenous part
+            and then evtl. takes actions to remove that part.
+
+            @attention Even when this method is const it may change all
+            members of this instance. This is due to the fact that changing
+            the homogenous part of a homogenous point does from a mathematical
+            point of view not change the point at all.
+        */
+        void implTestAndHomogenize() const;
+
+    public:
+        /** Create a homogen point
+
+            The point is initialized to (0.0, 0.0)
+        */
+        B2DHomPoint()
+        :   maTuple(),
+            mfW(1.0)
+        {}
+
+        /** Create a homogen point
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the Point. The homogenous part is initialized to 1.0.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the Point. The homogenous part is initialized to 1.0.
+        */
+        B2DHomPoint(double fX, double fY)
+        :   maTuple(fX, fY),
+            mfW(1.0)
+        {}
+
+        /** Create a copy of a 2D Point
+
+            @param rVec
+            The 2D point which will be copied. The homogenous part
+            is initialized to 1.0.
+        */
+        B2DHomPoint(const B2DPoint& rVec)
+        :   maTuple(rVec),
+            mfW(1.0)
+        {}
+
+        /** Create a copy of a homogen point
+
+            @param rVec
+            The homogen point which will be copied. The homogenous part
+            is copied, too.
+        */
+        B2DHomPoint(const B2DHomPoint& rVec)
+        :   maTuple(rVec.maTuple.getX(), rVec.maTuple.getY()),
+            mfW(rVec.mfW)
+        {}
+
+        ~B2DHomPoint()
+        {}
+
+        /** Get a 2D point from this homogenous point
+
+            This method normalizes this homogen point if necessary and
+            returns the corresponding 2D point for this homogen point.
+
+            @attention Even when this method is const it may change all
+            members of this instance.
+        */
+        B2DPoint getB2DPoint() const;
+
+        /** Get X-coordinate
+
+            This method normalizes this homogen point if necessary and
+            returns the corresponding X-coordinate for this homogen point.
+
+            @attention Even when this method is const it may change all
+            members of this instance.
+        */
+        double getX() const;
+
+        /** Get Y-coordinate
+
+            This method normalizes this homogen point if necessary and
+            returns the corresponding Y-coordinate for this homogen point.
+
+            @attention Even when this method is const it may change all
+            members of this instance.
+        */
+        double getY() const;
+
+        /** Set X-coordinate of the homogen point.
+
+            This method sets the X-coordinate of the homogen point. If
+            the point does have a homogenous part this is taken into account.
+
+            @param fX
+            The to-be-set X-coordinate without homogenous part.
+        */
+        void setX(double fX);
+
+        /** Set Y-coordinate of the homogen point.
+
+            This method sets the Y-coordinate of the homogen point. If
+            the point does have a homogenous part this is taken into account.
+
+            @param fY
+            The to-be-set Y-coordinate without homogenous part.
+        */
+        void setY(double fY);
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B2DHomPoint& operator+=( const B2DHomPoint& rPnt );
+
+        B2DHomPoint& operator-=( const B2DHomPoint& rPnt );
+
+        B2DHomPoint& operator*=(double t);
+
+        B2DHomPoint& operator*=( const B2DHomMatrix& rMat );
+
+        B2DHomPoint& operator/=(double t);
+
+        B2DHomPoint& operator-(void);
+
+        bool operator==( const B2DHomPoint& rPnt ) const;
+
+        bool operator!=( const B2DHomPoint& rPnt ) const;
+
+        B2DHomPoint& operator=( const B2DHomPoint& rPnt );
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+    B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+    B2DHomPoint absolute(const B2DHomPoint& rVec);
+
+    B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t);
+
+    B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2);
+
+    B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2, B2DHomPoint& rOld3);
+
+    B2DHomPoint operator+(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+    B2DHomPoint operator-(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+
+    B2DHomPoint operator*(const B2DHomPoint& rVec, double t);
+
+    B2DHomPoint operator*(double t, const B2DHomPoint& rVec);
+
+    B2DHomPoint operator*( const B2DHomMatrix& rMat, const B2DHomPoint& rPoint );
+
+    B2DHomPoint operator/(const B2DHomPoint& rVec, double t);
+
+    B2DHomPoint operator/(double t, const B2DHomPoint& rVec);
+} // end of namespace basegfx
+
+#endif /* _BGFX_POINT_B2DHOMPOINT_HXX */
diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/basegfx/inc/basegfx/point/b2dpoint.hxx
new file mode 100644
index 000000000000..273a1c54e3ba
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b2dpoint.hxx
@@ -0,0 +1,151 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B2DPOINT_HXX
+#define _BGFX_POINT_B2DPOINT_HXX
+
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predeclaration
+    class B2DHomMatrix;
+
+    /** Base Point class with two double values
+
+        This class derives all operators and common handling for
+        a 2D data class from B2DTuple. All necessary extensions
+        which are special for points will be added here.
+
+        @see B2DTuple
+    */
+    class B2DPoint : public ::basegfx::B2DTuple
+    {
+    public:
+        /** Create a 2D Point
+
+            The point is initialized to (0.0, 0.0)
+        */
+        B2DPoint()
+        :   B2DTuple()
+        {}
+
+        /** Create a 2D Point
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 2D Point.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 2D Point.
+        */
+        B2DPoint(double fX, double fY)
+        :   B2DTuple(fX, fY)
+        {}
+
+        /** Create a copy of a 2D Point
+
+            @param rPoint
+            The 2D Point which will be copied.
+        */
+        B2DPoint(const B2DPoint& rPoint)
+        :   B2DTuple(rPoint)
+        {}
+
+        /** Create a copy of a 2D Point
+
+            @param rPoint
+            The 2D Point which will be copied.
+        */
+        B2DPoint(const ::basegfx::B2IPoint& rPoint)
+        :   B2DTuple(rPoint)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B2DTuple-based classes
+        */
+        B2DPoint(const ::basegfx::B2DTuple& rTuple)
+        :   B2DTuple(rTuple)
+        {}
+
+        ~B2DPoint()
+        {}
+
+        /** *=operator to allow usage from B2DPoint, too
+        */
+        B2DPoint& operator*=( const B2DPoint& rPnt )
+        {
+            mfX *= rPnt.mfX;
+            mfY *= rPnt.mfY;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B2DPoint, too
+        */
+        B2DPoint& operator*=(double t)
+        {
+            mfX *= t;
+            mfY *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B2DTuple calculations
+        */
+        B2DPoint& operator=( const ::basegfx::B2DTuple& rPoint );
+
+        /** Transform point by given transformation matrix.
+
+            The translational components of the matrix are, in
+            contrast to B2DVector, applied.
+        */
+        B2DPoint& operator*=( const ::basegfx::B2DHomMatrix& rMat );
+
+        static const B2DPoint& getEmptyPoint()
+        {
+            return (const B2DPoint&) ::basegfx::B2DTuple::getEmptyTuple();
+        }
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    /** Transform B2DPoint by given transformation matrix.
+
+        Since this is a Point, translational components of the
+        matrix are used.
+    */
+    B2DPoint operator*( const B2DHomMatrix& rMat, const B2DPoint& rPoint );
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_POINT_B2DPOINT_HXX */
diff --git a/basegfx/inc/basegfx/point/b2ipoint.hxx b/basegfx/inc/basegfx/point/b2ipoint.hxx
new file mode 100644
index 000000000000..dec51735de7c
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b2ipoint.hxx
@@ -0,0 +1,127 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B2IPOINT_HXX
+#define _BGFX_POINT_B2IPOINT_HXX
+
+#include <basegfx/tuple/b2ituple.hxx>
+
+namespace basegfx
+{
+    // predeclaration
+    class B2DHomMatrix;
+
+    /** Base Point class with two sal_Int32 values
+
+        This class derives all operators and common handling for
+        a 2D data class from B2ITuple. All necessary extensions
+        which are special for points will be added here.
+
+        @see B2ITuple
+    */
+    class B2IPoint : public ::basegfx::B2ITuple
+    {
+    public:
+        /** Create a 2D Point
+
+            The point is initialized to (0, 0)
+        */
+        B2IPoint()
+        :   B2ITuple()
+        {}
+
+        /** Create a 2D Point
+
+            @param nX
+            This parameter is used to initialize the X-coordinate
+            of the 2D Point.
+
+            @param nY
+            This parameter is used to initialize the Y-coordinate
+            of the 2D Point.
+        */
+        B2IPoint(sal_Int32 nX, sal_Int32 nY)
+        :   B2ITuple(nX, nY)
+        {}
+
+        /** Create a copy of a 2D Point
+
+            @param rPoint
+            The 2D Point which will be copied.
+        */
+        B2IPoint(const B2IPoint& rPoint)
+        :   B2ITuple(rPoint)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B2ITuple-based classes
+        */
+        B2IPoint(const ::basegfx::B2ITuple& rTuple)
+        :   B2ITuple(rTuple)
+        {}
+
+        ~B2IPoint()
+        {}
+
+        /** *=operator to allow usage from B2IPoint, too
+        */
+        B2IPoint& operator*=( const B2IPoint& rPnt )
+        {
+            mnX *= rPnt.mnX;
+            mnY *= rPnt.mnY;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B2IPoint, too
+        */
+        B2IPoint& operator*=(sal_Int32 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B2ITuple calculations
+        */
+        B2IPoint& operator=( const ::basegfx::B2ITuple& rPoint );
+
+        /** Transform point by given transformation matrix.
+
+            The translational components of the matrix are, in
+            contrast to B2DVector, applied.
+        */
+        B2IPoint& operator*=( const ::basegfx::B2DHomMatrix& rMat );
+
+        static const B2IPoint& getEmptyPoint()
+        {
+            return (const B2IPoint&) ::basegfx::B2ITuple::getEmptyTuple();
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_POINT_B2IPOINT_HXX */
diff --git a/basegfx/inc/basegfx/point/b3dhompoint.hxx b/basegfx/inc/basegfx/point/b3dhompoint.hxx
new file mode 100644
index 000000000000..7417d7528d16
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b3dhompoint.hxx
@@ -0,0 +1,405 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B3DHOMPOINT_HXX
+#define _BGFX_POINT_B3DHOMPOINT_HXX
+
+#include <basegfx/point/b3dpoint.hxx>
+
+namespace basegfx
+{
+    /** Basic homogen Point class with three double values and one homogen factor
+
+        This class provides access to homogen coordinates in 3D.
+        For this purpose all the operators which need to do specific
+        action due to their homogenity are implemented here.
+        The only caveat are member methods which are declared as const
+        but do change the content. These are documented for that reason.
+        The class is designed to provide homogenous coordinates without
+        direct access to the homogen part (mfW). This is also the reason
+        for leaving out the [] operators which return references to members.
+
+        @see B3DTuple
+    */
+    class B3DHomPoint
+    {
+    protected:
+        /// This member contains the coordinate part of the point
+        ::basegfx::B3DTuple                 maTuple;
+
+        /// This Member holds the homogenous part of the point
+        double                                      mfW;
+
+        /** Test if this homogen point does have a homogenous part
+
+            @return Returns true if this point has no homogenous part
+        */
+        bool implIsHomogenized() const
+        {
+            const double fOne(1.0);
+            return ::basegfx::fTools::equal(mfW, fOne);
+        }
+
+        /** Remove homogenous part of this Point
+
+            This method does necessary calculations to remove
+            the evtl. homogenous part of this Point. This may
+            change all members.
+        */
+        void implHomogenize();
+
+        /** Test and on demand remove homogenous part
+
+            This method tests if this Point does have a homogenous part
+            and then evtl. takes actions to remove that part.
+
+            @attention Even when this method is const it may change all
+            members of this instance. This is due to the fact that changing
+            the homogenous part of a homogenous point does from a mathematical
+            point of view not change the point at all.
+        */
+        void implTestAndHomogenize() const
+        {
+            if(!implIsHomogenized())
+                ((B3DHomPoint*)this)->implHomogenize();
+        }
+
+    public:
+        /** Create a homogen point
+
+            The point is initialized to (0.0, 0.0, 0.0)
+        */
+        B3DHomPoint()
+        :   maTuple(),
+            mfW(1.0)
+        {}
+
+        /** Create a homogen point
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the Point. The homogenous part is initialized to 1.0.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the Point. The homogenous part is initialized to 1.0.
+
+            @param fZ
+            This parameter is used to initialize the Z-coordinate
+            of the Point. The homogenous part is initialized to 1.0.
+        */
+        B3DHomPoint(double fX, double fY, double fZ)
+        :   maTuple(fX, fY, fZ),
+            mfW(1.0)
+        {}
+
+        /** Create a copy of a 3D Point
+
+            @param rVec
+            The 3D point which will be copied. The homogenous part
+            is initialized to 1.0.
+        */
+        B3DHomPoint(const B3DPoint& rVec)
+        :   maTuple(rVec),
+            mfW(1.0)
+        {}
+
+        /** Create a copy of a homogen point
+
+            @param rVec
+            The homogen point which will be copied. The homogenous part
+            is copied, too.
+        */
+        B3DHomPoint(const B3DHomPoint& rVec)
+        :   maTuple(rVec.maTuple.getX(), rVec.maTuple.getY(), rVec.maTuple.getZ()),
+            mfW(rVec.mfW)
+        {}
+
+        ~B3DHomPoint()
+        {}
+
+        /** get a 3D point from this homogenous point
+
+            This method normalizes this homogen point if necessary and
+            returns the corresponding 3D point for this homogen point.
+
+            @attention Even when this method is const it may change all
+            members of this instance.
+        */
+        B3DPoint getB3DPoint() const
+        {
+            implTestAndHomogenize();
+            return B3DPoint(maTuple.getX(), maTuple.getY(), maTuple.getZ());
+        }
+
+        /** get X-coordinate
+
+            This method normalizes this homogen point if necessary and
+            returns the corresponding X-coordinate for this homogen point.
+
+            @attention Even when this method is const it may change all
+            members of this instance.
+        */
+        double getX() const
+        {
+            implTestAndHomogenize();
+            return maTuple.getX();
+        }
+
+        /** get Y-coordinate
+
+            This method normalizes this homogen point if necessary and
+            returns the corresponding Y-coordinate for this homogen point.
+
+            @attention Even when this method is const it may change all
+            members of this instance.
+        */
+        double getY() const
+        {
+            implTestAndHomogenize();
+            return maTuple.getY();
+        }
+
+        /** get Z-coordinate
+
+            This method normalizes this homogen point if necessary and
+            returns the corresponding Z-coordinate for this homogen point.
+
+            @attention Even when this method is const it may change all
+            members of this instance.
+        */
+        double getZ() const
+        {
+            implTestAndHomogenize();
+            return maTuple.getY();
+        }
+
+        /** Set X-coordinate of the homogen point.
+
+            This method sets the X-coordinate of the homogen point. If
+            the point does have a homogenous part this is taken into account.
+
+            @param fX
+            The to-be-set X-coordinate without homogenous part.
+        */
+        void setX(double fX)
+        {
+            maTuple.setX(implIsHomogenized() ? fX : fX * mfW );
+        }
+
+        /** Set Y-coordinate of the homogen point.
+
+            This method sets the Y-coordinate of the homogen point. If
+            the point does have a homogenous part this is taken into account.
+
+            @param fY
+            The to-be-set Y-coordinate without homogenous part.
+        */
+        void setY(double fY)
+        {
+            maTuple.setY(implIsHomogenized() ? fY : fY * mfW );
+        }
+
+        /** Set Z-coordinate of the homogen point.
+
+            This method sets the Z-coordinate of the homogen point. If
+            the point does have a homogenous part this is taken into account.
+
+            @param fZ
+            The to-be-set Z-coordinate without homogenous part.
+        */
+        void setZ(double fZ)
+        {
+            maTuple.setZ(implIsHomogenized() ? fZ : fZ * mfW );
+        }
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B3DHomPoint& operator+=( const B3DHomPoint& rPnt )
+        {
+            maTuple.setX(getX() * rPnt.mfW + rPnt.getX() * mfW);
+            maTuple.setY(getY() * rPnt.mfW + rPnt.getY() * mfW);
+            maTuple.setZ(getZ() * rPnt.mfW + rPnt.getZ() * mfW);
+            mfW = mfW * rPnt.mfW;
+
+            return *this;
+        }
+
+        B3DHomPoint& operator-=( const B3DHomPoint& rPnt )
+        {
+            maTuple.setX(getX() * rPnt.mfW - rPnt.getX() * mfW);
+            maTuple.setY(getY() * rPnt.mfW - rPnt.getY() * mfW);
+            maTuple.setZ(getZ() * rPnt.mfW - rPnt.getZ() * mfW);
+            mfW = mfW * rPnt.mfW;
+
+            return *this;
+        }
+
+        B3DHomPoint& operator*=(double t)
+        {
+            if(!::basegfx::fTools::equalZero(t))
+            {
+                mfW /= t;
+            }
+
+            return *this;
+        }
+
+        B3DHomPoint& operator/=(double t)
+        {
+            mfW *= t;
+            return *this;
+        }
+
+        B3DHomPoint& operator-(void)
+        {
+            mfW = -mfW;
+            return *this;
+        }
+
+        bool operator==( const B3DHomPoint& rPnt ) const
+        {
+            implTestAndHomogenize();
+            return (maTuple == rPnt.maTuple);
+        }
+
+        bool operator!=( const B3DHomPoint& rPnt ) const
+        {
+            implTestAndHomogenize();
+            return (maTuple != rPnt.maTuple);
+        }
+
+        B3DHomPoint& operator=( const B3DHomPoint& rPnt )
+        {
+            maTuple = rPnt.maTuple;
+            mfW = rPnt.mfW;
+            return *this;
+        }
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    inline B3DHomPoint minimum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+    {
+        B3DHomPoint aMin(
+            (rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
+            (rVecB.getY() < rVecA.getY()) ? rVecB.getY() : rVecA.getY(),
+            (rVecB.getZ() < rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ());
+        return aMin;
+    }
+
+    inline B3DHomPoint maximum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+    {
+        B3DHomPoint aMax(
+            (rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
+            (rVecB.getY() > rVecA.getY()) ? rVecB.getY() : rVecA.getY(),
+            (rVecB.getZ() > rVecA.getZ()) ? rVecB.getZ() : rVecA.getZ());
+        return aMax;
+    }
+
+    inline B3DHomPoint absolute(const B3DHomPoint& rVec)
+    {
+        B3DHomPoint aAbs(
+            (0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(),
+            (0.0 > rVec.getY()) ? -rVec.getY() : rVec.getY(),
+            (0.0 > rVec.getZ()) ? -rVec.getZ() : rVec.getZ());
+        return aAbs;
+    }
+
+    inline B3DHomPoint interpolate(B3DHomPoint& rOld1, B3DHomPoint& rOld2, double t)
+    {
+        B3DHomPoint aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+        return aInt;
+    }
+
+    inline B3DHomPoint average(B3DHomPoint& rOld1, B3DHomPoint& rOld2)
+    {
+        B3DHomPoint aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5,
+            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+        return aAvg;
+    }
+
+    inline B3DHomPoint average(B3DHomPoint& rOld1, B3DHomPoint& rOld2, B3DHomPoint& rOld3)
+    {
+        B3DHomPoint aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    inline B3DHomPoint operator+(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+    {
+        B3DHomPoint aSum(rVecA);
+        aSum += rVecB;
+        return aSum;
+    }
+
+    inline B3DHomPoint operator-(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+    {
+        B3DHomPoint aSub(rVecA);
+        aSub -= rVecB;
+        return aSub;
+    }
+
+    inline B3DHomPoint operator*(const B3DHomPoint& rVec, double t)
+    {
+        B3DHomPoint aNew(rVec);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3DHomPoint operator*(double t, const B3DHomPoint& rVec)
+    {
+        B3DHomPoint aNew(rVec);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3DHomPoint operator/(const B3DHomPoint& rVec, double t)
+    {
+        B3DHomPoint aNew(rVec);
+        aNew /= t;
+        return aNew;
+    }
+
+    inline B3DHomPoint operator/(double t, const B3DHomPoint& rVec)
+    {
+        B3DHomPoint aNew(rVec);
+        aNew /= t;
+        return aNew;
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_POINT_B3DHOMPOINT_HXX */
diff --git a/basegfx/inc/basegfx/point/b3dpoint.hxx b/basegfx/inc/basegfx/point/b3dpoint.hxx
new file mode 100644
index 000000000000..943f74c1352d
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b3dpoint.hxx
@@ -0,0 +1,150 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B3DPOINT_HXX
+#define _BGFX_POINT_B3DPOINT_HXX
+
+#include <basegfx/tuple/b3dtuple.hxx>
+
+namespace basegfx
+{
+    // predeclaration
+    class B3DHomMatrix;
+
+    /** Base Point class with three double values
+
+        This class derives all operators and common handling for
+        a 3D data class from B3DTuple. All necessary extensions
+        which are special for points will be added here.
+
+        @see B3DTuple
+    */
+    class B3DPoint : public ::basegfx::B3DTuple
+    {
+    public:
+        /** Create a 3D Point
+
+            The point is initialized to (0.0, 0.0, 0.0)
+        */
+        B3DPoint()
+        :   B3DTuple()
+        {}
+
+        /** Create a 3D Point
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 3D Point.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 3D Point.
+
+            @param fZ
+            This parameter is used to initialize the Z-coordinate
+            of the 3D Point.
+        */
+        B3DPoint(double fX, double fY, double fZ)
+        :   B3DTuple(fX, fY, fZ)
+        {}
+
+        /** Create a copy of a 3D Point
+
+            @param rVec
+            The 3D Point which will be copied.
+        */
+        B3DPoint(const B3DPoint& rVec)
+        :   B3DTuple(rVec)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B3DTuple-based classes
+        */
+        B3DPoint(const ::basegfx::B3DTuple& rTuple)
+        :   B3DTuple(rTuple)
+        {}
+
+        ~B3DPoint()
+        {}
+
+        /** *=operator to allow usage from B3DPoint, too
+        */
+        B3DPoint& operator*=( const B3DPoint& rPnt )
+        {
+            mfX *= rPnt.mfX;
+            mfY *= rPnt.mfY;
+            mfZ *= rPnt.mfZ;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B3DPoint, too
+        */
+        B3DPoint& operator*=(double t)
+        {
+            mfX *= t;
+            mfY *= t;
+            mfZ *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B3DTuple calculations
+        */
+        B3DPoint& operator=( const ::basegfx::B3DTuple& rVec )
+        {
+            mfX = rVec.getX();
+            mfY = rVec.getY();
+            mfZ = rVec.getZ();
+            return *this;
+        }
+
+        /** Transform point by given transformation matrix.
+
+            The translational components of the matrix are, in
+            contrast to B3DVector, applied.
+        */
+        B3DPoint& operator*=( const ::basegfx::B3DHomMatrix& rMat );
+
+        static const B3DPoint& getEmptyPoint()
+        {
+            return (const B3DPoint&) ::basegfx::B3DTuple::getEmptyTuple();
+        }
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    /** Transform B3DPoint by given transformation matrix.
+
+        Since this is a Point, translational components of the
+        matrix are used.
+    */
+    B3DPoint operator*( const B3DHomMatrix& rMat, const B3DPoint& rPoint );
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_POINT_B3DPOINT_HXX */
diff --git a/basegfx/inc/basegfx/point/b3ipoint.hxx b/basegfx/inc/basegfx/point/b3ipoint.hxx
new file mode 100644
index 000000000000..f20fe3d99c79
--- /dev/null
+++ b/basegfx/inc/basegfx/point/b3ipoint.hxx
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POINT_B3IPOINT_HXX
+#define _BGFX_POINT_B3IPOINT_HXX
+
+#include <basegfx/tuple/b3ituple.hxx>
+
+namespace basegfx
+{
+    // predeclaration
+    class B3DHomMatrix;
+
+    /** Base Point class with three sal_Int32 values
+
+        This class derives all operators and common handling for
+        a 3D data class from B3ITuple. All necessary extensions
+        which are special for points will be added here.
+
+        @see B3ITuple
+    */
+    class B3IPoint : public ::basegfx::B3ITuple
+    {
+    public:
+        /** Create a 3D Point
+
+            The point is initialized to (0, 0, 0)
+        */
+        B3IPoint()
+        :   B3ITuple()
+        {}
+
+        /** Create a 3D Point
+
+            @param nX
+            This parameter is used to initialize the X-coordinate
+            of the 3D Point.
+
+            @param nY
+            This parameter is used to initialize the Y-coordinate
+            of the 3D Point.
+
+            @param nZ
+            This parameter is used to initialize the Z-coordinate
+            of the 3D Point.
+        */
+        B3IPoint(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ)
+        :   B3ITuple(nX, nY, nZ)
+        {}
+
+        /** Create a copy of a 3D Point
+
+            @param rVec
+            The 3D Point which will be copied.
+        */
+        B3IPoint(const B3IPoint& rVec)
+        :   B3ITuple(rVec)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B3ITuple-based classes
+        */
+        B3IPoint(const ::basegfx::B3ITuple& rTuple)
+        :   B3ITuple(rTuple)
+        {}
+
+        ~B3IPoint()
+        {}
+
+        /** *=operator to allow usage from B3IPoint, too
+        */
+        B3IPoint& operator*=( const B3IPoint& rPnt )
+        {
+            mnX *= rPnt.mnX;
+            mnY *= rPnt.mnY;
+            mnZ *= rPnt.mnZ;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B3IPoint, too
+        */
+        B3IPoint& operator*=(sal_Int32 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            mnZ *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B3ITuple calculations
+        */
+        B3IPoint& operator=( const ::basegfx::B3ITuple& rVec )
+        {
+            mnX = rVec.getX();
+            mnY = rVec.getY();
+            mnZ = rVec.getZ();
+            return *this;
+        }
+
+        /** Transform point by given transformation matrix.
+
+            The translational components of the matrix are, in
+            contrast to B3DVector, applied.
+        */
+        B3IPoint& operator*=( const ::basegfx::B3DHomMatrix& rMat );
+
+        static const B3IPoint& getEmptyPoint()
+        {
+            return (const B3IPoint&) ::basegfx::B3ITuple::getEmptyTuple();
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_POINT_B3IPOINT_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
new file mode 100644
index 000000000000..fd8997fcda4d
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
@@ -0,0 +1,144 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DLINEGEOMETRY_HXX
+#define _BGFX_POLYGON_B2DLINEGEOMETRY_HXX
+
+#include <sal/types.h>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        /** Create line start/end geometry element, mostly arrows and things like that.
+
+            @param rCandidate
+            The polygon which needs to get that line ends and needs to have two points
+            at least.
+
+            @param rArrow
+            The line start/end geometry. It is assumed that the tip is pointing
+            upwards. Result will be rotated and scaled to fit.
+
+            @param bStart
+            describes if creation is for start or end of candidate.
+
+            @param fWidth
+            defines the size of the element, it's describing the target width in X
+            of the arrow.
+
+            @param fDockingPosition needs to be in [0.0 ..1.0] range, where 0.0 means
+            that the tip of the arrow will be aligned with the polygon start, 1.0 means
+            the bottom. The default of 0.5 describes a centered arrow.
+
+            @param pConsumedLength
+            Using this parameter it is possible to get back how much from the candidate
+            geometry is overlapped by the created element (consumed).
+
+            @param fCandidateLength
+            This should contain the length of rCandidate to allow work without
+            again calculating the length (which may be expensive with beziers). If 0.0 is
+            given, the length is calculated on demand.
+
+            @return
+            The Line start and end polygon, correctly rotated and scaled
+        */
+        B2DPolyPolygon createAreaGeometryForLineStartEnd(
+            const B2DPolygon& rCandidate,
+            const B2DPolyPolygon& rArrow,
+            bool bStart,
+            double fWidth,
+            double fCandidateLength = 0.0, // 0.0 -> calculate self
+            double fDockingPosition = 0.5, // 0->top, 1->bottom
+            double* pConsumedLength = 0L);
+
+        /** create filled polygon geometry for lines with a line width
+
+            This method will create bezier based, fillable polygons which
+            will resample the curve if it was extended for the given half
+            line width. It will remove extrema positions from contained
+            bezier segments and get as close as possible and defined by
+            the given parameters to the ideal result.
+
+            It will check edges for trivial bezier to avoid unnecessary
+            bezier polygons. Care is taken to produce the in-between
+            polygon points (the ones original on the source poygon) since
+            it has showed that without those, the raster converters leave
+            non-filled gaps.
+
+            @param rCandidate
+            The source polygon defining the hairline polygon path
+
+            @param fHalfLineWidth
+            The width of the line to one side
+
+            @param eJoin
+            The LineJoin if the edges meeting in a point do not have a C1
+            or C2 continuity
+
+            @param fMaxAllowedAngle
+            Allows to hand over the maximum allowed angle between an edge and
+            it's control vectors. The smaller, the more subdivisions will be
+            needed to create the filled geometry. Allowed range is cropped to
+            [F_PI2 .. 0.01 * F_PI2].
+
+            @param fMaxPartOfEdge
+            Allows to influence from with relative length of a control vector
+            compared to it's edge a split is forced. The smaller, the more
+            subdivisions will be needed to create the filled geometry. Allowed
+            range is cropped to [1.0 .. 0.01]
+
+            @praram fMiterMinimumAngle
+            The minimum wanted angle between two edges when edge rounding
+            is using miter. When an edge is smaller than this (tighter)
+            the usual fallback to bevel is used. Allowed range is cropped
+            to [F_PI .. 0.01 * F_PI].
+
+            @return
+            The PolyPolygon containing the geometry of the extended line by
+            it's line width. Contains bezier segments and edge roundings as
+            needed and defined.
+        */
+        B2DPolyPolygon createAreaGeometry(
+            const B2DPolygon& rCandidate,
+            double fHalfLineWidth,
+            B2DLineJoin eJoin = B2DLINEJOIN_ROUND,
+            double fMaxAllowedAngle = (12.5 * F_PI180),
+            double fMaxPartOfEdge = 0.4,
+            double fMiterMinimumAngle = (15.0 * F_PI180));
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_POLYGON_B2DLINEGEOMETRY_HXX */
+// eof
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
new file mode 100644
index 000000000000..a12120b5f441
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -0,0 +1,274 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX
+#define _BGFX_POLYGON_B2DPOLYGON_HXX
+
+#include <sal/types.h>
+#include <o3tl/cow_wrapper.hxx>
+#include <basegfx/vector/b2enums.hxx>
+#include <basegfx/range/b2drange.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+class ImplB2DPolygon;
+
+namespace basegfx
+{
+    class B2DPolygon;
+    class B2DPoint;
+    class B2DVector;
+    class B2DHomMatrix;
+    class B2DCubicBezier;
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B2DPolygon
+    {
+    public:
+        typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
+
+    private:
+        // internal data.
+        ImplType                                    mpPolygon;
+
+    public:
+        /// diverse constructors
+        B2DPolygon();
+        B2DPolygon(const B2DPolygon& rPolygon);
+        B2DPolygon(const B2DPolygon& rPolygon, sal_uInt32 nIndex, sal_uInt32 nCount);
+        ~B2DPolygon();
+
+        /// assignment operator
+        B2DPolygon& operator=(const B2DPolygon& rPolygon);
+
+        /// unshare this polygon with all internally shared instances
+        void makeUnique();
+
+        /// compare operators
+        bool operator==(const B2DPolygon& rPolygon) const;
+        bool operator!=(const B2DPolygon& rPolygon) const;
+
+        /// member count
+        sal_uInt32 count() const;
+
+        /// Coordinate interface
+        basegfx::B2DPoint getB2DPoint(sal_uInt32 nIndex) const;
+        void setB2DPoint(sal_uInt32 nIndex, const basegfx::B2DPoint& rValue);
+
+        /// Coordinate insert/append
+        void insert(sal_uInt32 nIndex, const basegfx::B2DPoint& rPoint, sal_uInt32 nCount = 1);
+        void append(const basegfx::B2DPoint& rPoint, sal_uInt32 nCount);
+        void append(const basegfx::B2DPoint& rPoint);
+        void reserve(sal_uInt32 nCount);
+
+        /// Basic ControlPoint interface
+        basegfx::B2DPoint getPrevControlPoint(sal_uInt32 nIndex) const;
+        basegfx::B2DPoint getNextControlPoint(sal_uInt32 nIndex) const;
+        void setPrevControlPoint(sal_uInt32 nIndex, const basegfx::B2DPoint& rValue);
+        void setNextControlPoint(sal_uInt32 nIndex, const basegfx::B2DPoint& rValue);
+        void setControlPoints(sal_uInt32 nIndex, const basegfx::B2DPoint& rPrev, const basegfx::B2DPoint& rNext);
+
+        /// ControlPoint resets
+        void resetPrevControlPoint(sal_uInt32 nIndex);
+        void resetNextControlPoint(sal_uInt32 nIndex);
+        void resetControlPoints(sal_uInt32 nIndex);
+        void resetControlPoints();
+
+        /// Bezier segment append with control points. The current last polygon point is implicitly taken as start point.
+        void appendBezierSegment(const basegfx::B2DPoint& rNextControlPoint, const basegfx::B2DPoint& rPrevControlPoint, const basegfx::B2DPoint& rPoint);
+
+        /// ControlPoint checks
+        bool areControlPointsUsed() const;
+        bool isPrevControlPointUsed(sal_uInt32 nIndex) const;
+        bool isNextControlPointUsed(sal_uInt32 nIndex) const;
+        B2VectorContinuity getContinuityInPoint(sal_uInt32 nIndex) const;
+
+        /** check edge for being a bezier segment
+
+            This test the existance of control vectors, but do not apply
+            testAndSolveTrivialBezier() to the bezier segment, so it is still useful
+            to do so.
+            Since it can use internal data representations, it is faster
+            than using getBezierSegment() and applying isBezier() on it.
+
+            @param nIndex
+            Index of the addressed edge's start point
+
+            @return
+            true if edge exists and at least one control vector is used
+        */
+        bool isBezierSegment(sal_uInt32 nIndex) const;
+
+        /** bezier segment access
+
+            This method also works when it is no bezier segment at all and will fill
+            the given B2DCubicBezier as needed.
+            In any case, the given B2DCubicBezier will be filled, if necessary with
+            the single start point (if no valid edge exists).
+
+            @param nIndex
+            Index of the addressed edge's start point
+
+            @param rTarget
+            The B2DCubicBezier to be filled. It's data WILL be changed.
+        */
+        void getBezierSegment(sal_uInt32 nIndex, B2DCubicBezier& rTarget) const;
+
+        /** Default adaptive subdivision access
+
+            This method will return a default adapive subdivision of the polygon.
+            If the polygon does not contain any bezier curve segments, it will
+            just return itself.
+
+            The subdivision is created on first request and buffered, so when using
+            this subdivision You have the guarantee for fast accesses for multiple
+            usages. It is intended for tooling usage for tasks which would be hard
+            to accomplish on bezier segments (e.g. isInEpsilonRange).
+
+            The current default subdivision uses adaptiveSubdivideByCount with 9
+            subdivisions which gives 10 edges and 11 points per segment and is
+            usually pretty usable for processing purposes. There is no parameter
+            passing here ATM but it may be changed on demand. If needed, a TYPE
+            and PARAMETER (both defaulted) may be added to allow for switching
+            between the different kinds of subdivisiond and passing them one
+            parameter.
+
+            The lifetime of the buffered subdivision is based on polygon changes.
+            When changing the polygon, it will be flushed. It is buffered at the
+            refcounted implementation class, so it will survive copy by value and
+            combinations in PolyPolygons.
+
+            @return
+            The default (and buffered) subdivision of this polygon. It may
+            be this polygon itself when it has no bezier segments. It is guaranteed
+            to have no more bezier segments
+        */
+        B2DPolygon getDefaultAdaptiveSubdivision() const;
+
+        /** Get the B2DRange (Rectangle dimensions) of this B2DPolygon
+
+            A polygon may have up to three ranges:
+
+            (a) the range of the polygon points
+            (b) the range of the polygon points and control points
+            (c) the outer range of the subdivided bezier curve
+
+            Ranges (a) and (c) are produced by tools::getRange(); resp. this
+            getB2DRange(). tools::getRangeWithControlPoints handles case (b).
+
+            To get range (c) a simple solution would be to subdivide the polygon
+            and use getRange() on it. Since subdivision is expensive and decreases
+            the polygon quality, i added this new method. It will use a
+            methodology suggested by HDU. First, it gets the range (a).
+            Then it iterates over the bezier segments and for each it
+            first tests if the outer range of the bezier segment is already
+            contained in the result range.
+
+            The subdivision itself uses getAllExtremumPositions() to only
+            calculate extremum points and to expand the result accordingly.
+            Thus it calculates maximal four extremum points on the bezier
+            segment, no split is used at all.
+
+            @return
+            The outer range of the bezier curve/polygon
+        */
+        B2DRange getB2DRange() const;
+
+        /** insert other 2D polygons
+
+            The default (with nIndex2 == 0 && nCount == 0) inserts the whole
+            rPoly at position nIndex
+
+            @param nIndex
+            Target index for points to be inserted
+
+            @param rPoly
+            The source for new points
+
+            @param nIndex2
+            The index to the first source point into rPoly
+
+            @param nCount
+            How many points to add from rPoly to this polygon. Null
+            means to copy all (starting from nIndex2)
+        */
+        void insert(sal_uInt32 nIndex, const B2DPolygon& rPoly, sal_uInt32 nIndex2 = 0, sal_uInt32 nCount = 0);
+
+        /** append other 2D polygons
+
+            The default (nIndex ==0 && nCount == 0) will append
+            the whole rPoly
+
+            @param rPoly
+            The source polygon
+
+            @param nIndex
+            The index to the first point of rPoly to append
+
+            @param nCount
+            The number of points to append from rPoly, starting
+            from nIndex. If zero, as much as possibel is appended
+        */
+        void append(const B2DPolygon& rPoly, sal_uInt32 nIndex = 0, sal_uInt32 nCount = 0);
+
+        /// remove points
+        void remove(sal_uInt32 nIndex, sal_uInt32 nCount = 1);
+
+        /// clear all points
+        void clear();
+
+        /// closed state interface
+        bool isClosed() const;
+        void setClosed(bool bNew);
+
+        /// flip polygon direction
+        void flip();
+
+        /// test if Polygon has double points
+        bool hasDoublePoints() const;
+
+        /// remove double points, at the begin/end and follow-ups, too
+        void removeDoublePoints();
+
+        /// apply transformation given in matrix form
+        void transform(const basegfx::B2DHomMatrix& rMatrix);
+
+        // point iterators (same iterator validity conditions as for vector)
+        const B2DPoint* begin() const;
+        const B2DPoint* end() const;
+        B2DPoint* begin();
+        B2DPoint* end();
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_POLYGON_B2DPOLYGON_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
new file mode 100644
index 000000000000..d13d3d0a862c
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYPOLYGON_B2DPOLYGONCLIPPER_HXX
+#define _BGFX_POLYPOLYGON_B2DPOLYGONCLIPPER_HXX
+
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predefinitions
+    class B2DRange;
+
+    namespace tools
+    {
+        // This method clips the given PolyPolygon against a horizontal or vertical axis (parallell to X or Y axis). The axis is
+        // defined by bParallelToXAxis (true -> it's parallel to the X-Axis of the coordinate system, else to the Y-Axis) and the
+        // fValueOnOtherAxis (gives the translation to the coordinate system axis). For example, when You want to define
+        // a clip axis parallel to X.Axis and 100 above it, use bParallelToXAxis = true and fValueOnOtherAxis = 100.
+        // The value bAboveAxis defines on which side the return value will be (true -> above X, right of Y).
+        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+        B2DPolyPolygon clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
+        B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke);
+
+        // Clip the given PolyPolygon against the given range. bInside defines if the result will contain the
+        // parts which are contained in the range or vice versa.
+        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+        B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
+        B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
+
+        // Clip given PolyPolygon against the endless edge (ray) defined by the given two points. bAbove defines on which side
+        // of the edge the result will be together with the definition of the edge. If the edge is seen as a vector
+        // from A to B and bAbove is true, the result will contain the geometry left of the vector.
+        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+        B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke);
+        B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke);
+
+        // Clip given PolyPolygon against given clipping polygon.
+        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+        // With stroke polygons, You get all line snippets inside rCip.
+        // With filled polygons, You get all PolyPolygon parts which were inside rClip.
+        // The switch bInside decides if the parts inside the clip polygon or outside shall be created.
+        // The clip polygon is always assumed closed, even when it's isClosed() is false.
+        B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke);
+        B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke);
+
+        // clip the given polygon against the given range. the resulting polygon will always contain
+        // the inside parts which will always be interpreted as areas. the incoming polygon is expected
+        // to be a simple triangle list. the result is also a simple triangle list.
+        B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate, const B2DRange& rRange );
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYPOLYGON_B2DPOLYGONCLIPPER_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
new file mode 100644
index 000000000000..a9d6e0a1b6fe
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_CUTANDTOUCH_HXX
+#define _BGFX_POLYGON_CUTANDTOUCH_HXX
+
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        // look for self-intersections and self-touches (points on an edge) in given polygon and add
+        // extra points there. Result will have no touches or intersections on an edge, only on points
+        B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate);
+
+        // look for polypolygon-intersections and polypolygon-touches (point of poly A on an edge of poly B) in given PolyPolygon and add
+        // extra points there. Result will have no touches or intersections between contained polygons on an edge, only on points. For
+        // convenience, the correction for self-intersections for each member polygon will be used, too.
+        // Changed: Self intersections are searched by default, but may be switched off by 2nd parameter.
+        B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate, bool bSelfIntersections = true);
+
+        // look for intersections of rCandidate with all polygons from rMask and add extra points there. Do
+        // not change or add points to rMask.
+        B2DPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolygon& rCandidate);
+
+        // look for intersections of rCandidate with all polygons from rMask and add extra points there. Do
+        // not change or add points to rMask.
+        B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolyPolygon& rCandidate);
+
+        // look for intersections of rCandidate with the edge from rStart to rEnd and add extra points there.
+        // Points are only added in the range of the edge, not on the endless vector.
+        B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd);
+        B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd);
+
+        // look for intersections of rCandidate with the mask Polygon and add extra points there.
+        // The mask polygon is assumed to be closed, even when it's not explicitely.
+        B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rMask);
+        B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rMask);
+
+        // look for self-intersections in given polygon and add extra points there. Result will have no
+        // intersections on an edge
+        B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate);
+
+        // add points at all self-intersections of single polygons (depends on bSelfIntersections)
+        // and at polygon-polygon intersections
+        B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, bool bSelfIntersections = true);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_POLYGON_CUTANDTOUCH_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
new file mode 100644
index 000000000000..7d1d0bc9660c
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
@@ -0,0 +1,534 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX
+#define _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/range/b2drectangle.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b3dpolygon.hxx>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predefinitions
+    class B2DPolygon;
+    class B2DRange;
+
+    namespace tools
+    {
+        // B2DPolygon tools
+
+        // open/close with point add/remove and control point corrections
+        void openWithGeometryChange(B2DPolygon& rCandidate);
+        void closeWithGeometryChange(B2DPolygon& rCandidate);
+
+        /** Check if given polygon is closed.
+
+            This is kind of a 'classic' method to support old polygon
+            definitions.  Those old polygon definitions define the
+            closed state of the polygon using identical start and
+            endpoints. This method corrects this (removes double
+            start/end points) and sets the Closed()-state of the
+            polygon correctly.
+        */
+        void checkClosed(B2DPolygon& rCandidate);
+
+        // Get successor and predecessor indices. Returning the same index means there
+        // is none. Same for successor.
+        sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate);
+        sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate);
+
+        // Get orientation of Polygon
+        B2VectorOrientation getOrientation(const B2DPolygon& rCandidate);
+
+        // isInside tests for B2dPoint and other B2dPolygon. On border is not inside as long as
+        // not true is given in bWithBorder flag.
+        bool isInside(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false);
+        bool isInside(const B2DPolygon& rCandidate, const B2DPolygon& rPolygon, bool bWithBorder = false);
+
+        /** Get the range of a polygon including bezier control points
+
+            For detailed discussion, see B2DPolygon::getB2DRange()
+
+            @param rCandidate
+            The B2DPolygon eventually containing bezier segments
+
+            @return
+            The outer range of the bezier curve containing bezier control points
+        */
+        B2DRange getRangeWithControlPoints(const B2DPolygon& rCandidate);
+
+        /** Get the range of a polygon
+
+            This method creates the outer range of the subdivided bezier curve.
+            For detailed discussion see B2DPolygon::getB2DRange()
+
+            @param rCandidate
+            The B2DPolygon eventually containing bezier segments
+
+            @return
+            The outer range of the bezier curve
+        */
+        B2DRange getRange(const B2DPolygon& rCandidate);
+
+        // get signed area of polygon
+        double getSignedArea(const B2DPolygon& rCandidate);
+
+        // get area of polygon
+        double getArea(const B2DPolygon& rCandidate);
+
+        /** get length of polygon edge from point nIndex to nIndex + 1 */
+        double getEdgeLength(const B2DPolygon& rCandidate, sal_uInt32 nIndex);
+
+        /** get length of polygon */
+        double getLength(const B2DPolygon& rCandidate);
+
+        // get position on polygon for absolute given distance. If
+        // length is given, it is assumed the correct polygon length, if 0.0 it is calculated
+        // using getLength(...)
+        B2DPoint getPositionAbsolute(const B2DPolygon& rCandidate, double fDistance, double fLength = 0.0);
+
+        // get position on polygon for relative given distance in range [0.0 .. 1.0]. If
+        // length is given, it is assumed the correct polygon length, if 0.0 it is calculated
+        // using getLength(...)
+        B2DPoint getPositionRelative(const B2DPolygon& rCandidate, double fDistance, double fLength = 0.0);
+
+        // get a snippet from given polygon for absolute distances. The polygon is assumed
+        // to be opened (not closed). fFrom and fTo need to be in range [0.0 .. fLength], where
+        // fTo >= fFrom. If length is given, it is assumed the correct polygon length,
+        // if 0.0 it is calculated using getLength(...)
+        B2DPolygon getSnippetAbsolute(const B2DPolygon& rCandidate, double fFrom, double fTo, double fLength = 0.0);
+
+        // get a snippet from given polygon for relative distances. The polygon is assumed
+        // to be opened (not closed). fFrom and fTo need to be in range [0.0 .. 1.0], where
+        // fTo >= fFrom. If length is given, it is assumed the correct polygon length,
+        // if 0.0 it is calculated using getLength(...)
+        B2DPolygon getSnippetRelative(const B2DPolygon& rCandidate, double fFrom = 0.0, double fTo = 1.0, double fLength = 0.0);
+
+        // Continuity check for point with given index
+        B2VectorContinuity getContinuityInPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndex);
+
+        // Subdivide all contained curves. Use distanceBound value if given.
+        B2DPolygon adaptiveSubdivideByDistance(const B2DPolygon& rCandidate, double fDistanceBound = 0.0);
+
+        // Subdivide all contained curves. Use angleBound value if given.
+        B2DPolygon adaptiveSubdivideByAngle(const B2DPolygon& rCandidate, double fAngleBound = 0.0);
+
+        // #i37443# Subdivide all contained curves.
+        B2DPolygon adaptiveSubdivideByCount(const B2DPolygon& rCandidate, sal_uInt32 nCount = 0L);
+
+        // Definitions for the cut flags used from the findCut methods
+        typedef sal_uInt16 CutFlagValue;
+
+        #define CUTFLAG_NONE            (0x0000)
+        #define CUTFLAG_LINE            (0x0001)
+        #define CUTFLAG_START1          (0x0002)
+        #define CUTFLAG_START2          (0x0004)
+        #define CUTFLAG_END1            (0x0008)
+        #define CUTFLAG_END2            (0x0010)
+        #define CUTFLAG_ALL         (CUTFLAG_LINE|CUTFLAG_START1|CUTFLAG_START2|CUTFLAG_END1|CUTFLAG_END2)
+        #define CUTFLAG_DEFAULT     (CUTFLAG_LINE|CUTFLAG_START2|CUTFLAG_END2)
+
+        // Calculate cut between the points given by the two indices. pCut1
+        // and pCut2 will contain the cut coordinate on each edge in ]0.0, 1.0]
+        // (if given) and the return value will contain a cut description.
+        CutFlagValue findCut(
+            const B2DPolygon& rCandidate,
+            sal_uInt32 nIndex1, sal_uInt32 nIndex2,
+            CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
+            double* pCut1 = 0L, double* pCut2 = 0L);
+
+        // This version is working with two indexed edges from different
+        // polygons.
+        CutFlagValue findCut(
+            const B2DPolygon& rCandidate1, sal_uInt32 nIndex1,
+            const B2DPolygon& rCandidate2, sal_uInt32 nIndex2,
+            CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
+            double* pCut1 = 0L, double* pCut2 = 0L);
+
+        // This version works with two points and vectors to define the
+        // edges for the cut test.
+        CutFlagValue findCut(
+            const B2DPoint& rEdge1Start, const B2DVector& rEdge1Delta,
+            const B2DPoint& rEdge2Start, const B2DVector& rEdge2Delta,
+            CutFlagValue aCutFlags = CUTFLAG_DEFAULT,
+            double* pCut1 = 0L, double* pCut2 = 0L);
+
+        // test if point is on the given edge in range ]0.0..1.0[ without
+        // the start/end points. If so, return true and put the parameter
+        // value in pCut (if provided)
+        bool isPointOnEdge(
+            const B2DPoint& rPoint,
+            const B2DPoint& rEdgeStart,
+            const B2DVector& rEdgeDelta,
+            double* pCut = 0L);
+
+        /** Apply given LineDashing to given polygon
+
+            This method is used to cut down line polygons to the needed
+            pieces when a dashing needs to be applied.
+            It is now capable of keeping contained bezier segments.
+            It is also capable of delivering line and non-line portions
+            depending on what target polygons You provide. This is useful
+            e.g. for dashed lines with two colors.
+            If the last and the first snippet in one of the results have
+            a common start/end ppoint, they will be merged to achieve as
+            view as needed result line snippets. This is also relevant for
+            further processing the results.
+
+            @param rCandidate
+            The polygon based on which the snippets will be created.
+
+            @param rDotDashArray
+            The line pattern given as array of length values
+
+            @param pLineTarget
+            The target for line snippets, e.g. the first entry will be
+            a line segment with length rDotDashArray[0]. The given
+            polygon will be emptied as preparation.
+
+            @param pGapTarget
+            The target for gap snippets, e.g. the first entry will be
+            a line segment with length rDotDashArray[1]. The given
+            polygon will be emptied as preparation.
+
+            @param fFullDashDotLen
+            The sumed-up length of the rDotDashArray. If zero, it will
+            be calculated internally.
+        */
+        void applyLineDashing(
+            const B2DPolygon& rCandidate,
+            const ::std::vector<double>& rDotDashArray,
+            B2DPolyPolygon* pLineTarget,
+            B2DPolyPolygon* pGapTarget = 0,
+            double fFullDashDotLen = 0.0);
+
+        // test if point is inside epsilon-range around an edge defined
+        // by the two given points. Can be used for HitTesting. The epsilon-range
+        // is defined to be the rectangle centered to the given edge, using height
+        // 2 x fDistance, and the circle around both points with radius fDistance.
+        bool isInEpsilonRange(const B2DPoint& rEdgeStart, const B2DPoint& rEdgeEnd, const B2DPoint& rTestPosition, double fDistance);
+
+        // test if point is inside epsilon-range around the given Polygon. Can be used
+        // for HitTesting. The epsilon-range is defined to be the rectangle centered
+        // to the given edge, using height 2 x fDistance, and the circle around both points
+        // with radius fDistance.
+        bool isInEpsilonRange(const B2DPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance);
+
+        /** Create a polygon from a rectangle.
+
+            @param rRect
+            The rectangle which describes the polygon size
+
+            @param fRadius
+            Radius of the edge rounding, relative to the rectangle size. 0.0 means no
+            rounding, 1.0 will lead to an ellipse
+         */
+        B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadius );
+
+        /** Create a polygon from a rectangle.
+
+            @param rRect
+            The rectangle which describes the polygon size
+
+            @param fRadiusX
+            @param fRadiusY
+            Radius of the edge rounding, relative to the rectangle size. 0.0 means no
+            rounding, 1.0 will lead to an ellipse
+         */
+        B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadiusX, double fRadiusY );
+
+        /** Create a polygon from a rectangle.
+         */
+        B2DPolygon createPolygonFromRect( const B2DRectangle& rRect );
+
+        /** Create the unit polygon
+         */
+        B2DPolygon createUnitPolygon();
+
+        /** Create a circle polygon with given radius.
+
+            This method creates a circle approximation consisting of
+            four cubic bezier segments, which approximate the given
+            circle with an error of less than 0.5 percent.
+
+            @param rCenter
+            Center point of the circle
+
+            @param fRadius
+            Radius of the circle
+         */
+        B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius );
+
+        /** create a polygon which describes the unit circle and close it
+
+            @param nStartQuadrant
+            To be able to rebuild the old behaviour where the circles started at bottom,
+            this parameter is used. Default is 0 which is the first quadrant and the
+            polygon's start point will be the rightmost one. When using e.g. 1, the
+            first created quadrant will start at the YMax-position (with Y down on screens,
+            this is the lowest one). This is needed since when lines are dashed, toe old
+            geometry started at bottom point, else it would look different.
+         */
+        B2DPolygon createPolygonFromUnitCircle(sal_uInt32 nStartQuadrant = 0);
+
+        /** Create an ellipse polygon with given radii.
+
+            This method creates an ellipse approximation consisting of
+            four cubic bezier segments, which approximate the given
+            ellipse with an error of less than 0.5 percent.
+
+            @param rCenter
+            Center point of the circle
+
+            @param fRadiusX
+            Radius of the ellipse in X direction
+
+            @param fRadiusY
+            Radius of the ellipse in Y direction
+         */
+        B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY );
+
+        /** Create an unit ellipse polygon with the given angles, from start to end
+         */
+        B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double   fStart, double fEnd );
+
+        B2DPolygon createPolygonFromUnitEllipseSegment( double fStart, double fEnd );
+
+        /** Predicate whether a given polygon is a rectangle.
+
+            @param rPoly
+            Polygon to check
+
+            @return true, if the polygon describes a rectangle
+            (polygon is closed, and the points are either cw or ccw
+            enumerations of a rectangle's vertices). Note that
+            intermediate points and duplicate points are ignored.
+         */
+        bool isRectangle( const B2DPolygon& rPoly );
+
+        // create 3d polygon from given 2d polygon. The given fZCoordinate is used to expand the
+        // third coordinate.
+        B3DPolygon createB3DPolygonFromB2DPolygon(const B2DPolygon& rCandidate, double fZCoordinate = 0.0);
+
+        // create 2d PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given
+        // matrix and the resulting x,y is used to form the new polygon.
+        B2DPolygon createB2DPolygonFromB3DPolygon(const B3DPolygon& rCandidate, const B3DHomMatrix& rMat);
+
+        // create simplified version of the original polygon by
+        // replacing segments with spikes/loops and self intersections
+        // by several trivial sub-segments
+        B2DPolygon createSimplifiedPolygon(const B2DPolygon&);
+
+        // calculate the distance to the given endless ray and return. The relative position on the edge is returned in Cut.
+        // That position may be less than 0.0 or more than 1.0
+        double getDistancePointToEndlessRay(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut);
+
+        // calculate the smallest distance to given edge and return. The relative position on the edge is returned in Cut.
+        // That position is in the range [0.0 .. 1.0] and the returned distance is adapted accordingly to the start or end
+        // point of the edge
+        double getSmallestDistancePointToEdge(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut);
+
+        // for each contained edge calculate the smallest distance. Return the index to the smallest
+        // edge in rEdgeIndex. The relative position on the edge is returned in rCut.
+        // If nothing was found (e.g. empty input plygon), DBL_MAX is returned.
+        double getSmallestDistancePointToPolygon(const B2DPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rEdgeIndex, double& rCut);
+
+        // distort single point. rOriginal describes the original range, where the given points describe the distorted corresponding points.
+        B2DPoint distort(const B2DPoint& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight);
+
+        // distort polygon. rOriginal describes the original range, where the given points describe the distorted corresponding points.
+        B2DPolygon distort(const B2DPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight);
+
+        // rotate polygon around given point with given angle.
+        B2DPolygon rotateAroundPoint(const B2DPolygon& rCandidate, const B2DPoint& rCenter, double fAngle);
+
+        // expand all segments (which are not yet) to curve segments. This is done with setting the control
+        // vectors on the 1/3 resp. 2/3 distances on each segment.
+        B2DPolygon expandToCurve(const B2DPolygon& rCandidate);
+
+        // expand given segment to curve segment. This is done with setting the control
+        // vectors on the 1/3 resp. 2/3 distances. The return value describes if a change took place.
+        bool expandToCurveInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex);
+
+        // set continuity for the whole curve. If not a curve, nothing will change. Non-curve points are not changed, too.
+        B2DPolygon setContinuity(const B2DPolygon& rCandidate, B2VectorContinuity eContinuity);
+
+        // set continuity for given index. If not a curve, nothing will change. Non-curve points are not changed, too.
+        // The return value describes if a change took place.
+        bool setContinuityInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity);
+
+        // test if polygon contains neutral points. A neutral point is one whos orientation is neutral
+        // e.g. positioned on the edge of it's predecessor and successor
+        bool hasNeutralPoints(const B2DPolygon& rCandidate);
+
+        // remove neutral points. A neutral point is one whos orientation is neutral
+        // e.g. positioned on the edge of it's predecessor and successor
+        B2DPolygon removeNeutralPoints(const B2DPolygon& rCandidate);
+
+        // tests if polygon is convex
+        bool isConvex(const B2DPolygon& rCandidate);
+
+        // calculates the orientation at edge nIndex
+        B2VectorOrientation getOrientationForIndex(const B2DPolygon& rCandidate, sal_uInt32 nIndex);
+
+        // calculates if given point is on given line, taking care of the numerical epsilon
+        bool isPointOnLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidate, bool bWithPoints = false);
+
+        // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses
+        // isPointOnLine internally
+        bool isPointOnPolygon(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithPoints = true);
+
+        // test if candidate is inside triangle
+        bool isPointInTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC, const B2DPoint& rCandidate, bool bWithBorder = false);
+
+        // test if candidateA and candidateB are on the same side of the given line
+        bool arePointsOnSameSideOfLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidateA, const B2DPoint& rCandidateB, bool bWithLine = false);
+
+        // add triangles for given rCandidate to rTarget. For each triangle, 3 points will be added to rCandidate.
+        // All triangles will go from the start point of rCandidate to two consecutive points, building (rCandidate.count() - 2)
+        // triangles.
+        void addTriangleFan(const B2DPolygon& rCandidate, B2DPolygon& rTarget);
+
+        // grow for polygon. Move all geometry in each point in the direction of the normal in that point
+        // with the given amount. Value may be negative.
+        B2DPolygon growInNormalDirection(const B2DPolygon& rCandidate, double fValue);
+
+        // force all sub-polygons to a point count of nSegments
+        B2DPolygon reSegmentPolygon(const B2DPolygon& rCandidate, sal_uInt32 nSegments);
+
+        // create polygon state at t from 0.0 to 1.0 between the two polygons. Both polygons must have the same
+        // organisation, e.g. same amount of points
+        B2DPolygon interpolate(const B2DPolygon& rOld1, const B2DPolygon& rOld2, double t);
+
+        bool isPolyPolygonEqualRectangle( const B2DPolyPolygon& rPolyPoly, const B2DRange& rRect );
+
+        // #i76891# Try to remove existing curve segments if they are simply edges
+        B2DPolygon simplifyCurveSegments(const B2DPolygon& rCandidate);
+
+        // makes the given indexed point the new polygon start point. To do that, the points in the
+        // polygon will be rotated. This is only valid for closed polygons, for non-closed ones
+        // an assertion will be triggered
+        B2DPolygon makeStartPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndexOfNewStatPoint);
+
+        /** create edges of given length along given B2DPolygon
+
+            @param rCandidate
+            The polygon to move along. Points at the given polygon are created, starting
+            at position fStart and stopping at less or equal to fEnd. The closed state is
+            preserved.
+            The polygon is subdivided if curve segments are included. That subdivision is the base
+            for the newly created points.
+            If the source is closed, the indirectly existing last edge may NOT have the
+            given length.
+            If the source is open, all edges will have the given length. You may use the last
+            point of the original when You want to add the last edge Yourself.
+
+            @param fLength
+            The length of the created edges. If less or equal zero, an empty polygon is returned.
+
+            @param fStart
+            The start distance for the first to be generated point. Use 0.0 to get the
+            original start point. Negative values are truncated to 0.0.
+
+            @param fEnd
+            The maximum distance for the last point. No more points behind this distance will be created.
+            Use 0.0 to proccess the whole polygon. Negative values are truncated to 0.0. It also
+            needs to be more or equal to fStart, else it is truncated to fStart.
+
+            @return
+            The newly created polygon
+         */
+        B2DPolygon createEdgesOfGivenLength(const B2DPolygon& rCandidate, double fLength, double fStart = 0.0, double fEnd = 0.0);
+
+        /** Create Waveline along given polygon
+            The implementation is based on createEdgesOfGivenLength and creates a curve
+            segment with the given dimensions for each created line segment. The polygon
+            is treated as if opened (closed state will be ignored) and only for whole
+            edges a curve segment will be created (no rest handling)
+
+            @param rCandidate
+            The polygon along which the waveline will be created
+
+            @param fWaveWidth
+            The length of a single waveline curve segment
+
+            @param fgWaveHeight
+            The height of the waveline (amplitude)
+        */
+        B2DPolygon createWaveline(const B2DPolygon& rCandidate, double fWaveWidth, double fWaveHeight);
+
+        /** split each edge of a polygon in exactly nSubEdges equidistant edges
+
+            @param rCandidate
+            The source polygon. If too small (no edges), nSubEdges too small (<2)
+            or neither bHandleCurvedEdgesnor bHandleStraightEdges it will just be returned.
+            Else for each edge nSubEdges will be created. Closed state is preserved.
+
+            @param nSubEdges
+            How many edges shall be created as replacement for each single edge
+
+            @param bHandleCurvedEdges
+            Process curved edges or not. If to handle the curved edges will be splitted
+            into nSubEdges part curved edges of equidistant bezier distances. If not,
+            curved edges will just be copied.
+
+            @param bHandleStraightEdges
+            Process straight edges or not. If to handle the straight edges will be splitted
+            into nSubEdges part curved edges of equidistant length. If not,
+            straight edges will just be copied.
+        */
+        B2DPolygon reSegmentPolygonEdges(const B2DPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges);
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 2D Polygons
+        bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, const double& rfSmallValue);
+        bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB);
+
+        /** snap some polygon coordinates to discrete coordinates
+
+            This method allows to snap some polygon points to discrete (integer) values
+            which equals e.g. a snap to discrete coordinates. It will snap points of
+            horizontal and vertical edges
+
+            @param rCandidate
+            The source polygon
+
+            @return
+            The modified version of the source polygon
+        */
+        B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon& rCandidate);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
new file mode 100644
index 000000000000..e23d640b8833
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
+#define _BGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
+
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace triangulator
+    {
+        // triangulate given polygon
+        ::basegfx::B2DPolygon triangulate(const ::basegfx::B2DPolygon& rCandidate);
+
+        // triangulate given PolyPolygon
+        ::basegfx::B2DPolygon triangulate(const ::basegfx::B2DPolyPolygon& rCandidate);
+
+    } // end of namespace triangulator
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
new file mode 100644
index 000000000000..0032cc47ce4e
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
@@ -0,0 +1,137 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DPOLYPOLYGON_HXX
+#define _BGFX_POLYGON_B2DPOLYPOLYGON_HXX
+
+#include <sal/types.h>
+#include <o3tl/cow_wrapper.hxx>
+#include <basegfx/range/b2drange.hxx>
+
+// predeclarations
+class ImplB2DPolyPolygon;
+
+namespace basegfx
+{
+    class B2DPolygon;
+    class B2DHomMatrix;
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B2DPolyPolygon
+    {
+    public:
+        typedef o3tl::cow_wrapper< ImplB2DPolyPolygon > ImplType;
+
+    private:
+        ImplType                                        mpPolyPolygon;
+
+    public:
+        B2DPolyPolygon();
+        B2DPolyPolygon(const B2DPolyPolygon& rPolyPolygon);
+        explicit B2DPolyPolygon(const B2DPolygon& rPolygon);
+        ~B2DPolyPolygon();
+
+        // assignment operator
+        B2DPolyPolygon& operator=(const B2DPolyPolygon& rPolyPolygon);
+
+        /// unshare this poly-polygon (and all included polygons) with all internally shared instances
+        void makeUnique();
+
+        // compare operators
+        bool operator==(const B2DPolyPolygon& rPolyPolygon) const;
+        bool operator!=(const B2DPolyPolygon& rPolyPolygon) const;
+
+        // polygon interface
+        sal_uInt32 count() const;
+
+        B2DPolygon getB2DPolygon(sal_uInt32 nIndex) const;
+        void setB2DPolygon(sal_uInt32 nIndex, const B2DPolygon& rPolygon);
+
+        // test for curve
+        bool areControlPointsUsed() const;
+
+        // insert/append single polygon
+        void insert(sal_uInt32 nIndex, const B2DPolygon& rPolygon, sal_uInt32 nCount = 1);
+        void append(const B2DPolygon& rPolygon, sal_uInt32 nCount = 1);
+
+        /** Default adaptive subdivision access
+
+            For details refer to B2DPolygon::getDefaultAdaptiveSubdivision()
+
+            @return
+            The default subdivision of this polygon
+        */
+        B2DPolyPolygon getDefaultAdaptiveSubdivision() const;
+
+        /** Get the B2DRange (Rectangle dimensions) of this B2DPolyPolygon
+
+            For details refer to B2DPolygon::getB2DRange()
+
+            @return
+            The outer range of the bezier curve/polygon
+        */
+        B2DRange getB2DRange() const;
+
+        // insert/append multiple polygons
+        void insert(sal_uInt32 nIndex, const B2DPolyPolygon& rPolyPolygon);
+        void append(const B2DPolyPolygon& rPolyPolygon);
+
+        // remove
+        void remove(sal_uInt32 nIndex, sal_uInt32 nCount = 1);
+
+        // reset to empty state
+        void clear();
+
+        // closed state
+        bool isClosed() const;
+        void setClosed(bool bNew);
+
+        // flip polygon direction
+        void flip();
+
+        // test if PolyPolygon has double points
+        bool hasDoublePoints() const;
+
+        // remove double points, at the begin/end and follow-ups, too
+        void removeDoublePoints();
+
+        // apply transformation given in matrix form to the polygon
+        void transform(const basegfx::B2DHomMatrix& rMatrix);
+
+        // polygon iterators (same iterator validity conditions as for vector)
+        const B2DPolygon* begin() const;
+        const B2DPolygon* end() const;
+        B2DPolygon* begin();
+        B2DPolygon* end();
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYGON_B2DPOLYPOLYGON_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
new file mode 100644
index 000000000000..7e648302c5e5
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
+#define _BGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX
+
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        // Solve all crossovers in a polyPolygon. This re-layouts all contained polygons so that the
+        // result will contain only non-cutting polygons. For that reason, points will be added at
+        // crossover and touch points and the single Polygons may be re-combined. The orientations
+        // of the contained polygons in not changed but used as topological information.
+        // Self crossovers of the contained sub-polygons are implicitely handled, but to not lose
+        // the topological information, it may be necessary to remove self-intersections of the
+        // contained sub-polygons in a preparing step and to explicitely correct their orientations.
+        B2DPolyPolygon solveCrossovers(const B2DPolyPolygon& rCandidate);
+
+        // Version for single polygons. This is for solving self-intersections. Result will be free of
+        // crossovers. When result contains multiple polygons, it may be necessary to rearrange their
+        // orientations since holes may have been created (use correctOrientations eventually).
+        B2DPolyPolygon solveCrossovers(const B2DPolygon& rCandidate);
+
+        // Neutral polygons will be stripped. Neutral polygons are ones who's orientation is
+        // neutral, so normally they have no volume -> just closed paths. A polygon with the same
+        // positive and negative oriented volume is also neutral, so this may not be wanted. It is
+        // safe to call with crossover-free polygons, though (that's where it's mostly used).
+        B2DPolyPolygon stripNeutralPolygons(const B2DPolyPolygon& rCandidate);
+
+        // Remove not necessary polygons. Works only correct with crossover-free polygons. For each
+        // polygon, the depth for the PolyPolygon is calculated. The orientation is used to identify holes.
+        // Start value for holes is -1, for polygons it's zero. Ech time a polygon is contained in another one,
+        // it's depth is increased when inside a polygon, decreased when inside a hole. The result is a depth
+        // which e.g. is -1 for holes outside everything, 1 for a polygon covered by another polygon and zero
+        // for e.g. holes in a polygon or polygons outside everythig else.
+        // In the 2nd step, all polygons with depth other than zero are removed. If bKeepAboveZero is used,
+        // all polygons < 1 are removed. The bKeepAboveZero mode is useful for clipping, e.g. just append
+        // one polygon to another and use this mode -> only parts where two polygons overlapped will be kept.
+        // In combination with correct orientation of the input orientations and the SolveCrossover calls this
+        // can be combined for logical polygon operations or polygon clipping.
+        B2DPolyPolygon stripDispensablePolygons(const B2DPolyPolygon& rCandidate, bool bKeepAboveZero = false);
+
+        // For convenience: The four basic operations OR, XOR, AND and DIFF for
+        // two PolyPolygons. These are combinations of the above methods. To not be forced
+        // to do evtl. already done preparations twice, You have to do the operations Yourself.
+        //
+        // A source preparation consists of preparing it to be seen as XOR-Rule PolyPolygon,
+        // so it is freed of intersections, self-intersections and the orientations are corrected.
+        // Important is that it will define the same areas as before, but is intersection-free.
+        // As an example think about a single polygon looping in itself and having holes. To
+        // topologically correctly handle this, it is necessary to remove all intersections and
+        // to correct the orientations. The orientation of the isolated holes e.g. will be negative.
+        // Topologically it is necessary to prepare each polygon which is seen as entity. It is
+        // not sufficient just to concatenate them and prepare the result, this may be topologically
+        // different since the simple concatenation will be seen as XOR. To work correctly, You
+        // may need to OR those polygons.
+
+        // Preparations: solve self-intersections and intersections, remove neutral
+        // parts and correct orientations.
+        B2DPolyPolygon prepareForPolygonOperation(const B2DPolygon& rCandidate);
+        B2DPolyPolygon prepareForPolygonOperation(const B2DPolyPolygon& rCandidate);
+
+        // OR: Return all areas where CandidateA or CandidateB exist
+        B2DPolyPolygon solvePolygonOperationOr(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB);
+
+        // XOR: Return all areas where CandidateA or CandidateB exist, but not both
+        B2DPolyPolygon solvePolygonOperationXor(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB);
+
+        // AND: Return all areas where CandidateA and CandidateB exist
+        B2DPolyPolygon solvePolygonOperationAnd(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB);
+
+        // DIFF: Return all areas where CandidateA is not covered by CandidateB (cut B out of A)
+        B2DPolyPolygon solvePolygonOperationDiff(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB);
+
+        /** merge all single PolyPolygons to a single, OR-ed PolyPolygon
+
+            @param rInput
+            The source PolyPolygons
+
+            @return A single PolyPolygon containing the Or-merged result
+        */
+        B2DPolyPolygon mergeToSinglePolyPolygon(const std::vector< basegfx::B2DPolyPolygon >& rInput);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+#endif /* _BGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
new file mode 100644
index 000000000000..f5ceb67586e8
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
+#define _BGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
+
+#include <sal/types.h>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** Fill rule to use for poly-polygon filling.
+
+        The fill rule determines which areas are inside, and which are
+        outside the poly-polygon.
+     */
+    enum FillRule
+    {
+        /** Areas, for which a scanline has crossed an odd number of
+            vertices, are regarded 'inside', the remainder 'outside'
+            of the poly-polygon.
+         */
+        FillRule_EVEN_ODD,
+
+        /** For each edge a scanline crosses, a current winding number
+            is updated. Downward edges count +1, upward edges count
+            -1. If the total accumulated winding number for one area
+            is not zero, this area is regarded 'inside', otherwise,
+            'outside'.
+         */
+        FillRule_NONZERO_WINDING_NUMBER
+    };
+}
+
+#endif /* _BGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
new file mode 100644
index 000000000000..a77f1a371a8a
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
@@ -0,0 +1,141 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DPOLYPOLYGONRASTERCONVERTER_HXX
+#define _BGFX_POLYGON_B2DPOLYPOLYGONRASTERCONVERTER_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drectangle.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygonfillrule.hxx>
+#include <vector>
+#include <utility>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** Raster-convert a poly-polygon.
+
+        This class can raster-convert a given poly-polygon. Simply
+        derive from this, and override the span() method, which will
+        get called for every scanline span of the poly-polygon.
+
+        @derive
+        Overwrite span() with the render output method of your choice.
+     */
+    class B2DPolyPolygonRasterConverter
+    {
+    public:
+        /** Create raster-converter for given poly-polygon
+         */
+        B2DPolyPolygonRasterConverter(const B2DPolyPolygon& rPolyPolyRaster);
+
+        /** Create raster-converter for given poly-polygon and raster
+            area.
+
+            @param rPolyPolyRaster
+            Poly-Polygon to raster convert
+
+            @param rMinUpdateArea
+            Minimal area to touch when raster-converting. The
+            rectangle given here is guaranteed to be iterated through
+            scanline by scanline (but the raster converter might
+            actually use more scanlines, e.g. if the poly-polygon's
+            bound rect is larger). One of the cases where this
+            parameter comes in handy is when rendering in the 'off'
+            spans, and a certain area must be filled. <em>Do not</em>
+            use this for clipping, as described above, the touched
+            area might also be larger.
+         */
+        B2DPolyPolygonRasterConverter(const B2DPolyPolygon& rPolyPolyRaster,
+                                      const B2DRectangle&   rRasterArea );
+
+        virtual ~B2DPolyPolygonRasterConverter();
+
+        /** Raster-convert the contained poly-polygon
+
+            @param eFillRule
+            Fill rule to use for span filling
+         */
+        void rasterConvert( FillRule eFillRule);
+
+        /** Override this method, to be called for every scanline span
+            of the poly-polygon
+
+            @param rfXLeft
+            The left end of the current horizontal span
+
+            @param rfXRight
+            The right end of the current horizontal span
+
+            @param nY
+            The y position of the current horizontal span
+
+            @param bOn
+            Denotes whether this span is on or off, according to the
+            active fill rule.
+        */
+        virtual void span(const double& rfXLeft,
+                          const double& rfXRight,
+                          sal_Int32     nY,
+                          bool          bOn ) = 0;
+
+        /// @internal
+        struct Vertex
+        {
+            inline Vertex();
+            inline Vertex( const B2DPoint&, const B2DPoint&, bool );
+
+            B2DPoint    aP1;
+            B2DPoint    aP2;
+            bool        bDownwards;
+        };
+
+    private:
+        // default: disabled copy/assignment
+        B2DPolyPolygonRasterConverter(const B2DPolyPolygonRasterConverter&);
+        B2DPolyPolygonRasterConverter& operator=( const B2DPolyPolygonRasterConverter& );
+
+        void init();
+
+        typedef ::std::vector<Vertex>               VectorOfVertices;
+        typedef ::std::vector<VectorOfVertices>     VectorOfVertexVectors;
+
+        /// The poly-polygon to raster-convert
+        B2DPolyPolygon                              maPolyPolygon;
+        /// Total bound rect of the poly-polygon
+        const B2DRectangle                          maPolyPolyRectangle;
+
+        /** Vector containing for each scanline a vector which in turn
+            contains all vertices that start on the specific scanline
+         */
+        VectorOfVertexVectors                       maScanlines;
+    };
+}
+
+#endif /* _BGFX_POLYGON_B2DPOLYPOLYGONRASTERCONVERTER_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
new file mode 100644
index 000000000000..1115a96ef8da
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -0,0 +1,279 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX
+#define _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b3dpolypolygon.hxx>
+#include <vector>
+
+namespace rtl
+{
+    class OUString;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predefinitions
+    class B2DPolyPolygon;
+    class B2DRange;
+
+    namespace tools
+    {
+        // B2DPolyPolygon tools
+
+        // Check and evtl. correct orientations of all contained Polygons so that
+        // the orientations of contained polygons will variate to express areas and
+        // holes
+        B2DPolyPolygon correctOrientations(const B2DPolyPolygon& rCandidate);
+
+        // make sure polygon with index 0L is not a hole. This may evtl. change the
+        // sequence of polygons, but allows to use polygon with index 0L to
+        // get the correct normal for the whole polyPolygon
+        B2DPolyPolygon correctOutmostPolygon(const B2DPolyPolygon& rCandidate);
+
+        // Subdivide all contained curves. Use distanceBound value if given.
+        B2DPolyPolygon adaptiveSubdivideByDistance(const B2DPolyPolygon& rCandidate, double fDistanceBound = 0.0);
+
+        // Subdivide all contained curves. Use distanceBound value if given. Else, a convenient one
+        // is created.
+        B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound = 0.0);
+
+        // Subdivide all contained curves. Use nCount divisions if given. Else, a convenient one
+        // is created.
+        B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount = 0L);
+
+        // isInside test for B2dPoint. On border is not inside as long as not true is given
+        // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct.
+        bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false);
+
+        /** get range of PolyPolygon. Control points are included.
+
+            For detailed description look at getRangeWithControlPoints(const B2DPolygon&).
+            This method just expands by the range of every sub-Polygon.
+
+            @param rCandidate
+            The B2DPolyPolygon eventually containing bezier segments
+
+            @return
+            The outer range including control points
+        */
+        B2DRange getRangeWithControlPoints(const B2DPolyPolygon& rCandidate);
+
+        /** Get the range of a polyPolygon
+
+            For detailed description look at getRange(const B2DPolygon&).
+            This method just expands by the range of every sub-Polygon.
+
+            @param rCandidate
+            The B2DPolyPolygon eventually containing bezier segments
+
+            @return
+            The outer range of the polygon
+        */
+        B2DRange getRange(const B2DPolyPolygon& rCandidate);
+
+        /** Apply given LineDashing to given polyPolygon
+
+            For a description see applyLineDashing in b2dpolygontoos.hxx
+        */
+        void applyLineDashing(
+            const B2DPolyPolygon& rCandidate,
+            const ::std::vector<double>& rDotDashArray,
+            B2DPolyPolygon* pLineTarget,
+            B2DPolyPolygon* pGapTarget = 0,
+            double fFullDashDotLen = 0.0);
+
+        // test if point is inside epsilon-range around the given PolyPolygon. Can be used
+        // for HitTesting. The epsilon-range is defined to be the tube around the PolyPolygon
+        // with distance fDistance and rounded edges (start and end point).
+        bool isInEpsilonRange(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance);
+
+        /** Read poly-polygon from SVG.
+
+            This function imports a poly-polygon from an SVG-D
+            attribute. Currently, elliptical arc elements are not yet
+            supported (and ignored during parsing).
+
+            @param o_rPolyPoly
+            The output poly-polygon
+
+            @param rSvgDAttribute
+            A valid SVG-D attribute string
+
+            @return true, if the string was successfully parsed
+         */
+        bool importFromSvgD( B2DPolyPolygon&        o_rPolyPoly,
+                             const ::rtl::OUString& rSvgDAttribute );
+
+        /** Read poly-polygon from SVG.
+
+            This function imports a poly-polygon from an SVG points
+            attribute (a plain list of coordinate pairs).
+
+            @param o_rPoly
+            The output polygon. Note that svg:points can only define a
+            single polygon
+
+            @param rSvgPointsAttribute
+            A valid SVG points attribute string
+
+            @return true, if the string was successfully parsed
+         */
+        bool importFromSvgPoints( B2DPolygon&            o_rPoly,
+                                  const ::rtl::OUString& rSvgPointsAttribute );
+
+
+        // grow for polyPolygon. Move all geometry in each point in the direction of the normal in that point
+        // with the given amount. Value may be negative.
+        B2DPolyPolygon growInNormalDirection(const B2DPolyPolygon& rCandidate, double fValue);
+
+        // This method will correct a pair of polyPolygons where the goal is to keep same point count
+        // to allow direct point association and also to remove self-intersections produced by shrinks.
+        // This method will eventually change both polyPolygons to reach that goal because there are cases
+        // where it is necessary to add new cut points to the original
+        void correctGrowShrinkPolygonPair(B2DPolyPolygon& rOriginal, B2DPolyPolygon& rGrown);
+
+        // force all sub-polygons to a point count of nSegments
+        B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, sal_uInt32 nSegments);
+
+        // create polygon state at t from 0.0 to 1.0 between the two polygons. Both polygons must have the same
+        // organisation, e.g. same amount of polygons
+        B2DPolyPolygon interpolate(const B2DPolyPolygon& rOld1, const B2DPolyPolygon& rOld2, double t);
+
+        // create 3d PolyPolygon from given 2d PolyPolygon. The given fZCoordinate is used to expand the
+        // third coordinate.
+        B3DPolyPolygon createB3DPolyPolygonFromB2DPolyPolygon(const B2DPolyPolygon& rCandidate, double fZCoordinate = 0.0);
+
+        // create 2d PolyPolygon from given 3d PolyPolygon. All coordinates are transformed using the given
+        // matrix and the resulting x,y is used to form the new polygon.
+        B2DPolyPolygon createB2DPolyPolygonFromB3DPolyPolygon(const B3DPolyPolygon& rCandidate, const B3DHomMatrix& rMat);
+
+        // for each contained edge in each contained polygon calculate the smallest distance. Return the index to the smallest
+        // edge in rEdgeIndex and the index to the polygon in rPolygonIndex. The relative position on the edge is returned in rCut.
+        // If nothing was found (e.g. empty input plygon), DBL_MAX is returned.
+        double getSmallestDistancePointToPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rPolygonIndex, sal_uInt32& rEdgeIndex, double& rCut);
+
+        // distort PolyPolygon. rOriginal describes the original range, where the given points describe the distorted
+        // corresponding points.
+        B2DPolyPolygon distort(const B2DPolyPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight);
+
+        // rotate PolyPolygon around given point with given angle.
+        B2DPolyPolygon rotateAroundPoint(const B2DPolyPolygon& rCandidate, const B2DPoint& rCenter, double fAngle);
+
+        // expand all segments (which are not yet) to curve segments. This is done with setting the control
+        // vectors on the 1/3 resp. 2/3 distances on each segment.
+        B2DPolyPolygon expandToCurve(const B2DPolyPolygon& rCandidate);
+
+        // set continuity for the whole curve. If not a curve, nothing will change. Non-curve points are not changed, too.
+        B2DPolyPolygon setContinuity(const B2DPolyPolygon& rCandidate, B2VectorContinuity eContinuity);
+
+        /** Predicate whether a given poly-polygon is a rectangle.
+
+            @param rPoly
+            PolyPolygon to check
+
+            @return true, if the poly-polygon describes a rectangle
+            (contains exactly one polygon, polygon is closed, and the
+            points are either cw or ccw enumerations of a rectangle's
+            vertices). Note that intermediate points and duplicate
+            points are ignored.
+         */
+        bool isRectangle( const B2DPolyPolygon& rPoly );
+
+        /** Export poly-polygon to SVG.
+
+            This function exports a poly-polygon into an SVG-D
+            statement. Currently, output of relative point sequences
+            is not yet supported (might cause slightly larger output)
+
+            @param rPolyPoly
+            The poly-polygon to export
+
+            @param bUseRelativeCoordinates
+            When true, all coordinate values are exported as relative
+            to the current position. This tends to save some space,
+            since fewer digits needs to be written.
+
+            @param bDetectQuadraticBeziers
+            When true, the export tries to detect cubic bezier
+            segments in the input polygon, which can be represented by
+            quadratic bezier segments. Note that the generated string
+            causes versions prior to OOo2.0 to crash.
+
+            @return the generated SVG-D statement (the XML d attribute
+            value alone, without any "<path ...>" or "d="...")
+         */
+        ::rtl::OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly,
+                                      bool                  bUseRelativeCoordinates=true,
+                                      bool                  bDetectQuadraticBeziers=true );
+
+        // #i76891# Try to remove existing curve segments if they are simply edges
+        B2DPolyPolygon simplifyCurveSegments(const B2DPolyPolygon& rCandidate);
+
+        /** split each edge of a polyPolygon in exactly nSubEdges equidistant edges
+
+            @param rCandidate
+            The source polyPolygon. If too small (no edges), nSubEdges too small (<2)
+            or neither bHandleCurvedEdgesnor bHandleStraightEdges it will just be returned.
+            Else for each edge nSubEdges will be created. Closed state is preserved.
+
+            @param nSubEdges
+            @param bHandleCurvedEdges
+            @param bHandleStraightEdges
+            Please take a look at reSegmentPolygonEdges description, these are the same.
+        */
+        B2DPolyPolygon reSegmentPolyPolygonEdges(const B2DPolyPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges);
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 2D PolyPolygons
+        bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB, const double& rfSmallValue);
+        bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB);
+
+        /** snap some polygon coordinates to discrete coordinates
+
+            This method allows to snap some polygon points to discrete (integer) values
+            which equals e.g. a snap to discrete coordinates. It will snap points of
+            horizontal and vertical edges
+
+            @param rCandidate
+            The source polygon
+
+            @return
+            The modified version of the source polygon
+        */
+        B2DPolyPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolyPolygon& rCandidate);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
new file mode 100644
index 000000000000..70ffdf2b7339
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
@@ -0,0 +1,132 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dpolygontriangulator.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DTRAPEZOID_HXX
+#define _BGFX_POLYGON_B2DTRAPEZOID_HXX
+
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // class to hold a single trapezoid
+    class B2DTrapezoid
+    {
+    private:
+        // Geometry data. YValues are down-oriented, this means bottom should
+        // be bigger than top to be below it. The constructor implementation
+        // guarantees:
+        //
+        // - mfBottomY >= mfTopY
+        // - mfTopXRight >= mfTopXLeft
+        // - mfBottomXRight >= mfBottomXLeft
+        double              mfTopXLeft;
+        double              mfTopXRight;
+        double              mfTopY;
+        double              mfBottomXLeft;
+        double              mfBottomXRight;
+        double              mfBottomY;
+
+    public:
+        // constructor
+        B2DTrapezoid(
+            const double& rfTopXLeft,
+            const double& rfTopXRight,
+            const double& rfTopY,
+            const double& rfBottomXLeft,
+            const double& rfBottomXRight,
+            const double& rfBottomY);
+
+        // data read access
+        const double& getTopXLeft() const { return mfTopXLeft; }
+        const double& getTopXRight() const { return mfTopXRight; }
+        const double& getTopY() const { return mfTopY; }
+        const double& getBottomXLeft() const { return mfBottomXLeft; }
+        const double& getBottomXRight() const { return mfBottomXRight; }
+        const double& getBottomY() const { return mfBottomY; }
+
+        // convenience method to get content as Polygon
+        B2DPolygon getB2DPolygon() const;
+    };
+
+    typedef ::std::vector< B2DTrapezoid > B2DTrapezoidVector;
+
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        // convert SourcePolyPolygon to trapezoids. The trapezoids will be appended to
+        // ro_Result. ro_Result will not be cleared. If SourcePolyPolygon contains curves,
+        // it's default AdaptiveSubdivision will be used.
+        // CAUTION: Trapezoids are oreintation-dependent in the sense that the upper and lower
+        // lines have to be parallel to the X-Axis, thus this subdivision is NOT simply usable
+        // for primitive decompositions. To use it, the shear and rotate parts of the
+        // involved transformations HAVE to be taken into account.
+        void trapezoidSubdivide(
+            B2DTrapezoidVector& ro_Result,
+            const B2DPolyPolygon& rSourcePolyPolygon);
+
+        // directly create trapezoids from given edge. Depending on the given geometry,
+        // none up to three trapezoids will be created
+        void createLineTrapezoidFromEdge(
+            B2DTrapezoidVector& ro_Result,
+            const B2DPoint& rPointA,
+            const B2DPoint& rPointB,
+            double fLineWidth = 1.0);
+
+        // create trapezoids for all edges of the given polygon. The closed state of
+        // the polygon is taken into account. If curves are contaned, the default
+        // AdaptiveSubdivision will be used.
+        void createLineTrapezoidFromB2DPolygon(
+            B2DTrapezoidVector& ro_Result,
+            const B2DPolygon& rPolygon,
+            double fLineWidth = 1.0);
+
+        // create trapezoids for all edges of the given polyPolygon. The closed state of
+        // the PolyPolygon is taken into account. If curves are contaned, the default
+        // AdaptiveSubdivision will be used.
+        void createLineTrapezoidFromB2DPolyPolygon(
+            B2DTrapezoidVector& ro_Result,
+            const B2DPolyPolygon& rPolyPolygon,
+            double fLineWidth = 1.0);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_POLYGON_B2DTRAPEZOID_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
new file mode 100644
index 000000000000..1732c1338042
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
@@ -0,0 +1,141 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B3DPOLYGON_HXX
+#define _BGFX_POLYGON_B3DPOLYGON_HXX
+
+#include <sal/types.h>
+#include <o3tl/cow_wrapper.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+class ImplB3DPolygon;
+
+namespace basegfx
+{
+    class B3DPolygon;
+    class B3DPoint;
+    class B3DHomMatrix;
+    class B3DVector;
+    class B2DPoint;
+    class B2DHomMatrix;
+    class BColor;
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B3DPolygon
+    {
+    public:
+        typedef o3tl::cow_wrapper< ImplB3DPolygon > ImplType;
+
+    private:
+        // internal data.
+        ImplType                                    mpPolygon;
+
+    public:
+        B3DPolygon();
+        B3DPolygon(const B3DPolygon& rPolygon);
+        B3DPolygon(const B3DPolygon& rPolygon, sal_uInt32 nIndex, sal_uInt32 nCount);
+        ~B3DPolygon();
+
+        // assignment operator
+        B3DPolygon& operator=(const B3DPolygon& rPolygon);
+
+        /// unshare this polygon with all internally shared instances
+        void makeUnique();
+
+        // compare operators
+        bool operator==(const B3DPolygon& rPolygon) const;
+        bool operator!=(const B3DPolygon& rPolygon) const;
+
+        // member count
+        sal_uInt32 count() const;
+
+        // Coordinate interface
+        B3DPoint getB3DPoint(sal_uInt32 nIndex) const;
+        void setB3DPoint(sal_uInt32 nIndex, const B3DPoint& rValue);
+
+        // Coordinate insert/append
+        void insert(sal_uInt32 nIndex, const B3DPoint& rPoint, sal_uInt32 nCount = 1);
+        void append(const B3DPoint& rPoint, sal_uInt32 nCount = 1);
+
+        // BColor interface
+        BColor getBColor(sal_uInt32 nIndex) const;
+        void setBColor(sal_uInt32 nIndex, const BColor& rValue);
+        bool areBColorsUsed() const;
+        void clearBColors();
+
+        // Normals interface
+        B3DVector getNormal() const; // plane normal
+        B3DVector getNormal(sal_uInt32 nIndex) const; // normal in each point
+        void setNormal(sal_uInt32 nIndex, const B3DVector& rValue);
+        void transformNormals(const B3DHomMatrix& rMatrix);
+        bool areNormalsUsed() const;
+        void clearNormals();
+
+        // TextureCoordinate interface
+        B2DPoint getTextureCoordinate(sal_uInt32 nIndex) const;
+        void setTextureCoordinate(sal_uInt32 nIndex, const B2DPoint& rValue);
+        void transformTextureCoordiantes(const B2DHomMatrix& rMatrix);
+        bool areTextureCoordinatesUsed() const;
+        void clearTextureCoordinates();
+
+        // insert/append other 2D polygons
+        void insert(sal_uInt32 nIndex, const B3DPolygon& rPoly, sal_uInt32 nIndex2 = 0, sal_uInt32 nCount = 0);
+        void append(const B3DPolygon& rPoly, sal_uInt32 nIndex = 0, sal_uInt32 nCount = 0);
+
+        // remove
+        void remove(sal_uInt32 nIndex, sal_uInt32 nCount = 1);
+
+        // clear all points
+        void clear();
+
+        // closed state
+        bool isClosed() const;
+        void setClosed(bool bNew);
+
+        // flip polygon direction
+        void flip();
+
+        // test if Polygon has double points
+        bool hasDoublePoints() const;
+
+        // remove double points, at the begin/end and follow-ups, too
+        void removeDoublePoints();
+
+        // apply transformation given in matrix form to the polygon
+        void transform(const B3DHomMatrix& rMatrix);
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+#endif /* _BGFX_POLYGON_B3DPOLYGON_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
new file mode 100644
index 000000000000..71c7f36d50d8
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYPOLYGON_B3DPOLYGONCLIPPER_HXX
+#define _BGFX_POLYPOLYGON_B3DPOLYGONCLIPPER_HXX
+
+#include <basegfx/polygon/b3dpolypolygon.hxx>
+#include <basegfx/polygon/b3dpolygon.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predefinitions
+    class B3DRange;
+    class B2DRange;
+
+    namespace tools
+    {
+        /** define for deciding one of X,Y,Z directions
+        */
+        enum B3DOrientation
+        {
+            B3DORIENTATION_X,       // X-Axis
+            B3DORIENTATION_Y,       // Y-Axis
+            B3DORIENTATION_Z        // Z-Axis
+        };
+
+        // Clip given 3D polygon against a plane orthogonal to X,Y or Z axis. The plane is defined using the
+        // enum ePlaneOrthogonal which names the vector orthogonal to the plane, the fPlaneOffset gives the distance
+        // of the plane from the center (0.0).
+        // The value bClipPositive defines on which side the return value will be (true -> on positive side of plane).
+        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+        B3DPolyPolygon clipPolyPolygonOnOrthogonalPlane(const B3DPolyPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke);
+
+        // version for Polygons
+        B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke);
+
+        // Clip the given PolyPolygon against the given range. bInside defines if the result will contain the
+        // parts which are contained in the range or vice versa.
+        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+        B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke);
+
+        // version for Polygons
+        B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke);
+
+        // versions for B2DRange, clips only against X,Y
+        B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
+        B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
+
+        // Clip the given PolyPolygon against given plane in 3D. The plane is defined by a plane normal and a point on the plane.
+        // The value bClipPositive defines on which side the return value will be (true -> on positive side of plane).
+        // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
+        B3DPolyPolygon clipPolyPolygonOnPlane(const B3DPolyPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke);
+
+        // version for Polygons
+        B3DPolyPolygon clipPolygonOnPlane(const B3DPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYPOLYGON_B3DPOLYGONCLIPPER_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
new file mode 100644
index 000000000000..7945fc1bde00
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
@@ -0,0 +1,191 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B3DPOLYGONTOOLS_HXX
+#define _BGFX_POLYGON_B3DPOLYGONTOOLS_HXX
+
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/vector/b3dvector.hxx>
+#include <basegfx/polygon/b3dpolypolygon.hxx>
+#include <basegfx/vector/b2enums.hxx>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predefinitions
+    class B3DPolygon;
+    class B3DRange;
+
+    namespace tools
+    {
+        // B3DPolygon tools
+
+        /** Check if given polygon is closed. This is kind of a
+            'classic' method to support old polygon definitions.
+            Those old polygon definitions define the closed state
+            of the polygon using identical start and endpoints. This
+            method corrects this (removes double start/end points)
+            and sets the Closed()-state of the polygon correctly.
+        */
+        void checkClosed(B3DPolygon& rCandidate);
+
+        // Get successor and predecessor indices. Returning the same index means there
+        // is none. Same for successor.
+        sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate);
+        sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate);
+
+        // Get orientation of Polygon
+        B2VectorOrientation getOrientation(const B3DPolygon& rCandidate);
+
+        // get size of polygon. Control vectors are included in that ranges.
+        B3DRange getRange(const B3DPolygon& rCandidate);
+
+        // get normal vector of polygon
+        B3DVector getNormal(const B3DPolygon& rCandidate);
+
+        // get normal vector of positive oriented polygon
+        B3DVector getPositiveOrientedNormal(const B3DPolygon& rCandidate);
+
+        // get signed area of polygon
+        double getSignedArea(const B3DPolygon& rCandidate);
+
+        // get area of polygon
+        double getArea(const B3DPolygon& rCandidate);
+
+        // get signed area of polygon
+        double getSignedArea(const B3DPolygon& rCandidate);
+
+        // get area of polygon
+        double getArea(const ::basegfx::B3DPolygon& rCandidate);
+
+        // get length of polygon edge from point nIndex to nIndex + 1
+        double getEdgeLength(const B3DPolygon& rCandidate, sal_uInt32 nIndex);
+
+        // get length of polygon
+        double getLength(const B3DPolygon& rCandidate);
+
+        // get position on polygon for absolute given distance. If
+        // length is given, it is assumed the correct polygon length, if 0.0 it is calculated
+        // using getLength(...)
+        B3DPoint getPositionAbsolute(const B3DPolygon& rCandidate, double fDistance, double fLength = 0.0);
+
+        // get position on polygon for relative given distance in range [0.0 .. 1.0]. If
+        // length is given, it is assumed the correct polygon length, if 0.0 it is calculated
+        // using getLength(...)
+        B3DPoint getPositionRelative(const B3DPolygon& rCandidate, double fDistance, double fLength = 0.0);
+
+        /** Apply given LineDashing to given polygon
+
+            For a description see applyLineDashing in b2dpolygontoos.hxx
+        */
+        void applyLineDashing(
+            const B3DPolygon& rCandidate,
+            const ::std::vector<double>& rDotDashArray,
+            B3DPolyPolygon* pLineTarget,
+            B3DPolyPolygon* pGapTarget = 0,
+            double fFullDashDotLen = 0.0);
+
+        /** Create/replace normals for given 3d geometry with default normals from given center to outside.
+            rCandidate: the 3d geometry to change
+            rCenter:    the center of the 3d geometry
+         */
+        B3DPolygon applyDefaultNormalsSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter);
+
+        /** invert normals for given 3d geometry.
+         */
+        B3DPolygon invertNormals( const B3DPolygon& rCandidate);
+
+        /** Create/replace texture coordinates for given 3d geometry with parallel projected one
+            rRange: the full range of the 3d geometry
+            If bChangeX, x texture coordinate will be recalculated.
+            If bChangeY, y texture coordinate will be recalculated.
+         */
+        B3DPolygon applyDefaultTextureCoordinatesParallel( const B3DPolygon& rCandidate, const B3DRange& rRange, bool bChangeX = true, bool bChangeY = true);
+
+        /** Create/replace texture coordinates for given 3d geometry with spherical one
+            rCenter: the centre of the used 3d geometry
+            If bChangeX, x texture coordinate will be recalculated.
+            If bChangeY, y texture coordinate will be recalculated.
+         */
+        B3DPolygon applyDefaultTextureCoordinatesSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX = true, bool bChangeY = true);
+
+        // test if point is inside epsilon-range around an edge defined
+        // by the two given points. Can be used for HitTesting. The epsilon-range
+        // is defined to be the cylinder centered to the given edge, using radius
+        // fDistance, and the sphere around both points with radius fDistance.
+        bool isInEpsilonRange(const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, const B3DPoint& rTestPosition, double fDistance);
+
+        // test if point is inside epsilon-range around the given Polygon. Can be used
+        // for HitTesting. The epsilon-range is defined to be the cylinder centered to
+        // the given edge, using radius fDistance, and the sphere around both points with radius fDistance.
+        bool isInEpsilonRange(const B3DPolygon& rCandidate, const B3DPoint& rTestPosition, double fDistance);
+
+        // isInside tests for B3DPoint and other B3DPolygon. On border is not inside as long as
+        // not true is given in bWithBorder flag.
+        bool isInside(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false);
+        bool isInside(const B3DPolygon& rCandidate, const B3DPolygon& rPolygon, bool bWithBorder = false);
+
+        // calculates if given point is on given line, taking care of the numerical epsilon
+        bool isPointOnLine(const B3DPoint& rStart, const B3DPoint& rEnd, const B3DPoint& rCandidate, bool bWithPoints = false);
+
+        // calculates if given point is on given polygon, taking care of the numerical epsilon. Uses
+        // isPointOnLine internally
+        bool isPointOnPolygon(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithPoints = true);
+
+        // helper to get a fCut position between a plane (given with normal and a point)
+        // and a line given by start and end point
+        bool getCutBetweenLineAndPlane(const B3DVector& rPlaneNormal, const B3DPoint& rPlanePoint, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut);
+
+        // helper to get a fCut position between a 3d Polygon
+        // and a line given by start and end point
+        bool getCutBetweenLineAndPolygon(const B3DPolygon& rCandidate, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut);
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 3D Polygons
+        bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB, const double& rfSmallValue);
+        bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB);
+
+        /** snap some polygon coordinates to discrete coordinates
+
+            This method allows to snap some polygon points to discrete (integer) values
+            which equals e.g. a snap to discrete coordinates. It will snap points of
+            horizontal and vertical edges
+
+            @param rCandidate
+            The source polygon
+
+            @return
+            The modified version of the source polygon
+        */
+        B3DPolygon snapPointsOfHorizontalOrVerticalEdges(const B3DPolygon& rCandidate);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYGON_B3DPOLYGONTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
new file mode 100644
index 000000000000..76e0c2f844c0
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
@@ -0,0 +1,125 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B3DPOLYPOLYGON_HXX
+#define _BGFX_POLYGON_B3DPOLYPOLYGON_HXX
+
+#include <sal/types.h>
+#include <o3tl/cow_wrapper.hxx>
+
+// predeclarations
+class ImplB3DPolyPolygon;
+
+namespace basegfx
+{
+    class B3DPolygon;
+    class B3DHomMatrix;
+    class B2DHomMatrix;
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B3DPolyPolygon
+    {
+    public:
+        typedef o3tl::cow_wrapper< ImplB3DPolyPolygon > ImplType;
+
+    private:
+        ImplType                                        mpPolyPolygon;
+
+    public:
+        B3DPolyPolygon();
+        B3DPolyPolygon(const B3DPolyPolygon& rPolyPolygon);
+        explicit B3DPolyPolygon(const B3DPolygon& rPolygon);
+        ~B3DPolyPolygon();
+
+        // assignment operator
+        B3DPolyPolygon& operator=(const B3DPolyPolygon& rPolyPolygon);
+
+        /// unshare this poly-polygon (and all included polygons) with all internally shared instances
+        void makeUnique();
+
+        // compare operators
+        bool operator==(const B3DPolyPolygon& rPolyPolygon) const;
+        bool operator!=(const B3DPolyPolygon& rPolyPolygon) const;
+
+        // polygon interface
+        sal_uInt32 count() const;
+
+        // B3DPolygon interface
+        B3DPolygon getB3DPolygon(sal_uInt32 nIndex) const;
+        void setB3DPolygon(sal_uInt32 nIndex, const B3DPolygon& rPolygon);
+
+        // BColor interface
+        bool areBColorsUsed() const;
+        void clearBColors();
+
+        // Normals interface
+        void transformNormals(const B3DHomMatrix& rMatrix);
+        bool areNormalsUsed() const;
+        void clearNormals();
+
+        // TextureCoordinate interface
+        void transformTextureCoordiantes(const B2DHomMatrix& rMatrix);
+        bool areTextureCoordinatesUsed() const;
+        void clearTextureCoordinates();
+
+        // insert/append single polygon
+        void insert(sal_uInt32 nIndex, const B3DPolygon& rPolygon, sal_uInt32 nCount = 1);
+        void append(const B3DPolygon& rPolygon, sal_uInt32 nCount = 1);
+
+        // insert/append multiple polygons
+        void insert(sal_uInt32 nIndex, const B3DPolyPolygon& rPolyPolygon);
+        void append(const B3DPolyPolygon& rPolyPolygon);
+
+        // remove
+        void remove(sal_uInt32 nIndex, sal_uInt32 nCount = 1);
+
+        // reset to empty state
+        void clear();
+
+        // closed state
+        bool isClosed() const;
+        void setClosed(bool bNew);
+
+        // flip polygon direction
+        void flip();
+
+        // test if PolyPolygon has double points
+        bool hasDoublePoints() const;
+
+        // remove double points, at the begin/end and follow-ups, too
+        void removeDoublePoints();
+
+        // apply transformation given in matrix form to the polygon
+        void transform(const basegfx::B3DHomMatrix& rMatrix);
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYGON_B3DPOLYPOLYGON_HXX */
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
new file mode 100644
index 000000000000..813be9839a9a
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
@@ -0,0 +1,154 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYPOLYGON_B3DPOLYGONTOOLS_HXX
+#define _BGFX_POLYPOLYGON_B3DPOLYGONTOOLS_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <vector>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/point/b3dpoint.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predefinitions
+    class B3DPolyPolygon;
+    class B3DRange;
+
+    namespace tools
+    {
+        // B3DPolyPolygon tools
+
+        // get size of PolyPolygon. Control vectors are included in that ranges.
+        B3DRange getRange(const B3DPolyPolygon& rCandidate);
+
+        /** Apply given LineDashing to given polyPolygon
+
+            For a description see applyLineDashing in b2dpolygontoos.hxx
+        */
+        void applyLineDashing(
+            const B3DPolyPolygon& rCandidate,
+            const ::std::vector<double>& rDotDashArray,
+            B3DPolyPolygon* pLineTarget,
+            B3DPolyPolygon* pGapTarget = 0,
+            double fFullDashDotLen = 0.0);
+
+        /** Create a unit 3D line polyPolygon which defines a cube.
+         */
+        B3DPolyPolygon createUnitCubePolyPolygon();
+
+        /** Create a unit 3D fill polyPolygon which defines a cube.
+         */
+        B3DPolyPolygon createUnitCubeFillPolyPolygon();
+
+        /** Create a 3D line polyPolygon from a B3DRange which defines a cube.
+         */
+        B3DPolyPolygon createCubePolyPolygonFromB3DRange( const B3DRange& rRange);
+
+        /** Create a 3D fill polyPolygon from a B3DRange which defines a cube.
+         */
+        B3DPolyPolygon createCubeFillPolyPolygonFromB3DRange( const B3DRange& rRange);
+
+        /** Create a unit 3D line polyPolygon which defines a sphere with the given count of hor and ver segments.
+            Result will be centered at (0.0, 0.0, 0.0) and sized [-1.0 .. 1.0] in all dimensions.
+            If nHorSeg == 0 and/or nVerSeg == 0, a default will be calculated to have a step at least each 15 degrees.
+            With VerStart, VerStop and hor range in cartesian may be specified to create a partial sphere only.
+         */
+        B3DPolyPolygon createUnitSpherePolyPolygon(
+            sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L,
+            double fVerStart = F_PI2, double fVerStop = -F_PI2,
+            double fHorStart = 0.0, double fHorStop = F_2PI);
+
+        /** Create a 3D line polyPolygon from a B3DRange which defines a sphere with the given count of hor and ver segments.
+            If nHorSeg == 0 and/or nVerSeg == 0, a default will be calculated to have a step at least each 15 degrees.
+            With VerStart, VerStop and hor range in cartesian may be specified to create a partial sphere only.
+         */
+        B3DPolyPolygon createSpherePolyPolygonFromB3DRange(
+            const B3DRange& rRange,
+            sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L,
+            double fVerStart = F_PI2, double fVerStop = -F_PI2,
+            double fHorStart = 0.0, double fHorStop = F_2PI);
+
+        /** same as createUnitSpherePolyPolygon, but creates filled polygons (closed and oriented)
+            There is one extra, the bool bNormals defines if normals will be set, default is false
+         */
+        B3DPolyPolygon createUnitSphereFillPolyPolygon(
+            sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L,
+            bool bNormals = false,
+            double fVerStart = F_PI2, double fVerStop = -F_PI2,
+            double fHorStart = 0.0, double fHorStop = F_2PI);
+
+        /** same as createSpherePolyPolygonFromB3DRange, but creates filled polygons (closed and oriented)
+            There is one extra, the bool bNormals defines if normals will be set, default is false
+         */
+        B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange(
+            const B3DRange& rRange,
+            sal_uInt32 nHorSeg = 0L, sal_uInt32 nVerSeg = 0L,
+            bool bNormals = false,
+            double fVerStart = F_PI2, double fVerStop = -F_PI2,
+            double fHorStart = 0.0, double fHorStop = F_2PI);
+
+        /** Create/replace normals for given 3d geometry with default normals from given center to outside.
+            rCandidate: the 3d geometry to change
+            rCenter:    the center of the 3d geometry
+         */
+        B3DPolyPolygon applyDefaultNormalsSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter);
+
+        /** invert normals for given 3d geometry.
+         */
+        B3DPolyPolygon invertNormals( const B3DPolyPolygon& rCandidate);
+
+        /** Create/replace texture coordinates for given 3d geometry with parallel projected one
+            rRange: the full range of the 3d geometry
+            If bChangeX, x texture coordinate will be recalculated.
+            If bChangeY, y texture coordinate will be recalculated.
+         */
+        B3DPolyPolygon applyDefaultTextureCoordinatesParallel( const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bChangeX = true, bool bChangeY = true);
+
+        /** Create/replace texture coordinates for given 3d geometry with spherical one
+            rCenter: the centre of the used 3d geometry
+            If bChangeX, x texture coordinate will be recalculated.
+            If bChangeY, y texture coordinate will be recalculated.
+         */
+        B3DPolyPolygon applyDefaultTextureCoordinatesSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX = true, bool bChangeY = true);
+
+        // isInside test for B3DPoint. On border is not inside as long as not true is given
+        // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct.
+        bool isInside(const B3DPolyPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false);
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 3D PolyPolygons
+        bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB, const double& rfSmallValue);
+        bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB);
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+#endif /* _BGFX_POLYPOLYGON_B3DPOLYGONTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx
new file mode 100644
index 000000000000..eba1536f4ee6
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b1drange.hxx
@@ -0,0 +1,165 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B1DRANGE_HXX
+#define _BGFX_RANGE_B1DRANGE_HXX
+
+#include <basegfx/range/basicrange.hxx>
+
+
+namespace basegfx
+{
+    class B1IRange;
+
+    class B1DRange
+    {
+        ::basegfx::BasicRange< double, DoubleTraits >   maRange;
+
+    public:
+        B1DRange()
+        {
+        }
+
+        explicit B1DRange(double fStartValue)
+        :   maRange(fStartValue)
+        {
+        }
+
+        B1DRange(double fStartValue1, double fStartValue2)
+        :   maRange(fStartValue1)
+        {
+            expand(fStartValue2);
+        }
+
+        B1DRange(const B1DRange& rRange)
+        :   maRange(rRange.maRange)
+        {
+        }
+
+        explicit B1DRange( const B1IRange& rRange );
+
+        bool isEmpty() const
+        {
+            return maRange.isEmpty();
+        }
+
+        void reset()
+        {
+            maRange.reset();
+        }
+
+        bool operator==( const B1DRange& rRange ) const
+        {
+            return (maRange == rRange.maRange);
+        }
+
+        bool operator!=( const B1DRange& rRange ) const
+        {
+            return (maRange != rRange.maRange);
+        }
+
+        B1DRange& operator=(const B1DRange& rRange)
+        {
+            maRange = rRange.maRange;
+            return *this;
+        }
+
+        bool equal(const B1DRange& rRange) const
+        {
+            return (maRange.equal(rRange.maRange));
+        }
+
+        double getMinimum() const
+        {
+            return maRange.getMinimum();
+        }
+
+        double getMaximum() const
+        {
+            return maRange.getMaximum();
+        }
+
+        double getRange() const
+        {
+            return maRange.getRange();
+        }
+
+        double getCenter() const
+        {
+            return maRange.getCenter();
+        }
+
+        bool isInside(double fValue) const
+        {
+            return maRange.isInside(fValue);
+        }
+
+        bool isInside(const B1DRange& rRange) const
+        {
+            return maRange.isInside(rRange.maRange);
+        }
+
+        bool overlaps(const B1DRange& rRange) const
+        {
+            return maRange.overlaps(rRange.maRange);
+        }
+
+        bool overlapsMore(const B1DRange& rRange) const
+        {
+            return maRange.overlapsMore(rRange.maRange);
+        }
+
+        void expand(double fValue)
+        {
+            maRange.expand(fValue);
+        }
+
+        void expand(const B1DRange& rRange)
+        {
+            maRange.expand(rRange.maRange);
+        }
+
+        void intersect(const B1DRange& rRange)
+        {
+            maRange.intersect(rRange.maRange);
+        }
+
+        void grow(double fValue)
+        {
+            maRange.grow(fValue);
+        }
+    };
+
+    /** Round double to nearest integer for 1D range
+
+        @return the nearest integer for this range
+    */
+    B1IRange fround(const B1DRange& rRange);
+} // end of namespace basegfx
+
+
+#endif /* _BGFX_RANGE_B1DRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/b1ibox.hxx b/basegfx/inc/basegfx/range/b1ibox.hxx
new file mode 100644
index 000000000000..cb4ab8770a49
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b1ibox.hxx
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B1IBOX_HXX
+#define _BGFX_RANGE_B1IBOX_HXX
+
+#include <basegfx/range/basicbox.hxx>
+
+
+namespace basegfx
+{
+    class B1IBox
+    {
+        ::basegfx::BasicBox maRange;
+
+    public:
+        B1IBox()
+        {
+        }
+
+        explicit B1IBox(sal_Int32 nStartValue)
+        :   maRange(nStartValue)
+        {
+        }
+
+        B1IBox(sal_Int32 nStartValue1, sal_Int32 nStartValue2)
+        :   maRange(nStartValue1)
+        {
+            expand(nStartValue2);
+        }
+
+        B1IBox(const B1IBox& rBox)
+        :   maRange(rBox.maRange)
+        {
+        }
+
+        bool isEmpty() const
+        {
+            return maRange.isEmpty();
+        }
+
+        void reset()
+        {
+            maRange.reset();
+        }
+
+        bool operator==( const B1IBox& rBox ) const
+        {
+            return (maRange == rBox.maRange);
+        }
+
+        bool operator!=( const B1IBox& rBox ) const
+        {
+            return (maRange != rBox.maRange);
+        }
+
+        void operator=(const B1IBox& rBox)
+        {
+            maRange = rBox.maRange;
+        }
+
+        sal_Int32 getMinimum() const
+        {
+            return maRange.getMinimum();
+        }
+
+        sal_Int32 getMaximum() const
+        {
+            return maRange.getMaximum();
+        }
+
+        Int32Traits::DifferenceType getRange() const
+        {
+            return maRange.getRange();
+        }
+
+        double getCenter() const
+        {
+            return maRange.getCenter();
+        }
+
+        bool isInside(sal_Int32 nValue) const
+        {
+            return maRange.isInside(nValue);
+        }
+
+        bool isInside(const B1IBox& rBox) const
+        {
+            return maRange.isInside(rBox.maRange);
+        }
+
+        bool overlaps(const B1IBox& rBox) const
+        {
+            return maRange.overlaps(rBox.maRange);
+        }
+
+        void expand(sal_Int32 nValue)
+        {
+            maRange.expand(nValue);
+        }
+
+        void expand(const B1IBox& rBox)
+        {
+            maRange.expand(rBox.maRange);
+        }
+
+        void intersect(const B1IBox& rBox)
+        {
+            maRange.intersect(rBox.maRange);
+        }
+
+        void grow(sal_Int32 nValue)
+        {
+            maRange.grow(nValue);
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_B1IBOX_HXX */
diff --git a/basegfx/inc/basegfx/range/b1irange.hxx b/basegfx/inc/basegfx/range/b1irange.hxx
new file mode 100644
index 000000000000..6c65fbaebff4
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b1irange.hxx
@@ -0,0 +1,144 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B1IRANGE_HXX
+#define _BGFX_RANGE_B1IRANGE_HXX
+
+#include <basegfx/range/basicrange.hxx>
+
+
+namespace basegfx
+{
+    class B1IRange
+    {
+        ::basegfx::BasicRange< sal_Int32, Int32Traits > maRange;
+
+    public:
+        B1IRange()
+        {
+        }
+
+        explicit B1IRange(sal_Int32 nStartValue)
+        :   maRange(nStartValue)
+        {
+        }
+
+        B1IRange(sal_Int32 nStartValue1, sal_Int32 nStartValue2)
+        :   maRange(nStartValue1)
+        {
+            expand(nStartValue2);
+        }
+
+        B1IRange(const B1IRange& rRange)
+        :   maRange(rRange.maRange)
+        {
+        }
+
+        bool isEmpty() const
+        {
+            return maRange.isEmpty();
+        }
+
+        void reset()
+        {
+            maRange.reset();
+        }
+
+        bool operator==( const B1IRange& rRange ) const
+        {
+            return (maRange == rRange.maRange);
+        }
+
+        bool operator!=( const B1IRange& rRange ) const
+        {
+            return (maRange != rRange.maRange);
+        }
+
+        B1IRange& operator=(const B1IRange& rRange)
+        {
+            maRange = rRange.maRange;
+            return *this;
+        }
+
+        sal_Int32 getMinimum() const
+        {
+            return maRange.getMinimum();
+        }
+
+        sal_Int32 getMaximum() const
+        {
+            return maRange.getMaximum();
+        }
+
+        Int32Traits::DifferenceType getRange() const
+        {
+            return maRange.getRange();
+        }
+
+        double getCenter() const
+        {
+            return maRange.getCenter();
+        }
+
+        bool isInside(sal_Int32 nValue) const
+        {
+            return maRange.isInside(nValue);
+        }
+
+        bool isInside(const B1IRange& rRange) const
+        {
+            return maRange.isInside(rRange.maRange);
+        }
+
+        bool overlaps(const B1IRange& rRange) const
+        {
+            return maRange.overlaps(rRange.maRange);
+        }
+
+        void expand(sal_Int32 nValue)
+        {
+            maRange.expand(nValue);
+        }
+
+        void expand(const B1IRange& rRange)
+        {
+            maRange.expand(rRange.maRange);
+        }
+
+        void intersect(const B1IRange& rRange)
+        {
+            maRange.intersect(rRange.maRange);
+        }
+
+        void grow(sal_Int32 nValue)
+        {
+            maRange.grow(nValue);
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_B1IRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/b2dconnectedranges.hxx b/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
new file mode 100644
index 000000000000..6c41ede934cf
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
@@ -0,0 +1,263 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2DCONNECTEDRANGES_HXX
+#define _BGFX_RANGE_B2DCONNECTEDRANGES_HXX
+
+#include <osl/diagnose.h>
+#include <basegfx/range/b2drange.hxx>
+#include <list>
+#include <utility>
+#include <algorithm>
+
+
+namespace basegfx
+{
+    /** Calculate connected ranges from input ranges.
+
+        This template constructs a list of connected ranges from the
+        given input ranges. That is, the output will contain a set of
+        ranges, itself containing a number of input ranges, which will
+        be mutually non-intersecting.
+
+        Example:
+        <code>
+        -------------------
+        |          -------|
+        |          |     ||
+        | ---      |     ||
+        | | |      -------|        --------
+        | | +---------    |        |      |
+        | --+        |    |        |      |
+        |   |        |    |        --------
+        |   ----------    |
+        -------------------
+        </code
+
+        Here, the outer rectangles represent the output
+        ranges. Contained are the input rectangles that comprise these
+        output ranges.
+
+        @tpl UserData
+        User data to be stored along with the range, to later identify
+        which range went into which connected component. Must be
+        assignable, default- and copy-constructible.
+     */
+    template< typename UserData > class B2DConnectedRanges
+    {
+    public:
+        /// Type of the basic entity (rect + user data)
+        typedef ::std::pair< B2DRange, UserData > ComponentType;
+        typedef ::std::list< ComponentType >      ComponentListType;
+
+        /// List of (intersecting) components, plus overall bounds
+        struct ConnectedComponents
+        {
+            ComponentListType   maComponentList;
+            B2DRange            maTotalBounds;
+        };
+
+        typedef ::std::list< ConnectedComponents > ConnectedComponentsType;
+
+
+        /// Create the range calculator
+        B2DConnectedRanges() :
+            maDisjunctAggregatesList(),
+            maTotalBounds()
+        {
+        }
+
+        /** Query total bounds of all added ranges.
+
+            @return the union bound rect over all added ranges.
+         */
+        B2DRange getBounds() const
+        {
+            return maTotalBounds;
+        }
+
+        /** Add an additional range.
+
+            This method integrates a new range into the connected
+            ranges lists. The method has a worst-case time complexity
+            of O(n^2), with n denoting the number of already added
+            ranges (typically, for well-behaved input, it is O(n)
+            though).
+         */
+        void addRange( const B2DRange&  rRange,
+                       const UserData&  rUserData )
+        {
+            // check whether fast path is possible: if new range is
+            // outside accumulated total range, can add it as a
+            // separate component right away.
+            const bool bNotOutsideEverything(
+                maTotalBounds.overlaps( rRange ) );
+
+            // update own global bounds range
+            maTotalBounds.expand( rRange );
+
+            // assemble anything intersecting with rRange into
+            // this new connected component
+            ConnectedComponents aNewConnectedComponent;
+
+            // as at least rRange will be a member of
+            // aNewConnectedComponent (will be added below), can
+            // preset the overall bounds here.
+            aNewConnectedComponent.maTotalBounds = rRange;
+
+
+            //
+            //  STAGE 1: Search for intersecting maDisjunctAggregatesList entries
+            //  =================================================================
+            //
+
+            // if rRange is empty, it will intersect with no
+            // maDisjunctAggregatesList member. Thus, we can safe us
+            // the check.
+            // if rRange is outside all other rectangle, skip here,
+            // too
+            if( bNotOutsideEverything &&
+                !rRange.isEmpty() )
+            {
+                typename ConnectedComponentsType::iterator aCurrAggregate;
+                typename ConnectedComponentsType::iterator aLastAggregate;
+
+                // flag, determining whether we touched one or more of
+                // the maDisjunctAggregatesList entries. _If_ we did,
+                // we have to repeat the intersection process, because
+                // these changes might have generated new
+                // intersections.
+                bool bSomeAggregatesChanged;
+
+                // loop, until bSomeAggregatesChanged stays false
+                do
+                {
+                    // only continue loop if 'intersects' branch below was hit
+                    bSomeAggregatesChanged = false;
+
+                    // iterate over all current members of maDisjunctAggregatesList
+                    for( aCurrAggregate=maDisjunctAggregatesList.begin(),
+                             aLastAggregate=maDisjunctAggregatesList.end();
+                         aCurrAggregate != aLastAggregate; )
+                    {
+                        // first check if current component's bounds
+                        // are empty. This ensures that distinct empty
+                        // components are not merged into one
+                        // aggregate. As a matter of fact, they have
+                        // no position and size.
+
+                        if( !aCurrAggregate->maTotalBounds.isEmpty() &&
+                            aCurrAggregate->maTotalBounds.overlaps(
+                                aNewConnectedComponent.maTotalBounds ) )
+                        {
+                            // union the intersecting
+                            // maDisjunctAggregatesList element into
+                            // aNewConnectedComponent
+
+                            // calc union bounding box
+                            aNewConnectedComponent.maTotalBounds.expand( aCurrAggregate->maTotalBounds );
+
+                            // extract all aCurrAggregate components
+                            // to aNewConnectedComponent
+                            aNewConnectedComponent.maComponentList.splice(
+                                aNewConnectedComponent.maComponentList.end(),
+                                aCurrAggregate->maComponentList );
+
+                            // remove and delete aCurrAggregate entry
+                            // from list (we've gutted it's content
+                            // above). list::erase() will update our
+                            // iterator with the predecessor here.
+                            aCurrAggregate = maDisjunctAggregatesList.erase( aCurrAggregate );
+
+                            // at least one aggregate changed, need to rescan everything
+                            bSomeAggregatesChanged = true;
+                        }
+                        else
+                        {
+                            aCurrAggregate++;
+                        }
+                    }
+                }
+                while( bSomeAggregatesChanged );
+            }
+
+            //
+            //  STAGE 2: Add newly generated connected component list element
+            //  =============================================================
+            //
+
+            // add new component to the end of the component list
+            aNewConnectedComponent.maComponentList.push_back(
+                ComponentType( rRange, rUserData ) );
+
+            // do some consistency checks (aka post conditions)
+            OSL_ENSURE( !aNewConnectedComponent.maComponentList.empty(),
+                        "B2DConnectedRanges::addRange(): empty aggregate list" );
+            OSL_ENSURE( !aNewConnectedComponent.maTotalBounds.isEmpty() ||
+                        (aNewConnectedComponent.maTotalBounds.isEmpty() &&
+                         aNewConnectedComponent.maComponentList.size() == 1),
+                        "B2DConnectedRanges::addRange(): empty ranges must be solitary");
+
+            // add aNewConnectedComponent as a new entry to
+            // maDisjunctAggregatesList
+            maDisjunctAggregatesList.push_back( aNewConnectedComponent );
+        }
+
+        /** Apply a functor to each of the disjunct component
+            aggregates.
+
+            @param aFunctor
+            Functor to apply. Must provide an operator( const ConnectedComponents& ).
+
+            @return a copy of the functor, as applied to all aggregates.
+         */
+        template< typename UnaryFunctor > UnaryFunctor forEachAggregate( UnaryFunctor aFunctor ) const
+        {
+            return ::std::for_each( maDisjunctAggregatesList.begin(),
+                                    maDisjunctAggregatesList.end(),
+                                    aFunctor );
+        }
+
+    private:
+        // default: disabled copy/assignment
+        B2DConnectedRanges(const B2DConnectedRanges&);
+        B2DConnectedRanges& operator=( const B2DConnectedRanges& );
+
+        /** Current list of disjunct sets of connected components
+
+            Each entry corresponds to one of the top-level rectangles
+            in the drawing above.
+         */
+        ConnectedComponentsType maDisjunctAggregatesList;
+
+        /** Global bound rect over all added ranges.
+         */
+        B2DRange                maTotalBounds;
+    };
+}
+
+#endif /* _BGFX_RANGE_B2DCONNECTEDRANGES_HXX */
diff --git a/basegfx/inc/basegfx/range/b2dpolyrange.hxx b/basegfx/inc/basegfx/range/b2dpolyrange.hxx
new file mode 100644
index 000000000000..2202869dc921
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2dpolyrange.hxx
@@ -0,0 +1,145 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dmultirange.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2DPOLYRANGE_HXX
+#define _BGFX_RANGE_B2DPOLYRANGE_HXX
+
+#include <o3tl/cow_wrapper.hxx>
+#include <boost/tuple/tuple.hpp>
+#include <basegfx/vector/b2enums.hxx>
+
+namespace basegfx
+{
+    class B2DTuple;
+    class B2DRange;
+    class B2DPolyPolygon;
+    class ImplB2DPolyRange;
+
+    /** Multiple ranges in one object.
+
+        This class combines multiple ranges in one object, providing a
+        total, enclosing range for it.
+
+        You can use this class e.g. when updating views containing
+        rectangular objects. Add each modified object to a
+        B2DMultiRange, then test each viewable object against
+        intersection with the multi range.
+
+        Similar in spirit to the poly-polygon vs. polygon relationship.
+
+        Note that comparable to polygons, a poly-range can also
+        contain 'holes' - this is encoded via polygon orientation at
+        the poly-polygon, and via explicit flags for the poly-range.
+     */
+    class B2DPolyRange
+    {
+    public:
+        typedef boost::tuple<B2DRange,B2VectorOrientation> ElementType ;
+
+        B2DPolyRange();
+        ~B2DPolyRange();
+
+        /** Create a multi range with exactly one containing range
+         */
+        explicit B2DPolyRange( const ElementType& rElement );
+        B2DPolyRange( const B2DRange& rRange, B2VectorOrientation eOrient );
+        B2DPolyRange( const B2DPolyRange& );
+        B2DPolyRange& operator=( const B2DPolyRange& );
+
+        /// unshare this poly-range with all internally shared instances
+        void makeUnique();
+
+        bool operator==(const B2DPolyRange&) const;
+        bool operator!=(const B2DPolyRange&) const;
+
+        /// Number of included ranges
+        sal_uInt32 count() const;
+
+        ElementType getElement(sal_uInt32 nIndex) const;
+        void        setElement(sal_uInt32 nIndex, const ElementType& rElement );
+        void        setElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient );
+
+        // insert/append a single range
+        void insertElement(sal_uInt32 nIndex, const ElementType& rElement, sal_uInt32 nCount = 1);
+        void insertElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount = 1);
+        void appendElement(const ElementType& rElement, sal_uInt32 nCount = 1);
+        void appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount = 1);
+
+        // insert/append multiple ranges
+        void insertPolyRange(sal_uInt32 nIndex, const B2DPolyRange&);
+        void appendPolyRange(const B2DPolyRange&);
+
+        void remove(sal_uInt32 nIndex, sal_uInt32 nCount = 1);
+        void clear();
+
+        // flip range orientations - converts holes to solids, and vice versa
+        void flip();
+
+        /** Get overall range
+
+            @return
+            The union range of all contained ranges
+        */
+        B2DRange getBounds() const;
+
+        /** Test whether given tuple is inside one or more of the
+            included ranges. Does *not* use overall range, but checks
+            individually.
+         */
+        bool isInside( const B2DTuple& rTuple ) const;
+
+        /** Test whether given range is inside one or more of the
+            included ranges. Does *not* use overall range, but checks
+            individually.
+         */
+        bool isInside( const B2DRange& rRange ) const;
+
+        /** Test whether given range overlaps one or more of the
+            included ranges. Does *not* use overall range, but checks
+            individually.
+         */
+        bool overlaps( const B2DRange& rRange ) const;
+
+        /** Request a poly-polygon with solved cross-overs
+         */
+        B2DPolyPolygon solveCrossovers() const;
+
+        // element iterators (same iterator validity conditions as for vector)
+        const B2DRange* begin() const;
+        const B2DRange* end() const;
+        B2DRange* begin();
+        B2DRange* end();
+
+    private:
+        o3tl::cow_wrapper< ImplB2DPolyRange > mpImpl;
+    };
+}
+
+#endif /* _BGFX_RANGE_B2DPOLYRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/basegfx/inc/basegfx/range/b2drange.hxx
new file mode 100644
index 000000000000..fc3a6fe53659
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -0,0 +1,295 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2DRANGE_HXX
+#define _BGFX_RANGE_B2DRANGE_HXX
+
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/range/basicrange.hxx>
+#include <vector>
+
+
+namespace basegfx
+{
+    // predeclarations
+    class B2IRange;
+    class B2DHomMatrix;
+
+    class B2DRange
+    {
+    public:
+        typedef double          ValueType;
+        typedef DoubleTraits    TraitsType;
+
+        B2DRange()
+        {
+        }
+
+        explicit B2DRange(const B2DTuple& rTuple)
+        :   maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY())
+        {
+        }
+
+        B2DRange(double x1,
+                 double y1,
+                 double x2,
+                 double y2)
+        :   maRangeX(x1),
+            maRangeY(y1)
+        {
+            maRangeX.expand(x2);
+            maRangeY.expand(y2);
+        }
+
+        B2DRange(const B2DTuple& rTuple1,
+                 const B2DTuple& rTuple2)
+        :   maRangeX(rTuple1.getX()),
+            maRangeY(rTuple1.getY())
+        {
+            expand( rTuple2 );
+        }
+
+        B2DRange(const B2DRange& rRange)
+        :   maRangeX(rRange.maRangeX),
+            maRangeY(rRange.maRangeY)
+        {
+        }
+
+        explicit B2DRange(const B2IRange& rRange);
+
+        bool isEmpty() const
+        {
+            return (
+                maRangeX.isEmpty()
+                || maRangeY.isEmpty()
+                );
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+        }
+
+        bool operator==( const B2DRange& rRange ) const
+        {
+            return (maRangeX == rRange.maRangeX
+                && maRangeY == rRange.maRangeY);
+        }
+
+        bool operator!=( const B2DRange& rRange ) const
+        {
+            return (maRangeX != rRange.maRangeX
+                || maRangeY != rRange.maRangeY);
+        }
+
+        B2DRange& operator=(const B2DRange& rRange)
+        {
+            maRangeX = rRange.maRangeX;
+            maRangeY = rRange.maRangeY;
+            return *this;
+        }
+
+        bool equal(const B2DRange& rRange) const
+        {
+            return (maRangeX.equal(rRange.maRangeX)
+                    && maRangeY.equal(rRange.maRangeY));
+        }
+
+        double getMinX() const
+        {
+            return maRangeX.getMinimum();
+        }
+
+        double getMinY() const
+        {
+            return maRangeY.getMinimum();
+        }
+
+        double getMaxX() const
+        {
+            return maRangeX.getMaximum();
+        }
+
+        double getMaxY() const
+        {
+            return maRangeY.getMaximum();
+        }
+
+        double getWidth() const
+        {
+            return maRangeX.getRange();
+        }
+
+        double getHeight() const
+        {
+            return maRangeY.getRange();
+        }
+
+        B2DPoint getMinimum() const
+        {
+            return B2DPoint(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum()
+                );
+        }
+
+        B2DPoint getMaximum() const
+        {
+            return B2DPoint(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum()
+                );
+        }
+
+        B2DVector getRange() const
+        {
+            return B2DVector(
+                maRangeX.getRange(),
+                maRangeY.getRange()
+                );
+        }
+
+        B2DPoint getCenter() const
+        {
+            return B2DPoint(
+                maRangeX.getCenter(),
+                maRangeY.getCenter()
+                );
+        }
+
+        double getCenterX() const
+        {
+            return maRangeX.getCenter();
+        }
+
+        double getCenterY() const
+        {
+            return maRangeY.getCenter();
+        }
+
+        bool isInside(const B2DTuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                );
+        }
+
+        bool isInside(const B2DRange& rRange) const
+        {
+            return (
+                maRangeX.isInside(rRange.maRangeX)
+                && maRangeY.isInside(rRange.maRangeY)
+                );
+        }
+
+        bool overlaps(const B2DRange& rRange) const
+        {
+            return (
+                maRangeX.overlaps(rRange.maRangeX)
+                && maRangeY.overlaps(rRange.maRangeY)
+                );
+        }
+
+        bool overlapsMore(const B2DRange& rRange) const
+        {
+            return (
+                maRangeX.overlapsMore(rRange.maRangeX)
+                && maRangeY.overlapsMore(rRange.maRangeY)
+                );
+        }
+
+        void expand(const B2DTuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+        }
+
+        void expand(const B2DRange& rRange)
+        {
+            maRangeX.expand(rRange.maRangeX);
+            maRangeY.expand(rRange.maRangeY);
+        }
+
+        void intersect(const B2DRange& rRange)
+        {
+            maRangeX.intersect(rRange.maRangeX);
+            maRangeY.intersect(rRange.maRangeY);
+        }
+
+        void grow(double fValue)
+        {
+            maRangeX.grow(fValue);
+            maRangeY.grow(fValue);
+        }
+
+        void transform(const B2DHomMatrix& rMatrix);
+
+    private:
+        typedef ::basegfx::BasicRange< ValueType, TraitsType >  MyBasicRange;
+
+        MyBasicRange        maRangeX;
+        MyBasicRange        maRangeY;
+    };
+
+    /** Round double to nearest integer for 2D range
+
+        @return the nearest integer for this range
+    */
+    B2IRange fround(const B2DRange& rRange);
+
+    /** Compute the set difference of the two given ranges
+
+        This method calculates the symmetric difference (aka XOR)
+        between the two given ranges, and returning the resulting
+        ranges. Thus, the result will contain all areas where one, but
+        not both ranges lie.
+
+        @param o_rResult
+        Result vector. The up to four difference ranges are returned
+        within this vector
+
+        @param rFirst
+        The first range
+
+        @param rSecond
+        The second range
+
+        @return the input vector
+     */
+    ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >& o_rResult,
+                                                     const B2DRange&            rFirst,
+                                                     const B2DRange&            rSecond );
+
+} // end of namespace basegfx
+
+
+#endif /* _BGFX_RANGE_B2DRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/b2drangeclipper.hxx b/basegfx/inc/basegfx/range/b2drangeclipper.hxx
new file mode 100644
index 000000000000..3285ffeaffe1
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2drangeclipper.hxx
@@ -0,0 +1,53 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dmultirange.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2DRANGECLIPPER_HXX
+#define _BGFX_RANGE_B2DRANGECLIPPER_HXX
+
+#include <basegfx/range/b2dpolyrange.hxx>
+#include <vector>
+
+namespace basegfx
+{
+    namespace tools
+    {
+        /** Extract poly-polygon w/o self-intersections from poly-range
+
+            Similar to the solveCrossovers(const B2DPolyPolygon&)
+            method, this one calculates a self-intersection-free
+            poly-polygon with the same topology, and encoding
+            inside/outsidedness via polygon orientation and layering.
+         */
+        B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges,
+                                       const std::vector<B2VectorOrientation>& rOrientations);
+    }
+}
+
+#endif /* _BGFX_RANGE_B2DRANGECLIPPER_HXX */
diff --git a/basegfx/inc/basegfx/range/b2drectangle.hxx b/basegfx/inc/basegfx/range/b2drectangle.hxx
new file mode 100644
index 000000000000..1fd2087f0bcd
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2drectangle.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2DRECTANGLE_HXX
+#define _BGFX_RANGE_B2DRECTANGLE_HXX
+
+#include <basegfx/range/b2drange.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B2DRange exactly models a Rectangle, thus,
+    // for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B2DRange B2DRectangle;
+}
+
+#endif /* _BGFX_RANGE_B2DRECTANGLE_HXX */
diff --git a/basegfx/inc/basegfx/range/b2ibox.hxx b/basegfx/inc/basegfx/range/b2ibox.hxx
new file mode 100644
index 000000000000..a188c7e8abe6
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2ibox.hxx
@@ -0,0 +1,251 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2IBOX_HXX
+#define _BGFX_RANGE_B2IBOX_HXX
+
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/tuple/b2ituple.hxx>
+#include <basegfx/tuple/b2i64tuple.hxx>
+#include <basegfx/range/basicbox.hxx>
+#include <vector>
+
+
+namespace basegfx
+{
+    class B2IBox
+    {
+    public:
+        typedef sal_Int32       ValueType;
+        typedef Int32Traits     TraitsType;
+
+        B2IBox()
+        {
+        }
+
+        explicit B2IBox(const B2ITuple& rTuple)
+        :   maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY())
+        {
+        }
+
+        B2IBox(sal_Int32 x1,
+               sal_Int32 y1,
+               sal_Int32 x2,
+               sal_Int32 y2) :
+            maRangeX(x1),
+            maRangeY(y1)
+        {
+            maRangeX.expand(x2);
+            maRangeY.expand(y2);
+        }
+
+        B2IBox(const B2ITuple& rTuple1,
+               const B2ITuple& rTuple2) :
+            maRangeX(rTuple1.getX()),
+            maRangeY(rTuple1.getY())
+        {
+            expand( rTuple2 );
+        }
+
+        B2IBox(const B2IBox& rBox) :
+            maRangeX(rBox.maRangeX),
+            maRangeY(rBox.maRangeY)
+        {
+        }
+
+        bool isEmpty() const
+        {
+            return maRangeX.isEmpty() || maRangeY.isEmpty();
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+        }
+
+        bool operator==( const B2IBox& rBox ) const
+        {
+            return (maRangeX == rBox.maRangeX
+                && maRangeY == rBox.maRangeY);
+        }
+
+        bool operator!=( const B2IBox& rBox ) const
+        {
+            return (maRangeX != rBox.maRangeX
+                || maRangeY != rBox.maRangeY);
+        }
+
+        void operator=(const B2IBox& rBox)
+        {
+            maRangeX = rBox.maRangeX;
+            maRangeY = rBox.maRangeY;
+        }
+
+        sal_Int32 getMinX() const
+        {
+            return maRangeX.getMinimum();
+        }
+
+        sal_Int32 getMinY() const
+        {
+            return maRangeY.getMinimum();
+        }
+
+        sal_Int32 getMaxX() const
+        {
+            return maRangeX.getMaximum();
+        }
+
+        sal_Int32 getMaxY() const
+        {
+            return maRangeY.getMaximum();
+        }
+
+        sal_Int64 getWidth() const
+        {
+            return maRangeX.getRange();
+        }
+
+        sal_Int64 getHeight() const
+        {
+            return maRangeY.getRange();
+        }
+
+        B2IPoint getMinimum() const
+        {
+            return B2IPoint(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum()
+                );
+        }
+
+        B2IPoint getMaximum() const
+        {
+            return B2IPoint(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum()
+                );
+        }
+
+        B2I64Tuple getRange() const
+        {
+            return B2I64Tuple(
+                maRangeX.getRange(),
+                maRangeY.getRange()
+                );
+        }
+
+        B2DPoint getCenter() const
+        {
+            return B2DPoint(
+                maRangeX.getCenter(),
+                maRangeY.getCenter()
+                );
+        }
+
+        bool isInside(const B2ITuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                );
+        }
+
+        bool isInside(const B2IBox& rBox) const
+        {
+            return (
+                maRangeX.isInside(rBox.maRangeX)
+                && maRangeY.isInside(rBox.maRangeY)
+                );
+        }
+
+        bool overlaps(const B2IBox& rBox) const
+        {
+            return (
+                maRangeX.overlaps(rBox.maRangeX)
+                && maRangeY.overlaps(rBox.maRangeY)
+                );
+        }
+
+        void expand(const B2ITuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+        }
+
+        void expand(const B2IBox& rBox)
+        {
+            maRangeX.expand(rBox.maRangeX);
+            maRangeY.expand(rBox.maRangeY);
+        }
+
+        void intersect(const B2IBox& rBox)
+        {
+            maRangeX.intersect(rBox.maRangeX);
+            maRangeY.intersect(rBox.maRangeY);
+        }
+
+        void grow(sal_Int32 nValue)
+        {
+            maRangeX.grow(nValue);
+            maRangeY.grow(nValue);
+        }
+
+    private:
+        BasicBox        maRangeX;
+        BasicBox        maRangeY;
+    };
+
+    /** Compute the set difference of the two given boxes
+
+        This method calculates the symmetric difference (aka XOR)
+        between the two given boxes, and returning the resulting
+        boxes. Thus, the result will contain all areas where one, but
+        not both boxes lie.
+
+        @param o_rResult
+        Result vector. The up to four difference boxes are returned
+        within this vector
+
+        @param rFirst
+        The first box
+
+        @param rSecond
+        The second box
+
+        @return the input vector
+     */
+    ::std::vector< B2IBox >& computeSetDifference( ::std::vector< B2IBox >& o_rResult,
+                                                   const B2IBox&            rFirst,
+                                                   const B2IBox&            rSecond );
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_B2IBOX_HXX */
diff --git a/basegfx/inc/basegfx/range/b2irange.hxx b/basegfx/inc/basegfx/range/b2irange.hxx
new file mode 100644
index 000000000000..8d4690283da0
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2irange.hxx
@@ -0,0 +1,254 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2IRANGE_HXX
+#define _BGFX_RANGE_B2IRANGE_HXX
+
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/tuple/b2ituple.hxx>
+#include <basegfx/tuple/b2i64tuple.hxx>
+#include <basegfx/range/basicrange.hxx>
+#include <vector>
+
+
+namespace basegfx
+{
+    class B2IRange
+    {
+    public:
+        typedef sal_Int32       ValueType;
+        typedef Int32Traits     TraitsType;
+
+        B2IRange()
+        {
+        }
+
+        explicit B2IRange(const B2ITuple& rTuple)
+        :   maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY())
+        {
+        }
+
+        B2IRange(sal_Int32 x1,
+                 sal_Int32 y1,
+                 sal_Int32 x2,
+                 sal_Int32 y2)
+        :   maRangeX(x1),
+            maRangeY(y1)
+        {
+            maRangeX.expand(x2);
+            maRangeY.expand(y2);
+        }
+
+        B2IRange(const B2ITuple& rTuple1,
+                 const B2ITuple& rTuple2)
+        :   maRangeX(rTuple1.getX()),
+            maRangeY(rTuple1.getY())
+        {
+            expand( rTuple2 );
+        }
+
+        B2IRange(const B2IRange& rRange)
+        :   maRangeX(rRange.maRangeX),
+            maRangeY(rRange.maRangeY)
+        {
+        }
+
+        bool isEmpty() const
+        {
+            return maRangeX.isEmpty() || maRangeY.isEmpty();
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+        }
+
+        bool operator==( const B2IRange& rRange ) const
+        {
+            return (maRangeX == rRange.maRangeX
+                && maRangeY == rRange.maRangeY);
+        }
+
+        bool operator!=( const B2IRange& rRange ) const
+        {
+            return (maRangeX != rRange.maRangeX
+                || maRangeY != rRange.maRangeY);
+        }
+
+        B2IRange& operator=(const B2IRange& rRange)
+        {
+            maRangeX = rRange.maRangeX;
+            maRangeY = rRange.maRangeY;
+            return *this;
+        }
+
+        sal_Int32 getMinX() const
+        {
+            return maRangeX.getMinimum();
+        }
+
+        sal_Int32 getMinY() const
+        {
+            return maRangeY.getMinimum();
+        }
+
+        sal_Int32 getMaxX() const
+        {
+            return maRangeX.getMaximum();
+        }
+
+        sal_Int32 getMaxY() const
+        {
+            return maRangeY.getMaximum();
+        }
+
+        sal_Int64 getWidth() const
+        {
+            return maRangeX.getRange();
+        }
+
+        sal_Int64 getHeight() const
+        {
+            return maRangeY.getRange();
+        }
+
+        B2IPoint getMinimum() const
+        {
+            return B2IPoint(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum()
+                );
+        }
+
+        B2IPoint getMaximum() const
+        {
+            return B2IPoint(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum()
+                );
+        }
+
+        B2I64Tuple getRange() const
+        {
+            return B2I64Tuple(
+                maRangeX.getRange(),
+                maRangeY.getRange()
+                );
+        }
+
+        B2DPoint getCenter() const
+        {
+            return B2DPoint(
+                maRangeX.getCenter(),
+                maRangeY.getCenter()
+                );
+        }
+
+        bool isInside(const B2ITuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                );
+        }
+
+        bool isInside(const B2IRange& rRange) const
+        {
+            return (
+                maRangeX.isInside(rRange.maRangeX)
+                && maRangeY.isInside(rRange.maRangeY)
+                );
+        }
+
+        bool overlaps(const B2IRange& rRange) const
+        {
+            return (
+                maRangeX.overlaps(rRange.maRangeX)
+                && maRangeY.overlaps(rRange.maRangeY)
+                );
+        }
+
+        void expand(const B2ITuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+        }
+
+        void expand(const B2IRange& rRange)
+        {
+            maRangeX.expand(rRange.maRangeX);
+            maRangeY.expand(rRange.maRangeY);
+        }
+
+        void intersect(const B2IRange& rRange)
+        {
+            maRangeX.intersect(rRange.maRangeX);
+            maRangeY.intersect(rRange.maRangeY);
+        }
+
+        void grow(sal_Int32 nValue)
+        {
+            maRangeX.grow(nValue);
+            maRangeY.grow(nValue);
+        }
+
+    private:
+        typedef ::basegfx::BasicRange< ValueType, TraitsType >  MyBasicRange;
+
+        MyBasicRange        maRangeX;
+        MyBasicRange        maRangeY;
+    };
+
+    /** Compute the set difference of the two given ranges
+
+        This method calculates the symmetric difference (aka XOR)
+        between the two given ranges, and returning the resulting
+        ranges. Thus, the result will contain all areas where one, but
+        not both ranges lie.
+
+        @param o_rResult
+        Result vector. The up to four difference ranges are returned
+        within this vector
+
+        @param rFirst
+        The first range
+
+        @param rSecond
+        The second range
+
+        @return the input vector
+     */
+    ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >& o_rResult,
+                                                     const B2IRange&            rFirst,
+                                                     const B2IRange&            rSecond );
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_B2IRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/b2irectangle.hxx b/basegfx/inc/basegfx/range/b2irectangle.hxx
new file mode 100644
index 000000000000..a9e46c82710c
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b2irectangle.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B2IRECTANGLE_HXX
+#define _BGFX_RANGE_B2IRECTANGLE_HXX
+
+#include <basegfx/range/b2irange.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B2IRange exactly models a Rectangle, thus,
+    // for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B2IRange B2IRectangle;
+}
+
+#endif /* _BGFX_RANGE_B2IRECTANGLE_HXX */
diff --git a/basegfx/inc/basegfx/range/b3drange.hxx b/basegfx/inc/basegfx/range/b3drange.hxx
new file mode 100644
index 000000000000..2a2a42aa0718
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b3drange.hxx
@@ -0,0 +1,302 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B3DRANGE_HXX
+#define _BGFX_RANGE_B3DRANGE_HXX
+
+#include <basegfx/vector/b3dvector.hxx>
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/tuple/b3dtuple.hxx>
+#include <basegfx/range/basicrange.hxx>
+
+namespace basegfx
+{
+    // predeclarations
+    class B3IRange;
+    class B3DHomMatrix;
+
+    class B3DRange
+    {
+        typedef ::basegfx::BasicRange< double, DoubleTraits >   MyBasicRange;
+
+        MyBasicRange            maRangeX;
+        MyBasicRange            maRangeY;
+        MyBasicRange            maRangeZ;
+
+    public:
+        B3DRange()
+        {
+        }
+
+        explicit B3DRange(const B3DTuple& rTuple)
+        :   maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY()),
+            maRangeZ(rTuple.getZ())
+        {
+        }
+
+        B3DRange(double x1,
+                 double y1,
+                 double z1,
+                 double x2,
+                 double y2,
+                 double z2)
+        :   maRangeX(x1),
+            maRangeY(y1),
+            maRangeZ(z1)
+        {
+            maRangeX.expand(x2);
+            maRangeY.expand(y2);
+            maRangeZ.expand(z2);
+        }
+
+        B3DRange(const B3DTuple& rTuple1,
+                 const B3DTuple& rTuple2)
+        :   maRangeX(rTuple1.getX()),
+            maRangeY(rTuple1.getY()),
+            maRangeZ(rTuple1.getZ())
+        {
+            expand(rTuple2);
+        }
+
+        B3DRange(const B3DRange& rRange)
+        :   maRangeX(rRange.maRangeX),
+            maRangeY(rRange.maRangeY),
+            maRangeZ(rRange.maRangeZ)
+        {
+        }
+
+        explicit B3DRange(const B3IRange& rRange);
+
+        bool isEmpty() const
+        {
+            return (
+                maRangeX.isEmpty()
+                || maRangeY.isEmpty()
+                || maRangeZ.isEmpty()
+                );
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+            maRangeZ.reset();
+        }
+
+        bool operator==( const B3DRange& rRange ) const
+        {
+            return (maRangeX == rRange.maRangeX
+                && maRangeY == rRange.maRangeY
+                && maRangeZ == rRange.maRangeZ);
+        }
+
+        bool operator!=( const B3DRange& rRange ) const
+        {
+            return (maRangeX != rRange.maRangeX
+                || maRangeY != rRange.maRangeY
+                || maRangeZ != rRange.maRangeZ);
+        }
+
+        B3DRange& operator=(const B3DRange& rRange)
+        {
+            maRangeX = rRange.maRangeX;
+            maRangeY = rRange.maRangeY;
+            maRangeZ = rRange.maRangeZ;
+            return *this;
+        }
+
+        bool equal(const B3DRange& rRange) const
+        {
+            return (maRangeX.equal(rRange.maRangeX)
+                    && maRangeY.equal(rRange.maRangeY)
+                    && maRangeZ.equal(rRange.maRangeZ));
+        }
+
+        double getMinX() const
+        {
+            return maRangeX.getMinimum();
+        }
+
+        double getMinY() const
+        {
+            return maRangeY.getMinimum();
+        }
+
+        double getMinZ() const
+        {
+            return maRangeZ.getMinimum();
+        }
+
+        double getMaxX() const
+        {
+            return maRangeX.getMaximum();
+        }
+
+        double getMaxY() const
+        {
+            return maRangeY.getMaximum();
+        }
+
+        double getMaxZ() const
+        {
+            return maRangeZ.getMaximum();
+        }
+
+        double getWidth() const
+        {
+            return maRangeX.getRange();
+        }
+
+        double getHeight() const
+        {
+            return maRangeY.getRange();
+        }
+
+        double getDepth() const
+        {
+            return maRangeZ.getRange();
+        }
+
+        B3DPoint getMinimum() const
+        {
+            return B3DPoint(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum(),
+                maRangeZ.getMinimum()
+                );
+        }
+
+        B3DPoint getMaximum() const
+        {
+            return B3DPoint(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum(),
+                maRangeZ.getMaximum()
+                );
+        }
+
+        B3DVector getRange() const
+        {
+            return B3DVector(
+                maRangeX.getRange(),
+                maRangeY.getRange(),
+                maRangeZ.getRange()
+                );
+        }
+
+        B3DPoint getCenter() const
+        {
+            return B3DPoint(
+                maRangeX.getCenter(),
+                maRangeY.getCenter(),
+                maRangeZ.getCenter()
+                );
+        }
+
+        double getCenterX() const
+        {
+            return maRangeX.getCenter();
+        }
+
+        double getCenterY() const
+        {
+            return maRangeY.getCenter();
+        }
+
+        double getCenterZ() const
+        {
+            return maRangeZ.getCenter();
+        }
+
+        bool isInside(const B3DTuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                && maRangeZ.isInside(rTuple.getZ())
+                );
+        }
+
+        bool isInside(const B3DRange& rRange) const
+        {
+            return (
+                maRangeX.isInside(rRange.maRangeX)
+                && maRangeY.isInside(rRange.maRangeY)
+                && maRangeZ.isInside(rRange.maRangeZ)
+                );
+        }
+
+        bool overlaps(const B3DRange& rRange) const
+        {
+            return (
+                maRangeX.overlaps(rRange.maRangeX)
+                && maRangeY.overlaps(rRange.maRangeY)
+                && maRangeZ.overlaps(rRange.maRangeZ)
+                );
+        }
+
+        void expand(const B3DTuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+            maRangeZ.expand(rTuple.getZ());
+        }
+
+        void expand(const B3DRange& rRange)
+        {
+            maRangeX.expand(rRange.maRangeX);
+            maRangeY.expand(rRange.maRangeY);
+            maRangeZ.expand(rRange.maRangeZ);
+        }
+
+        void intersect(const B3DRange& rRange)
+        {
+            maRangeX.intersect(rRange.maRangeX);
+            maRangeY.intersect(rRange.maRangeY);
+            maRangeZ.intersect(rRange.maRangeZ);
+        }
+
+        void grow(double fValue)
+        {
+            maRangeX.grow(fValue);
+            maRangeY.grow(fValue);
+            maRangeZ.grow(fValue);
+        }
+
+        void transform(const B3DHomMatrix& rMatrix);
+    };
+
+    /** Round double to nearest integer for 3D range
+
+        @return the nearest integer for this range
+    */
+    B3IRange fround(const B3DRange& rRange);
+} // end of namespace basegfx
+
+
+#endif /* _BGFX_RANGE_B3DRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/b3dvolume.hxx b/basegfx/inc/basegfx/range/b3dvolume.hxx
new file mode 100644
index 000000000000..18163d5b6c34
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b3dvolume.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B3DBOX_HXX
+#define _BGFX_RANGE_B3DBOX_HXX
+
+#include <basegfx/range/b3drange.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B3DRange exactly models a Volume in 3D, thus,
+    // for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B3DRange B3DVolume;
+}
+
+#endif /* _BGFX_RANGE_B3DBOX_HXX */
diff --git a/basegfx/inc/basegfx/range/b3ibox.hxx b/basegfx/inc/basegfx/range/b3ibox.hxx
new file mode 100644
index 000000000000..f9693465a2bb
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b3ibox.hxx
@@ -0,0 +1,259 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B3IBOX_HXX
+#define _BGFX_RANGE_B3IBOX_HXX
+
+#include <basegfx/point/b3ipoint.hxx>
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/tuple/b3ituple.hxx>
+#include <basegfx/tuple/b3i64tuple.hxx>
+#include <basegfx/range/basicbox.hxx>
+
+namespace basegfx
+{
+    class B3IBox
+    {
+        BasicBox            maRangeX;
+        BasicBox            maRangeY;
+        BasicBox            maRangeZ;
+
+    public:
+        B3IBox()
+        {
+        }
+
+        explicit B3IBox(const B3ITuple& rTuple) :
+            maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY()),
+            maRangeZ(rTuple.getZ())
+        {
+        }
+
+        B3IBox(sal_Int32 x1,
+               sal_Int32 y1,
+               sal_Int32 z1,
+               sal_Int32 x2,
+               sal_Int32 y2,
+               sal_Int32 z2) :
+            maRangeX(x1),
+            maRangeY(y1),
+            maRangeZ(z1)
+        {
+            maRangeX.expand(x2);
+            maRangeY.expand(y2);
+            maRangeZ.expand(z2);
+        }
+
+        B3IBox(const B3ITuple& rTuple1,
+               const B3ITuple& rTuple2) :
+            maRangeX(rTuple1.getX()),
+            maRangeY(rTuple1.getY()),
+            maRangeZ(rTuple1.getZ())
+        {
+            expand(rTuple2);
+        }
+
+        B3IBox(const B3IBox& rBox) :
+            maRangeX(rBox.maRangeX),
+            maRangeY(rBox.maRangeY),
+            maRangeZ(rBox.maRangeZ)
+        {
+        }
+
+        bool isEmpty() const
+        {
+            return maRangeX.isEmpty() || maRangeY.isEmpty() || maRangeZ.isEmpty();
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+            maRangeZ.reset();
+        }
+
+        bool operator==( const B3IBox& rBox ) const
+        {
+            return (maRangeX == rBox.maRangeX
+                && maRangeY == rBox.maRangeY
+                && maRangeZ == rBox.maRangeZ);
+        }
+
+        bool operator!=( const B3IBox& rBox ) const
+        {
+            return (maRangeX != rBox.maRangeX
+                || maRangeY != rBox.maRangeY
+                || maRangeZ != rBox.maRangeZ);
+        }
+
+        void operator=(const B3IBox& rBox)
+        {
+            maRangeX = rBox.maRangeX;
+            maRangeY = rBox.maRangeY;
+            maRangeZ = rBox.maRangeZ;
+        }
+
+        sal_Int32 getMinX() const
+        {
+            return maRangeX.getMinimum();
+        }
+
+        sal_Int32 getMinY() const
+        {
+            return maRangeY.getMinimum();
+        }
+
+        sal_Int32 getMinZ() const
+        {
+            return maRangeZ.getMinimum();
+        }
+
+        sal_Int32 getMaxX() const
+        {
+            return maRangeX.getMaximum();
+        }
+
+        sal_Int32 getMaxY() const
+        {
+            return maRangeY.getMaximum();
+        }
+
+        sal_Int32 getMaxZ() const
+        {
+            return maRangeZ.getMaximum();
+        }
+
+        sal_Int64 getWidth() const
+        {
+            return maRangeX.getRange();
+        }
+
+        sal_Int64 getHeight() const
+        {
+            return maRangeY.getRange();
+        }
+
+        sal_Int64 getDepth() const
+        {
+            return maRangeZ.getRange();
+        }
+
+        B3IPoint getMinimum() const
+        {
+            return B3IPoint(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum(),
+                maRangeZ.getMinimum()
+                );
+        }
+
+        B3IPoint getMaximum() const
+        {
+            return B3IPoint(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum(),
+                maRangeZ.getMaximum()
+                );
+        }
+
+        B3I64Tuple getRange() const
+        {
+            return B3I64Tuple(
+                maRangeX.getRange(),
+                maRangeY.getRange(),
+                maRangeZ.getRange()
+                );
+        }
+
+        B3DPoint getCenter() const
+        {
+            return B3DPoint(
+                maRangeX.getCenter(),
+                maRangeY.getCenter(),
+                maRangeZ.getCenter()
+                );
+        }
+
+        bool isInside(const B3ITuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                && maRangeZ.isInside(rTuple.getZ())
+                );
+        }
+
+        bool isInside(const B3IBox& rBox) const
+        {
+            return (
+                maRangeX.isInside(rBox.maRangeX)
+                && maRangeY.isInside(rBox.maRangeY)
+                && maRangeZ.isInside(rBox.maRangeZ)
+                );
+        }
+
+        bool overlaps(const B3IBox& rBox) const
+        {
+            return (
+                maRangeX.overlaps(rBox.maRangeX)
+                && maRangeY.overlaps(rBox.maRangeY)
+                && maRangeZ.overlaps(rBox.maRangeZ)
+                );
+        }
+
+        void expand(const B3ITuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+            maRangeZ.expand(rTuple.getZ());
+        }
+
+        void expand(const B3IBox& rBox)
+        {
+            maRangeX.expand(rBox.maRangeX);
+            maRangeY.expand(rBox.maRangeY);
+            maRangeZ.expand(rBox.maRangeZ);
+        }
+
+        void intersect(const B3IBox& rBox)
+        {
+            maRangeX.intersect(rBox.maRangeX);
+            maRangeY.intersect(rBox.maRangeY);
+            maRangeZ.intersect(rBox.maRangeZ);
+        }
+
+        void grow(sal_Int32 nValue)
+        {
+            maRangeX.grow(nValue);
+            maRangeY.grow(nValue);
+            maRangeZ.grow(nValue);
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_B3IBOX_HXX */
diff --git a/basegfx/inc/basegfx/range/b3irange.hxx b/basegfx/inc/basegfx/range/b3irange.hxx
new file mode 100644
index 000000000000..e2b9a08c3093
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b3irange.hxx
@@ -0,0 +1,262 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B3IRANGE_HXX
+#define _BGFX_RANGE_B3IRANGE_HXX
+
+#include <basegfx/point/b3ipoint.hxx>
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/tuple/b3ituple.hxx>
+#include <basegfx/tuple/b3i64tuple.hxx>
+#include <basegfx/range/basicrange.hxx>
+
+namespace basegfx
+{
+    class B3IRange
+    {
+        typedef ::basegfx::BasicRange< sal_Int32, Int32Traits > MyBasicRange;
+
+        MyBasicRange            maRangeX;
+        MyBasicRange            maRangeY;
+        MyBasicRange            maRangeZ;
+
+    public:
+        B3IRange()
+        {
+        }
+
+        explicit B3IRange(const B3ITuple& rTuple)
+        :   maRangeX(rTuple.getX()),
+            maRangeY(rTuple.getY()),
+            maRangeZ(rTuple.getZ())
+        {
+        }
+
+        B3IRange(sal_Int32 x1,
+                 sal_Int32 y1,
+                 sal_Int32 z1,
+                 sal_Int32 x2,
+                 sal_Int32 y2,
+                 sal_Int32 z2)
+        :   maRangeX(x1),
+            maRangeY(y1),
+            maRangeZ(z1)
+        {
+            maRangeX.expand(x2);
+            maRangeY.expand(y2);
+            maRangeZ.expand(z2);
+        }
+
+        B3IRange(const B3ITuple& rTuple1,
+                 const B3ITuple& rTuple2)
+        :   maRangeX(rTuple1.getX()),
+            maRangeY(rTuple1.getY()),
+            maRangeZ(rTuple1.getZ())
+        {
+            expand(rTuple2);
+        }
+
+        B3IRange(const B3IRange& rRange)
+        :   maRangeX(rRange.maRangeX),
+            maRangeY(rRange.maRangeY),
+            maRangeZ(rRange.maRangeZ)
+        {
+        }
+
+        bool isEmpty() const
+        {
+            return maRangeX.isEmpty() || maRangeY.isEmpty() || maRangeZ.isEmpty();
+        }
+
+        void reset()
+        {
+            maRangeX.reset();
+            maRangeY.reset();
+            maRangeZ.reset();
+        }
+
+        bool operator==( const B3IRange& rRange ) const
+        {
+            return (maRangeX == rRange.maRangeX
+                && maRangeY == rRange.maRangeY
+                && maRangeZ == rRange.maRangeZ);
+        }
+
+        bool operator!=( const B3IRange& rRange ) const
+        {
+            return (maRangeX != rRange.maRangeX
+                || maRangeY != rRange.maRangeY
+                || maRangeZ != rRange.maRangeZ);
+        }
+
+        B3IRange& operator=(const B3IRange& rRange)
+        {
+            maRangeX = rRange.maRangeX;
+            maRangeY = rRange.maRangeY;
+            maRangeZ = rRange.maRangeZ;
+            return *this;
+        }
+
+        sal_Int32 getMinX() const
+        {
+            return maRangeX.getMinimum();
+        }
+
+        sal_Int32 getMinY() const
+        {
+            return maRangeY.getMinimum();
+        }
+
+        sal_Int32 getMinZ() const
+        {
+            return maRangeZ.getMinimum();
+        }
+
+        sal_Int32 getMaxX() const
+        {
+            return maRangeX.getMaximum();
+        }
+
+        sal_Int32 getMaxY() const
+        {
+            return maRangeY.getMaximum();
+        }
+
+        sal_Int32 getMaxZ() const
+        {
+            return maRangeZ.getMaximum();
+        }
+
+        sal_Int64 getWidth() const
+        {
+            return maRangeX.getRange();
+        }
+
+        sal_Int64 getHeight() const
+        {
+            return maRangeY.getRange();
+        }
+
+        sal_Int64 getDepth() const
+        {
+            return maRangeZ.getRange();
+        }
+
+        B3IPoint getMinimum() const
+        {
+            return B3IPoint(
+                maRangeX.getMinimum(),
+                maRangeY.getMinimum(),
+                maRangeZ.getMinimum()
+                );
+        }
+
+        B3IPoint getMaximum() const
+        {
+            return B3IPoint(
+                maRangeX.getMaximum(),
+                maRangeY.getMaximum(),
+                maRangeZ.getMaximum()
+                );
+        }
+
+        B3I64Tuple getRange() const
+        {
+            return B3I64Tuple(
+                maRangeX.getRange(),
+                maRangeY.getRange(),
+                maRangeZ.getRange()
+                );
+        }
+
+        B3DPoint getCenter() const
+        {
+            return B3DPoint(
+                maRangeX.getCenter(),
+                maRangeY.getCenter(),
+                maRangeZ.getCenter()
+                );
+        }
+
+        bool isInside(const B3ITuple& rTuple) const
+        {
+            return (
+                maRangeX.isInside(rTuple.getX())
+                && maRangeY.isInside(rTuple.getY())
+                && maRangeZ.isInside(rTuple.getZ())
+                );
+        }
+
+        bool isInside(const B3IRange& rRange) const
+        {
+            return (
+                maRangeX.isInside(rRange.maRangeX)
+                && maRangeY.isInside(rRange.maRangeY)
+                && maRangeZ.isInside(rRange.maRangeZ)
+                );
+        }
+
+        bool overlaps(const B3IRange& rRange) const
+        {
+            return (
+                maRangeX.overlaps(rRange.maRangeX)
+                && maRangeY.overlaps(rRange.maRangeY)
+                && maRangeZ.overlaps(rRange.maRangeZ)
+                );
+        }
+
+        void expand(const B3ITuple& rTuple)
+        {
+            maRangeX.expand(rTuple.getX());
+            maRangeY.expand(rTuple.getY());
+            maRangeZ.expand(rTuple.getZ());
+        }
+
+        void expand(const B3IRange& rRange)
+        {
+            maRangeX.expand(rRange.maRangeX);
+            maRangeY.expand(rRange.maRangeY);
+            maRangeZ.expand(rRange.maRangeZ);
+        }
+
+        void intersect(const B3IRange& rRange)
+        {
+            maRangeX.intersect(rRange.maRangeX);
+            maRangeY.intersect(rRange.maRangeY);
+            maRangeZ.intersect(rRange.maRangeZ);
+        }
+
+        void grow(sal_Int32 nValue)
+        {
+            maRangeX.grow(nValue);
+            maRangeY.grow(nValue);
+            maRangeZ.grow(nValue);
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_B3IRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/b3ivolume.hxx b/basegfx/inc/basegfx/range/b3ivolume.hxx
new file mode 100644
index 000000000000..0250a9050251
--- /dev/null
+++ b/basegfx/inc/basegfx/range/b3ivolume.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_B3IBOX_HXX
+#define _BGFX_RANGE_B3IBOX_HXX
+
+#include <basegfx/range/b3irange.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B3IRange exactly models a Box in 3D, thus,
+    // for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B3IRange B3IBox;
+}
+
+#endif /* _BGFX_RANGE_B3IBOX_HXX */
diff --git a/basegfx/inc/basegfx/range/basicbox.hxx b/basegfx/inc/basegfx/range/basicbox.hxx
new file mode 100644
index 000000000000..0a5274bc9bc9
--- /dev/null
+++ b/basegfx/inc/basegfx/range/basicbox.hxx
@@ -0,0 +1,136 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_BASICBOX_HXX
+#define _BGFX_RANGE_BASICBOX_HXX
+
+#include <basegfx/range/basicrange.hxx>
+
+
+namespace basegfx
+{
+    /** Specialization of BasicRange, handling the inside predicates
+        differently.
+
+        This template considers the rightmost and bottommost border as
+        <em>outside</em> of the range, in contrast to BasicRange,
+        which considers them inside.
+     */
+    class BasicBox : public BasicRange< sal_Int32, Int32Traits >
+    {
+        typedef BasicRange< sal_Int32, Int32Traits > Base;
+    public:
+        BasicBox() :
+            Base()
+        {
+        }
+
+        BasicBox( sal_Int32 nValue ) :
+            Base( nValue )
+        {
+        }
+
+        BasicBox(const BasicBox& rBox) :
+            Base( rBox )
+        {
+        }
+
+        double getCenter() const
+        {
+            if(isEmpty())
+            {
+                return 0.0;
+            }
+            else
+            {
+                return ((mnMaximum + mnMinimum - 1.0) / 2.0);
+            }
+        }
+
+        using Base::isInside;
+
+        bool isInside(sal_Int32 nValue) const
+        {
+            if(isEmpty())
+            {
+                return false;
+            }
+            else
+            {
+                return (nValue >= mnMinimum) && (nValue < mnMaximum);
+            }
+        }
+
+        using Base::overlaps;
+
+        bool overlaps(const BasicBox& rBox) const
+        {
+            if(isEmpty())
+            {
+                return false;
+            }
+            else
+            {
+                if(rBox.isEmpty())
+                {
+                    return false;
+                }
+                else
+                {
+                    return !((rBox.mnMaximum <= mnMinimum) || (rBox.mnMinimum >= mnMaximum));
+                }
+            }
+        }
+
+        void grow(sal_Int32 nValue)
+        {
+            if(!isEmpty())
+            {
+                bool bLessThanZero(nValue < 0);
+
+                if(nValue > 0 || bLessThanZero)
+                {
+                    mnMinimum -= nValue;
+                    mnMaximum += nValue;
+
+                    if(bLessThanZero)
+                    {
+                        // test if range did collapse
+                        if(mnMinimum > mnMaximum)
+                        {
+                            // if yes, collapse to center
+                            mnMinimum = mnMaximum = ((mnMaximum + mnMinimum - 1) / 2);
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_BASICBOX_HXX */
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
new file mode 100644
index 000000000000..578e36824cf3
--- /dev/null
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -0,0 +1,297 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_BASICRANGE_HXX
+#define _BGFX_RANGE_BASICRANGE_HXX
+
+#include <sal/types.h>
+#include <float.h>
+#include <basegfx/numeric/ftools.hxx>
+
+
+namespace basegfx
+{
+    template< typename T, typename Traits > class BasicRange
+    {
+    protected:
+        T       mnMinimum;
+        T       mnMaximum;
+
+    public:
+        typedef T       ValueType;
+        typedef Traits  TraitsType;
+
+        BasicRange() :
+            mnMinimum(Traits::maxVal()),
+            mnMaximum(Traits::minVal())
+        {
+        }
+
+        BasicRange( T nValue ) :
+            mnMinimum(nValue),
+            mnMaximum(nValue)
+        {
+        }
+
+        BasicRange(const BasicRange& rRange) :
+            mnMinimum(rRange.mnMinimum),
+            mnMaximum(rRange.mnMaximum)
+        {
+        }
+
+        void reset()
+        {
+            mnMinimum = Traits::maxVal();
+            mnMaximum = Traits::minVal();
+        }
+
+        bool isEmpty() const
+        {
+            return Traits::maxVal() == mnMinimum;
+        }
+
+        T getMinimum() const { return mnMinimum; }
+        T getMaximum() const { return mnMaximum; }
+
+        double getCenter() const
+        {
+            if(isEmpty())
+            {
+                return 0.0;
+            }
+            else
+            {
+                return ((mnMaximum + mnMinimum) / 2.0);
+            }
+        }
+
+        bool isInside(T nValue) const
+        {
+            if(isEmpty())
+            {
+                return false;
+            }
+            else
+            {
+                return (nValue >= mnMinimum) && (nValue <= mnMaximum);
+            }
+        }
+
+        bool isInside(const BasicRange& rRange) const
+        {
+            if(isEmpty())
+            {
+                return false;
+            }
+            else
+            {
+                if(rRange.isEmpty())
+                {
+                    return false;
+                }
+                else
+                {
+                    return (rRange.mnMinimum >= mnMinimum) && (rRange.mnMaximum <= mnMaximum);
+                }
+            }
+        }
+
+        bool overlaps(const BasicRange& rRange) const
+        {
+            if(isEmpty())
+            {
+                return false;
+            }
+            else
+            {
+                if(rRange.isEmpty())
+                {
+                    return false;
+                }
+                else
+                {
+                    return !((rRange.mnMaximum < mnMinimum) || (rRange.mnMinimum > mnMaximum));
+                }
+            }
+        }
+
+        bool overlapsMore(const BasicRange& rRange) const
+        {
+            if(isEmpty() || rRange.isEmpty())
+                return false;
+            // returns true if the overlap is more than just a touching at the limits
+            return ((rRange.mnMaximum > mnMinimum) && (rRange.mnMinimum < mnMaximum));
+        }
+
+        bool operator==( const BasicRange& rRange ) const
+        {
+            return (mnMinimum == rRange.mnMinimum && mnMaximum == rRange.mnMaximum);
+        }
+
+        bool operator!=( const BasicRange& rRange ) const
+        {
+            return (mnMinimum != rRange.mnMinimum || mnMaximum != rRange.mnMaximum);
+        }
+
+        BasicRange& operator=(const BasicRange& rRange)
+        {
+            mnMinimum = rRange.mnMinimum;
+            mnMaximum = rRange.mnMaximum;
+            return *this;
+        }
+
+        bool equal(const BasicRange& rRange) const
+        {
+            return (
+                fTools::equal(mnMinimum, rRange.mnMinimum) &&
+                fTools::equal(mnMaximum, rRange.mnMaximum));
+        }
+
+        void expand(T nValue)
+        {
+            if(isEmpty())
+            {
+                mnMinimum = mnMaximum = nValue;
+            }
+            else
+            {
+                if(nValue < mnMinimum)
+                {
+                    mnMinimum = nValue;
+                }
+
+                if(nValue > mnMaximum)
+                {
+                    mnMaximum = nValue;
+                }
+            }
+        }
+
+        void expand(const BasicRange& rRange)
+        {
+            if(isEmpty())
+            {
+                mnMinimum = rRange.mnMinimum;
+                mnMaximum = rRange.mnMaximum;
+            }
+            else
+            {
+                if(!rRange.isEmpty())
+                {
+                    if(rRange.mnMinimum < mnMinimum)
+                    {
+                        mnMinimum = rRange.mnMinimum;
+                    }
+
+                    if(rRange.mnMaximum > mnMaximum)
+                    {
+                        mnMaximum = rRange.mnMaximum;
+                    }
+                }
+            }
+        }
+
+        void intersect(const BasicRange& rRange)
+        {
+            // here, overlaps also tests all isEmpty() conditions already.
+            if( !overlaps( rRange ) )
+            {
+                reset();
+            }
+            else
+            {
+                if(rRange.mnMinimum > mnMinimum)
+                {
+                    mnMinimum = rRange.mnMinimum;
+                }
+
+                if(rRange.mnMaximum < mnMaximum)
+                {
+                    mnMaximum = rRange.mnMaximum;
+                }
+            }
+        }
+
+        void grow(T nValue)
+        {
+            if(!isEmpty())
+            {
+                bool bLessThanZero(nValue < 0);
+
+                if(nValue > 0 || bLessThanZero)
+                {
+                    mnMinimum -= nValue;
+                    mnMaximum += nValue;
+
+                    if(bLessThanZero)
+                    {
+                        // test if range did collapse
+                        if(mnMinimum > mnMaximum)
+                        {
+                            // if yes, collapse to center
+                            mnMinimum = mnMaximum = (mnMinimum + mnMaximum) / 2;
+                        }
+                    }
+                }
+            }
+        }
+
+        typename Traits::DifferenceType getRange() const
+        {
+            if(isEmpty())
+            {
+                return Traits::neutral();
+            }
+            else
+            {
+                return (mnMaximum - mnMinimum);
+            }
+        }
+    };
+
+    // some pre-fabricated traits
+    struct DoubleTraits
+    {
+        static double minVal() { return DBL_MIN; };
+        static double maxVal() { return DBL_MAX; };
+        static double neutral() { return 0.0; };
+
+        typedef double DifferenceType;
+    };
+
+    struct Int32Traits
+    {
+        static sal_Int32 minVal() { return SAL_MIN_INT32; };
+        static sal_Int32 maxVal() { return SAL_MAX_INT32; };
+        static sal_Int32 neutral() { return 0L; };
+
+        typedef sal_Int64 DifferenceType;
+    };
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_RANGE_BASICRANGE_HXX */
diff --git a/basegfx/inc/basegfx/range/rangeexpander.hxx b/basegfx/inc/basegfx/range/rangeexpander.hxx
new file mode 100644
index 000000000000..f8d2ac9c6b68
--- /dev/null
+++ b/basegfx/inc/basegfx/range/rangeexpander.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RANGE_RANGEEXPANDER_HXX
+#define _BGFX_RANGE_RANGEEXPANDER_HXX
+
+#include <basegfx/range/b1drange.hxx>
+#include <basegfx/range/b1irange.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b3drange.hxx>
+#include <basegfx/range/b3irange.hxx>
+
+namespace basegfx
+{
+    /** Generic functor for expanding a range with a number of other
+        ranges.
+
+        Since *Range::expand() is overloaded, straight-forward
+        application of ::boost::bind and friends fails (because of
+        ambiguities). Thus, this functor template can be used, to
+        expand the given range with a number of other ranges, passed
+        in at the function operator.
+
+        @tpl RangeType
+        Range type to operate with. Preferrably, one of B1*Range,
+        B2*Range, or B3*Range.
+    */
+    template< typename RangeType > class RangeExpander
+    {
+    public:
+        typedef RangeType   ValueType;
+        typedef void        result_type;
+
+        explicit RangeExpander( ValueType& rBounds ) :
+            mrBounds( rBounds )
+        {
+        }
+
+        void operator()( const ValueType& rBounds )
+        {
+            mrBounds.expand( rBounds );
+        }
+
+    private:
+        ValueType& mrBounds;
+    };
+
+    typedef RangeExpander< B1DRange > B1DRangeExpander;
+    typedef RangeExpander< B1IRange > B1IRangeExpander;
+    typedef RangeExpander< B2DRange > B2DRangeExpander;
+    typedef RangeExpander< B2IRange > B2IRangeExpander;
+    typedef RangeExpander< B3DRange > B3DRangeExpander;
+    typedef RangeExpander< B3IRange > B3IRangeExpander;
+
+} // end of namespace basegfx
+
+
+#endif /* _BGFX_RANGE_RANGEEXPANDER_HXX */
diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx
new file mode 100644
index 000000000000..c28adcdb2ef7
--- /dev/null
+++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RASTER_BPIXELRASTER_HXX
+#define _BGFX_RASTER_BPIXELRASTER_HXX
+
+#include <algorithm>
+#include <sal/types.h>
+#include <basegfx/pixel/bpixel.hxx>
+#include <rtl/memory.h>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class BPixelRaster
+    {
+    private:
+        // do not allow copy constructor and assignment operator
+        BPixelRaster(const BPixelRaster&);
+        BPixelRaster& operator=(const BPixelRaster&);
+
+    protected:
+        sal_uInt32                  mnWidth;
+        sal_uInt32                  mnHeight;
+        sal_uInt32                  mnCount;
+        BPixel*                     mpContent;
+
+    public:
+        // reset
+        void reset()
+        {
+            rtl_zeroMemory(mpContent, sizeof(BPixel) * mnCount);
+        }
+
+        // constructor/destructor
+        BPixelRaster(sal_uInt32 nWidth, sal_uInt32 nHeight)
+        :   mnWidth(nWidth),
+            mnHeight(nHeight),
+            mnCount(nWidth * nHeight),
+            mpContent(new BPixel[mnCount])
+        {
+            reset();
+        }
+
+        ~BPixelRaster()
+        {
+            delete [] mpContent;
+        }
+
+        // coordinate calcs between X/Y and span
+        sal_uInt32 getIndexFromXY(sal_uInt32 nX, sal_uInt32 nY) const { return (nX + (nY * mnWidth)); }
+        sal_uInt32 getXFromIndex(sal_uInt32 nIndex) const { return (nIndex % mnWidth); }
+        sal_uInt32 getYFromIndex(sal_uInt32 nIndex) const { return (nIndex / mnWidth); }
+
+        // data access read
+        sal_uInt32 getWidth() const { return mnWidth; }
+        sal_uInt32 getHeight() const { return mnHeight; }
+        sal_uInt32 getCount() const { return mnCount; }
+
+        // data access read only
+        const BPixel& getBPixel(sal_uInt32 nIndex) const
+        {
+#ifdef DBG_UTIL
+            if(nIndex >= mnCount)
+            {
+                OSL_ENSURE(false, "getBPixel: Access out of range (!)");
+                return BPixel::getEmptyBPixel();
+            }
+#endif
+            return mpContent[nIndex];
+        }
+
+        // data access read/write
+        BPixel& getBPixel(sal_uInt32 nIndex)
+        {
+#ifdef DBG_UTIL
+            if(nIndex >= mnCount)
+            {
+                OSL_ENSURE(false, "getBPixel: Access out of range (!)");
+                return mpContent[0L];
+            }
+#endif
+            return mpContent[nIndex];
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_RASTER_BPIXELRASTER_HXX */
diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/basegfx/inc/basegfx/raster/bzpixelraster.hxx
new file mode 100644
index 000000000000..2c0905a78397
--- /dev/null
+++ b/basegfx/inc/basegfx/raster/bzpixelraster.hxx
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RASTER_BZPIXELRASTER_HXX
+#define _BGFX_RASTER_BZPIXELRASTER_HXX
+
+#include <basegfx/raster/bpixelraster.hxx>
+#include <rtl/memory.h>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class BZPixelRaster : public BPixelRaster
+    {
+    protected:
+        // additionally, host a ZBuffer
+        sal_uInt16*                 mpZBuffer;
+
+    public:
+        // reset
+        void resetZ()
+        {
+            reset();
+            rtl_zeroMemory(mpZBuffer, sizeof(sal_uInt16) * mnCount);
+        }
+
+        // constructor/destructor
+        BZPixelRaster(sal_uInt32 nWidth, sal_uInt32 nHeight)
+        :   BPixelRaster(nWidth, nHeight),
+            mpZBuffer(new sal_uInt16[mnCount])
+        {
+            rtl_zeroMemory(mpZBuffer, sizeof(sal_uInt16) * mnCount);
+        }
+
+        ~BZPixelRaster()
+        {
+            delete [] mpZBuffer;
+        }
+
+        // data access read only
+        const sal_uInt16& getZ(sal_uInt32 nIndex) const
+        {
+#ifdef DBG_UTIL
+            if(nIndex >= mnCount)
+            {
+                OSL_ENSURE(false, "getZ: Access out of range (!)");
+                return mpZBuffer[0L];
+            }
+#endif
+            return mpZBuffer[nIndex];
+        }
+
+        // data access read/write
+        sal_uInt16& getZ(sal_uInt32 nIndex)
+        {
+#ifdef DBG_UTIL
+            if(nIndex >= mnCount)
+            {
+                OSL_ENSURE(false, "getZ: Access out of range (!)");
+                return mpZBuffer[0L];
+            }
+#endif
+            return mpZBuffer[nIndex];
+        }
+    };
+} // end of namespace basegfx
+
+#endif /* _BGFX_RASTER_BZPIXELRASTER_HXX */
diff --git a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx b/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
new file mode 100644
index 000000000000..fb777482246d
--- /dev/null
+++ b/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
@@ -0,0 +1,345 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_RASTER_RASTERCONVERT3D_HXX
+#define _BGFX_RASTER_RASTERCONVERT3D_HXX
+
+#include <sal/types.h>
+#include <vector>
+#include <basegfx/color/bcolor.hxx>
+#include <basegfx/vector/b3dvector.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// predeclarations
+
+namespace basegfx
+{
+    class B3DPolygon;
+    class B3DPolyPolygon;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// interpolators for double precision
+
+namespace basegfx
+{
+    class ip_single
+    {
+    private:
+        double                                      mfVal;
+        double                                      mfInc;
+
+    public:
+        ip_single()
+        :   mfVal(0.0),
+            mfInc(0.0)
+        {}
+
+        ip_single(double fVal, double fInc)
+        :   mfVal(fVal),
+            mfInc(fInc)
+        {}
+
+        double getVal() const { return mfVal; }
+        double getInc() const { return mfInc; }
+
+        void increment(double fStep) { mfVal += fStep * mfInc; }
+    };
+} // end of namespace basegfx
+
+namespace basegfx
+{
+    class ip_double
+    {
+    private:
+        ip_single                                   maX;
+        ip_single                                   maY;
+
+    public:
+        ip_double()
+        :   maX(),
+            maY()
+        {}
+
+        ip_double(double fXVal, double fXInc, double fYVal, double fYInc)
+        :   maX(fXVal, fXInc),
+            maY(fYVal, fYInc)
+        {}
+
+        const ip_single& getX() const { return maX; }
+        const ip_single& getY() const { return maY; }
+
+        void increment(double fStep) { maX.increment(fStep); maY.increment(fStep); }
+    };
+} // end of namespace basegfx
+
+namespace basegfx
+{
+    class ip_triple
+    {
+    private:
+        ip_single                                   maX;
+        ip_single                                   maY;
+        ip_single                                   maZ;
+
+    public:
+        ip_triple()
+        :   maX(),
+            maY(),
+            maZ()
+        {}
+
+        ip_triple(double fXVal, double fXInc, double fYVal, double fYInc, double fZVal, double fZInc)
+        :   maX(fXVal, fXInc),
+            maY(fYVal, fYInc),
+            maZ(fZVal, fZInc)
+        {}
+
+        const ip_single& getX() const { return maX; }
+        const ip_single& getY() const { return maY; }
+        const ip_single& getZ() const { return maZ; }
+
+        void increment(double fStep) { maX.increment(fStep); maY.increment(fStep); maZ.increment(fStep); }
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// InterpolatorProvider3D to have a common source for allocating interpolators
+// which may then be addressed using the index to the vectors
+
+namespace basegfx
+{
+    #define SCANLINE_EMPTY_INDEX (0xffffffff)
+
+    class InterpolatorProvider3D
+    {
+    private:
+        ::std::vector< ip_triple >                  maColorInterpolators;
+        ::std::vector< ip_triple >                  maNormalInterpolators;
+        ::std::vector< ip_double >                  maTextureInterpolators;
+        ::std::vector< ip_triple >                  maInverseTextureInterpolators;
+
+    protected:
+        sal_uInt32 addColorInterpolator(const BColor& rA, const BColor& rB, double fInvYDelta)
+        {
+            B3DVector aDelta(rB.getRed() - rA.getRed(), rB.getGreen() - rA.getGreen(), rB.getBlue() - rA.getBlue());
+            aDelta *= fInvYDelta;
+            maColorInterpolators.push_back(ip_triple(rA.getRed(), aDelta.getX(), rA.getGreen(), aDelta.getY(), rA.getBlue(), aDelta.getZ()));
+            return (maColorInterpolators.size() - 1L);
+        }
+
+        sal_uInt32 addNormalInterpolator(const B3DVector& rA, const B3DVector& rB, double fInvYDelta)
+        {
+            B3DVector aDelta(rB.getX() - rA.getX(), rB.getY() - rA.getY(), rB.getZ() - rA.getZ());
+            aDelta *= fInvYDelta;
+            maNormalInterpolators.push_back(ip_triple(rA.getX(), aDelta.getX(), rA.getY(), aDelta.getY(), rA.getZ(), aDelta.getZ()));
+            return (maNormalInterpolators.size() - 1L);
+        }
+
+        sal_uInt32 addTextureInterpolator(const B2DPoint& rA, const B2DPoint& rB, double fInvYDelta)
+        {
+            B2DVector aDelta(rB.getX() - rA.getX(), rB.getY() - rA.getY());
+            aDelta *= fInvYDelta;
+            maTextureInterpolators.push_back(ip_double(rA.getX(), aDelta.getX(), rA.getY(), aDelta.getY()));
+            return (maTextureInterpolators.size() - 1L);
+        }
+
+        sal_uInt32 addInverseTextureInterpolator(const B2DPoint& rA, const B2DPoint& rB, double fZEyeA, double fZEyeB, double fInvYDelta)
+        {
+            const double fInvZEyeA(fTools::equalZero(fZEyeA) ? fZEyeA : 1.0 / fZEyeA);
+            const double fInvZEyeB(fTools::equalZero(fZEyeB) ? fZEyeB : 1.0 / fZEyeB);
+            const B2DPoint aInvA(rA * fInvZEyeA);
+            const B2DPoint aInvB(rB * fInvZEyeB);
+            double fZDelta(fInvZEyeB - fInvZEyeA);
+            B2DVector aDelta(aInvB.getX() - aInvA.getX(), aInvB.getY() - aInvA.getY());
+
+            fZDelta *= fInvYDelta;
+            aDelta *= fInvYDelta;
+
+            maInverseTextureInterpolators.push_back(ip_triple(aInvA.getX(), aDelta.getX(), aInvA.getY(), aDelta.getY(), fInvZEyeA, fZDelta));
+            return (maInverseTextureInterpolators.size() - 1L);
+        }
+
+        void reset()
+        {
+            maColorInterpolators.clear();
+            maNormalInterpolators.clear();
+            maTextureInterpolators.clear();
+            maInverseTextureInterpolators.clear();
+        }
+
+    public:
+        InterpolatorProvider3D() {}
+
+        ::std::vector< ip_triple >& getColorInterpolators() { return maColorInterpolators; }
+        ::std::vector< ip_triple >& getNormalInterpolators() { return maNormalInterpolators; }
+        ::std::vector< ip_double >& getTextureInterpolators() { return maTextureInterpolators; }
+        ::std::vector< ip_triple >& getInverseTextureInterpolators() { return maInverseTextureInterpolators; }
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// RasterConversionLineEntry3D for Raterconversion of 3D PolyPolygons
+
+namespace basegfx
+{
+    class RasterConversionLineEntry3D
+    {
+    private:
+        ip_single                                   maX;
+        ip_single                                   maZ;
+        sal_Int32                                   mnY;
+        sal_uInt32                                  mnCount;
+
+        sal_uInt32                                  mnColorIndex;
+        sal_uInt32                                  mnNormalIndex;
+        sal_uInt32                                  mnTextureIndex;
+        sal_uInt32                                  mnInverseTextureIndex;
+
+    public:
+        RasterConversionLineEntry3D(const double& rfX, const double& rfDeltaX, const double& rfZ, const double& rfDeltaZ, sal_Int32 nY, sal_uInt32 nCount)
+        :   maX(rfX, rfDeltaX),
+            maZ(rfZ, rfDeltaZ),
+            mnY(nY),
+            mnCount(nCount),
+            mnColorIndex(SCANLINE_EMPTY_INDEX),
+            mnNormalIndex(SCANLINE_EMPTY_INDEX),
+            mnTextureIndex(SCANLINE_EMPTY_INDEX),
+            mnInverseTextureIndex(SCANLINE_EMPTY_INDEX)
+        {}
+
+        void setColorIndex(sal_uInt32 nIndex) { mnColorIndex = nIndex; }
+        void setNormalIndex(sal_uInt32 nIndex) { mnNormalIndex = nIndex; }
+        void setTextureIndex(sal_uInt32 nIndex) { mnTextureIndex = nIndex; }
+        void setInverseTextureIndex(sal_uInt32 nIndex) { mnInverseTextureIndex = nIndex; }
+
+        bool operator<(const RasterConversionLineEntry3D& rComp) const
+        {
+            if(mnY == rComp.mnY)
+            {
+                return maX.getVal() < rComp.maX.getVal();
+            }
+
+            return mnY < rComp.mnY;
+        }
+
+        bool decrementRasterConversionLineEntry3D(sal_uInt32 nStep)
+        {
+            if(nStep >= mnCount)
+            {
+                return false;
+            }
+            else
+            {
+                mnCount -= nStep;
+                return true;
+            }
+        }
+
+        void incrementRasterConversionLineEntry3D(sal_uInt32 nStep, InterpolatorProvider3D& rProvider)
+        {
+            const double fStep((double)nStep);
+            maX.increment(fStep);
+            maZ.increment(fStep);
+            mnY += nStep;
+
+            if(SCANLINE_EMPTY_INDEX != mnColorIndex)
+            {
+                rProvider.getColorInterpolators()[mnColorIndex].increment(fStep);
+            }
+
+            if(SCANLINE_EMPTY_INDEX != mnNormalIndex)
+            {
+                rProvider.getNormalInterpolators()[mnNormalIndex].increment(fStep);
+            }
+
+            if(SCANLINE_EMPTY_INDEX != mnTextureIndex)
+            {
+                rProvider.getTextureInterpolators()[mnTextureIndex].increment(fStep);
+            }
+
+            if(SCANLINE_EMPTY_INDEX != mnInverseTextureIndex)
+            {
+                rProvider.getInverseTextureInterpolators()[mnInverseTextureIndex].increment(fStep);
+            }
+        }
+
+        // data read access
+        const ip_single& getX() const { return maX; }
+        sal_Int32 getY() const { return mnY; }
+        const ip_single& getZ() const { return maZ; }
+        sal_uInt32 getColorIndex() const { return mnColorIndex; }
+        sal_uInt32 getNormalIndex() const { return mnNormalIndex; }
+        sal_uInt32 getTextureIndex() const { return mnTextureIndex; }
+        sal_uInt32 getInverseTextureIndex() const { return mnInverseTextureIndex; }
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// the basic RaterConverter itself. Only one method needs to be overloaded. The
+// class itself is strictly virtual
+
+namespace basegfx
+{
+    class RasterConverter3D : public InterpolatorProvider3D
+    {
+    private:
+        // the line entries for an area conversion run
+        ::std::vector< RasterConversionLineEntry3D >            maLineEntries;
+
+        struct lineComparator
+        {
+            bool operator()(const RasterConversionLineEntry3D* pA, const RasterConversionLineEntry3D* pB)
+            {
+                OSL_ENSURE(pA && pB, "lineComparator: empty pointer (!)");
+                return pA->getX().getVal() < pB->getX().getVal();
+            }
+        };
+
+        void addArea(const B3DPolygon& rFill, const B3DHomMatrix* pViewToEye);
+        void addArea(const B3DPolyPolygon& rFill, const B3DHomMatrix* pViewToEye);
+        void addEdge(const B3DPolygon& rFill, sal_uInt32 a, sal_uInt32 b, const B3DHomMatrix* pViewToEye);
+
+        void rasterconvertB3DArea(sal_Int32 nStartLine, sal_Int32 nStopLine);
+        void rasterconvertB3DEdge(const B3DPolygon& rLine, sal_uInt32 nA, sal_uInt32 nB, sal_Int32 nStartLine, sal_Int32 nStopLine, sal_uInt16 nLineWidth);
+
+        virtual void processLineSpan(const RasterConversionLineEntry3D& rA, const RasterConversionLineEntry3D& rB, sal_Int32 nLine, sal_uInt32 nSpanCount) = 0;
+
+    public:
+        RasterConverter3D();
+        virtual ~RasterConverter3D();
+
+        void rasterconvertB3DPolyPolygon(const B3DPolyPolygon& rFill, const B3DHomMatrix* pViewToEye, sal_Int32 nStartLine, sal_Int32 nStopLine);
+        void rasterconvertB3DPolygon(const B3DPolygon& rLine, sal_Int32 nStartLine, sal_Int32 nStopLine, sal_uInt16 nLineWidth);
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_RASTER_RASTERCONVERT3D_HXX */
diff --git a/basegfx/inc/basegfx/tools/b2dclipstate.hxx b/basegfx/inc/basegfx/tools/b2dclipstate.hxx
new file mode 100644
index 000000000000..7d336d8cb48e
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/b2dclipstate.hxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: rectcliptools.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_CLIPSTATE_HXX
+#define _BGFX_TOOLS_CLIPSTATE_HXX
+
+#include <sal/types.h>
+#include <o3tl/cow_wrapper.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class B2DRange;
+    class B2DPolyRange;
+    class B2DPolygon;
+    class B2DPolyPolygon;
+
+    namespace tools
+    {
+        class ImplB2DClipState;
+
+        /** This class provides an optimized, symbolic clip state for graphical output
+
+            Having a current 'clip' state is a common attribute of
+            almost all graphic output APIs, most of which internally
+            represent it via a list of rectangular bands. In contrast,
+            this implementation purely uses symbolic clips, but in a
+            quite efficient manner, deferring actual evaluation until
+            a clip representation is requested, and using faster code
+            paths for common special cases (like all-rectangle clips)
+         */
+        class B2DClipState
+        {
+        public:
+            typedef o3tl::cow_wrapper< ImplB2DClipState > ImplType;
+
+        private:
+            ImplType mpImpl;
+
+        public:
+            /// Init clip, in 'cleared' state - everything is visible
+            B2DClipState();
+            ~B2DClipState();
+            B2DClipState( const B2DClipState& );
+            explicit B2DClipState( const B2DRange& );
+            explicit B2DClipState( const B2DPolygon& );
+            explicit B2DClipState( const B2DPolyPolygon& );
+            B2DClipState& operator=( const B2DClipState& );
+
+            /// unshare this poly-range with all internally shared instances
+            void makeUnique();
+
+            /// Set clip to 'null' - nothing is visible
+            void makeNull();
+            /// returns true when clip is 'null' - nothing is visible
+            bool isNull() const;
+
+            /// Set clip 'cleared' - everything is visible
+            void makeClear();
+            /// returns true when clip is 'cleared' - everything is visible
+            bool isCleared() const;
+
+            bool operator==(const B2DClipState&) const;
+            bool operator!=(const B2DClipState&) const;
+
+            void unionRange(const B2DRange& );
+            void unionPolygon(const B2DPolygon& );
+            void unionPolyPolygon(const B2DPolyPolygon& );
+            void unionClipState(const B2DClipState& );
+
+            void intersectRange(const B2DRange& );
+            void intersectPolygon(const B2DPolygon& );
+            void intersectPolyPolygon(const B2DPolyPolygon& );
+            void intersectClipState(const B2DClipState& );
+
+            void subtractRange(const B2DRange& );
+            void subtractPolygon(const B2DPolygon& );
+            void subtractPolyPolygon(const B2DPolyPolygon& );
+            void subtractClipState(const B2DClipState& );
+
+            void xorRange(const B2DRange& );
+            void xorPolygon(const B2DPolygon& );
+            void xorPolyPolygon(const B2DPolyPolygon& );
+            void xorClipState(const B2DClipState& );
+
+            B2DPolyPolygon getClipPoly() const;
+        };
+    }
+}
+
+#endif // _BGFX_TOOLS_CLIPSTATE_HXX
diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx
new file mode 100755
index 000000000000..1903518d991b
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/canvastools.hxx
@@ -0,0 +1,221 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_CANVASTOOLS_HXX
+#define _BGFX_TOOLS_CANVASTOOLS_HXX
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+
+
+namespace com { namespace sun { namespace star { namespace geometry
+{
+    struct AffineMatrix2D;
+    struct AffineMatrix3D;
+    struct Matrix2D;
+    struct RealPoint2D;
+    struct RealSize2D;
+    struct RealRectangle2D;
+    struct RealRectangle3D;
+    struct IntegerPoint2D;
+    struct IntegerSize2D;
+    struct IntegerRectangle2D;
+    struct RealBezierSegment2D;
+} } } }
+
+namespace com { namespace sun { namespace star { namespace rendering
+{
+    class  XGraphicDevice;
+    class  XPolyPolygon2D;
+} } } }
+
+namespace com { namespace sun { namespace star { namespace awt
+{
+    struct Point;
+    struct Size;
+    struct Rectangle;
+} } } }
+
+namespace basegfx
+{
+    class B2DHomMatrix;
+    class B3DHomMatrix;
+    class B2DVector;
+    class B2DPoint;
+    class B2DRange;
+    class B3DRange;
+    class B2IVector;
+    class B2IPoint;
+    class B2IRange;
+    class B2DPolygon;
+    class B2DPolyPolygon;
+
+    namespace unotools
+    {
+        // Polygon conversions
+        // ===================================================================
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
+            xPolyPolygonFromB2DPolygon( const ::com::sun::star::uno::Reference<
+                                            ::com::sun::star::rendering::XGraphicDevice >&  xGraphicDevice,
+                                        const ::basegfx::B2DPolygon&                        rPoly    );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >
+            xPolyPolygonFromB2DPolyPolygon( const ::com::sun::star::uno::Reference<
+                                                 ::com::sun::star::rendering::XGraphicDevice >&     xGraphicDevice,
+                                            const ::basegfx::B2DPolyPolygon&                    rPolyPoly    );
+
+
+        ::com::sun::star::uno::Sequence<
+              ::com::sun::star::uno::Sequence<
+                  ::com::sun::star::geometry::RealBezierSegment2D > >
+                    bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
+
+        ::com::sun::star::uno::Sequence<
+              ::com::sun::star::uno::Sequence<
+                  ::com::sun::star::geometry::RealPoint2D > >
+                    pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
+
+        ::basegfx::B2DPolygon polygonFromPoint2DSequence(
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::geometry::RealPoint2D >& rPoints );
+
+        ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence(
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& rPoints );
+
+        ::basegfx::B2DPolygon polygonFromBezier2DSequence(
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::geometry::RealBezierSegment2D >& rPoints );
+
+        ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence(
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& rPoints );
+
+        ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D(
+            const ::com::sun::star::uno::Reference<
+                     ::com::sun::star::rendering::XPolyPolygon2D >& rPoly );
+
+        // Matrix conversions
+        // ===================================================================
+
+        ::com::sun::star::geometry::AffineMatrix2D&
+            affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D&  matrix,
+                                       const ::basegfx::B2DHomMatrix&               transform);
+
+        ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D(
+            ::com::sun::star::geometry::AffineMatrix3D& matrix,
+            const ::basegfx::B3DHomMatrix& transform);
+
+        ::basegfx::B2DHomMatrix&
+            homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix&                             transform,
+                                       const ::com::sun::star::geometry::AffineMatrix2D&    matrix );
+
+        ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix );
+        ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix );
+
+        ::com::sun::star::geometry::Matrix2D&
+            matrixFromHomMatrix( ::com::sun::star::geometry::Matrix2D& matrix,
+                                 const ::basegfx::B2DHomMatrix&        transform);
+
+        ::basegfx::B2DHomMatrix&
+            homMatrixFromMatrix( ::basegfx::B2DHomMatrix&                    transform,
+                                 const ::com::sun::star::geometry::Matrix2D& matrix );
+
+        // Geometry conversions
+        // ===================================================================
+
+        ::com::sun::star::geometry::RealSize2D          size2DFromB2DSize( const ::basegfx::B2DVector& );
+        ::com::sun::star::geometry::RealPoint2D         point2DFromB2DPoint( const ::basegfx::B2DPoint& );
+        ::com::sun::star::geometry::RealRectangle2D     rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& );
+        ::com::sun::star::geometry::RealRectangle3D     rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& );
+
+        ::basegfx::B2DVector    b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& );
+        ::basegfx::B2DPoint     b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
+        ::basegfx::B2DRange     b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
+        ::basegfx::B3DRange     b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& );
+
+        ::com::sun::star::geometry::IntegerSize2D       integerSize2DFromB2ISize( const ::basegfx::B2IVector& );
+        ::com::sun::star::geometry::IntegerPoint2D      integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& );
+        ::com::sun::star::geometry::IntegerRectangle2D  integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& );
+
+        ::basegfx::B2IVector    b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& );
+        ::basegfx::B2IPoint     b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& );
+        ::basegfx::B2IRange     b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& );
+
+        ::com::sun::star::awt::Size         awtSizeFromB2ISize( const ::basegfx::B2IVector& );
+        ::com::sun::star::awt::Point        awtPointFromB2IPoint( const ::basegfx::B2IPoint& );
+        ::com::sun::star::awt::Rectangle    awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& );
+
+        ::basegfx::B2IVector    b2ISizeFromAwtSize( const ::com::sun::star::awt::Size& );
+        ::basegfx::B2IPoint     b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& );
+        ::basegfx::B2IRange     b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& );
+
+        // Geometry comparisons
+        // ===================================================================
+
+        bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB );
+        bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB );
+        bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB );
+        bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB );
+        bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB );
+
+        bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB );
+        bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB );
+        bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB );
+
+        bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB );
+        bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB );
+        bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB );
+
+        /** Return smalltest integer range, which completely contains
+            given floating point range.
+
+            @param rRange
+            Input range. Values must be within the representable
+            bounds of sal_Int32
+
+            @return the closest integer range, which completely
+            contains rRange.
+         */
+        ::basegfx::B2IRange     b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
+
+        /** Return smalltest B2DRange with integer values, which
+            completely contains given floating point range.
+
+            @param rRange
+            Input range.
+
+            @return the closest B2DRange with integer coordinates,
+            which completely contains rRange.
+         */
+        ::basegfx::B2DRange     b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
+
+    }
+}
+
+#endif /* _BGFX_TOOLS_CANVASTOOLS_HXX */
diff --git a/basegfx/inc/basegfx/tools/debugplotter.hxx b/basegfx/inc/basegfx/tools/debugplotter.hxx
new file mode 100644
index 000000000000..ece104af3553
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/debugplotter.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_DEBUGPLOTTER_HXX
+#define _BGFX_TOOLS_DEBUGPLOTTER_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <rtl/string.hxx>
+#include <boost/utility.hpp> // for noncopyable
+#include <vector>
+#include <utility>
+#include <iostream>
+
+
+namespace basegfx
+{
+    class B2DCubicBezier;
+
+    /** Generates debug output for various basegfx data types.
+
+        Use this class to produce debug (trace) output for various
+        basegfx geometry data types. By default, this class outputs
+        via OSL_TRACE (i.e. to stderr), and uses the gnuplot output
+        format.
+
+        To be able to generate one coherent block of output, this
+        class delays actual writing to its destructor
+     */
+    class DebugPlotter : private ::boost::noncopyable
+    {
+    public:
+        /** Create new debug output object
+
+            @param pTitle
+            Title of the debug output, will appear in trace output
+         */
+        explicit DebugPlotter( const sal_Char* pTitle );
+
+        /** Create new debug output object
+
+            @param pTitle
+            Title of the debug output, will appear in trace output
+
+            @param rOutputStream
+            Stream to write output to. Must stay valid over the
+            lifetime of this object!
+         */
+        DebugPlotter( const sal_Char* pTitle,
+                      ::std::ostream& rOutputStream );
+
+        ~DebugPlotter();
+
+        void plot( const B2DPoint&          rPoint,
+                   const sal_Char*          pTitle );
+        void plot( const B2DVector&         rVec,
+                   const sal_Char*          pTitle );
+        void plot( const B2DCubicBezier&    rBezier,
+                   const sal_Char*          pTitle );
+        void plot( const B2DRange&          rRange,
+                   const sal_Char*          pTitle );
+        void plot( const B2DPolygon&        rPoly,
+                   const sal_Char*          pTitle );
+        void plot( const B2DPolyPolygon&    rPoly,
+                   const sal_Char*          pTitle );
+
+    private:
+        void print( const sal_Char* );
+
+        ::rtl::OString                                              maTitle;
+        ::std::vector< ::std::pair< B2DPoint, ::rtl::OString > >    maPoints;
+        ::std::vector< ::std::pair< B2DVector, ::rtl::OString > >   maVectors;
+        ::std::vector< ::std::pair< B2DRange, ::rtl::OString > >    maRanges;
+        ::std::vector< ::std::pair< B2DPolygon, ::rtl::OString > >  maPolygons;
+
+        ::std::ostream*                                             mpOutputStream;
+    };
+}
+
+#endif /* _BGFX_TOOLS_DEBUGPLOTTER_HXX */
diff --git a/basegfx/inc/basegfx/tools/gradienttools.hxx b/basegfx/inc/basegfx/tools/gradienttools.hxx
new file mode 100644
index 000000000000..2f436fa1d717
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/gradienttools.hxx
@@ -0,0 +1,410 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_GRADIENTTOOLS_HXX
+#define _BGFX_TOOLS_GRADIENTTOOLS_HXX
+
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+#include <vector>
+#include <algorithm>
+
+namespace basegfx
+{
+    /** Gradient definition as used in ODF 1.2
+
+        This struct collects all data necessary for rendering ODF
+        1.2-compatible gradients. Use the createXXXODFGradientInfo()
+        methods below for initializing from ODF attributes.
+     */
+    struct ODFGradientInfo
+    {
+        /** transformation mapping from [0,1]^2 texture coordinate
+           space to [0,1]^2 shape coordinate space
+         */
+        B2DHomMatrix maTextureTransform;
+
+        /** transformation mapping from [0,1]^2 shape coordinate space
+           to [0,1]^2 texture coordinate space. This is the
+           transformation commonly used to create gradients from a
+           scanline rasterizer (put shape u/v coordinates into it, get
+           texture s/t coordinates out of it)
+         */
+        B2DHomMatrix maBackTextureTransform;
+
+        /** Aspect ratio of the gradient. Only used in drawinglayer
+           for generating nested gradient polygons currently. Already
+           catered for in the transformations above.
+         */
+        double       mfAspectRatio;
+
+        /** Requested gradient steps to render. See the
+           implementations of the getXXXGradientAlpha() methods below,
+           the semantic differs slightly for the different gradient
+           types.
+         */
+        sal_uInt32   mnSteps;
+    };
+
+    namespace tools
+    {
+        /** Create matrix for ODF's linear gradient definition
+
+            Note that odf linear gradients are varying in y direction.
+
+            @param o_rGradientInfo
+            Receives the calculated texture transformation matrix (for
+            use with standard [0,1]x[0,1] texture coordinates)
+
+            @param rTargetArea
+            Output area, needed for aspect ratio calculations and
+            texture transformation
+
+            @param nSteps
+            Number of gradient steps (from ODF)
+
+            @param fBorder
+            Width of gradient border (from ODF)
+
+            @param fAngle
+            Gradient angle (from ODF)
+         */
+        ODFGradientInfo& createLinearODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                     const B2DRange&  rTargetArea,
+                                                     sal_uInt32       nSteps,
+                                                     double           fBorder,
+                                                     double           fAngle);
+
+        /** Calculate linear gradient blend value
+
+            This method generates you the lerp alpha value for
+            blending linearly between gradient start and end color,
+            according to the formula (startCol*(1.0-alpha) + endCol*alpha)
+
+            @param rUV
+            Current uv coordinate. Values outside [0,1] will be
+            clamped. Assumes gradient color varies along the y axis.
+
+            @param rGradInfo
+            Gradient info, for transformation and number of steps
+         */
+        inline double getLinearGradientAlpha(const B2DPoint&        rUV,
+                                             const ODFGradientInfo& rGradInfo )
+        {
+            const B2DPoint aCoor(rGradInfo.maBackTextureTransform * rUV);
+            const double t(clamp(aCoor.getY(), 0.0, 1.0));
+            const sal_uInt32 nSteps(rGradInfo.mnSteps);
+
+            if(nSteps > 2L && nSteps < 128L)
+                return floor(t * nSteps) / double(nSteps + 1L);
+
+            return t;
+        }
+
+        /** Create matrix for ODF's axial gradient definition
+
+            Note that odf axial gradients are varying in y
+            direction. Note further that you can map the axial
+            gradient to a linear gradient (in case you want or need to
+            avoid an extra gradient renderer), by using
+            createLinearODFGradientInfo() instead, shifting the
+            resulting texture transformation by 0.5 to the top and
+            appending the same stop colors again, but mirrored.
+
+            @param o_rGradientInfo
+            Receives the calculated texture transformation matrix (for
+            use with standard [0,1]x[0,1] texture coordinates)
+
+            @param rTargetArea
+            Output area, needed for aspect ratio calculations and
+            texture transformation
+
+            @param nSteps
+            Number of gradient steps (from ODF)
+
+            @param fBorder
+            Width of gradient border (from ODF)
+
+            @param fAngle
+            Gradient angle (from ODF)
+         */
+        ODFGradientInfo& createAxialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                    const B2DRange&  rTargetArea,
+                                                    sal_uInt32       nSteps,
+                                                    double           fBorder,
+                                                    double           fAngle);
+
+        /** Calculate axial gradient blend value
+
+            This method generates you the lerp alpha value for
+            blending linearly between gradient start and end color,
+            according to the formula (startCol*(1.0-alpha) + endCol*alpha)
+
+            @param rUV
+            Current uv coordinate. Values outside [0,1] will be
+            clamped. Assumes gradient color varies along the y axis.
+
+            @param rGradInfo
+            Gradient info, for transformation and number of steps
+         */
+        inline double getAxialGradientAlpha(const B2DPoint&        rUV,
+                                            const ODFGradientInfo& rGradInfo )
+        {
+            const B2DPoint   aCoor(rGradInfo.maBackTextureTransform * rUV);
+            const double     t(clamp(fabs(aCoor.getY()), 0.0, 1.0));
+            const sal_uInt32 nSteps(rGradInfo.mnSteps);
+            const double     fInternalSteps((nSteps * 2L) - 1L);
+
+            if(nSteps > 2L && nSteps < 128L)
+                return floor(((t * fInternalSteps) + 1.0) / 2.0) / double(nSteps - 1L);
+
+            return t;
+        }
+
+        /** Create matrix for ODF's radial gradient definition
+
+            @param o_rGradientInfo
+            Receives the calculated texture transformation matrix (for
+            use with standard [0,1]x[0,1] texture coordinates)
+
+            @param rTargetArea
+            Output area, needed for aspect ratio calculations and
+            texture transformation
+
+            @param rOffset
+            Gradient offset value (from ODF)
+
+            @param nSteps
+            Number of gradient steps (from ODF)
+
+            @param fBorder
+            Width of gradient border (from ODF)
+
+            @param fAngle
+            Gradient angle (from ODF)
+         */
+        ODFGradientInfo& createRadialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                     const B2DRange&  rTargetArea,
+                                                     const B2DVector& rOffset,
+                                                     sal_uInt32       nSteps,
+                                                     double           fBorder);
+
+        /** Calculate radial gradient blend value
+
+            This method generates you the lerp alpha value for
+            blending linearly between gradient start and end color,
+            according to the formula (startCol*(1.0-alpha) + endCol*alpha)
+
+            @param rUV
+            Current uv coordinate. Values outside [0,1] will be
+            clamped.
+
+            @param rGradInfo
+            Gradient info, for transformation and number of steps
+         */
+        inline double getRadialGradientAlpha(const B2DPoint&        rUV,
+                                             const ODFGradientInfo& rGradInfo )
+        {
+            const B2DPoint aCoor(rGradInfo.maBackTextureTransform * rUV);
+            const double   fDist(
+                clamp(aCoor.getX() * aCoor.getX() + aCoor.getY() * aCoor.getY(),
+                      0.0,
+                      1.0));
+
+            const double t(1.0 - sqrt(fDist));
+            const sal_uInt32 nSteps(rGradInfo.mnSteps);
+
+            if(nSteps > 2L && nSteps < 128L)
+                return floor(t * nSteps) / double(nSteps - 1L);
+
+            return t;
+        }
+
+        /** Create matrix for ODF's elliptical gradient definition
+
+            @param o_rGradientInfo
+            Receives the calculated texture transformation matrix (for
+            use with standard [0,1]x[0,1] texture coordinates)
+
+            @param rTargetArea
+            Output area, needed for aspect ratio calculations and
+            texture transformation
+
+            @param rOffset
+            Gradient offset value (from ODF)
+
+            @param nSteps
+            Number of gradient steps (from ODF)
+
+            @param fBorder
+            Width of gradient border (from ODF)
+
+            @param fAngle
+            Gradient angle (from ODF)
+         */
+        ODFGradientInfo& createEllipticalODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                         const B2DRange&  rTargetArea,
+                                                         const B2DVector& rOffset,
+                                                         sal_uInt32       nSteps,
+                                                         double           fBorder,
+                                                         double           fAngle);
+
+        /** Calculate elliptical gradient blend value
+
+            This method generates you the lerp alpha value for
+            blending linearly between gradient start and end color,
+            according to the formula (startCol*(1.0-alpha) + endCol*alpha)
+
+            @param rUV
+            Current uv coordinate. Values outside [0,1] will be
+            clamped.
+
+            @param rGradInfo
+            Gradient info, for transformation and number of steps
+         */
+        inline double getEllipticalGradientAlpha(const B2DPoint&        rUV,
+                                                 const ODFGradientInfo& rGradInfo )
+        {
+            return getRadialGradientAlpha(rUV,rGradInfo); // only matrix setup differs
+        }
+
+        /** Create matrix for ODF's square gradient definition
+
+            @param o_rGradientInfo
+            Receives the calculated texture transformation matrix (for
+            use with standard [0,1]x[0,1] texture coordinates)
+
+            @param rTargetArea
+            Output area, needed for aspect ratio calculations and
+            texture transformation
+
+            @param rOffset
+            Gradient offset value (from ODF)
+
+            @param nSteps
+            Number of gradient steps (from ODF)
+
+            @param fBorder
+            Width of gradient border (from ODF)
+
+            @param fAngle
+            Gradient angle (from ODF)
+         */
+        ODFGradientInfo& createSquareODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                     const B2DRange&  rTargetArea,
+                                                     const B2DVector& rOffset,
+                                                     sal_uInt32       nSteps,
+                                                     double           fBorder,
+                                                     double           fAngle);
+
+        /** Calculate square gradient blend value
+
+            This method generates you the lerp alpha value for
+            blending linearly between gradient start and end color,
+            according to the formula (startCol*(1.0-alpha) + endCol*alpha)
+
+            @param rUV
+            Current uv coordinate. Values outside [0,1] will be
+            clamped.
+
+            @param rGradInfo
+            Gradient info, for transformation and number of steps
+         */
+        inline double getSquareGradientAlpha(const B2DPoint&        rUV,
+                                             const ODFGradientInfo& rGradInfo )
+        {
+            const B2DPoint aCoor(rGradInfo.maBackTextureTransform * rUV);
+            const double   fAbsX(fabs(aCoor.getX()));
+            const double   fAbsY(fabs(aCoor.getY()));
+
+            if(fTools::moreOrEqual(fAbsX, 1.0) || fTools::moreOrEqual(fAbsY, 1.0))
+                return 0.0;
+
+            const double t(1.0 - (fAbsX > fAbsY ? fAbsX : fAbsY));
+            const sal_uInt32 nSteps(rGradInfo.mnSteps);
+
+            if(nSteps > 2L && nSteps < 128L)
+                return floor(t * nSteps) / double(nSteps - 1L);
+
+            return t;
+        }
+
+        /** Create matrix for ODF's rectangular gradient definition
+
+            @param o_rGradientInfo
+            Receives the calculated texture transformation matrix (for
+            use with standard [0,1]x[0,1] texture coordinates)
+
+            @param rTargetArea
+            Output area, needed for aspect ratio calculations and
+            texture transformation
+
+            @param rOffset
+            Gradient offset value (from ODF)
+
+            @param nSteps
+            Number of gradient steps (from ODF)
+
+            @param fBorder
+            Width of gradient border (from ODF)
+
+            @param fAngle
+            Gradient angle (from ODF)
+         */
+        ODFGradientInfo& createRectangularODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                          const B2DRange&  rTargetArea,
+                                                          const B2DVector& rOffset,
+                                                          sal_uInt32       nSteps,
+                                                          double           fBorder,
+                                                          double           fAngle);
+
+        /** Calculate rectangular gradient blend value
+
+            This method generates you the lerp alpha value for
+            blending linearly between gradient start and end color,
+            according to the formula (startCol*(1.0-alpha) + endCol*alpha)
+
+            @param rUV
+            Current uv coordinate. Values outside [0,1] will be
+            clamped.
+
+            @param rGradInfo
+            Gradient info, for transformation and number of steps
+         */
+        inline double getRectangularGradientAlpha(const B2DPoint&        rUV,
+                                                  const ODFGradientInfo& rGradInfo )
+        {
+            return getSquareGradientAlpha(rUV, rGradInfo); // only matrix setup differs
+        }
+    }
+}
+
+#endif
diff --git a/basegfx/inc/basegfx/tools/keystoplerp.hxx b/basegfx/inc/basegfx/tools/keystoplerp.hxx
new file mode 100644
index 000000000000..a54b3485b1a1
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/keystoplerp.hxx
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: canvastools.hxx,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_KEYSTOPLERP_HXX
+#define _BGFX_TOOLS_KEYSTOPLERP_HXX
+
+#include <basegfx/numeric/ftools.hxx>
+#include <vector>
+
+namespace com{ namespace sun{ namespace star{ namespace uno {
+    template<typename T> class Sequence;
+}}}}
+
+namespace basegfx
+{
+    namespace tools
+    {
+        /** Lerp in a vector of key stops
+
+            This class holds a key stop vector and provides the
+            functionality to lerp inside it. Useful e.g. for
+            multi-stop gradients, or the SMIL key time activity.
+
+            For those, given a global [0,1] lerp alpha, one need to
+            find the suitable bucket index from key stop vector, and
+            then calculate the relative alpha between the two buckets
+            found.
+         */
+        class KeyStopLerp
+        {
+        public:
+            typedef std::pair<std::ptrdiff_t,double> ResultType;
+
+            /** Create lerper with given vector of stops
+
+                @param rKeyStops
+
+                Vector of stops, must contain at least two elements
+                (though preferrably more, otherwise you probably don't
+                need key stop lerping in the first place). All
+                elements must be of monotonically increasing value.
+             */
+            explicit KeyStopLerp( const std::vector<double>& rKeyStops );
+
+            /** Create lerper with given sequence of stops
+
+                @param rKeyStops
+
+                Sequence of stops, must contain at least two elements
+                (though preferrably more, otherwise you probably don't
+                need key stop lerping in the first place). All
+                elements must be of monotonically increasing value.
+             */
+            explicit KeyStopLerp( const ::com::sun::star::uno::Sequence<double>& rKeyStops );
+
+            /** Find two nearest bucket index & interpolate
+
+                @param fAlpha
+                Find bucket index i, with keyStops[i] < fAlpha <=
+                keyStops[i+1]. Return new alpha value in [0,1),
+                proportional to fAlpha's position between keyStops[i]
+                and keyStops[i+1]
+             */
+            ResultType lerp(double fAlpha) const;
+
+        private:
+            std::vector<double>    maKeyStops;
+            mutable std::ptrdiff_t mnLastIndex;
+        };
+    }
+}
+
+#endif
diff --git a/basegfx/inc/basegfx/tools/lerp.hxx b/basegfx/inc/basegfx/tools/lerp.hxx
new file mode 100644
index 000000000000..590ef34c2009
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/lerp.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: lerp.hxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_LERP_HXX
+#define _BGFX_TOOLS_LERP_HXX
+
+#include <sal/types.h>
+
+namespace basegfx
+{
+    namespace tools
+    {
+        /** Generic linear interpolator
+
+            @tpl ValueType
+            Must have operator+ and operator* defined, and should
+            have value semantics.
+
+            @param t
+            As usual, t must be in the [0,1] range
+        */
+        template< typename ValueType > ValueType lerp( const ValueType&     rFrom,
+                                                       const ValueType&     rTo,
+                                                       double               t )
+        {
+            // This is only to suppress a double->int warning. All other
+            // types should be okay here.
+            return static_cast<ValueType>( (1.0-t)*rFrom + t*rTo );
+        }
+    }
+}
+
+#endif /* _BGFX_TOOLS_LERP_HXX */
diff --git a/basegfx/inc/basegfx/tools/rectcliptools.hxx b/basegfx/inc/basegfx/tools/rectcliptools.hxx
new file mode 100644
index 000000000000..ae7c057666d9
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/rectcliptools.hxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_RECTCLIPTOOLS_HXX
+#define _BGFX_TOOLS_RECTCLIPTOOLS_HXX
+
+#include <sal/types.h>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        namespace RectClipFlags
+        {
+            static const sal_uInt32 LEFT   = (sal_Int32)0x01;
+            static const sal_uInt32 RIGHT  = (sal_Int32)0x02;
+            static const sal_uInt32 TOP    = (sal_Int32)0x04;
+            static const sal_uInt32 BOTTOM = (sal_Int32)0x08;
+        }
+
+        /** Calc clip mask for Cohen-Sutherland rectangle clip
+
+            This function returns a clip mask used for the
+            Cohen-Sutherland rectangle clip method, where one or more
+            of the lower four bits are set, if the given point is
+            outside one or more of the four half planes defining the
+            rectangle (see RectClipFlags for possible values)
+         */
+        template< class Point, class Rect > inline
+           sal_uInt32 getCohenSutherlandClipFlags( const Point& rP,
+                                                   const Rect&  rR )
+        {
+            // maxY | minY | maxX | minX
+            sal_uInt32 clip  = (rP.getX() < rR.getMinX()) << 0;
+                       clip |= (rP.getX() > rR.getMaxX()) << 1;
+                       clip |= (rP.getY() < rR.getMinY()) << 2;
+                       clip |= (rP.getY() > rR.getMaxY()) << 3;
+            return clip;
+        }
+
+        /** Determine number of clip planes hit by given clip mask
+
+            This method returns the number of one bits in the four
+            least significant bits of the argument, which amounts to
+            the number of clip planes hit within the
+            getCohenSutherlandClipFlags() method.
+         */
+        inline sal_uInt32 getNumberOfClipPlanes( sal_uInt32 nFlags )
+        {
+            // classic bit count algo, see e.g. Reingold, Nievergelt,
+            // Deo: Combinatorial Algorithms, Theory and Practice,
+            // Prentice-Hall 1977
+            nFlags = (nFlags & 0x05) + ((nFlags >> 1) & 0x05);
+            nFlags = (nFlags & 0x03) + (nFlags >> 2); // no need for &
+                                                      // 0x03, can't
+                                                      // overflow
+            return nFlags;
+        }
+    }
+}
+
+#endif // _BGFX_TOOLS_RECTCLIPTOOLS_HXX
diff --git a/basegfx/inc/basegfx/tools/tools.hxx b/basegfx/inc/basegfx/tools/tools.hxx
new file mode 100644
index 000000000000..896fd22c162d
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/tools.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TOOLS_TOOLS_HXX
+#define _BGFX_TOOLS_TOOLS_HXX
+
+#include <sal/types.h>
+
+namespace basegfx
+{
+    class B2DPoint;
+    class B2DRange;
+
+    namespace tools
+    {
+        /** Liang-Barsky 2D line clipping algorithm
+
+            This function clips a line given by two points against the
+            given rectangle. The resulting line is returned in the
+            given points.
+
+            @param io_rStart
+            Start point of the line. On return, contains the clipped
+            start point.
+
+            @param io_rEnd
+            End point of the line. On return, contains the clipped
+            end point.
+
+            @param rClipRect
+            The rectangle to clip against
+
+            @return true, when at least part of the line is visible
+            after the clip, false otherwise
+         */
+        bool liangBarskyClip2D( ::basegfx::B2DPoint&        io_rStart,
+                                ::basegfx::B2DPoint&        io_rEnd,
+                                const ::basegfx::B2DRange&  rClipRect );
+
+        /** Expand given parallelogram, such that it extends beyond
+            bound rect in a given direction.
+
+            This method is useful when e.g. generating one-dimensional
+            gradients, such as linear or axial gradients: those
+            gradients vary only in one direction, the other has
+            constant color. Most of the time, those gradients extends
+            infinitely in the direction with the constant color, but
+            practically, one always has a limiting bound rect into
+            which the gradient is painted. The method at hand now
+            extends a given parallelogram (e.g. the transformed
+            bounding box of a gradient) virtually into infinity to the
+            top and to the bottom (i.e. normal to the line io_rLeftTop
+            io_rRightTop), such that the given rectangle is guaranteed
+            to be covered in that direction.
+
+            @attention There might be some peculiarities with this
+            method, that might limit its usage to the described
+            gradients. One of them is the fact that when determining
+            how far the parallelogram has to be extended to the top or
+            the bottom, the upper and lower border are assumed to be
+            infinite lines.
+
+            @param io_rLeftTop
+            Left, top edge of the parallelogramm. Note that this need
+            not be the left, top edge geometrically, it's just used
+            when determining the extension direction. Thus, it's
+            perfectly legal to affine-transform a rectangle, and given
+            the transformed point here. On method return, this
+            parameter will contain the adapted output.
+
+            @param io_rLeftBottom
+            Left, bottom edge of the parallelogramm. Note that this need
+            not be the left, bottom edge geometrically, it's just used
+            when determining the extension direction. Thus, it's
+            perfectly legal to affine-transform a rectangle, and given
+            the transformed point here. On method return, this
+            parameter will contain the adapted output.
+
+            @param io_rRightTop
+            Right, top edge of the parallelogramm. Note that this need
+            not be the right, top edge geometrically, it's just used
+            when determining the extension direction. Thus, it's
+            perfectly legal to affine-transform a rectangle, and given
+            the transformed point here. On method return, this
+            parameter will contain the adapted output.
+
+            @param io_rRightBottom
+            Right, bottom edge of the parallelogramm. Note that this need
+            not be the right, bottom edge geometrically, it's just used
+            when determining the extension direction. Thus, it's
+            perfectly legal to affine-transform a rectangle, and given
+            the transformed point here. On method return, this
+            parameter will contain the adapted output.
+
+            @param rFitTarget
+            The rectangle to fit the parallelogram into.
+         */
+        void infiniteLineFromParallelogram( ::basegfx::B2DPoint&        io_rLeftTop,
+                                            ::basegfx::B2DPoint&        io_rLeftBottom,
+                                            ::basegfx::B2DPoint&        io_rRightTop,
+                                            ::basegfx::B2DPoint&        io_rRightBottom,
+                                            const ::basegfx::B2DRange&  rFitTarget  );
+
+    }
+}
+
+#endif /* _BGFX_TOOLS_TOOLS_HXX */
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
new file mode 100755
index 000000000000..8a4044e1ca4b
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_BASEGFX_UNOPOLYPOLYGON_HXX
+#define INCLUDED_BASEGFX_UNOPOLYPOLYGON_HXX
+
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase3.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/rendering/FillRule.hpp>
+#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
+#include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+
+
+namespace basegfx
+{
+namespace unotools
+{
+    typedef ::cppu::WeakComponentImplHelper3<
+             ::com::sun::star::rendering::XLinePolyPolygon2D,
+          ::com::sun::star::rendering::XBezierPolyPolygon2D,
+          ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase;
+
+    class UnoPolyPolygon : private cppu::BaseMutex,
+                           public UnoPolyPolygonBase
+    {
+    public:
+        explicit UnoPolyPolygon( const B2DPolyPolygon& );
+
+        // XPolyPolygon2D
+        virtual void SAL_CALL addPolyPolygon( const ::com::sun::star::geometry::RealPoint2D& position, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& polyPolygon ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int32 SAL_CALL getNumberOfPolygons(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int32 SAL_CALL getNumberOfPolygonPoints( ::sal_Int32 polygon ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::rendering::FillRule SAL_CALL getFillRule(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setFillRule( ::com::sun::star::rendering::FillRule fillRule ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isClosed( ::sal_Int32 index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setClosed( ::sal_Int32 index, ::sal_Bool closedState ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // XLinePolyPolygon2D
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > > SAL_CALL getPoints( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setPoints( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::geometry::RealPoint2D SAL_CALL getPoint( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setPoint( const ::com::sun::star::geometry::RealPoint2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // XBezierPolyPolygon2D
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > > SAL_CALL getBezierSegments( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setBezierSegments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::geometry::RealBezierSegment2D SAL_CALL getBezierSegment( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setBezierSegment( const ::com::sun::star::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::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 );
+
+        B2DPolyPolygon getPolyPolygon() const;
+
+    protected:
+        /// Check whether index is a valid polygon index
+        void checkIndex( sal_Int32 nIndex ) const // throw (::com::sun::star::lang::IndexOutOfBoundsException);
+        {
+            if( nIndex < 0 || nIndex >= static_cast<sal_Int32>(maPolyPoly.count()) )
+                throw ::com::sun::star::lang::IndexOutOfBoundsException();
+        }
+
+        B2DPolyPolygon getSubsetPolyPolygon( sal_Int32 nPolygonIndex,
+                                             sal_Int32 nNumberOfPolygons,
+                                             sal_Int32 nPointIndex,
+                                             sal_Int32 nNumberOfPoints ) const;
+
+        /// Get cow copy of internal polygon. not thread-safe outside this object.
+        B2DPolyPolygon getPolyPolygonUnsafe() const;
+
+        /// Called whenever internal polypolygon gets modified
+        virtual void modifying() const {}
+
+    private:
+        UnoPolyPolygon( const UnoPolyPolygon& );
+        UnoPolyPolygon& operator=( const UnoPolyPolygon& );
+
+        B2DPolyPolygon                        maPolyPoly;
+        ::com::sun::star::rendering::FillRule meFillRule;
+    };
+}
+}
+
+#endif /* INCLUDED_BASEGFX_UNOPOLYPOLYGON_HXX */
diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
new file mode 100644
index 000000000000..71dd227ac736
--- /dev/null
+++ b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
@@ -0,0 +1,359 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TUPLE_B2DTUPLE_HXX
+#define _BGFX_TUPLE_B2DTUPLE_HXX
+
+#include <sal/types.h>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    // predeclarations
+    class B2ITuple;
+
+    /** Base class for all Points/Vectors with two double values
+
+        This class provides all methods common to Point
+        avd Vector classes which are derived from here.
+
+        @derive Use this class to implement Points or Vectors
+        which are based on two double values
+    */
+    class B2DTuple
+    {
+    protected:
+        double                                      mfX;
+        double                                      mfY;
+
+    public:
+        /** Create a 2D Tuple
+
+            The tuple is initialized to (0.0, 0.0)
+        */
+        B2DTuple()
+        :   mfX(0.0),
+            mfY(0.0)
+        {}
+
+        /** Create a 2D Tuple
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 2D Tuple.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 2D Tuple.
+        */
+        B2DTuple(double fX, double fY)
+        :   mfX( fX ),
+            mfY( fY )
+        {}
+
+        /** Create a copy of a 2D Tuple
+
+            @param rTup
+            The 2D Tuple which will be copied.
+        */
+        B2DTuple(const B2DTuple& rTup)
+        :   mfX( rTup.mfX ),
+            mfY( rTup.mfY )
+        {}
+
+        /** Create a copy of a 2D integer Tuple
+
+            @param rTup
+            The 2D Tuple which will be copied.
+        */
+        explicit B2DTuple(const B2ITuple& rTup);
+
+        ~B2DTuple()
+        {}
+
+        /// Get X-Coordinate of 2D Tuple
+        double getX() const
+        {
+            return mfX;
+        }
+
+        /// Get Y-Coordinate of 2D Tuple
+        double getY() const
+        {
+            return mfY;
+        }
+
+        /// Set X-Coordinate of 2D Tuple
+        void setX(double fX)
+        {
+            mfX = fX;
+        }
+
+        /// Set Y-Coordinate of 2D Tuple
+        void setY(double fY)
+        {
+            mfY = fY;
+        }
+
+        /// Array-access to 2D Tuple
+        const double& operator[] (int nPos) const
+        {
+            // Here, normally one if(...) should be used. In the assumption that
+            // both double members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mfX; return mfY;
+            return *((&mfX) + nPos);
+        }
+
+        /// Array-access to 2D Tuple
+        double& operator[] (int nPos)
+        {
+            // Here, normally one if(...) should be used. In the assumption that
+            // both double members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mfX; return mfY;
+            return *((&mfX) + nPos);
+        }
+
+        // comparators with tolerance
+        //////////////////////////////////////////////////////////////////////
+
+        bool equalZero() const
+        {
+            return (this == &getEmptyTuple() ||
+                    (fTools::equalZero(mfX) && fTools::equalZero(mfY)));
+        }
+
+        bool equalZero(const double& rfSmallValue) const
+        {
+            return (this == &getEmptyTuple() ||
+                    (fTools::equalZero(mfX, rfSmallValue) && fTools::equalZero(mfY, rfSmallValue)));
+        }
+
+        bool equal(const B2DTuple& rTup) const
+        {
+            return (
+                this == &rTup ||
+                (fTools::equal(mfX, rTup.mfX) &&
+                fTools::equal(mfY, rTup.mfY)));
+        }
+
+        bool equal(const B2DTuple& rTup, const double& rfSmallValue) const
+        {
+            return (
+                this == &rTup ||
+                (fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
+                fTools::equal(mfY, rTup.mfY, rfSmallValue)));
+        }
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B2DTuple& operator+=( const B2DTuple& rTup )
+        {
+            mfX += rTup.mfX;
+            mfY += rTup.mfY;
+            return *this;
+        }
+
+        B2DTuple& operator-=( const B2DTuple& rTup )
+        {
+            mfX -= rTup.mfX;
+            mfY -= rTup.mfY;
+            return *this;
+        }
+
+        B2DTuple& operator/=( const B2DTuple& rTup )
+        {
+            mfX /= rTup.mfX;
+            mfY /= rTup.mfY;
+            return *this;
+        }
+
+        B2DTuple& operator*=( const B2DTuple& rTup )
+        {
+            mfX *= rTup.mfX;
+            mfY *= rTup.mfY;
+            return *this;
+        }
+
+        B2DTuple& operator*=(double t)
+        {
+            mfX *= t;
+            mfY *= t;
+            return *this;
+        }
+
+        B2DTuple& operator/=(double t)
+        {
+            const double fVal(1.0 / t);
+            mfX *= fVal;
+            mfY *= fVal;
+            return *this;
+        }
+
+        B2DTuple operator-(void) const
+        {
+            return B2DTuple(-mfX, -mfY);
+        }
+
+        bool operator==( const B2DTuple& rTup ) const
+        {
+            return equal(rTup);
+        }
+
+        bool operator!=( const B2DTuple& rTup ) const
+        {
+            return !equal(rTup);
+        }
+
+        B2DTuple& operator=( const B2DTuple& rTup )
+        {
+            mfX = rTup.mfX;
+            mfY = rTup.mfY;
+            return *this;
+        }
+
+        void correctValues(const double fCompareValue = 0.0);
+
+        static const B2DTuple& getEmptyTuple();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    inline B2DTuple minimum(const B2DTuple& rTupA, const B2DTuple& rTupB)
+    {
+        B2DTuple aMin(
+            (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+        return aMin;
+    }
+
+    inline B2DTuple maximum(const B2DTuple& rTupA, const B2DTuple& rTupB)
+    {
+        B2DTuple aMax(
+            (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+        return aMax;
+    }
+
+    inline B2DTuple absolute(const B2DTuple& rTup)
+    {
+        B2DTuple aAbs(
+            (0.0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
+            (0.0 > rTup.getY()) ? -rTup.getY() : rTup.getY());
+        return aAbs;
+    }
+
+    inline B2DTuple interpolate(const B2DTuple& rOld1, const B2DTuple& rOld2, double t)
+    {
+        B2DTuple aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+        return aInt;
+    }
+
+    inline B2DTuple average(const B2DTuple& rOld1, const B2DTuple& rOld2)
+    {
+        B2DTuple aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5);
+        return aAvg;
+    }
+
+    inline B2DTuple average(const B2DTuple& rOld1, const B2DTuple& rOld2, const B2DTuple& rOld3)
+    {
+        B2DTuple aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    inline B2DTuple operator+(const B2DTuple& rTupA, const B2DTuple& rTupB)
+    {
+        B2DTuple aSum(rTupA);
+        aSum += rTupB;
+        return aSum;
+    }
+
+    inline B2DTuple operator-(const B2DTuple& rTupA, const B2DTuple& rTupB)
+    {
+        B2DTuple aSub(rTupA);
+        aSub -= rTupB;
+        return aSub;
+    }
+
+    inline B2DTuple operator/(const B2DTuple& rTupA, const B2DTuple& rTupB)
+    {
+        B2DTuple aDiv(rTupA);
+        aDiv /= rTupB;
+        return aDiv;
+    }
+
+    inline B2DTuple operator*(const B2DTuple& rTupA, const B2DTuple& rTupB)
+    {
+        B2DTuple aMul(rTupA);
+        aMul *= rTupB;
+        return aMul;
+    }
+
+    inline B2DTuple operator*(const B2DTuple& rTup, double t)
+    {
+        B2DTuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B2DTuple operator*(double t, const B2DTuple& rTup)
+    {
+        B2DTuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B2DTuple operator/(const B2DTuple& rTup, double t)
+    {
+        B2DTuple aNew(rTup);
+        aNew /= t;
+        return aNew;
+    }
+
+    inline B2DTuple operator/(double t, const B2DTuple& rTup)
+    {
+        B2DTuple aNew(t, t);
+        B2DTuple aTmp(rTup);
+        aNew /= aTmp;
+        return aNew;
+    }
+
+    /** Round double to nearest integer for 2D tuple
+
+        @return the nearest integer for this tuple
+    */
+    B2ITuple fround(const B2DTuple& rTup);
+} // end of namespace basegfx
+
+#endif /* _BGFX_TUPLE_B2DTUPLE_HXX */
diff --git a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
new file mode 100644
index 000000000000..9c813c07a994
--- /dev/null
+++ b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
@@ -0,0 +1,312 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TUPLE_B2I64TUPLE_HXX
+#define _BGFX_TUPLE_B2I64TUPLE_HXX
+
+#include <sal/types.h>
+#include <basegfx/tuple/b2dtuple.hxx>
+
+
+namespace basegfx
+{
+    /** Base class for all Points/Vectors with two sal_Int64 values
+
+        This class provides all methods common to Point
+        avd Vector classes which are derived from here.
+
+        @derive Use this class to implement Points or Vectors
+        which are based on two sal_Int64 values
+    */
+    class B2I64Tuple
+    {
+    protected:
+        sal_Int64                                       mnX;
+        sal_Int64                                       mnY;
+
+    public:
+        /** Create a 2D Tuple
+
+            The tuple is initialized to (0, 0)
+        */
+        B2I64Tuple()
+        :   mnX(0),
+            mnY(0)
+        {}
+
+        /** Create a 2D Tuple
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 2D Tuple.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 2D Tuple.
+        */
+        B2I64Tuple(sal_Int64 fX, sal_Int64 fY)
+        :   mnX( fX ),
+            mnY( fY )
+        {}
+
+        /** Create a copy of a 2D Tuple
+
+            @param rTup
+            The 2D Tuple which will be copied.
+        */
+        B2I64Tuple(const B2I64Tuple& rTup)
+        :   mnX( rTup.mnX ),
+            mnY( rTup.mnY )
+        {}
+
+        ~B2I64Tuple()
+        {}
+
+        /// Get X-Coordinate of 2D Tuple
+        sal_Int64 getX() const
+        {
+            return mnX;
+        }
+
+        /// Get Y-Coordinate of 2D Tuple
+        sal_Int64 getY() const
+        {
+            return mnY;
+        }
+
+        /// Set X-Coordinate of 2D Tuple
+        void setX(sal_Int64 fX)
+        {
+            mnX = fX;
+        }
+
+        /// Set Y-Coordinate of 2D Tuple
+        void setY(sal_Int64 fY)
+        {
+            mnY = fY;
+        }
+
+        /// Array-access to 2D Tuple
+        const sal_Int64& operator[] (int nPos) const
+        {
+            // Here, normally one if(...) should be used. In the assumption that
+            // both sal_Int64 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; return mnY;
+            return *((&mnX) + nPos);
+        }
+
+        /// Array-access to 2D Tuple
+        sal_Int64& operator[] (int nPos)
+        {
+            // Here, normally one if(...) should be used. In the assumption that
+            // both sal_Int64 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; return mnY;
+            return *((&mnX) + nPos);
+        }
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B2I64Tuple& operator+=( const B2I64Tuple& rTup )
+        {
+            mnX += rTup.mnX;
+            mnY += rTup.mnY;
+            return *this;
+        }
+
+        B2I64Tuple& operator-=( const B2I64Tuple& rTup )
+        {
+            mnX -= rTup.mnX;
+            mnY -= rTup.mnY;
+            return *this;
+        }
+
+        B2I64Tuple& operator/=( const B2I64Tuple& rTup )
+        {
+            mnX /= rTup.mnX;
+            mnY /= rTup.mnY;
+            return *this;
+        }
+
+        B2I64Tuple& operator*=( const B2I64Tuple& rTup )
+        {
+            mnX *= rTup.mnX;
+            mnY *= rTup.mnY;
+            return *this;
+        }
+
+        B2I64Tuple& operator*=(sal_Int64 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            return *this;
+        }
+
+        B2I64Tuple& operator/=(sal_Int64 t)
+        {
+            mnX /= t;
+            mnY /= t;
+            return *this;
+        }
+
+        B2I64Tuple operator-(void) const
+        {
+            return B2I64Tuple(-mnX, -mnY);
+        }
+
+        bool equalZero() const { return mnX == 0 && mnY == 0; }
+
+        bool operator==( const B2I64Tuple& rTup ) const
+        {
+            return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY);
+        }
+
+        bool operator!=( const B2I64Tuple& rTup ) const
+        {
+            return !(*this == rTup);
+        }
+
+        B2I64Tuple& operator=( const B2I64Tuple& rTup )
+        {
+            mnX = rTup.mnX;
+            mnY = rTup.mnY;
+            return *this;
+        }
+
+        static const B2I64Tuple& getEmptyTuple();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    inline B2I64Tuple minimum(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
+    {
+        B2I64Tuple aMin(
+            (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+        return aMin;
+    }
+
+    inline B2I64Tuple maximum(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
+    {
+        B2I64Tuple aMax(
+            (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+        return aMax;
+    }
+
+    inline B2I64Tuple absolute(const B2I64Tuple& rTup)
+    {
+        B2I64Tuple aAbs(
+            (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
+            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY());
+        return aAbs;
+    }
+
+    inline B2DTuple interpolate(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2, double t)
+    {
+        B2DTuple aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+        return aInt;
+    }
+
+    inline B2DTuple average(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2)
+    {
+        B2DTuple aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5);
+        return aAvg;
+    }
+
+    inline B2DTuple average(const B2I64Tuple& rOld1, const B2I64Tuple& rOld2, const B2I64Tuple& rOld3)
+    {
+        B2DTuple aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    inline B2I64Tuple operator+(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
+    {
+        B2I64Tuple aSum(rTupA);
+        aSum += rTupB;
+        return aSum;
+    }
+
+    inline B2I64Tuple operator-(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
+    {
+        B2I64Tuple aSub(rTupA);
+        aSub -= rTupB;
+        return aSub;
+    }
+
+    inline B2I64Tuple operator/(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
+    {
+        B2I64Tuple aDiv(rTupA);
+        aDiv /= rTupB;
+        return aDiv;
+    }
+
+    inline B2I64Tuple operator*(const B2I64Tuple& rTupA, const B2I64Tuple& rTupB)
+    {
+        B2I64Tuple aMul(rTupA);
+        aMul *= rTupB;
+        return aMul;
+    }
+
+    inline B2I64Tuple operator*(const B2I64Tuple& rTup, sal_Int64 t)
+    {
+        B2I64Tuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B2I64Tuple operator*(sal_Int64 t, const B2I64Tuple& rTup)
+    {
+        B2I64Tuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B2I64Tuple operator/(const B2I64Tuple& rTup, sal_Int64 t)
+    {
+        B2I64Tuple aNew(rTup);
+        aNew /= t;
+        return aNew;
+    }
+
+    inline B2I64Tuple operator/(sal_Int64 t, const B2I64Tuple& rTup)
+    {
+        B2I64Tuple aNew(t, t);
+        B2I64Tuple aTmp(rTup);
+        aNew /= aTmp;
+        return aNew;
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_TUPLE_B2I64TUPLE_HXX */
diff --git a/basegfx/inc/basegfx/tuple/b2ituple.hxx b/basegfx/inc/basegfx/tuple/b2ituple.hxx
new file mode 100644
index 000000000000..da29b5509dec
--- /dev/null
+++ b/basegfx/inc/basegfx/tuple/b2ituple.hxx
@@ -0,0 +1,237 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TUPLE_B2ITUPLE_HXX
+#define _BGFX_TUPLE_B2ITUPLE_HXX
+
+#include <sal/types.h>
+
+
+namespace basegfx
+{
+    /** Base class for all Points/Vectors with two sal_Int32 values
+
+        This class provides all methods common to Point
+        avd Vector classes which are derived from here.
+
+        @derive Use this class to implement Points or Vectors
+        which are based on two sal_Int32 values
+    */
+    class B2ITuple
+    {
+    protected:
+        sal_Int32                                       mnX;
+        sal_Int32                                       mnY;
+
+    public:
+        /** Create a 2D Tuple
+
+            The tuple is initialized to (0, 0)
+        */
+        B2ITuple()
+        :   mnX(0),
+            mnY(0)
+        {}
+
+        /** Create a 2D Tuple
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 2D Tuple.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 2D Tuple.
+        */
+        B2ITuple(sal_Int32 fX, sal_Int32 fY)
+        :   mnX( fX ),
+            mnY( fY )
+        {}
+
+        /** Create a copy of a 2D Tuple
+
+            @param rTup
+            The 2D Tuple which will be copied.
+        */
+        B2ITuple(const B2ITuple& rTup)
+        :   mnX( rTup.mnX ),
+            mnY( rTup.mnY )
+        {}
+
+        ~B2ITuple()
+        {}
+
+        /// Get X-Coordinate of 2D Tuple
+        sal_Int32 getX() const
+        {
+            return mnX;
+        }
+
+        /// Get Y-Coordinate of 2D Tuple
+        sal_Int32 getY() const
+        {
+            return mnY;
+        }
+
+        /// Set X-Coordinate of 2D Tuple
+        void setX(sal_Int32 fX)
+        {
+            mnX = fX;
+        }
+
+        /// Set Y-Coordinate of 2D Tuple
+        void setY(sal_Int32 fY)
+        {
+            mnY = fY;
+        }
+
+        /// Array-access to 2D Tuple
+        const sal_Int32& operator[] (int nPos) const
+        {
+            // Here, normally one if(...) should be used. In the assumption that
+            // both sal_Int32 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; return mnY;
+            return *((&mnX) + nPos);
+        }
+
+        /// Array-access to 2D Tuple
+        sal_Int32& operator[] (int nPos)
+        {
+            // Here, normally one if(...) should be used. In the assumption that
+            // both sal_Int32 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; return mnY;
+            return *((&mnX) + nPos);
+        }
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B2ITuple& operator+=( const B2ITuple& rTup )
+        {
+            mnX += rTup.mnX;
+            mnY += rTup.mnY;
+            return *this;
+        }
+
+        B2ITuple& operator-=( const B2ITuple& rTup )
+        {
+            mnX -= rTup.mnX;
+            mnY -= rTup.mnY;
+            return *this;
+        }
+
+        B2ITuple& operator/=( const B2ITuple& rTup )
+        {
+            mnX /= rTup.mnX;
+            mnY /= rTup.mnY;
+            return *this;
+        }
+
+        B2ITuple& operator*=( const B2ITuple& rTup )
+        {
+            mnX *= rTup.mnX;
+            mnY *= rTup.mnY;
+            return *this;
+        }
+
+        B2ITuple& operator*=(sal_Int32 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            return *this;
+        }
+
+        B2ITuple& operator/=(sal_Int32 t)
+        {
+            mnX /= t;
+            mnY /= t;
+            return *this;
+        }
+
+        B2ITuple operator-(void) const
+        {
+            return B2ITuple(-mnX, -mnY);
+        }
+
+        bool equalZero() const { return mnX == 0 && mnY == 0; }
+
+        bool operator==( const B2ITuple& rTup ) const
+        {
+            return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY);
+        }
+
+        bool operator!=( const B2ITuple& rTup ) const
+        {
+            return !(*this == rTup);
+        }
+
+        B2ITuple& operator=( const B2ITuple& rTup )
+        {
+            mnX = rTup.mnX;
+            mnY = rTup.mnY;
+            return *this;
+        }
+
+        static const B2ITuple& getEmptyTuple();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    class B2DTuple;
+
+    B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB);
+
+    B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB);
+
+    B2ITuple absolute(const B2ITuple& rTup);
+
+    B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t);
+
+    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2);
+
+    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2, const B2ITuple& rOld3);
+
+    B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB);
+
+    B2ITuple operator-(const B2ITuple& rTupA, const B2ITuple& rTupB);
+
+    B2ITuple operator/(const B2ITuple& rTupA, const B2ITuple& rTupB);
+
+    B2ITuple operator*(const B2ITuple& rTupA, const B2ITuple& rTupB);
+
+    B2ITuple operator*(const B2ITuple& rTup, sal_Int32 t);
+
+    B2ITuple operator*(sal_Int32 t, const B2ITuple& rTup);
+
+    B2ITuple operator/(const B2ITuple& rTup, sal_Int32 t);
+
+    B2ITuple operator/(sal_Int32 t, const B2ITuple& rTup);
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_TUPLE_B2ITUPLE_HXX */
diff --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
new file mode 100644
index 000000000000..11fb797ff0ff
--- /dev/null
+++ b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
@@ -0,0 +1,433 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TUPLE_B3DTUPLE_HXX
+#define _BGFX_TUPLE_B3DTUPLE_HXX
+
+#include <sal/types.h>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    // predeclarations
+    class B3ITuple;
+
+    /** Base class for all Points/Vectors with three double values
+
+        This class provides all methods common to Point
+        avd Vector classes which are derived from here.
+
+        @derive Use this class to implement Points or Vectors
+        which are based on three double values
+    */
+    class B3DTuple
+    {
+    protected:
+        double                                      mfX;
+        double                                      mfY;
+        double                                      mfZ;
+
+    public:
+        /** Create a 3D Tuple
+
+            The tuple is initialized to (0.0, 0.0, 0.0)
+        */
+        B3DTuple()
+        :   mfX(0.0),
+            mfY(0.0),
+            mfZ(0.0)
+        {}
+
+        /** Create a 3D Tuple
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 3D Tuple.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 3D Tuple.
+
+            @param fZ
+            This parameter is used to initialize the Z-coordinate
+            of the 3D Tuple.
+        */
+        B3DTuple(double fX, double fY, double fZ)
+        :   mfX(fX),
+            mfY(fY),
+            mfZ(fZ)
+        {}
+
+        /** Create a copy of a 3D Tuple
+
+            @param rTup
+            The 3D Tuple which will be copied.
+        */
+        B3DTuple(const B3DTuple& rTup)
+        :   mfX( rTup.mfX ),
+            mfY( rTup.mfY ),
+            mfZ( rTup.mfZ )
+        {}
+
+        /** Create a copy of a 3D integer Tuple
+
+            @param rTup
+            The 3D Tuple which will be copied.
+        */
+        explicit B3DTuple(const B3ITuple& rTup);
+
+        ~B3DTuple()
+        {}
+
+        /// get X-Coordinate of 3D Tuple
+        double getX() const
+        {
+            return mfX;
+        }
+
+        /// get Y-Coordinate of 3D Tuple
+        double getY() const
+        {
+            return mfY;
+        }
+
+        /// get Z-Coordinate of 3D Tuple
+        double getZ() const
+        {
+            return mfZ;
+        }
+
+        /// set X-Coordinate of 3D Tuple
+        void setX(double fX)
+        {
+            mfX = fX;
+        }
+
+        /// set Y-Coordinate of 3D Tuple
+        void setY(double fY)
+        {
+            mfY = fY;
+        }
+
+        /// set Z-Coordinate of 3D Tuple
+        void setZ(double fZ)
+        {
+            mfZ = fZ;
+        }
+
+        /// Array-access to 3D Tuple
+        const double& operator[] (int nPos) const
+        {
+            // Here, normally two if(...)'s should be used. In the assumption that
+            // both double members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mfX; if(1 == nPos) return mfY; return mfZ;
+            return *((&mfX) + nPos);
+        }
+
+        /// Array-access to 3D Tuple
+        double& operator[] (int nPos)
+        {
+            // Here, normally two if(...)'s should be used. In the assumption that
+            // both double members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mfX; if(1 == nPos) return mfY; return mfZ;
+            return *((&mfX) + nPos);
+        }
+
+        // comparators with tolerance
+        //////////////////////////////////////////////////////////////////////
+
+        bool equalZero() const
+        {
+            return (this == &getEmptyTuple() ||
+                (::basegfx::fTools::equalZero(mfX)
+                && ::basegfx::fTools::equalZero(mfY)
+                && ::basegfx::fTools::equalZero(mfZ)));
+        }
+
+        bool equalZero(const double& rfSmallValue) const
+        {
+            return (this == &getEmptyTuple() ||
+                (::basegfx::fTools::equalZero(mfX, rfSmallValue)
+                && ::basegfx::fTools::equalZero(mfY, rfSmallValue)
+                && ::basegfx::fTools::equalZero(mfZ, rfSmallValue)));
+        }
+
+        bool equal(const B3DTuple& rTup) const
+        {
+            return (
+                this == &rTup ||
+                (::basegfx::fTools::equal(mfX, rTup.mfX) &&
+                ::basegfx::fTools::equal(mfY, rTup.mfY) &&
+                ::basegfx::fTools::equal(mfZ, rTup.mfZ)));
+        }
+
+        bool equal(const B3DTuple& rTup, const double& rfSmallValue) const
+        {
+            return (
+                this == &rTup ||
+                (::basegfx::fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
+                ::basegfx::fTools::equal(mfY, rTup.mfY, rfSmallValue) &&
+                ::basegfx::fTools::equal(mfZ, rTup.mfZ, rfSmallValue)));
+        }
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B3DTuple& operator+=( const B3DTuple& rTup )
+        {
+            mfX += rTup.mfX;
+            mfY += rTup.mfY;
+            mfZ += rTup.mfZ;
+            return *this;
+        }
+
+        B3DTuple& operator-=( const B3DTuple& rTup )
+        {
+            mfX -= rTup.mfX;
+            mfY -= rTup.mfY;
+            mfZ -= rTup.mfZ;
+            return *this;
+        }
+
+        B3DTuple& operator/=( const B3DTuple& rTup )
+        {
+            mfX /= rTup.mfX;
+            mfY /= rTup.mfY;
+            mfZ /= rTup.mfZ;
+            return *this;
+        }
+
+        B3DTuple& operator*=( const B3DTuple& rTup )
+        {
+            mfX *= rTup.mfX;
+            mfY *= rTup.mfY;
+            mfZ *= rTup.mfZ;
+            return *this;
+        }
+
+        B3DTuple& operator*=(double t)
+        {
+            mfX *= t;
+            mfY *= t;
+            mfZ *= t;
+            return *this;
+        }
+
+        B3DTuple& operator/=(double t)
+        {
+            const double fVal(1.0 / t);
+            mfX *= fVal;
+            mfY *= fVal;
+            mfZ *= fVal;
+            return *this;
+        }
+
+        B3DTuple operator-(void) const
+        {
+            return B3DTuple(-mfX, -mfY, -mfZ);
+        }
+
+        bool operator==( const B3DTuple& rTup ) const
+        {
+            return equal(rTup);
+        }
+
+        bool operator!=( const B3DTuple& rTup ) const
+        {
+            return !equal(rTup);
+        }
+
+        B3DTuple& operator=( const B3DTuple& rTup )
+        {
+            mfX = rTup.mfX;
+            mfY = rTup.mfY;
+            mfZ = rTup.mfZ;
+            return *this;
+        }
+
+        void correctValues(const double fCompareValue = 0.0)
+        {
+            if(0.0 == fCompareValue)
+            {
+                if(::basegfx::fTools::equalZero(mfX))
+                {
+                    mfX = 0.0;
+                }
+
+                if(::basegfx::fTools::equalZero(mfY))
+                {
+                    mfY = 0.0;
+                }
+
+                if(::basegfx::fTools::equalZero(mfZ))
+                {
+                    mfZ = 0.0;
+                }
+            }
+            else
+            {
+                if(::basegfx::fTools::equal(mfX, fCompareValue))
+                {
+                    mfX = fCompareValue;
+                }
+
+                if(::basegfx::fTools::equal(mfY, fCompareValue))
+                {
+                    mfY = fCompareValue;
+                }
+
+                if(::basegfx::fTools::equal(mfZ, fCompareValue))
+                {
+                    mfZ = fCompareValue;
+                }
+            }
+        }
+
+        static const B3DTuple& getEmptyTuple();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    inline B3DTuple minimum(const B3DTuple& rTupA, const B3DTuple& rTupB)
+    {
+        B3DTuple aMin(
+            (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
+            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+        return aMin;
+    }
+
+    inline B3DTuple maximum(const B3DTuple& rTupA, const B3DTuple& rTupB)
+    {
+        B3DTuple aMax(
+            (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
+            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+        return aMax;
+    }
+
+    inline B3DTuple absolute(const B3DTuple& rTup)
+    {
+        B3DTuple aAbs(
+            (0.0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
+            (0.0 > rTup.getY()) ? -rTup.getY() : rTup.getY(),
+            (0.0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ());
+        return aAbs;
+    }
+
+    inline B3DTuple interpolate(const B3DTuple& rOld1, const B3DTuple& rOld2, double t)
+    {
+        B3DTuple aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+        return aInt;
+    }
+
+    inline B3DTuple average(const B3DTuple& rOld1, const B3DTuple& rOld2)
+    {
+        B3DTuple aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5,
+            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+        return aAvg;
+    }
+
+    inline B3DTuple average(const B3DTuple& rOld1, const B3DTuple& rOld2, const B3DTuple& rOld3)
+    {
+        B3DTuple aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    inline B3DTuple operator+(const B3DTuple& rTupA, const B3DTuple& rTupB)
+    {
+        B3DTuple aSum(rTupA);
+        aSum += rTupB;
+        return aSum;
+    }
+
+    inline B3DTuple operator-(const B3DTuple& rTupA, const B3DTuple& rTupB)
+    {
+        B3DTuple aSub(rTupA);
+        aSub -= rTupB;
+        return aSub;
+    }
+
+    inline B3DTuple operator/(const B3DTuple& rTupA, const B3DTuple& rTupB)
+    {
+        B3DTuple aDiv(rTupA);
+        aDiv /= rTupB;
+        return aDiv;
+    }
+
+    inline B3DTuple operator*(const B3DTuple& rTupA, const B3DTuple& rTupB)
+    {
+        B3DTuple aMul(rTupA);
+        aMul *= rTupB;
+        return aMul;
+    }
+
+    inline B3DTuple operator*(const B3DTuple& rTup, double t)
+    {
+        B3DTuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3DTuple operator*(double t, const B3DTuple& rTup)
+    {
+        B3DTuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3DTuple operator/(const B3DTuple& rTup, double t)
+    {
+        B3DTuple aNew(rTup);
+        aNew /= t;
+        return aNew;
+    }
+
+    inline B3DTuple operator/(double t, const B3DTuple& rTup)
+    {
+        B3DTuple aNew(rTup);
+        aNew /= t;
+        return aNew;
+    }
+
+    /** Round double to nearest integer for 3D tuple
+
+        @return the nearest integer for this tuple
+    */
+    B3ITuple fround(const B3DTuple& rTup);
+} // end of namespace basegfx
+
+#endif /* _BGFX_TUPLE_B3DTUPLE_HXX */
diff --git a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
new file mode 100644
index 000000000000..a2d754fe4f79
--- /dev/null
+++ b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
@@ -0,0 +1,349 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TUPLE_B3I64TUPLE_HXX
+#define _BGFX_TUPLE_B3I64TUPLE_HXX
+
+#include <sal/types.h>
+#include <basegfx/tuple/b3dtuple.hxx>
+
+
+namespace basegfx
+{
+    /** Base class for all Points/Vectors with three sal_Int64 values
+
+        This class provides all methods common to Point
+        avd Vector classes which are derived from here.
+
+        @derive Use this class to implement Points or Vectors
+        which are based on three sal_Int64 values
+    */
+    class B3I64Tuple
+    {
+    protected:
+        sal_Int64                                       mnX;
+        sal_Int64                                       mnY;
+        sal_Int64                                       mnZ;
+
+    public:
+        /** Create a 3D Tuple
+
+            The tuple is initialized to (0, 0, 0)
+        */
+        B3I64Tuple()
+        :   mnX(0),
+            mnY(0),
+            mnZ(0)
+        {}
+
+        /** Create a 3D Tuple
+
+            @param nX
+            This parameter is used to initialize the X-coordinate
+            of the 3D Tuple.
+
+            @param nY
+            This parameter is used to initialize the Y-coordinate
+            of the 3D Tuple.
+
+            @param nZ
+            This parameter is used to initialize the Z-coordinate
+            of the 3D Tuple.
+        */
+        B3I64Tuple(sal_Int64 nX, sal_Int64 nY, sal_Int64 nZ)
+        :   mnX(nX),
+            mnY(nY),
+            mnZ(nZ)
+        {}
+
+        /** Create a copy of a 3D Tuple
+
+            @param rTup
+            The 3D Tuple which will be copied.
+        */
+        B3I64Tuple(const B3I64Tuple& rTup)
+        :   mnX( rTup.mnX ),
+            mnY( rTup.mnY ),
+            mnZ( rTup.mnZ )
+        {}
+
+        ~B3I64Tuple()
+        {}
+
+        /// get X-Coordinate of 3D Tuple
+        sal_Int64 getX() const
+        {
+            return mnX;
+        }
+
+        /// get Y-Coordinate of 3D Tuple
+        sal_Int64 getY() const
+        {
+            return mnY;
+        }
+
+        /// get Z-Coordinate of 3D Tuple
+        sal_Int64 getZ() const
+        {
+            return mnZ;
+        }
+
+        /// set X-Coordinate of 3D Tuple
+        void setX(sal_Int64 nX)
+        {
+            mnX = nX;
+        }
+
+        /// set Y-Coordinate of 3D Tuple
+        void setY(sal_Int64 nY)
+        {
+            mnY = nY;
+        }
+
+        /// set Z-Coordinate of 3D Tuple
+        void setZ(sal_Int64 nZ)
+        {
+            mnZ = nZ;
+        }
+
+        /// Array-access to 3D Tuple
+        const sal_Int64& operator[] (int nPos) const
+        {
+            // Here, normally two if(...)'s should be used. In the assumption that
+            // both sal_Int64 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
+            return *((&mnX) + nPos);
+        }
+
+        /// Array-access to 3D Tuple
+        sal_Int64& operator[] (int nPos)
+        {
+            // Here, normally two if(...)'s should be used. In the assumption that
+            // both sal_Int64 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
+            return *((&mnX) + nPos);
+        }
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B3I64Tuple& operator+=( const B3I64Tuple& rTup )
+        {
+            mnX += rTup.mnX;
+            mnY += rTup.mnY;
+            mnZ += rTup.mnZ;
+            return *this;
+        }
+
+        B3I64Tuple& operator-=( const B3I64Tuple& rTup )
+        {
+            mnX -= rTup.mnX;
+            mnY -= rTup.mnY;
+            mnZ -= rTup.mnZ;
+            return *this;
+        }
+
+        B3I64Tuple& operator/=( const B3I64Tuple& rTup )
+        {
+            mnX /= rTup.mnX;
+            mnY /= rTup.mnY;
+            mnZ /= rTup.mnZ;
+            return *this;
+        }
+
+        B3I64Tuple& operator*=( const B3I64Tuple& rTup )
+        {
+            mnX *= rTup.mnX;
+            mnY *= rTup.mnY;
+            mnZ *= rTup.mnZ;
+            return *this;
+        }
+
+        B3I64Tuple& operator*=(sal_Int64 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            mnZ *= t;
+            return *this;
+        }
+
+        B3I64Tuple& operator/=(sal_Int64 t)
+        {
+            mnX /= t;
+            mnY /= t;
+            mnZ /= t;
+            return *this;
+        }
+
+        B3I64Tuple operator-(void) const
+        {
+            return B3I64Tuple(-mnX, -mnY, -mnZ);
+        }
+
+        bool equalZero() const
+        {
+            return (this == &getEmptyTuple() ||
+                (mnX == 0 && mnY == 0 && mnZ == 0));
+        }
+
+        bool operator==( const B3I64Tuple& rTup ) const
+        {
+            return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ);
+        }
+
+        bool operator!=( const B3I64Tuple& rTup ) const
+        {
+            return !(*this == rTup);
+        }
+
+        B3I64Tuple& operator=( const B3I64Tuple& rTup )
+        {
+            mnX = rTup.mnX;
+            mnY = rTup.mnY;
+            mnZ = rTup.mnZ;
+            return *this;
+        }
+
+        static const B3I64Tuple& getEmptyTuple();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    inline B3I64Tuple minimum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
+    {
+        B3I64Tuple aMin(
+            (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
+            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+        return aMin;
+    }
+
+    inline B3I64Tuple maximum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
+    {
+        B3I64Tuple aMax(
+            (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
+            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+        return aMax;
+    }
+
+    inline B3I64Tuple absolute(const B3I64Tuple& rTup)
+    {
+        B3I64Tuple aAbs(
+            (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
+            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY(),
+            (0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ());
+        return aAbs;
+    }
+
+    inline B3DTuple interpolate(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2, double t)
+    {
+        B3DTuple aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+        return aInt;
+    }
+
+    inline B3DTuple average(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2)
+    {
+        B3DTuple aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5,
+            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+        return aAvg;
+    }
+
+    inline B3DTuple average(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2, const B3I64Tuple& rOld3)
+    {
+        B3DTuple aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    inline B3I64Tuple operator+(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
+    {
+        B3I64Tuple aSum(rTupA);
+        aSum += rTupB;
+        return aSum;
+    }
+
+    inline B3I64Tuple operator-(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
+    {
+        B3I64Tuple aSub(rTupA);
+        aSub -= rTupB;
+        return aSub;
+    }
+
+    inline B3I64Tuple operator/(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
+    {
+        B3I64Tuple aDiv(rTupA);
+        aDiv /= rTupB;
+        return aDiv;
+    }
+
+    inline B3I64Tuple operator*(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
+    {
+        B3I64Tuple aMul(rTupA);
+        aMul *= rTupB;
+        return aMul;
+    }
+
+    inline B3I64Tuple operator*(const B3I64Tuple& rTup, sal_Int64 t)
+    {
+        B3I64Tuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3I64Tuple operator*(sal_Int64 t, const B3I64Tuple& rTup)
+    {
+        B3I64Tuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3I64Tuple operator/(const B3I64Tuple& rTup, sal_Int64 t)
+    {
+        B3I64Tuple aNew(rTup);
+        aNew /= t;
+        return aNew;
+    }
+
+    inline B3I64Tuple operator/(sal_Int64 t, const B3I64Tuple& rTup)
+    {
+        B3I64Tuple aNew(t, t, t);
+        B3I64Tuple aTmp(rTup);
+        aNew /= aTmp;
+        return aNew;
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_TUPLE_B3I64TUPLE_HXX */
diff --git a/basegfx/inc/basegfx/tuple/b3ituple.hxx b/basegfx/inc/basegfx/tuple/b3ituple.hxx
new file mode 100644
index 000000000000..644ae07b6545
--- /dev/null
+++ b/basegfx/inc/basegfx/tuple/b3ituple.hxx
@@ -0,0 +1,349 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_TUPLE_B3ITUPLE_HXX
+#define _BGFX_TUPLE_B3ITUPLE_HXX
+
+#include <sal/types.h>
+#include <basegfx/tuple/b3dtuple.hxx>
+
+
+namespace basegfx
+{
+    /** Base class for all Points/Vectors with three sal_Int32 values
+
+        This class provides all methods common to Point
+        avd Vector classes which are derived from here.
+
+        @derive Use this class to implement Points or Vectors
+        which are based on three sal_Int32 values
+    */
+    class B3ITuple
+    {
+    protected:
+        sal_Int32                                       mnX;
+        sal_Int32                                       mnY;
+        sal_Int32                                       mnZ;
+
+    public:
+        /** Create a 3D Tuple
+
+            The tuple is initialized to (0, 0, 0)
+        */
+        B3ITuple()
+        :   mnX(0),
+            mnY(0),
+            mnZ(0)
+        {}
+
+        /** Create a 3D Tuple
+
+            @param nX
+            This parameter is used to initialize the X-coordinate
+            of the 3D Tuple.
+
+            @param nY
+            This parameter is used to initialize the Y-coordinate
+            of the 3D Tuple.
+
+            @param nZ
+            This parameter is used to initialize the Z-coordinate
+            of the 3D Tuple.
+        */
+        B3ITuple(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ)
+        :   mnX(nX),
+            mnY(nY),
+            mnZ(nZ)
+        {}
+
+        /** Create a copy of a 3D Tuple
+
+            @param rTup
+            The 3D Tuple which will be copied.
+        */
+        B3ITuple(const B3ITuple& rTup)
+        :   mnX( rTup.mnX ),
+            mnY( rTup.mnY ),
+            mnZ( rTup.mnZ )
+        {}
+
+        ~B3ITuple()
+        {}
+
+        /// get X-Coordinate of 3D Tuple
+        sal_Int32 getX() const
+        {
+            return mnX;
+        }
+
+        /// get Y-Coordinate of 3D Tuple
+        sal_Int32 getY() const
+        {
+            return mnY;
+        }
+
+        /// get Z-Coordinate of 3D Tuple
+        sal_Int32 getZ() const
+        {
+            return mnZ;
+        }
+
+        /// set X-Coordinate of 3D Tuple
+        void setX(sal_Int32 nX)
+        {
+            mnX = nX;
+        }
+
+        /// set Y-Coordinate of 3D Tuple
+        void setY(sal_Int32 nY)
+        {
+            mnY = nY;
+        }
+
+        /// set Z-Coordinate of 3D Tuple
+        void setZ(sal_Int32 nZ)
+        {
+            mnZ = nZ;
+        }
+
+        /// Array-access to 3D Tuple
+        const sal_Int32& operator[] (int nPos) const
+        {
+            // Here, normally two if(...)'s should be used. In the assumption that
+            // both sal_Int32 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
+            return *((&mnX) + nPos);
+        }
+
+        /// Array-access to 3D Tuple
+        sal_Int32& operator[] (int nPos)
+        {
+            // Here, normally two if(...)'s should be used. In the assumption that
+            // both sal_Int32 members can be accessed as an array a shortcut is used here.
+            // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
+            return *((&mnX) + nPos);
+        }
+
+        // operators
+        //////////////////////////////////////////////////////////////////////
+
+        B3ITuple& operator+=( const B3ITuple& rTup )
+        {
+            mnX += rTup.mnX;
+            mnY += rTup.mnY;
+            mnZ += rTup.mnZ;
+            return *this;
+        }
+
+        B3ITuple& operator-=( const B3ITuple& rTup )
+        {
+            mnX -= rTup.mnX;
+            mnY -= rTup.mnY;
+            mnZ -= rTup.mnZ;
+            return *this;
+        }
+
+        B3ITuple& operator/=( const B3ITuple& rTup )
+        {
+            mnX /= rTup.mnX;
+            mnY /= rTup.mnY;
+            mnZ /= rTup.mnZ;
+            return *this;
+        }
+
+        B3ITuple& operator*=( const B3ITuple& rTup )
+        {
+            mnX *= rTup.mnX;
+            mnY *= rTup.mnY;
+            mnZ *= rTup.mnZ;
+            return *this;
+        }
+
+        B3ITuple& operator*=(sal_Int32 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            mnZ *= t;
+            return *this;
+        }
+
+        B3ITuple& operator/=(sal_Int32 t)
+        {
+            mnX /= t;
+            mnY /= t;
+            mnZ /= t;
+            return *this;
+        }
+
+        B3ITuple operator-(void) const
+        {
+            return B3ITuple(-mnX, -mnY, -mnZ);
+        }
+
+        bool equalZero() const
+        {
+            return (this == &getEmptyTuple() ||
+                (mnX == 0 && mnY == 0 && mnZ == 0));
+        }
+
+        bool operator==( const B3ITuple& rTup ) const
+        {
+            return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ);
+        }
+
+        bool operator!=( const B3ITuple& rTup ) const
+        {
+            return !(*this == rTup);
+        }
+
+        B3ITuple& operator=( const B3ITuple& rTup )
+        {
+            mnX = rTup.mnX;
+            mnY = rTup.mnY;
+            mnZ = rTup.mnZ;
+            return *this;
+        }
+
+        static const B3ITuple& getEmptyTuple();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    inline B3ITuple minimum(const B3ITuple& rTupA, const B3ITuple& rTupB)
+    {
+        B3ITuple aMin(
+            (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
+            (rTupB.getZ() < rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+        return aMin;
+    }
+
+    inline B3ITuple maximum(const B3ITuple& rTupA, const B3ITuple& rTupB)
+    {
+        B3ITuple aMax(
+            (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY(),
+            (rTupB.getZ() > rTupA.getZ()) ? rTupB.getZ() : rTupA.getZ());
+        return aMax;
+    }
+
+    inline B3ITuple absolute(const B3ITuple& rTup)
+    {
+        B3ITuple aAbs(
+            (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
+            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY(),
+            (0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ());
+        return aAbs;
+    }
+
+    inline B3DTuple interpolate(const B3ITuple& rOld1, const B3ITuple& rOld2, double t)
+    {
+        B3DTuple aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY(),
+            ((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ());
+        return aInt;
+    }
+
+    inline B3DTuple average(const B3ITuple& rOld1, const B3ITuple& rOld2)
+    {
+        B3DTuple aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5,
+            (rOld1.getZ() + rOld2.getZ()) * 0.5);
+        return aAvg;
+    }
+
+    inline B3DTuple average(const B3ITuple& rOld1, const B3ITuple& rOld2, const B3ITuple& rOld3)
+    {
+        B3DTuple aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0),
+            (rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    inline B3ITuple operator+(const B3ITuple& rTupA, const B3ITuple& rTupB)
+    {
+        B3ITuple aSum(rTupA);
+        aSum += rTupB;
+        return aSum;
+    }
+
+    inline B3ITuple operator-(const B3ITuple& rTupA, const B3ITuple& rTupB)
+    {
+        B3ITuple aSub(rTupA);
+        aSub -= rTupB;
+        return aSub;
+    }
+
+    inline B3ITuple operator/(const B3ITuple& rTupA, const B3ITuple& rTupB)
+    {
+        B3ITuple aDiv(rTupA);
+        aDiv /= rTupB;
+        return aDiv;
+    }
+
+    inline B3ITuple operator*(const B3ITuple& rTupA, const B3ITuple& rTupB)
+    {
+        B3ITuple aMul(rTupA);
+        aMul *= rTupB;
+        return aMul;
+    }
+
+    inline B3ITuple operator*(const B3ITuple& rTup, sal_Int32 t)
+    {
+        B3ITuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3ITuple operator*(sal_Int32 t, const B3ITuple& rTup)
+    {
+        B3ITuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    inline B3ITuple operator/(const B3ITuple& rTup, sal_Int32 t)
+    {
+        B3ITuple aNew(rTup);
+        aNew /= t;
+        return aNew;
+    }
+
+    inline B3ITuple operator/(sal_Int32 t, const B3ITuple& rTup)
+    {
+        B3ITuple aNew(t, t, t);
+        B3ITuple aTmp(rTup);
+        aNew /= aTmp;
+        return aNew;
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_TUPLE_B3ITUPLE_HXX */
diff --git a/basegfx/inc/basegfx/vector/b2dsize.hxx b/basegfx/inc/basegfx/vector/b2dsize.hxx
new file mode 100644
index 000000000000..6ca3065ba4f9
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b2dsize.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B2DSIZE_HXX
+#define _BGFX_VECTOR_B2DSIZE_HXX
+
+#include <basegfx/vector/b2dvector.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B2DVector exactly models a Size object,
+    // thus, for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B2DVector B2DSize;
+}
+
+#endif /* _BGFX_VECTOR_B2DSIZE_HXX */
diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx
new file mode 100644
index 000000000000..e4cd8f3f179a
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b2dvector.hxx
@@ -0,0 +1,267 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B2DVECTOR_HXX
+#define _BGFX_VECTOR_B2DVECTOR_HXX
+
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/vector/b2ivector.hxx>
+#include <basegfx/vector/b2enums.hxx>
+
+namespace basegfx
+{
+    // predeclaration
+    class B2DHomMatrix;
+
+    /** Base Point class with two double values
+
+        This class derives all operators and common handling for
+        a 2D data class from B2DTuple. All necessary extensions
+        which are special for 2D Vectors are added here.
+
+        @see B2DTuple
+    */
+    class B2DVector : public ::basegfx::B2DTuple
+    {
+    public:
+        /** Create a 2D Vector
+
+            The vector is initialized to (0.0, 0.0)
+        */
+        B2DVector()
+        :   B2DTuple()
+        {}
+
+        /** Create a 2D Vector
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 2D Vector.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 2D Vector.
+        */
+        B2DVector(double fX, double fY)
+        :   B2DTuple(fX, fY)
+        {}
+
+        /** Create a copy of a 2D Vector
+
+            @param rVec
+            The 2D Vector which will be copied.
+        */
+        B2DVector(const B2DVector& rVec)
+        :   B2DTuple(rVec)
+        {}
+
+        /** Create a copy of a 2D Vector
+
+            @param rVec
+            The 2D Vector which will be copied.
+        */
+        B2DVector(const ::basegfx::B2IVector& rVec)
+        :   B2DTuple(rVec)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B2DTuple-based classes
+        */
+        B2DVector(const ::basegfx::B2DTuple& rTuple)
+        :   B2DTuple(rTuple)
+        {}
+
+        ~B2DVector()
+        {}
+
+        /** *=operator to allow usage from B2DVector, too
+        */
+        B2DVector& operator*=( const B2DVector& rPnt )
+        {
+            mfX *= rPnt.mfX;
+            mfY *= rPnt.mfY;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B2DVector, too
+        */
+        B2DVector& operator*=(double t)
+        {
+            mfX *= t;
+            mfY *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B2DTuple calculations
+        */
+        B2DVector& operator=( const ::basegfx::B2DTuple& rVec );
+
+        /** Calculate the length of this 2D Vector
+
+            @return The Length of the 2D Vector
+        */
+        double getLength() const;
+
+        /** Set the length of this 2D Vector
+
+            @param fLen
+            The to be achieved length of the 2D Vector
+        */
+        B2DVector& setLength(double fLen);
+
+        /** Normalize this 2D Vector
+
+            The length of the 2D Vector is set to 1.0
+        */
+        B2DVector& normalize();
+
+        /** Test if this 2D Vector is normalized
+
+            @return
+            true if lenth of vector is equal to 1.0
+            false else
+        */
+        bool isNormalized() const;
+
+        /** Calculate the Scalar with another 2D Vector
+
+            @param rVec
+            The second 2D Vector
+
+            @return
+            The Scalar value of the two involved 2D Vectors
+        */
+        double scalar( const B2DVector& rVec ) const;
+
+        /** Calculate the length of the cross product with another 2D Vector
+
+            In 2D, returning an actual vector does not make much
+            sense here. The magnitude, although, can be readily
+            used for tasks such as angle calculations, since for
+            the returned value, the following equation holds:
+            retVal = getLength(this)*getLength(rVec)*sin(theta),
+            with theta being the angle between the two vectors.
+
+            @param rVec
+            The second 2D Vector
+
+            @return
+            The length of the cross product of the two involved 2D Vectors
+        */
+        double cross( const B2DVector& rVec ) const;
+
+        /** Calculate the Angle with another 2D Vector
+
+            @param rVec
+            The second 2D Vector
+
+            @return
+            The Angle value of the two involved 2D Vectors in -pi/2 < return < pi/2
+        */
+        double angle( const B2DVector& rVec ) const;
+
+        /** Transform vector by given transformation matrix.
+
+            Since this is a vector, translational components of the
+            matrix are disregarded.
+        */
+        B2DVector& operator*=( const B2DHomMatrix& rMat );
+
+        static const B2DVector& getEmptyVector();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    /** Calculate the orientation to another 2D Vector
+
+        @param rVecA
+        The first 2D Vector
+
+        @param rVecB
+        The second 2D Vector
+
+        @return
+        The mathematical Orientation of the two involved 2D Vectors
+    */
+    B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB );
+
+    /** Calculate a perpendicular 2D Vector to the given one
+
+        @param rVec
+        The source 2D Vector
+
+        @attention This only works if the given 2D Vector is normalized.
+
+        @return
+        A 2D Vector perpendicular to the one given in parameter rVec
+    */
+    B2DVector getPerpendicular( const B2DVector& rNormalizedVec );
+
+    /** Calculate a perpendicular 2D Vector to the given one,
+        normalize the given one as preparation
+
+        @param rVec
+        The source 2D Vector
+
+        @return
+        A normalized 2D Vector perpendicular to the one given in parameter rVec
+    */
+    B2DVector getNormalizedPerpendicular( const B2DVector& rVec );
+
+    /** Test two vectors which need not to be normalized for parallelism
+
+        @param rVecA
+        The first 2D Vector
+
+        @param rVecB
+        The second 2D Vector
+
+        @return
+        bool if the two values are parallel. Also true if
+        one of the vectors is empty.
+    */
+    bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB );
+
+    /** Transform vector by given transformation matrix.
+
+        Since this is a vector, translational components of the
+        matrix are disregarded.
+    */
+    B2DVector operator*( const B2DHomMatrix& rMat, const B2DVector& rVec );
+
+    /** Test continuity between given vectors.
+
+        The two given vectors are assumed to describe control points on a
+        common point. Calculate if there is a continuity between them.
+    */
+    B2VectorContinuity getContinuity( const B2DVector& rBackVector, const B2DVector& rForwardVector );
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_VECTOR_B2DVECTOR_HXX */
diff --git a/basegfx/inc/basegfx/vector/b2enums.hxx b/basegfx/inc/basegfx/vector/b2enums.hxx
new file mode 100644
index 000000000000..6f68440bf715
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b2enums.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B2ENUMS_HXX
+#define _BGFX_VECTOR_B2ENUMS_HXX
+
+#include <sal/types.h>
+
+namespace basegfx
+{
+    /** Descriptor for the mathematical orientations of two 2D Vectors
+    */
+    enum B2VectorOrientation
+    {
+        /// mathematically positive oriented
+        ORIENTATION_POSITIVE = 0,
+
+        /// mathematically negative oriented
+        ORIENTATION_NEGATIVE,
+
+        /// mathematically neutral, thus parallel
+        ORIENTATION_NEUTRAL
+    };
+
+    /** Descriptor for the mathematical continuity of two 2D Vectors
+    */
+    enum B2VectorContinuity
+    {
+        /// none
+        CONTINUITY_NONE = 0,
+
+        /// mathematically negative oriented
+        CONTINUITY_C1,
+
+        /// mathematically neutral, thus parallel
+        CONTINUITY_C2
+    };
+
+    /** Descriptor for possible line joins between two line segments
+    */
+    enum B2DLineJoin
+    {
+        B2DLINEJOIN_NONE,       // no rounding
+        B2DLINEJOIN_MIDDLE,     // calc middle value between joints
+        B2DLINEJOIN_BEVEL,      // join edges with line
+        B2DLINEJOIN_MITER,      // extend till cut
+        B2DLINEJOIN_ROUND       // create arc
+    };
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_VECTOR_B2ENUMS_HXX */
diff --git a/basegfx/inc/basegfx/vector/b2isize.hxx b/basegfx/inc/basegfx/vector/b2isize.hxx
new file mode 100644
index 000000000000..e6cdb048995b
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b2isize.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B2ISIZE_HXX
+#define _BGFX_VECTOR_B2ISIZE_HXX
+
+#include <basegfx/vector/b2ivector.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B2IVector exactly models a Size object,
+    // thus, for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B2IVector B2ISize;
+}
+
+#endif /* _BGFX_VECTOR_B2ISIZE_HXX */
diff --git a/basegfx/inc/basegfx/vector/b2ivector.hxx b/basegfx/inc/basegfx/vector/b2ivector.hxx
new file mode 100644
index 000000000000..9e2fe1009841
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b2ivector.hxx
@@ -0,0 +1,230 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B2IVECTOR_HXX
+#define _BGFX_VECTOR_B2IVECTOR_HXX
+
+#include <basegfx/tuple/b2ituple.hxx>
+#include <basegfx/vector/b2enums.hxx>
+
+namespace basegfx
+{
+    // predeclaration
+    class B2DHomMatrix;
+
+    /** Base Point class with two sal_Int32 values
+
+        This class derives all operators and common handling for
+        a 2D data class from B2ITuple. All necessary extensions
+        which are special for 2D Vectors are added here.
+
+        @see B2ITuple
+    */
+    class B2IVector : public ::basegfx::B2ITuple
+    {
+    public:
+        /** Create a 2D Vector
+
+            The vector is initialized to (0, 0)
+        */
+        B2IVector()
+        :   B2ITuple()
+        {}
+
+        /** Create a 2D Vector
+
+            @param nX
+            This parameter is used to initialize the X-coordinate
+            of the 2D Vector.
+
+            @param nY
+            This parameter is used to initialize the Y-coordinate
+            of the 2D Vector.
+        */
+        B2IVector(sal_Int32 nX, sal_Int32 nY)
+        :   B2ITuple(nX, nY)
+        {}
+
+        /** Create a copy of a 2D Vector
+
+            @param rVec
+            The 2D Vector which will be copied.
+        */
+        B2IVector(const B2IVector& rVec)
+        :   B2ITuple(rVec)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B2ITuple-based classes
+        */
+        B2IVector(const ::basegfx::B2ITuple& rTuple)
+        :   B2ITuple(rTuple)
+        {}
+
+        ~B2IVector()
+        {}
+
+        /** *=operator to allow usage from B2IVector, too
+        */
+        B2IVector& operator*=( const B2IVector& rPnt )
+        {
+            mnX *= rPnt.mnX;
+            mnY *= rPnt.mnY;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B2IVector, too
+        */
+        B2IVector& operator*=(sal_Int32 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B2ITuple calculations
+        */
+        B2IVector& operator=( const ::basegfx::B2ITuple& rVec );
+
+        /** Calculate the length of this 2D Vector
+
+            @return The Length of the 2D Vector
+        */
+        double getLength() const;
+
+        /** Set the length of this 2D Vector
+
+            @param fLen
+            The to be achieved length of the 2D Vector
+        */
+        B2IVector& setLength(double fLen);
+
+        /** Calculate the Scalar with another 2D Vector
+
+            @param rVec
+            The second 2D Vector
+
+            @return
+            The Scalar value of the two involved 2D Vectors
+        */
+        double scalar( const B2IVector& rVec ) const;
+
+        /** Calculate the length of the cross product with another 2D Vector
+
+            In 2D, returning an actual vector does not make much
+            sense here. The magnitude, although, can be readily
+            used for tasks such as angle calculations, since for
+            the returned value, the following equation holds:
+            retVal = getLength(this)*getLength(rVec)*sin(theta),
+            with theta being the angle between the two vectors.
+
+            @param rVec
+            The second 2D Vector
+
+            @return
+            The length of the cross product of the two involved 2D Vectors
+        */
+        double cross( const B2IVector& rVec ) const;
+
+        /** Calculate the Angle with another 2D Vector
+
+            @param rVec
+            The second 2D Vector
+
+            @return
+            The Angle value of the two involved 2D Vectors in -pi/2 < return < pi/2
+        */
+        double angle( const B2IVector& rVec ) const;
+
+        /** Transform vector by given transformation matrix.
+
+            Since this is a vector, translational components of the
+            matrix are disregarded.
+        */
+        B2IVector& operator*=( const B2DHomMatrix& rMat );
+
+        static const B2IVector& getEmptyVector();
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    /** Calculate the orientation to another 2D Vector
+
+        @param rVecA
+        The first 2D Vector
+
+        @param rVecB
+        The second 2D Vector
+
+        @return
+        The mathematical Orientation of the two involved 2D Vectors
+    */
+    B2VectorOrientation getOrientation( const B2IVector& rVecA, const B2IVector& rVecB );
+
+    /** Calculate a perpendicular 2D Vector to the given one
+
+        @param rVec
+        The source 2D Vector
+
+        @return
+        A 2D Vector perpendicular to the one given in parameter rVec
+    */
+    B2IVector getPerpendicular( const B2IVector& rVec );
+
+    /** Test two vectors which need not to be normalized for parallelism
+
+        @param rVecA
+        The first 2D Vector
+
+        @param rVecB
+        The second 2D Vector
+
+        @return
+        bool if the two values are parallel. Also true if
+        one of the vectors is empty.
+    */
+    bool areParallel( const B2IVector& rVecA, const B2IVector& rVecB );
+
+    /** Transform vector by given transformation matrix.
+
+        Since this is a vector, translational components of the
+        matrix are disregarded.
+    */
+    B2IVector operator*( const B2DHomMatrix& rMat, const B2IVector& rVec );
+
+    /** Test continuity between given vectors.
+
+        The two given vectors are assumed to describe control points on a
+        common point. Calculate if there is a continuity between them.
+    */
+    B2VectorContinuity getContinuity( const B2IVector& rBackVector, const B2IVector& rForwardVector );
+
+} // end of namespace basegfx
+
+#endif /* _BGFX_VECTOR_B2IVECTOR_HXX */
diff --git a/basegfx/inc/basegfx/vector/b3dsize.hxx b/basegfx/inc/basegfx/vector/b3dsize.hxx
new file mode 100644
index 000000000000..e89a66bfa86c
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b3dsize.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B3DSIZE_HXX
+#define _BGFX_VECTOR_B3DSIZE_HXX
+
+#include <basegfx/vector/b3dvector.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B3DVector exactly models a Size3D object,
+    // thus, for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B3DVector B3DSize;
+}
+
+#endif /* _BGFX_VECTOR_B3DSIZE_HXX */
diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/basegfx/inc/basegfx/vector/b3dvector.hxx
new file mode 100644
index 000000000000..c4c329881170
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b3dvector.hxx
@@ -0,0 +1,340 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B3DVECTOR_HXX
+#define _BGFX_VECTOR_B3DVECTOR_HXX
+
+#include <basegfx/tuple/b3dtuple.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // predeclaration
+    class B3DHomMatrix;
+
+    /** Base Point class with three double values
+
+        This class derives all operators and common handling for
+        a 3D data class from B3DTuple. All necessary extensions
+        which are special for 3D Vectors are added here.
+
+        @see B3DTuple
+    */
+    class B3DVector : public ::basegfx::B3DTuple
+    {
+    public:
+        /** Create a 3D Vector
+
+            The vector is initialized to (0.0, 0.0, 0.0)
+        */
+        B3DVector()
+        :   B3DTuple()
+        {}
+
+        /** Create a 3D Vector
+
+            @param fX
+            This parameter is used to initialize the X-coordinate
+            of the 3D Vector.
+
+            @param fY
+            This parameter is used to initialize the Y-coordinate
+            of the 3D Vector.
+
+            @param fZ
+            This parameter is used to initialize the Z-coordinate
+            of the 3D Vector.
+        */
+        B3DVector(double fX, double fY, double fZ)
+        :   B3DTuple(fX, fY, fZ)
+        {}
+
+        /** Create a copy of a 3D Vector
+
+            @param rVec
+            The 3D Vector which will be copied.
+        */
+        B3DVector(const B3DVector& rVec)
+        :   B3DTuple(rVec)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B3DTuple-based classes
+        */
+        B3DVector(const ::basegfx::B3DTuple& rTuple)
+        :   B3DTuple(rTuple)
+        {}
+
+        ~B3DVector()
+        {}
+
+        /** *=operator to allow usage from B3DVector, too
+        */
+        B3DVector& operator*=( const B3DVector& rPnt )
+        {
+            mfX *= rPnt.mfX;
+            mfY *= rPnt.mfY;
+            mfZ *= rPnt.mfZ;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B3DVector, too
+        */
+        B3DVector& operator*=(double t)
+        {
+            mfX *= t;
+            mfY *= t;
+            mfZ *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B3DTuple calculations
+        */
+        B3DVector& operator=( const ::basegfx::B3DTuple& rVec )
+        {
+            mfX = rVec.getX();
+            mfY = rVec.getY();
+            mfZ = rVec.getZ();
+            return *this;
+        }
+
+        /** Calculate the length of this 3D Vector
+
+            @return The Length of the 3D Vector
+        */
+        double getLength(void) const
+        {
+            double fLen(scalar(*this));
+            if((0.0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Calculate the length in the XY-Plane for this 3D Vector
+
+            @return The XY-Plane Length of the 3D Vector
+        */
+        double getXYLength(void) const
+        {
+            double fLen((mfX * mfX) + (mfY * mfY));
+            if((0.0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Calculate the length in the XZ-Plane for this 3D Vector
+
+            @return The XZ-Plane Length of the 3D Vector
+        */
+        double getXZLength(void) const
+        {
+            double fLen((mfX * mfX) + (mfZ * mfZ)); // #i73040#
+            if((0.0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Calculate the length in the YZ-Plane for this 3D Vector
+
+            @return The YZ-Plane Length of the 3D Vector
+        */
+        double getYZLength(void) const
+        {
+            double fLen((mfY * mfY) + (mfZ * mfZ));
+            if((0.0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Set the length of this 3D Vector
+
+            @param fLen
+            The to be achieved length of the 3D Vector
+        */
+        B3DVector& setLength(double fLen)
+        {
+            double fLenNow(scalar(*this));
+
+            if(!::basegfx::fTools::equalZero(fLenNow))
+            {
+                const double fOne(1.0);
+
+                if(!::basegfx::fTools::equal(fOne, fLenNow))
+                {
+                    fLen /= sqrt(fLenNow);
+                }
+
+                mfX *= fLen;
+                mfY *= fLen;
+                mfZ *= fLen;
+            }
+
+            return *this;
+        }
+
+        /** Normalize this 3D Vector
+
+            The length of the 3D Vector is set to 1.0
+        */
+        B3DVector& normalize();
+
+        /** Test if this 3D Vector is normalized
+
+            @return
+            true if lenth of vector is equal to 1.0
+            false else
+        */
+        bool isNormalized() const
+        {
+            const double fOne(1.0);
+            const double fScalar(scalar(*this));
+
+            return (::basegfx::fTools::equal(fOne, fScalar));
+        }
+
+        /** get a 3D Vector which is perpendicular to this and a given 3D Vector
+
+            @attention This only works if this and the given 3D Vector are
+            both normalized.
+
+            @param rNormalizedVec
+            A normalized 3D Vector.
+
+            @return
+            A 3D Vector perpendicular to this and the given one
+        */
+        B3DVector getPerpendicular(const B3DVector& rNormalizedVec) const;
+
+        /** get the projection of this Vector on the given Plane
+
+            @attention This only works if the given 3D Vector defining
+            the Plane is normalized.
+
+            @param rNormalizedPlane
+            A normalized 3D Vector defining a Plane.
+
+            @return
+            The projected 3D Vector
+        */
+        B3DVector getProjectionOnPlane(const B3DVector& rNormalizedPlane) const;
+
+        /** Calculate the Scalar product
+
+            This method calculates the Scalar product between this
+            and the given 3D Vector.
+
+            @param rVec
+            A second 3D Vector.
+
+            @return
+            The Scalar Product of two 3D Vectors
+        */
+        double scalar(const B3DVector& rVec) const
+        {
+            return ((mfX * rVec.mfX) + (mfY * rVec.mfY) + (mfZ * rVec.mfZ));
+        }
+
+        /** Transform vector by given transformation matrix.
+
+            Since this is a vector, translational components of the
+            matrix are disregarded.
+        */
+        B3DVector& operator*=( const B3DHomMatrix& rMat );
+
+        static const B3DVector& getEmptyVector()
+        {
+            return (const B3DVector&) ::basegfx::B3DTuple::getEmptyTuple();
+        }
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    /** get a 3D Vector which is in 2D (ignoring
+        the Z-Coordinate) perpendicular to a given 3D Vector
+
+        @attention This only works if the given 3D Vector is normalized.
+
+        @param rNormalizedVec
+        A normalized 3D Vector.
+
+        @return
+        A 3D Vector perpendicular to the given one in X,Y (2D).
+    */
+    inline B3DVector getPerpendicular2D( const B3DVector& rNormalizedVec )
+    {
+        B3DVector aPerpendicular(-rNormalizedVec.getY(), rNormalizedVec.getX(), rNormalizedVec.getZ());
+        return aPerpendicular;
+    }
+
+    /** Test two vectors which need not to be normalized for parallelism
+
+        @param rVecA
+        The first 3D Vector
+
+        @param rVecB
+        The second 3D Vector
+
+        @return
+        bool if the two values are parallel. Also true if
+        one of the vectors is empty.
+    */
+    bool areParallel( const B3DVector& rVecA, const B3DVector& rVecB );
+
+    /** Transform vector by given transformation matrix.
+
+        Since this is a vector, translational components of the
+        matrix are disregarded.
+    */
+    B3DVector operator*( const B3DHomMatrix& rMat, const B3DVector& rVec );
+
+    /** Calculate the Cross Product of two 3D Vectors
+
+        @param rVecA
+        A first 3D Vector.
+
+        @param rVecB
+        A second 3D Vector.
+
+        @return
+        The Cross Product of both 3D Vectors
+    */
+    inline B3DVector cross(const B3DVector& rVecA, const B3DVector& rVecB)
+    {
+        B3DVector aVec(
+            rVecA.getY() * rVecB.getZ() - rVecA.getZ() * rVecB.getY(),
+            rVecA.getZ() * rVecB.getX() - rVecA.getX() * rVecB.getZ(),
+            rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
+        return aVec;
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_VECTOR_B3DVECTOR_HXX */
diff --git a/basegfx/inc/basegfx/vector/b3isize.hxx b/basegfx/inc/basegfx/vector/b3isize.hxx
new file mode 100644
index 000000000000..604ce5681ee7
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b3isize.hxx
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B3ISIZE_HXX
+#define _BGFX_VECTOR_B3ISIZE_HXX
+
+#include <basegfx/vector/b3ivector.hxx>
+
+namespace basegfx
+{
+    // syntactic sugar: a B3IVector exactly models a Size3D object,
+    // thus, for interface clarity, we provide an alias name
+
+    /// Alias name for interface clarity (not everybody is aware of the identity)
+    typedef B3IVector B3ISize;
+}
+
+#endif /* _BGFX_VECTOR_B3ISIZE_HXX */
diff --git a/basegfx/inc/basegfx/vector/b3ivector.hxx b/basegfx/inc/basegfx/vector/b3ivector.hxx
new file mode 100644
index 000000000000..b4900989cc06
--- /dev/null
+++ b/basegfx/inc/basegfx/vector/b3ivector.hxx
@@ -0,0 +1,259 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_VECTOR_B3IVECTOR_HXX
+#define _BGFX_VECTOR_B3IVECTOR_HXX
+
+#include <basegfx/tuple/b3ituple.hxx>
+
+namespace basegfx
+{
+    // predeclaration
+    class B3DHomMatrix;
+
+    /** Base Point class with three sal_Int32 values
+
+        This class derives all operators and common handling for
+        a 3D data class from B3ITuple. All necessary extensions
+        which are special for 3D Vectors are added here.
+
+        @see B3ITuple
+    */
+    class B3IVector : public ::basegfx::B3ITuple
+    {
+    public:
+        /** Create a 3D Vector
+
+            The vector is initialized to (0, 0, 0)
+        */
+        B3IVector()
+        :   B3ITuple()
+        {}
+
+        /** Create a 3D Vector
+
+            @param nX
+            This parameter is used to initialize the X-coordinate
+            of the 3D Vector.
+
+            @param nY
+            This parameter is used to initialize the Y-coordinate
+            of the 3D Vector.
+
+            @param nZ
+            This parameter is used to initialize the Z-coordinate
+            of the 3D Vector.
+        */
+        B3IVector(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ)
+        :   B3ITuple(nX, nY, nZ)
+        {}
+
+        /** Create a copy of a 3D Vector
+
+            @param rVec
+            The 3D Vector which will be copied.
+        */
+        B3IVector(const B3IVector& rVec)
+        :   B3ITuple(rVec)
+        {}
+
+        /** constructor with tuple to allow copy-constructing
+            from B3ITuple-based classes
+        */
+        B3IVector(const ::basegfx::B3ITuple& rTuple)
+        :   B3ITuple(rTuple)
+        {}
+
+        ~B3IVector()
+        {}
+
+        /** *=operator to allow usage from B3IVector, too
+        */
+        B3IVector& operator*=( const B3IVector& rPnt )
+        {
+            mnX *= rPnt.mnX;
+            mnY *= rPnt.mnY;
+            mnZ *= rPnt.mnZ;
+            return *this;
+        }
+
+        /** *=operator to allow usage from B3IVector, too
+        */
+        B3IVector& operator*=(sal_Int32 t)
+        {
+            mnX *= t;
+            mnY *= t;
+            mnZ *= t;
+            return *this;
+        }
+
+        /** assignment operator to allow assigning the results
+            of B3ITuple calculations
+        */
+        B3IVector& operator=( const ::basegfx::B3ITuple& rVec )
+        {
+            mnX = rVec.getX();
+            mnY = rVec.getY();
+            mnZ = rVec.getZ();
+            return *this;
+        }
+
+        /** Calculate the length of this 3D Vector
+
+            @return The Length of the 3D Vector
+        */
+        double getLength(void) const
+        {
+            double fLen(scalar(*this));
+            if((0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Calculate the length in the XY-Plane for this 3D Vector
+
+            @return The XY-Plane Length of the 3D Vector
+        */
+        double getXYLength(void) const
+        {
+            double fLen((mnX * mnX) + (mnY * mnY));
+            if((0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Calculate the length in the XZ-Plane for this 3D Vector
+
+            @return The XZ-Plane Length of the 3D Vector
+        */
+        double getXZLength(void) const
+        {
+            double fLen((mnX * mnZ) + (mnY * mnZ));
+            if((0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Calculate the length in the YZ-Plane for this 3D Vector
+
+            @return The YZ-Plane Length of the 3D Vector
+        */
+        double getYZLength(void) const
+        {
+            double fLen((mnY * mnY) + (mnZ * mnZ));
+            if((0 == fLen) || (1.0 == fLen))
+                return fLen;
+            return sqrt(fLen);
+        }
+
+        /** Set the length of this 3D Vector
+
+            @param fLen
+            The to be achieved length of the 3D Vector
+        */
+        B3IVector& setLength(double fLen)
+        {
+            double fLenNow(scalar(*this));
+
+            if(!::basegfx::fTools::equalZero(fLenNow))
+            {
+                const double fOne(1.0);
+
+                if(!::basegfx::fTools::equal(fOne, fLenNow))
+                {
+                    fLen /= sqrt(fLenNow);
+                }
+
+                mnX = fround(mnX*fLen);
+                mnY = fround(mnY*fLen);
+                mnZ = fround(mnZ*fLen);
+            }
+
+            return *this;
+        }
+
+        /** Calculate the Scalar product
+
+            This method calculates the Scalar product between this
+            and the given 3D Vector.
+
+            @param rVec
+            A second 3D Vector.
+
+            @return
+            The Scalar Product of two 3D Vectors
+        */
+        double scalar(const B3IVector& rVec) const
+        {
+            return ((mnX * rVec.mnX) + (mnY * rVec.mnY) + (mnZ * rVec.mnZ));
+        }
+
+        /** Transform vector by given transformation matrix.
+
+            Since this is a vector, translational components of the
+            matrix are disregarded.
+        */
+        B3IVector& operator*=( const B3DHomMatrix& rMat );
+
+        static const B3IVector& getEmptyVector()
+        {
+            return (const B3IVector&) ::basegfx::B3ITuple::getEmptyTuple();
+        }
+    };
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    /** Transform vector by given transformation matrix.
+
+        Since this is a vector, translational components of the
+        matrix are disregarded.
+    */
+    B3IVector operator*( const B3DHomMatrix& rMat, const B3IVector& rVec );
+
+    /** Calculate the Cross Product of two 3D Vectors
+
+        @param rVecA
+        A first 3D Vector.
+
+        @param rVecB
+        A second 3D Vector.
+
+        @return
+        The Cross Product of both 3D Vectors
+    */
+    inline B3IVector cross(const B3IVector& rVecA, const B3IVector& rVecB)
+    {
+        B3IVector aVec(
+            rVecA.getY() * rVecB.getZ() - rVecA.getZ() * rVecB.getY(),
+            rVecA.getZ() * rVecB.getX() - rVecA.getX() * rVecB.getZ(),
+            rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
+        return aVec;
+    }
+} // end of namespace basegfx
+
+#endif /* _BGFX_VECTOR_B3DVECTOR_HXX */
diff --git a/basegfx/inc/makefile.mk b/basegfx/inc/makefile.mk
new file mode 100644
index 000000000000..aa8007b7e507
--- /dev/null
+++ b/basegfx/inc/makefile.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..
+
+PRJNAME=basegfx
+TARGET=inc
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+    $(SLO)$/precompiled.pch \
+    $(SLO)$/precompiled_ex.pch
+    
+.ENDIF			# "$(ENABLE_PCH)"!=""
+
diff --git a/basegfx/inc/pch/precompiled_basegfx.cxx b/basegfx/inc/pch/precompiled_basegfx.cxx
new file mode 100644
index 000000000000..ee9c448f8af4
--- /dev/null
+++ b/basegfx/inc/pch/precompiled_basegfx.cxx
@@ -0,0 +1,29 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_basegfx.hxx"
+
diff --git a/basegfx/inc/pch/precompiled_basegfx.hxx b/basegfx/inc/pch/precompiled_basegfx.hxx
new file mode 100644
index 000000000000..45f87434590d
--- /dev/null
+++ b/basegfx/inc/pch/precompiled_basegfx.hxx
@@ -0,0 +1,32 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:30.796084
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+
diff --git a/basegfx/prj/build.lst b/basegfx/prj/build.lst
new file mode 100644
index 000000000000..fe3354b3f256
--- /dev/null
+++ b/basegfx/prj/build.lst
@@ -0,0 +1,18 @@
+fx	basegfx	:	o3tl sal offuh cppuhelper cppu CPPUNIT:cppunit NULL
+fx	basegfx									usr1	-	all	fx_mkout NULL
+fx	basegfx\inc								nmake	-	all	fx_inc NULL
+fx	basegfx\prj								get		-	all	fx_prj NULL
+fx	basegfx\source\curve					nmake	-	all	fx_curve fx_inc NULL
+fx	basegfx\source\matrix					nmake	-	all	fx_matrix fx_inc NULL
+fx	basegfx\source\numeric					nmake	-	all	fx_numeric fx_inc NULL
+fx	basegfx\source\point					nmake	-	all	fx_point fx_inc NULL
+fx	basegfx\source\polygon					nmake	-	all	fx_polygon fx_inc NULL
+fx	basegfx\source\range					nmake	-	all	fx_range fx_inc NULL
+fx	basegfx\source\tuple					nmake	-	all	fx_tuple fx_inc NULL
+fx	basegfx\source\tools					nmake	-	all	fx_tools fx_inc NULL
+fx	basegfx\source\vector					nmake	-	all	fx_vector fx_inc NULL
+fx	basegfx\source\color					nmake	-	all	fx_color fx_inc NULL
+fx	basegfx\source\pixel					nmake	-	all	fx_pixel fx_inc NULL
+fx	basegfx\source\raster					nmake	-	all	fx_raster fx_inc NULL
+fx	basegfx\util							nmake	-	all	fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector fx_color fx_pixel fx_raster NULL
+fx	basegfx\test					        nmake	-	all	fx_tests fx_util NULL
diff --git a/basegfx/prj/d.lst b/basegfx/prj/d.lst
new file mode 100644
index 000000000000..3d4d985f3ae6
--- /dev/null
+++ b/basegfx/prj/d.lst
@@ -0,0 +1,113 @@
+..\%__SRC%\lib\ibasegfx.lib %_DEST%\lib%_EXT%\ibasegfx.lib
+..\%__SRC%\lib\basegfx_s.lib %_DEST%\lib%_EXT%\basegfx_s.lib
+
+..\%__SRC%\bin\basegfx?????.dll %_DEST%\bin%_EXT%\basegfx?????.dll
+..\%__SRC%\bin\bgfx*.dll %_DEST%\bin%_EXT%\bgfx*.dll
+
+..\%__SRC%\lib\libbasegfx*.* %_DEST%\lib%_EXT%\libbasegfx*.*
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+
+mkdir: %_DEST%\inc%_EXT%\basegfx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\matrix
+..\inc\basegfx\matrix\b2dhommatrix.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b2dhommatrix.hxx
+..\inc\basegfx\matrix\b2dhommatrixtools.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b2dhommatrixtools.hxx
+..\inc\basegfx\matrix\b3dhommatrix.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b3dhommatrix.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\point
+..\inc\basegfx\point\b2dpoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2dpoint.hxx
+..\inc\basegfx\point\b3dpoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3dpoint.hxx
+..\inc\basegfx\point\b2ipoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2ipoint.hxx
+..\inc\basegfx\point\b3ipoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3ipoint.hxx
+..\inc\basegfx\point\b2dhompoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2dhompoint.hxx
+..\inc\basegfx\point\b3dhompoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3dhompoint.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\range
+..\inc\basegfx\range\rangeexpander.hxx %_DEST%\inc%_EXT%\basegfx\range\rangeexpander.hxx
+..\inc\basegfx\range\basicrange.hxx %_DEST%\inc%_EXT%\basegfx\range\basicrange.hxx
+..\inc\basegfx\range\basicbox.hxx %_DEST%\inc%_EXT%\basegfx\range\basicbox.hxx
+..\inc\basegfx\range\b1drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b1drange.hxx
+..\inc\basegfx\range\b2dpolyrange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2dpolyrange.hxx
+..\inc\basegfx\range\b2drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2drange.hxx
+..\inc\basegfx\range\b2drectangle.hxx %_DEST%\inc%_EXT%\basegfx\range\b2drectangle.hxx
+..\inc\basegfx\range\b2dconnectedranges.hxx %_DEST%\inc%_EXT%\basegfx\range\b2dconnectedranges.hxx
+..\inc\basegfx\range\b3drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b3drange.hxx
+..\inc\basegfx\range\b3dvolume.hxx %_DEST%\inc%_EXT%\basegfx\range\b3dvolume.hxx
+..\inc\basegfx\range\b1irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b1irange.hxx
+..\inc\basegfx\range\b2irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2irange.hxx
+..\inc\basegfx\range\b2irectangle.hxx %_DEST%\inc%_EXT%\basegfx\range\b2irectangle.hxx
+..\inc\basegfx\range\b3irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b3irange.hxx
+..\inc\basegfx\range\b3ivolume.hxx %_DEST%\inc%_EXT%\basegfx\range\b3ivolume.hxx
+..\inc\basegfx\range\b1ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b1ibox.hxx
+..\inc\basegfx\range\b2ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b2ibox.hxx
+..\inc\basegfx\range\b3ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b3ibox.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\vector
+..\inc\basegfx\vector\b2dvector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2dvector.hxx
+..\inc\basegfx\vector\b2enums.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2enums.hxx
+..\inc\basegfx\vector\b2dsize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2dsize.hxx
+..\inc\basegfx\vector\b3dvector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3dvector.hxx
+..\inc\basegfx\vector\b3dsize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3dsize.hxx
+..\inc\basegfx\vector\b2ivector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2ivector.hxx
+..\inc\basegfx\vector\b2isize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2isize.hxx
+..\inc\basegfx\vector\b3ivector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3ivector.hxx
+..\inc\basegfx\vector\b3isize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3isize.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\curve
+..\inc\basegfx\curve\b2dcubicbezier.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dcubicbezier.hxx
+..\inc\basegfx\curve\b2dquadraticbezier.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dquadraticbezier.hxx
+..\inc\basegfx\curve\b2dbeziertools.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dbeziertools.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\numeric
+..\inc\basegfx\numeric\ftools.hxx %_DEST%\inc%_EXT%\basegfx\numeric\ftools.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\polygon
+..\inc\basegfx\polygon\b2dpolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygon.hxx
+..\inc\basegfx\polygon\b2dpolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygon.hxx
+..\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygonfillrule.hxx
+..\inc\basegfx\polygon\b2dpolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygontools.hxx
+..\inc\basegfx\polygon\b2dpolypolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygontools.hxx
+..\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygonrasterconverter.hxx
+..\inc\basegfx\polygon\b2dlinegeometry.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dlinegeometry.hxx
+..\inc\basegfx\polygon\b2dpolygonclipper.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygonclipper.hxx
+..\inc\basegfx\polygon\b2dpolygontriangulator.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygontriangulator.hxx
+..\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygoncutandtouch.hxx
+..\inc\basegfx\polygon\b2dpolypolygoncutter.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygoncutter.hxx
+..\inc\basegfx\polygon\b2dtrapezoid.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dtrapezoid.hxx
+..\inc\basegfx\polygon\b3dpolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygon.hxx
+..\inc\basegfx\polygon\b3dpolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolypolygon.hxx
+..\inc\basegfx\polygon\b3dpolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygontools.hxx
+..\inc\basegfx\polygon\b3dpolypolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolypolygontools.hxx
+..\inc\basegfx\polygon\b3dpolygonclipper.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygonclipper.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\tuple
+..\inc\basegfx\tuple\b2dtuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2dtuple.hxx
+..\inc\basegfx\tuple\b3dtuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3dtuple.hxx
+..\inc\basegfx\tuple\b2ituple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2ituple.hxx
+..\inc\basegfx\tuple\b3ituple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3ituple.hxx
+..\inc\basegfx\tuple\b2i64tuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2i64tuple.hxx
+..\inc\basegfx\tuple\b3i64tuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3i64tuple.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\tools
+..\inc\basegfx\tools\canvastools.hxx %_DEST%\inc%_EXT%\basegfx\tools\canvastools.hxx
+..\inc\basegfx\tools\keystoplerp.hxx %_DEST%\inc%_EXT%\basegfx\tools\keystoplerp.hxx
+..\inc\basegfx\tools\lerp.hxx %_DEST%\inc%_EXT%\basegfx\tools\lerp.hxx
+..\inc\basegfx\tools\unopolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\tools\unopolypolygon.hxx
+..\inc\basegfx\tools\b2dclipstate.hxx %_DEST%\inc%_EXT%\basegfx\tools\b2dclipstate.hxx
+..\inc\basegfx\tools\rectcliptools.hxx %_DEST%\inc%_EXT%\basegfx\tools\rectcliptools.hxx
+..\inc\basegfx\tools\tools.hxx %_DEST%\inc%_EXT%\basegfx\tools\tools.hxx
+..\inc\basegfx\tools\gradienttools.hxx %_DEST%\inc%_EXT%\basegfx\tools\gradienttools.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\color
+..\inc\basegfx\color\bcolor.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolor.hxx
+..\inc\basegfx\color\bcolortools.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolortools.hxx
+..\inc\basegfx\color\bcolormodifier.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolormodifier.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\pixel
+..\inc\basegfx\pixel\bpixel.hxx %_DEST%\inc%_EXT%\basegfx\pixel\bpixel.hxx
+..\inc\basegfx\pixel\bzpixel.hxx %_DEST%\inc%_EXT%\basegfx\pixel\bzpixel.hxx
+
+mkdir: %_DEST%\inc%_EXT%\basegfx\raster
+..\inc\basegfx\raster\bpixelraster.hxx %_DEST%\inc%_EXT%\basegfx\raster\bpixelraster.hxx
+..\inc\basegfx\raster\bzpixelraster.hxx %_DEST%\inc%_EXT%\basegfx\raster\bzpixelraster.hxx
+..\inc\basegfx\raster\rasterconvert3d.hxx %_DEST%\inc%_EXT%\basegfx\raster\rasterconvert3d.hxx
diff --git a/basegfx/qa/mkpolygons.pl b/basegfx/qa/mkpolygons.pl
new file mode 100644
index 000000000000..b465a4f845ab
--- /dev/null
+++ b/basegfx/qa/mkpolygons.pl
@@ -0,0 +1,344 @@
+:
+eval 'exec perl -wS $0 ${1+"$@"}'
+    if 0;
+
+#
+# 2009 Copyright Novell, Inc. & Sun Microsystems, Inc.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+
+use IO::File;
+use Cwd;
+use File::Spec;
+use File::Spec::Functions;
+use File::Temp;
+use File::Path;
+
+$TempDir = "";
+
+
+# all the XML package generation is a blatant rip from AF's
+# write-calc-doc.pl
+
+
+###############################################################################
+#   Open a file with the given name.
+#   First it is checked if the temporary directory, in which all files for
+#   the document are gathered, is already present and create it if it is not.
+#   Then create the path to the file inside the temporary directory.
+#   Finally open the file and return a file handle to it.
+#
+sub open_file
+{
+    my  $filename = pop @_;
+
+    #   Create base directory of temporary directory tree if not alreay
+    #   present.
+    if ($TempDir eq "")
+    {
+        $TempDir = File::Temp::tempdir (CLEANUP => 1);
+    }
+
+    #   Create the path to the file.
+    my $fullname = File::Spec->catfile ($TempDir, $filename);
+    my ($volume,$directories,$file) = File::Spec->splitpath ($fullname);
+    mkpath (File::Spec->catpath ($volume,$directories,""));
+
+    #   Open the file and return a file handle to it.
+    return new IO::File ($fullname, "w");
+}
+
+
+###############################################################################
+#   Zip the files in the directory tree into the given file.
+#
+sub zip_dirtree
+{
+    my  $filename = pop @_;
+
+    my  $cwd = getcwd;
+    my  $zip_name = $filename;
+
+    #   We are about to change the directory.
+    #   Therefore create an absolute pathname for the zip archive.
+
+    #   First transfer the drive from $cwd to $zip_name.  This is a
+    #   workaround for a bug in file_name_is_absolute which thinks
+    #   the the path \bla is an absolute path under DOS.
+    my ($volume,$directories,$file) = File::Spec->splitpath ($zip_name);
+    my ($volume_cwd,$directories_cwd,$file_cwd) = File::Spec->splitpath ($cwd);
+    $volume = $volume_cwd if ($volume eq "");
+    $zip_name = File::Spec->catpath ($volume,$directories,$file);
+
+    #   Add the current working directory to a relative path.
+    if ( ! file_name_is_absolute ($zip_name))
+    {
+        $zip_name = File::Spec->catfile ($cwd, $zip_name);
+
+        #   Try everything to clean up the name.
+        $zip_name = File::Spec->rel2abs ($filename);
+        $zip_name = File::Spec->canonpath ($zip_name);
+
+        #   Remove .. directories from the middle of the path.
+        while ($zip_name =~ /\/[^\/][^\.\/][^\/]*\/\.\.\//)
+        {
+            $zip_name = $` . "/" . $';
+        }
+    }
+
+    #   Just in case the zip program gets confused by an existing file with the
+    #   same name as the one to be written that file is removed first.
+    if ( -e $filename)
+    {
+        if (unlink ($filename) == 0)
+        {
+            print "Existing file $filename could not be deleted.\n";
+            print "Please close the application that uses it, then try again.\n";
+            return;
+        }
+    }
+
+    #   Finally create the zip file.  First change into the temporary directory
+    #   so that the resulting zip file contains only paths relative to it.
+    print "zipping [$ZipCmd $ZipFlags $zip_name *]\n";
+    chdir ($TempDir);
+    system ("$ZipCmd $ZipFlags $zip_name *");
+    chdir ($cwd);
+}
+
+
+sub writeHeader
+{
+    print $OUT qq~<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" office:version="1.0">
+ <office:scripts/>
+ <office:automatic-styles>
+  <style:style style:name="dp1" style:family="drawing-page">
+   <style:drawing-page-properties presentation:background-visible="true" presentation:background-objects-visible="true" presentation:display-footer="true" presentation:display-page-number="false" presentation:display-date-time="true"/>
+  </style:style>
+  <style:style style:name="gr1" style:family="graphic" style:parent-style-name="standard">
+   <style:graphic-properties draw:textarea-horizontal-align="center" draw:fill="none" draw:stroke="none" draw:textarea-vertical-align="middle"/>
+  </style:style>
+  <style:style style:name="gr2" style:family="graphic" style:parent-style-name="standard">
+   <style:graphic-properties draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle"/>
+  </style:style>
+  <style:style style:name="pr1" style:family="presentation" style:parent-style-name="Default-title">
+   <style:graphic-properties draw:fill-color="#ffffff" draw:auto-grow-height="true" fo:min-height="3.508cm"/>
+  </style:style>
+  <style:style style:name="pr2" style:family="presentation" style:parent-style-name="Default-notes">
+   <style:graphic-properties draw:fill-color="#ffffff" draw:auto-grow-height="true" fo:min-height="13.367cm"/>
+  </style:style>
+  <style:style style:name="P1" style:family="paragraph">
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm"/>
+  </style:style>
+  <style:style style:name="P2" style:family="paragraph">
+   <style:paragraph-properties fo:margin-left="0.6cm" fo:margin-right="0cm" fo:text-indent="-0.6cm"/>
+  </style:style>
+  <text:list-style style:name="L1">
+   <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+    <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+    <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+    <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+    <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+    <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+    <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+    <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+    <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+  </text:list-style>
+ </office:automatic-styles>
+ <office:body>
+  <office:presentation>
+~;
+
+}
+
+sub writeSlideHeader
+{
+    my $titleText = pop @_;
+    my $slideNum = pop @_;
+
+    print $OUT "    <draw:page draw:name=\"page1\" draw:style-name=\"dp1\" draw:master-page-name=\"Default\">\n";
+    print $OUT "     <office:forms form:automatic-focus=\"false\" form:apply-design-mode=\"false\"/>\n";
+    print $OUT "     <draw:rect draw:style-name=\"gr1\" draw:text-style-name=\"P1\" draw:id=\"id$slideNum\" draw:layer=\"layout\" svg:width=\"17.5cm\" svg:height=\"6cm\" svg:x=\"5cm\" svg:y=\"4cm\">\n";
+    print $OUT "      <text:p text:style-name=\"P2\">Slide: $slideNum</text:p>\n";
+    print $OUT "      <text:p text:style-name=\"P2\">Path: $titleText</text:p>\n";
+    print $OUT "     </draw:rect>\n";
+}
+
+
+sub writeSlideFooter
+{
+    print $OUT "    <presentation:notes draw:style-name=\"dp1\">\n";
+    print $OUT "     <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"layout\" svg:width=\"14.851cm\" svg:height=\"11.138cm\" svg:x=\"3.068cm\" svg:y=\"2.257cm\" draw:page-number=\"1\" presentation:class=\"page\"/>\n";
+    print $OUT "     <draw:frame presentation:style-name=\"pr3\" draw:layer=\"layout\" svg:width=\"16.79cm\" svg:height=\"13.116cm\" svg:x=\"2.098cm\" svg:y=\"14.109cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">\n";
+    print $OUT "      <draw:text-box/>\n";
+    print $OUT "     </draw:frame>\n";
+    print $OUT "    </presentation:notes>\n";
+    print $OUT "   </draw:page>\n";
+}
+
+sub writeFooter
+{
+    print $OUT qq~   <presentation:settings presentation:full-screen="false"/>
+  </office:presentation>
+ </office:body>
+</office:document-content>
+~;
+
+}
+
+sub writePath
+{
+    my $pathAry = pop @_;
+    my $path = $pathAry->[1];
+    my $viewBox = $pathAry->[0];
+
+    print $OUT "       <draw:path draw:style-name=\"gr2\" draw:text-style-name=\"P1\" draw:layer=\"layout\" svg:width=\"10cm\" svg:height=\"10cm\" svg:x=\"5cm\" svg:y=\"5cm\" svg:viewBox=\"";
+    print $OUT $viewBox;
+    print $OUT "\" svg:d=\"";
+    print $OUT $path;
+    print $OUT "\">\n";
+    print $OUT "         <text:p/>\n";
+    print $OUT "       </draw:path>\n";
+}
+
+sub writeManifest
+{
+    my $outFile = open_file("META-INF/manifest.xml");
+
+    print $outFile qq~<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
+ <manifest:file-entry manifest:media-type="application/vnd.oasis.opendocument.presentation" manifest:full-path="/"/>
+ <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="content.xml"/>
+</manifest:manifest>
+~;
+
+    $outFile->close;
+}
+
+
+###############################################################################
+#   Print usage information.
+#
+sub usage   ()
+{
+    print <<END_OF_USAGE;
+usage: $0 <option>* [<SvgD-values>]
+
+output-file-name defaults to polygons.odp.
+
+         -h    Print this usage information.
+         -o    output-file-name
+END_OF_USAGE
+}
+
+###############################################################################
+#   Process the command line.
+#
+sub process_command_line
+{
+    foreach (@ARGV)
+    {
+        if (/^-h/)
+        {
+            usage;
+            exit 0;
+        }
+    }
+
+    $global_output_name = "polygons.odp";
+    my  $j = 0, $noMoreOptions = 0;
+    for (my $i=0; $i<$#ARGV; $i++)
+    {
+        if ( !$noMoreOptions and $ARGV[$i] eq "-o")
+        {
+            $i++;
+            $global_output_name = $ARGV[$i];
+        }
+        elsif ( !$noMoreOptions and $ARGV[$i] eq "--")
+        {
+            $noMoreOptions = 1;
+        }
+        elsif ( !$noMoreOptions and $ARGV[$i] =~ /^-/)
+        {
+            print "Unknown option $ARGV[$i]\n";
+            usage;
+            exit 1;
+        }
+        else
+        {
+            push(@paths, [$ARGV[$i],$ARGV[$i+1]]);
+            $i++;
+        }
+    }
+
+    print "output to $global_output_name\n";
+}
+
+###############################################################################
+#   Main
+###############################################################################
+
+$ZipCmd = $ENV{LOG_FILE_ZIP_CMD};
+$ZipFlags = $ENV{LOG_FILE_ZIP_FLAGS};
+#   Provide default values for the zip command and it's flags.
+if ( ! defined $ZipCmd)
+{
+    $ZipCmd = "zip" unless defined $ZipCmd;
+    $ZipFlags = "-r -q" unless defined $ZipFlags;
+}
+
+process_command_line();
+
+writeManifest();
+
+$OUT = open_file( "content.xml" );
+
+writeHeader();
+
+$pathNum=0;
+foreach $path (@paths)
+{
+    writeSlideHeader($pathNum, $path->[1]);
+    writePath($path);
+    writeSlideFooter();
+    $pathNum++;
+}
+
+writeFooter();
+
+$OUT->close;
+
+zip_dirtree ($global_output_name);
+
diff --git a/basegfx/source/color/bcolor.cxx b/basegfx/source/color/bcolor.cxx
new file mode 100644
index 000000000000..6e5b4c985e6d
--- /dev/null
+++ b/basegfx/source/color/bcolor.cxx
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/color/bcolor.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx
new file mode 100644
index 000000000000..15662c44414c
--- /dev/null
+++ b/basegfx/source/color/bcolormodifier.cxx
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/color/bcolormodifier.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    ::basegfx::BColor BColorModifier::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        switch(meMode)
+        {
+            case BCOLORMODIFYMODE_INTERPOLATE :
+            {
+                return interpolate(maBColor, aSourceColor, mfValue);
+            }
+            case BCOLORMODIFYMODE_GRAY :
+            {
+                const double fLuminance(aSourceColor.luminance());
+                return ::basegfx::BColor(fLuminance, fLuminance, fLuminance);
+            }
+            case BCOLORMODIFYMODE_BLACKANDWHITE :
+            {
+                const double fLuminance(aSourceColor.luminance());
+
+                if(fLuminance < mfValue)
+                {
+                    return ::basegfx::BColor::getEmptyBColor();
+                }
+                else
+                {
+                    return ::basegfx::BColor(1.0, 1.0, 1.0);
+                }
+            }
+            default : // BCOLORMODIFYMODE_REPLACE
+            {
+                return maBColor;
+            }
+        }
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
new file mode 100644
index 000000000000..543097de3d77
--- /dev/null
+++ b/basegfx/source/color/bcolortools.cxx
@@ -0,0 +1,268 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/color/bcolor.hxx>
+#include <basegfx/color/bcolortools.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx { namespace tools
+{
+    BColor rgb2hsl(const BColor& rRGBColor)
+    {
+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
+        const double minVal = ::std::min( ::std::min( r, g ), b );
+        const double maxVal = ::std::max( ::std::max( r, g ), b );
+        const double d = maxVal - minVal;
+
+        double h=0, s=0, l=0;
+
+        l = (maxVal + minVal) / 2.0;
+
+        if( ::basegfx::fTools::equalZero(d) )
+        {
+            s = h = 0; // hue undefined (achromatic case)
+        }
+        else
+        {
+            s = l > 0.5 ? d/(2.0-maxVal-minVal) :
+                d/(maxVal + minVal);
+
+            if( r == maxVal )
+                h = (g - b)/d;
+            else if( g == maxVal )
+                h = 2.0 + (b - r)/d;
+            else
+                h = 4.0 + (r - g)/d;
+
+            h *= 60.0;
+
+            if( h < 0.0 )
+                h += 360.0;
+        }
+
+        return BColor(h,s,l);
+    }
+
+    static inline double hsl2rgbHelper( double nValue1, double nValue2, double nHue )
+    {
+        // clamp hue to [0,360]
+        nHue = fmod( nHue, 360.0 );
+
+        // cope with wrap-arounds
+        if( nHue < 0.0 )
+            nHue += 360.0;
+
+        if( nHue < 60.0 )
+            return nValue1 + (nValue2 - nValue1)*nHue/60.0;
+        else if( nHue < 180.0 )
+            return nValue2;
+        else if( nHue < 240.0 )
+            return nValue1 + (nValue2 - nValue1)*(240.0 - nHue)/60.0;
+        else
+            return nValue1;
+    }
+
+    BColor hsl2rgb(const BColor& rHSLColor)
+    {
+        const double h=rHSLColor.getRed(), s=rHSLColor.getGreen(), l=rHSLColor.getBlue();
+
+        if( fTools::equalZero(s) )
+            return BColor(l, l, l ); // achromatic case
+
+        const double nVal1( l <= 0.5 ? l*(1.0 + s) : l + s - l*s );
+        const double nVal2( 2.0*l - nVal1 );
+
+        return BColor(
+            hsl2rgbHelper(nVal2,
+                          nVal1,
+                          h + 120.0),
+            hsl2rgbHelper(nVal2,
+                          nVal1,
+                          h),
+            hsl2rgbHelper(nVal2,
+                          nVal1,
+                          h - 120.0) );
+    }
+
+    BColor rgb2hsv(const BColor& rRGBColor)
+    {
+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
+        const double maxVal = std::max(std::max(r,g),b);
+        const double minVal = std::min(std::min(r,g),b);
+        const double delta = maxVal-minVal;
+
+        double h=0, s=0, v=0;
+
+        v = maxVal;
+        if( fTools::equalZero(v) )
+            s = 0;
+        else
+            s = delta / v;
+
+        if( !fTools::equalZero(s) )
+        {
+            if( maxVal == r )
+            {
+                h = (g - b) / delta;
+            }
+            else if( maxVal == g )
+            {
+                h = 2.0 + (b - r) / delta;
+            }
+            else
+            {
+                h = 4.0 + (r - g) / delta;
+            }
+
+            h *= 60.0;
+
+            if( h < 0 )
+                h += 360;
+        }
+
+        return BColor(h,s,v);
+    }
+
+    BColor hsv2rgb(const BColor& rHSVColor)
+    {
+        double h=rHSVColor.getRed();
+        const double s=rHSVColor.getGreen(), v=rHSVColor.getBlue();
+
+        if( fTools::equalZero(s) )
+        {
+            // achromatic case: no hue.
+            return BColor(v,v,v);
+        }
+        else
+        {
+            if( fTools::equal(h,360) )
+                h = 0; // 360 degrees is equivalent to 0 degrees
+
+            h /= 60.0;
+            const sal_Int32 intval = static_cast< sal_Int32 >( h );
+            const double f = h - intval;
+            const double p = v*(1.0-s);
+            const double q = v*(1.0-(s*f));
+            const double t = v*(1.0-(s*(1.0-f)));
+
+            /* which hue area? */
+            switch( intval )
+            {
+                case 0:
+                    return BColor(v,t,p);
+
+                case 1:
+                    return BColor(q,v,p);
+
+                case 2:
+                    return BColor(p,v,t);
+
+                case 3:
+                    return BColor(p,q,v);
+
+                case 4:
+                    return BColor(t,p,v);
+
+                case 5:
+                    return BColor(v,p,q);
+
+                default:
+                    // hue overflow
+                    return BColor();
+            }
+        }
+    }
+
+    BColor rgb2yiq(const BColor& rRGBColor)
+    {
+        // from Foley, van Dam, Computer Graphics
+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
+        return BColor(
+            0.299*r + 0.587*g + 0.114*b,
+            0.596*r - 0.274*g - 0.322*b,
+            0.211*r - 0.522*g + 0.311*b);
+    }
+
+    BColor yiq2rgb(const BColor& rYIQColor)
+    {
+        // from Foley, van Dam, Computer Graphics
+        const double y=rYIQColor.getRed(), i=rYIQColor.getGreen(), q=rYIQColor.getBlue();
+        return BColor(
+            y + 0.956*i + 0.623*q,
+            y - 0.272*i - 0.648*q,
+            y - 1.105*i + 1.705*q );
+    }
+
+    BColor ciexyz2rgb( const BColor& rXYZColor )
+    {
+        // from Poynton color faq, and SMPTE RP 177-1993, Derivation
+        // of Basic Television Color Equations
+        const double x=rXYZColor.getRed(), y=rXYZColor.getGreen(), z=rXYZColor.getBlue();
+        return BColor(
+            3.240479*x - 1.53715*y  - 0.498535*z,
+            -0.969256*x + 1.875991*y + 0.041556*z,
+            0.055648*x - 0.204043*y + 1.057311*z );
+    }
+
+    BColor rgb2ciexyz( const BColor& rRGBColor )
+    {
+        // from Poynton color faq, and SMPTE RP 177-1993, Derivation
+        // of Basic Television Color Equations
+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
+        return BColor(
+            0.412453*r + 0.35758*g  + 0.180423*b,
+            0.212671*r + 0.71516*g  + 0.072169*b,
+            0.019334*r + 0.119193*g + 0.950227*b);
+    }
+
+    BColor rgb2ypbpr(const BColor& rRGBColor)
+    {
+        const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue();
+        return BColor(
+             0.299*r    + 0.587*g    + 0.114*b,
+            -0.168736*r - 0.331264*g + 0.5*b,
+             0.5*r      - 0.418688*g - 0.081312*b);
+    }
+
+    BColor ypbpr2rgb(const BColor& rYPbPrColor)
+    {
+        const double y=rYPbPrColor.getRed(), pb=rYPbPrColor.getGreen(), pr=rYPbPrColor.getBlue();
+        return BColor(
+            1.*y +       0.*pb +    1.402*pr,
+            1.*y - 0.344136*pb - 0.714136*pr,
+            1.*y +    1.772*pb +       0.*pr);
+    }
+
+} } // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/color/makefile.mk b/basegfx/source/color/makefile.mk
new file mode 100644
index 000000000000..c4e842db72ae
--- /dev/null
+++ b/basegfx/source/color/makefile.mk
@@ -0,0 +1,49 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=color
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+#ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/bcolor.obj			\
+                $(SLO)$/bcolortools.obj		\
+                $(SLO)$/bcolormodifier.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/curve/b2dbeziertools.cxx b/basegfx/source/curve/b2dbeziertools.cxx
new file mode 100644
index 000000000000..eddd0b281fc2
--- /dev/null
+++ b/basegfx/source/curve/b2dbeziertools.cxx
@@ -0,0 +1,163 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/curve/b2dbeziertools.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    B2DCubicBezierHelper::B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions)
+    :   maLengthArray(),
+        mnEdgeCount(0)
+    {
+        const bool bIsBezier(rBase.isBezier());
+
+        if(bIsBezier)
+        {
+            // check nDivisions; at least one is needed, but also prevent too big values
+            if(nDivisions < 1)
+            {
+                nDivisions = 1;
+            }
+            else if(nDivisions > 1000)
+            {
+                nDivisions = 1000;
+            }
+
+            // set nEdgeCount
+            mnEdgeCount = nDivisions + 1;
+
+            // fill in maLengthArray
+            maLengthArray.clear();
+            maLengthArray.reserve(mnEdgeCount);
+            B2DPoint aCurrent(rBase.getStartPoint());
+            double fLength(0.0);
+
+            for(sal_uInt32 a(1);;)
+            {
+                const B2DPoint aNext(rBase.interpolatePoint((double)a / (double)mnEdgeCount));
+                const B2DVector aEdge(aNext - aCurrent);
+
+                fLength += aEdge.getLength();
+                maLengthArray.push_back(fLength);
+
+                if(++a < mnEdgeCount)
+                {
+                    aCurrent = aNext;
+                }
+                else
+                {
+                    const B2DPoint aLastNext(rBase.getEndPoint());
+                    const B2DVector aLastEdge(aLastNext - aNext);
+
+                    fLength += aLastEdge.getLength();
+                    maLengthArray.push_back(fLength);
+                    break;
+                }
+            }
+        }
+        else
+        {
+            maLengthArray.clear();
+            maLengthArray.push_back(rBase.getEdgeLength());
+            mnEdgeCount = 1;
+        }
+    }
+
+    double B2DCubicBezierHelper::distanceToRelative(double fDistance) const
+    {
+        if(fDistance <= 0.0)
+        {
+            return 0.0;
+        }
+
+        const double fLength(getLength());
+
+        if(fTools::moreOrEqual(fDistance, fLength))
+        {
+            return 1.0;
+        }
+
+        // fDistance is in ]0.0 .. fLength[
+
+        if(1 == mnEdgeCount)
+        {
+            // not a bezier, linear edge
+            return fDistance / fLength;
+        }
+
+        // it is a bezier
+        ::std::vector< double >::const_iterator aIter = ::std::lower_bound(maLengthArray.begin(), maLengthArray.end(), fDistance);
+        const sal_uInt32 nIndex(aIter - maLengthArray.begin());
+        const double fHighBound(maLengthArray[nIndex]);
+        const double fLowBound(nIndex ?  maLengthArray[nIndex - 1] : 0.0);
+        const double fLinearInterpolatedLength((fDistance - fLowBound) / (fHighBound - fLowBound));
+
+        return (static_cast< double >(nIndex) + fLinearInterpolatedLength) / static_cast< double >(mnEdgeCount);
+    }
+
+    double B2DCubicBezierHelper::relativeToDistance(double fRelative) const
+    {
+        if(fRelative <= 0.0)
+        {
+            return 0.0;
+        }
+
+        const double fLength(getLength());
+
+        if(fTools::moreOrEqual(fRelative, 1.0))
+        {
+            return fLength;
+        }
+
+        // fRelative is in ]0.0 .. 1.0[
+
+        if(1 == mnEdgeCount)
+        {
+            // not a bezier, linear edge
+            return fRelative * fLength;
+        }
+
+        // fRelative is in ]0.0 .. 1.0[
+        const double fIndex(fRelative * static_cast< double >(mnEdgeCount));
+        double fIntIndex;
+        const double fFractIndex(modf(fIndex, &fIntIndex));
+        const sal_uInt32 nIntIndex(static_cast< sal_uInt32 >(fIntIndex));
+        const double fStartDistance(nIntIndex ? maLengthArray[nIntIndex - 1] : 0.0);
+
+        return fStartDistance + ((maLengthArray[nIntIndex] - fStartDistance) * fFractIndex);
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+// eof
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
new file mode 100644
index 000000000000..80bd8922160b
--- /dev/null
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -0,0 +1,1106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+#include <limits>
+
+// #i37443#
+#define FACTOR_FOR_UNSHARPEN    (1.6)
+#ifdef DBG_UTIL
+static double fMultFactUnsharpen = FACTOR_FOR_UNSHARPEN;
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        void ImpSubDivAngle(
+            const B2DPoint& rfPA,           // start point
+            const B2DPoint& rfEA,           // edge on A
+            const B2DPoint& rfEB,           // edge on B
+            const B2DPoint& rfPB,           // end point
+            B2DPolygon& rTarget,            // target polygon
+            double fAngleBound,             // angle bound in [0.0 .. 2PI]
+            bool bAllowUnsharpen,           // #i37443# allow the criteria to get unsharp in recursions
+            sal_uInt16 nMaxRecursionDepth)  // endless loop protection
+        {
+            if(nMaxRecursionDepth)
+            {
+                // do angle test
+                B2DVector aLeft(rfEA - rfPA);
+                B2DVector aRight(rfEB - rfPB);
+
+                // #i72104#
+                if(aLeft.equalZero())
+                {
+                    aLeft = rfEB - rfPA;
+                }
+
+                if(aRight.equalZero())
+                {
+                    aRight = rfEA - rfPB;
+                }
+
+                const double fCurrentAngle(aLeft.angle(aRight));
+
+                if(fabs(fCurrentAngle) > (F_PI - fAngleBound))
+                {
+                    // end recursion
+                    nMaxRecursionDepth = 0;
+                }
+                else
+                {
+                    if(bAllowUnsharpen)
+                    {
+                        // #i37443# unsharpen criteria
+#ifdef DBG_UTIL
+                        fAngleBound *= fMultFactUnsharpen;
+#else
+                        fAngleBound *= FACTOR_FOR_UNSHARPEN;
+#endif
+                    }
+                }
+            }
+
+            if(nMaxRecursionDepth)
+            {
+                // divide at 0.5
+                const B2DPoint aS1L(average(rfPA, rfEA));
+                const B2DPoint aS1C(average(rfEA, rfEB));
+                const B2DPoint aS1R(average(rfEB, rfPB));
+                const B2DPoint aS2L(average(aS1L, aS1C));
+                const B2DPoint aS2R(average(aS1C, aS1R));
+                const B2DPoint aS3C(average(aS2L, aS2R));
+
+                // left recursion
+                ImpSubDivAngle(rfPA, aS1L, aS2L, aS3C, rTarget, fAngleBound, bAllowUnsharpen, nMaxRecursionDepth - 1);
+
+                // right recursion
+                ImpSubDivAngle(aS3C, aS2R, aS1R, rfPB, rTarget, fAngleBound, bAllowUnsharpen, nMaxRecursionDepth - 1);
+            }
+            else
+            {
+                rTarget.append(rfPB);
+            }
+        }
+
+        void ImpSubDivAngleStart(
+            const B2DPoint& rfPA,           // start point
+            const B2DPoint& rfEA,           // edge on A
+            const B2DPoint& rfEB,           // edge on B
+            const B2DPoint& rfPB,           // end point
+            B2DPolygon& rTarget,            // target polygon
+            const double& rfAngleBound,     // angle bound in [0.0 .. 2PI]
+            bool bAllowUnsharpen)           // #i37443# allow the criteria to get unsharp in recursions
+        {
+            sal_uInt16 nMaxRecursionDepth(8);
+            const B2DVector aLeft(rfEA - rfPA);
+            const B2DVector aRight(rfEB - rfPB);
+            bool bLeftEqualZero(aLeft.equalZero());
+            bool bRightEqualZero(aRight.equalZero());
+            bool bAllParallel(false);
+
+            if(bLeftEqualZero && bRightEqualZero)
+            {
+                nMaxRecursionDepth = 0;
+            }
+            else
+            {
+                const B2DVector aBase(rfPB - rfPA);
+                const bool bBaseEqualZero(aBase.equalZero()); // #i72104#
+
+                if(!bBaseEqualZero)
+                {
+                    const bool bLeftParallel(bLeftEqualZero ? true : areParallel(aLeft, aBase));
+                    const bool bRightParallel(bRightEqualZero ? true : areParallel(aRight, aBase));
+
+                    if(bLeftParallel && bRightParallel)
+                    {
+                        bAllParallel = true;
+
+                        if(!bLeftEqualZero)
+                        {
+                            double fFactor;
+
+                            if(fabs(aBase.getX()) > fabs(aBase.getY()))
+                            {
+                                fFactor = aLeft.getX() / aBase.getX();
+                            }
+                            else
+                            {
+                                fFactor = aLeft.getY() / aBase.getY();
+                            }
+
+                            if(fFactor >= 0.0 && fFactor <= 1.0)
+                            {
+                                bLeftEqualZero = true;
+                            }
+                        }
+
+                        if(!bRightEqualZero)
+                        {
+                            double fFactor;
+
+                            if(fabs(aBase.getX()) > fabs(aBase.getY()))
+                            {
+                                fFactor = aRight.getX() / -aBase.getX();
+                            }
+                            else
+                            {
+                                fFactor = aRight.getY() / -aBase.getY();
+                            }
+
+                            if(fFactor >= 0.0 && fFactor <= 1.0)
+                            {
+                                bRightEqualZero = true;
+                            }
+                        }
+
+                        if(bLeftEqualZero && bRightEqualZero)
+                        {
+                            nMaxRecursionDepth = 0;
+                        }
+                    }
+                }
+            }
+
+            if(nMaxRecursionDepth)
+            {
+                // divide at 0.5 ad test both edges for angle criteria
+                const B2DPoint aS1L(average(rfPA, rfEA));
+                const B2DPoint aS1C(average(rfEA, rfEB));
+                const B2DPoint aS1R(average(rfEB, rfPB));
+                const B2DPoint aS2L(average(aS1L, aS1C));
+                const B2DPoint aS2R(average(aS1C, aS1R));
+                const B2DPoint aS3C(average(aS2L, aS2R));
+
+                // test left
+                bool bAngleIsSmallerLeft(bAllParallel && bLeftEqualZero);
+                if(!bAngleIsSmallerLeft)
+                {
+                    const B2DVector aLeftLeft(bLeftEqualZero ? aS2L - aS1L : aS1L - rfPA); // #i72104#
+                    const B2DVector aRightLeft(aS2L - aS3C);
+                    const double fCurrentAngleLeft(aLeftLeft.angle(aRightLeft));
+                    bAngleIsSmallerLeft = (fabs(fCurrentAngleLeft) > (F_PI - rfAngleBound));
+                }
+
+                // test right
+                bool bAngleIsSmallerRight(bAllParallel && bRightEqualZero);
+                if(!bAngleIsSmallerRight)
+                {
+                    const B2DVector aLeftRight(aS2R - aS3C);
+                    const B2DVector aRightRight(bRightEqualZero ? aS2R - aS1R : aS1R - rfPB); // #i72104#
+                    const double fCurrentAngleRight(aLeftRight.angle(aRightRight));
+                    bAngleIsSmallerRight = (fabs(fCurrentAngleRight) > (F_PI - rfAngleBound));
+                }
+
+                if(bAngleIsSmallerLeft && bAngleIsSmallerRight)
+                {
+                    // no recursion necessary at all
+                    nMaxRecursionDepth = 0;
+                }
+                else
+                {
+                    // left
+                    if(bAngleIsSmallerLeft)
+                    {
+                        rTarget.append(aS3C);
+                    }
+                    else
+                    {
+                        ImpSubDivAngle(rfPA, aS1L, aS2L, aS3C, rTarget, rfAngleBound, bAllowUnsharpen, nMaxRecursionDepth);
+                    }
+
+                    // right
+                    if(bAngleIsSmallerRight)
+                    {
+                        rTarget.append(rfPB);
+                    }
+                    else
+                    {
+                        ImpSubDivAngle(aS3C, aS2R, aS1R, rfPB, rTarget, rfAngleBound, bAllowUnsharpen, nMaxRecursionDepth);
+                    }
+                }
+            }
+
+            if(!nMaxRecursionDepth)
+            {
+                rTarget.append(rfPB);
+            }
+        }
+
+        void ImpSubDivDistance(
+            const B2DPoint& rfPA,           // start point
+            const B2DPoint& rfEA,           // edge on A
+            const B2DPoint& rfEB,           // edge on B
+            const B2DPoint& rfPB,           // end point
+            B2DPolygon& rTarget,            // target polygon
+            double fDistanceBound2,         // quadratic distance criteria
+            double fLastDistanceError2,     // the last quadratic distance error
+            sal_uInt16 nMaxRecursionDepth)  // endless loop protection
+        {
+            if(nMaxRecursionDepth)
+            {
+                // decide if another recursion is needed. If not, set
+                // nMaxRecursionDepth to zero
+
+                // Perform bezier flatness test (lecture notes from R. Schaback,
+                // Mathematics of Computer-Aided Design, Uni Goettingen, 2000)
+                //
+                // ||P(t) - L(t)|| <= max     ||b_j - b_0 - j/n(b_n - b_0)||
+                //                    0<=j<=n
+                //
+                // What is calculated here is an upper bound to the distance from
+                // a line through b_0 and b_3 (rfPA and P4 in our notation) and the
+                // curve. We can drop 0 and n from the running indices, since the
+                // argument of max becomes zero for those cases.
+                const double fJ1x(rfEA.getX() - rfPA.getX() - 1.0/3.0*(rfPB.getX() - rfPA.getX()));
+                const double fJ1y(rfEA.getY() - rfPA.getY() - 1.0/3.0*(rfPB.getY() - rfPA.getY()));
+                const double fJ2x(rfEB.getX() - rfPA.getX() - 2.0/3.0*(rfPB.getX() - rfPA.getX()));
+                const double fJ2y(rfEB.getY() - rfPA.getY() - 2.0/3.0*(rfPB.getY() - rfPA.getY()));
+                const double fDistanceError2(::std::max(fJ1x*fJ1x + fJ1y*fJ1y, fJ2x*fJ2x + fJ2y*fJ2y));
+
+                // stop if error measure does not improve anymore. This is a
+                // safety guard against floating point inaccuracies.
+                // stop if distance from line is guaranteed to be bounded by d
+                const bool bFurtherDivision(fLastDistanceError2 > fDistanceError2 && fDistanceError2 >= fDistanceBound2);
+
+                if(bFurtherDivision)
+                {
+                    // remember last error value
+                    fLastDistanceError2 = fDistanceError2;
+                }
+                else
+                {
+                    // stop recustion
+                    nMaxRecursionDepth = 0;
+                }
+            }
+
+            if(nMaxRecursionDepth)
+            {
+                // divide at 0.5
+                const B2DPoint aS1L(average(rfPA, rfEA));
+                const B2DPoint aS1C(average(rfEA, rfEB));
+                const B2DPoint aS1R(average(rfEB, rfPB));
+                const B2DPoint aS2L(average(aS1L, aS1C));
+                const B2DPoint aS2R(average(aS1C, aS1R));
+                const B2DPoint aS3C(average(aS2L, aS2R));
+
+                // left recursion
+                ImpSubDivDistance(rfPA, aS1L, aS2L, aS3C, rTarget, fDistanceBound2, fLastDistanceError2, nMaxRecursionDepth - 1);
+
+                // right recursion
+                ImpSubDivDistance(aS3C, aS2R, aS1R, rfPB, rTarget, fDistanceBound2, fLastDistanceError2, nMaxRecursionDepth - 1);
+            }
+            else
+            {
+                rTarget.append(rfPB);
+            }
+        }
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    B2DCubicBezier::B2DCubicBezier(const B2DCubicBezier& rBezier)
+    :   maStartPoint(rBezier.maStartPoint),
+        maEndPoint(rBezier.maEndPoint),
+        maControlPointA(rBezier.maControlPointA),
+        maControlPointB(rBezier.maControlPointB)
+    {
+    }
+
+    B2DCubicBezier::B2DCubicBezier()
+    {
+    }
+
+    B2DCubicBezier::B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rEnd)
+    :   maStartPoint(rStart),
+        maEndPoint(rEnd),
+        maControlPointA(rStart),
+        maControlPointB(rEnd)
+    {
+    }
+
+    B2DCubicBezier::B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rControlPointA, const B2DPoint& rControlPointB, const B2DPoint& rEnd)
+    :   maStartPoint(rStart),
+        maEndPoint(rEnd),
+        maControlPointA(rControlPointA),
+        maControlPointB(rControlPointB)
+    {
+    }
+
+    B2DCubicBezier::~B2DCubicBezier()
+    {
+    }
+
+    // assignment operator
+    B2DCubicBezier& B2DCubicBezier::operator=(const B2DCubicBezier& rBezier)
+    {
+        maStartPoint = rBezier.maStartPoint;
+        maEndPoint = rBezier.maEndPoint;
+        maControlPointA = rBezier.maControlPointA;
+        maControlPointB = rBezier.maControlPointB;
+
+        return *this;
+    }
+
+    // compare operators
+    bool B2DCubicBezier::operator==(const B2DCubicBezier& rBezier) const
+    {
+        return (
+            maStartPoint == rBezier.maStartPoint
+            && maEndPoint == rBezier.maEndPoint
+            && maControlPointA == rBezier.maControlPointA
+            && maControlPointB == rBezier.maControlPointB
+        );
+    }
+
+    bool B2DCubicBezier::operator!=(const B2DCubicBezier& rBezier) const
+    {
+        return (
+            maStartPoint != rBezier.maStartPoint
+            || maEndPoint != rBezier.maEndPoint
+            || maControlPointA != rBezier.maControlPointA
+            || maControlPointB != rBezier.maControlPointB
+        );
+    }
+
+    bool B2DCubicBezier::equal(const B2DCubicBezier& rBezier) const
+    {
+        return (
+            maStartPoint.equal(rBezier.maStartPoint)
+            && maEndPoint.equal(rBezier.maEndPoint)
+            && maControlPointA.equal(rBezier.maControlPointA)
+            && maControlPointB.equal(rBezier.maControlPointB)
+        );
+    }
+
+    // test if vectors are used
+    bool B2DCubicBezier::isBezier() const
+    {
+        if(maControlPointA != maStartPoint || maControlPointB != maEndPoint)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    void B2DCubicBezier::testAndSolveTrivialBezier()
+    {
+        if(maControlPointA != maStartPoint || maControlPointB != maEndPoint)
+        {
+            const B2DVector aEdge(maEndPoint - maStartPoint);
+
+            // controls parallel to edge can be trivial. No edge -> not parallel -> control can
+            // still not be trivial (e.g. ballon loop)
+            if(!aEdge.equalZero())
+            {
+                // get control vectors
+                const B2DVector aVecA(maControlPointA - maStartPoint);
+                const B2DVector aVecB(maControlPointB - maEndPoint);
+
+                // check if trivial per se
+                bool bAIsTrivial(aVecA.equalZero());
+                bool bBIsTrivial(aVecB.equalZero());
+
+                // #i102241# prepare inverse edge length to normalize cross values;
+                // else the small compare value used in fTools::equalZero
+                // will be length dependent and this detection will work as less
+                // precise as longer the edge is. In principle, the length of the control
+                // vector would need to be used too, but to be trivial it is assumed to
+                // be of roughly equal length to the edge, so edge length can be used
+                // for both. Only needed when one of both is not trivial per se.
+                const double fInverseEdgeLength(bAIsTrivial && bBIsTrivial
+                    ? 1.0
+                    : 1.0 / aEdge.getLength());
+
+                // if A is not zero, check if it could be
+                if(!bAIsTrivial)
+                {
+                    // #i102241# parallel to edge? Check aVecA, aEdge. Use cross() which does what
+                    // we need here with the precision we need
+                    const double fCross(aVecA.cross(aEdge) * fInverseEdgeLength);
+
+                    if(fTools::equalZero(fCross))
+                    {
+                        // get scale to edge. Use bigger distance for numeric quality
+                        const double fScale(fabs(aEdge.getX()) > fabs(aEdge.getY())
+                            ? aVecA.getX() / aEdge.getX()
+                            : aVecA.getY() / aEdge.getY());
+
+                        // relative end point of vector in edge range?
+                        if(fTools::moreOrEqual(fScale, 0.0) && fTools::lessOrEqual(fScale, 1.0))
+                        {
+                            bAIsTrivial = true;
+                        }
+                    }
+                }
+
+                // if B is not zero, check if it could be, but only if A is already trivial;
+                // else solve to trivial will not be possible for whole edge
+                if(bAIsTrivial && !bBIsTrivial)
+                {
+                    // parallel to edge? Check aVecB, aEdge
+                    const double fCross(aVecB.cross(aEdge) * fInverseEdgeLength);
+
+                    if(fTools::equalZero(fCross))
+                    {
+                        // get scale to edge. Use bigger distance for numeric quality
+                        const double fScale(fabs(aEdge.getX()) > fabs(aEdge.getY())
+                            ? aVecB.getX() / aEdge.getX()
+                            : aVecB.getY() / aEdge.getY());
+
+                        // end point of vector in edge range? Caution: controlB is directed AGAINST edge
+                        if(fTools::lessOrEqual(fScale, 0.0) && fTools::moreOrEqual(fScale, -1.0))
+                        {
+                            bBIsTrivial = true;
+                        }
+                    }
+                }
+
+                // if both are/can be reduced, do it.
+                // Not possible if only one is/can be reduced (!)
+                if(bAIsTrivial && bBIsTrivial)
+                {
+                    maControlPointA = maStartPoint;
+                    maControlPointB = maEndPoint;
+                }
+            }
+        }
+    }
+
+    namespace {
+        double impGetLength(const B2DCubicBezier& rEdge, double fDeviation, sal_uInt32 nRecursionWatch)
+        {
+            const double fEdgeLength(rEdge.getEdgeLength());
+            const double fControlPolygonLength(rEdge.getControlPolygonLength());
+            const double fCurrentDeviation(fTools::equalZero(fControlPolygonLength) ? 0.0 : 1.0 - (fEdgeLength / fControlPolygonLength));
+
+            if(!nRecursionWatch || fTools:: lessOrEqual(fCurrentDeviation, fDeviation))
+            {
+                return (fEdgeLength + fControlPolygonLength) * 0.5;
+            }
+            else
+            {
+                B2DCubicBezier aLeft, aRight;
+                const double fNewDeviation(fDeviation * 0.5);
+                const sal_uInt32 nNewRecursionWatch(nRecursionWatch - 1);
+
+                rEdge.split(0.5, &aLeft, &aRight);
+
+                return impGetLength(aLeft, fNewDeviation, nNewRecursionWatch)
+                    + impGetLength(aRight, fNewDeviation, nNewRecursionWatch);
+            }
+        }
+    }
+
+    double B2DCubicBezier::getLength(double fDeviation) const
+    {
+        if(isBezier())
+        {
+            if(fDeviation < 0.00000001)
+            {
+                fDeviation = 0.00000001;
+            }
+
+            return impGetLength(*this, fDeviation, 6);
+        }
+        else
+        {
+            return B2DVector(getEndPoint() - getStartPoint()).getLength();
+        }
+    }
+
+    double B2DCubicBezier::getEdgeLength() const
+    {
+        const B2DVector aEdge(maEndPoint - maStartPoint);
+        return aEdge.getLength();
+    }
+
+    double B2DCubicBezier::getControlPolygonLength() const
+    {
+        const B2DVector aVectorA(maControlPointA - maStartPoint);
+        const B2DVector aVectorB(maEndPoint - maControlPointB);
+
+        if(!aVectorA.equalZero() || !aVectorB.equalZero())
+        {
+            const B2DVector aTop(maControlPointB - maControlPointA);
+            return (aVectorA.getLength() + aVectorB.getLength() + aTop.getLength());
+        }
+        else
+        {
+            return getEdgeLength();
+        }
+    }
+
+    void B2DCubicBezier::adaptiveSubdivideByAngle(B2DPolygon& rTarget, double fAngleBound, bool bAllowUnsharpen) const
+    {
+        if(isBezier())
+        {
+            // use support method #i37443# and allow unsharpen the criteria
+            ImpSubDivAngleStart(maStartPoint, maControlPointA, maControlPointB, maEndPoint, rTarget, fAngleBound * F_PI180, bAllowUnsharpen);
+        }
+        else
+        {
+            rTarget.append(getEndPoint());
+        }
+    }
+
+    B2DVector B2DCubicBezier::getTangent(double t) const
+    {
+        if(fTools::lessOrEqual(t, 0.0))
+        {
+            // tangent in start point
+            B2DVector aTangent(getControlPointA() - getStartPoint());
+
+            if(!aTangent.equalZero())
+            {
+                return aTangent;
+            }
+
+            // start point and control vector are the same, fallback
+            // to implicit start vector to control point B
+            aTangent = (getControlPointB() - getStartPoint()) * 0.3;
+
+            if(!aTangent.equalZero())
+            {
+                return aTangent;
+            }
+
+            // not a bezier at all, return edge vector
+            return (getEndPoint() - getStartPoint()) * 0.3;
+        }
+        else if(fTools::moreOrEqual(t, 1.0))
+        {
+            // tangent in end point
+            B2DVector aTangent(getEndPoint() - getControlPointB());
+
+            if(!aTangent.equalZero())
+            {
+                return aTangent;
+            }
+
+            // end point and control vector are the same, fallback
+            // to implicit start vector from control point A
+            aTangent = (getEndPoint() - getControlPointA()) * 0.3;
+
+            if(!aTangent.equalZero())
+            {
+                return aTangent;
+            }
+
+            // not a bezier at all, return edge vector
+            return (getEndPoint() - getStartPoint()) * 0.3;
+        }
+        else
+        {
+            // t is in ]0.0 .. 1.0[. Split and extract
+            B2DCubicBezier aRight;
+            split(t, 0, &aRight);
+
+            return aRight.getControlPointA() - aRight.getStartPoint();
+        }
+    }
+
+    // #i37443# adaptive subdivide by nCount subdivisions
+    void B2DCubicBezier::adaptiveSubdivideByCount(B2DPolygon& rTarget, sal_uInt32 nCount) const
+    {
+        const double fLenFact(1.0 / static_cast< double >(nCount + 1));
+
+        for(sal_uInt32 a(1); a <= nCount; a++)
+        {
+            const double fPos(static_cast< double >(a) * fLenFact);
+            rTarget.append(interpolatePoint(fPos));
+        }
+
+        rTarget.append(getEndPoint());
+    }
+
+    // adaptive subdivide by distance
+    void B2DCubicBezier::adaptiveSubdivideByDistance(B2DPolygon& rTarget, double fDistanceBound) const
+    {
+        if(isBezier())
+        {
+            ImpSubDivDistance(maStartPoint, maControlPointA, maControlPointB, maEndPoint, rTarget,
+                fDistanceBound * fDistanceBound, ::std::numeric_limits<double>::max(), 30);
+        }
+        else
+        {
+            rTarget.append(getEndPoint());
+        }
+    }
+
+    B2DPoint B2DCubicBezier::interpolatePoint(double t) const
+    {
+        OSL_ENSURE(t >= 0.0 && t <= 1.0, "B2DCubicBezier::interpolatePoint: Access out of range (!)");
+
+        if(isBezier())
+        {
+            const B2DPoint aS1L(interpolate(maStartPoint, maControlPointA, t));
+            const B2DPoint aS1C(interpolate(maControlPointA, maControlPointB, t));
+            const B2DPoint aS1R(interpolate(maControlPointB, maEndPoint, t));
+            const B2DPoint aS2L(interpolate(aS1L, aS1C, t));
+            const B2DPoint aS2R(interpolate(aS1C, aS1R, t));
+
+            return interpolate(aS2L, aS2R, t);
+        }
+        else
+        {
+            return interpolate(maStartPoint, maEndPoint, t);
+        }
+    }
+
+    double B2DCubicBezier::getSmallestDistancePointToBezierSegment(const B2DPoint& rTestPoint, double& rCut) const
+    {
+        const sal_uInt32 nInitialDivisions(3L);
+        B2DPolygon aInitialPolygon;
+
+        // as start make a fix division, creates nInitialDivisions + 2L points
+        aInitialPolygon.append(getStartPoint());
+        adaptiveSubdivideByCount(aInitialPolygon, nInitialDivisions);
+
+        // now look for the closest point
+        const sal_uInt32 nPointCount(aInitialPolygon.count());
+        B2DVector aVector(rTestPoint - aInitialPolygon.getB2DPoint(0L));
+        double fQuadDist(aVector.getX() * aVector.getX() + aVector.getY() * aVector.getY());
+        double fNewQuadDist;
+        sal_uInt32 nSmallestIndex(0L);
+
+        for(sal_uInt32 a(1L); a < nPointCount; a++)
+        {
+            aVector = B2DVector(rTestPoint - aInitialPolygon.getB2DPoint(a));
+            fNewQuadDist = aVector.getX() * aVector.getX() + aVector.getY() * aVector.getY();
+
+            if(fNewQuadDist < fQuadDist)
+            {
+                fQuadDist = fNewQuadDist;
+                nSmallestIndex = a;
+            }
+        }
+
+        // look right and left for even smaller distances
+        double fStepValue(1.0 / (double)((nPointCount - 1L) * 2L)); // half the edge step width
+        double fPosition((double)nSmallestIndex / (double)(nPointCount - 1L));
+        bool bDone(false);
+
+        while(!bDone)
+        {
+            if(!bDone)
+            {
+                // test left
+                double fPosLeft(fPosition - fStepValue);
+
+                if(fPosLeft < 0.0)
+                {
+                    fPosLeft = 0.0;
+                    aVector = B2DVector(rTestPoint - maStartPoint);
+                }
+                else
+                {
+                    aVector = B2DVector(rTestPoint - interpolatePoint(fPosLeft));
+                }
+
+                fNewQuadDist = aVector.getX() * aVector.getX() + aVector.getY() * aVector.getY();
+
+                if(fTools::less(fNewQuadDist, fQuadDist))
+                {
+                    fQuadDist = fNewQuadDist;
+                    fPosition = fPosLeft;
+                }
+                else
+                {
+                    // test right
+                    double fPosRight(fPosition + fStepValue);
+
+                    if(fPosRight > 1.0)
+                    {
+                        fPosRight = 1.0;
+                        aVector = B2DVector(rTestPoint - maEndPoint);
+                    }
+                    else
+                    {
+                        aVector = B2DVector(rTestPoint - interpolatePoint(fPosRight));
+                    }
+
+                    fNewQuadDist = aVector.getX() * aVector.getX() + aVector.getY() * aVector.getY();
+
+                    if(fTools::less(fNewQuadDist, fQuadDist))
+                    {
+                        fQuadDist = fNewQuadDist;
+                        fPosition = fPosRight;
+                    }
+                    else
+                    {
+                        // not less left or right, done
+                        bDone = true;
+                    }
+                }
+            }
+
+            if(0.0 == fPosition || 1.0 == fPosition)
+            {
+                // if we are completely left or right, we are done
+                bDone = true;
+            }
+
+            if(!bDone)
+            {
+                // prepare next step value
+                fStepValue /= 2.0;
+            }
+        }
+
+        rCut = fPosition;
+        return sqrt(fQuadDist);
+    }
+
+    void B2DCubicBezier::split(double t, B2DCubicBezier* pBezierA, B2DCubicBezier* pBezierB) const
+    {
+        OSL_ENSURE(t >= 0.0 && t <= 1.0, "B2DCubicBezier::split: Access out of range (!)");
+
+        if(!pBezierA && !pBezierB)
+        {
+            return;
+        }
+
+        if(isBezier())
+        {
+            const B2DPoint aS1L(interpolate(maStartPoint, maControlPointA, t));
+            const B2DPoint aS1C(interpolate(maControlPointA, maControlPointB, t));
+            const B2DPoint aS1R(interpolate(maControlPointB, maEndPoint, t));
+            const B2DPoint aS2L(interpolate(aS1L, aS1C, t));
+            const B2DPoint aS2R(interpolate(aS1C, aS1R, t));
+            const B2DPoint aS3C(interpolate(aS2L, aS2R, t));
+
+            if(pBezierA)
+            {
+                pBezierA->setStartPoint(maStartPoint);
+                pBezierA->setEndPoint(aS3C);
+                pBezierA->setControlPointA(aS1L);
+                pBezierA->setControlPointB(aS2L);
+            }
+
+            if(pBezierB)
+            {
+                pBezierB->setStartPoint(aS3C);
+                pBezierB->setEndPoint(maEndPoint);
+                pBezierB->setControlPointA(aS2R);
+                pBezierB->setControlPointB(aS1R);
+            }
+        }
+        else
+        {
+            const B2DPoint aSplit(interpolate(maStartPoint, maEndPoint, t));
+
+            if(pBezierA)
+            {
+                pBezierA->setStartPoint(maStartPoint);
+                pBezierA->setEndPoint(aSplit);
+                pBezierA->setControlPointA(maStartPoint);
+                pBezierA->setControlPointB(aSplit);
+            }
+
+            if(pBezierB)
+            {
+                pBezierB->setStartPoint(aSplit);
+                pBezierB->setEndPoint(maEndPoint);
+                pBezierB->setControlPointA(aSplit);
+                pBezierB->setControlPointB(maEndPoint);
+            }
+        }
+    }
+
+    B2DCubicBezier B2DCubicBezier::snippet(double fStart, double fEnd) const
+    {
+        B2DCubicBezier aRetval;
+
+        if(fTools::more(fStart, 1.0))
+        {
+            fStart = 1.0;
+        }
+        else if(fTools::less(fStart, 0.0))
+        {
+            fStart = 0.0;
+        }
+
+        if(fTools::more(fEnd, 1.0))
+        {
+            fEnd = 1.0;
+        }
+        else if(fTools::less(fEnd, 0.0))
+        {
+            fEnd = 0.0;
+        }
+
+        if(fEnd <= fStart)
+        {
+            // empty or NULL, create single point at center
+            const double fSplit((fEnd + fStart) * 0.5);
+            const B2DPoint aPoint(interpolate(getStartPoint(), getEndPoint(), fSplit));
+            aRetval.setStartPoint(aPoint);
+            aRetval.setEndPoint(aPoint);
+            aRetval.setControlPointA(aPoint);
+            aRetval.setControlPointB(aPoint);
+        }
+        else
+        {
+            if(isBezier())
+            {
+                // copy bezier; cut off right, then cut off left. Do not forget to
+                // adapt cut value when both cuts happen
+                const bool bEndIsOne(fTools::equal(fEnd, 1.0));
+                const bool bStartIsZero(fTools::equalZero(fStart));
+                aRetval = *this;
+
+                if(!bEndIsOne)
+                {
+                    aRetval.split(fEnd, &aRetval, 0);
+
+                    if(!bStartIsZero)
+                    {
+                        fStart /= fEnd;
+                    }
+                }
+
+                if(!bStartIsZero)
+                {
+                    aRetval.split(fStart, 0, &aRetval);
+                }
+            }
+            else
+            {
+                // no bezier, create simple edge
+                const B2DPoint aPointA(interpolate(getStartPoint(), getEndPoint(), fStart));
+                const B2DPoint aPointB(interpolate(getStartPoint(), getEndPoint(), fEnd));
+                aRetval.setStartPoint(aPointA);
+                aRetval.setEndPoint(aPointB);
+                aRetval.setControlPointA(aPointA);
+                aRetval.setControlPointB(aPointB);
+            }
+        }
+
+        return aRetval;
+    }
+
+    B2DRange B2DCubicBezier::getRange() const
+    {
+        B2DRange aRetval(maStartPoint, maEndPoint);
+
+        aRetval.expand(maControlPointA);
+        aRetval.expand(maControlPointB);
+
+        return aRetval;
+    }
+
+    bool B2DCubicBezier::getMinimumExtremumPosition(double& rfResult) const
+    {
+        ::std::vector< double > aAllResults;
+
+        aAllResults.reserve(4);
+        getAllExtremumPositions(aAllResults);
+
+        const sal_uInt32 nCount(aAllResults.size());
+
+        if(!nCount)
+        {
+            return false;
+        }
+        else if(1 == nCount)
+        {
+            rfResult = aAllResults[0];
+            return true;
+        }
+        else
+        {
+            rfResult = *(::std::min_element(aAllResults.begin(), aAllResults.end()));
+            return true;
+        }
+    }
+
+    namespace
+    {
+        inline void impCheckExtremumResult(double fCandidate, ::std::vector< double >& rResult)
+        {
+            // check for range ]0.0 .. 1.0[ with excluding 1.0 and 0.0 clearly
+            // by using the equalZero test, NOT ::more or ::less which will use the
+            // ApproxEqual() which is too exact here
+            if(fCandidate > 0.0 && !fTools::equalZero(fCandidate))
+            {
+                if(fCandidate < 1.0 && !fTools::equalZero(fCandidate - 1.0))
+                {
+                    rResult.push_back(fCandidate);
+                }
+            }
+        }
+    }
+
+    void B2DCubicBezier::getAllExtremumPositions(::std::vector< double >& rResults) const
+    {
+        rResults.clear();
+
+        // calculate the x-extrema parameters by zeroing first x-derivative
+        // of the cubic bezier's parametric formula, which results in a
+        // quadratic equation: dBezier/dt = t*t*fAX - 2*t*fBX + fCX
+        const B2DPoint aRelativeEndPoint(maEndPoint-maStartPoint);
+        const double fAX = 3 * (maControlPointA.getX() - maControlPointB.getX()) + aRelativeEndPoint.getX();
+        const double fBX = 2 * maControlPointA.getX() - maControlPointB.getX() - maStartPoint.getX();
+        double fCX(maControlPointA.getX() - maStartPoint.getX());
+
+        if(fTools::equalZero(fCX))
+        {
+            // detect fCX equal zero and truncate to real zero value in that case
+            fCX = 0.0;
+        }
+
+        if( !fTools::equalZero(fAX) )
+        {
+            // derivative is polynomial of order 2 => use binomial formula
+            const double fD = fBX*fBX - fAX*fCX;
+            if( fD >= 0.0 )
+            {
+                const double fS = sqrt(fD);
+                // same as above but for very small fAX and/or fCX
+                // this has much better numerical stability
+                // see NRC chapter 5-6 (thanks THB!)
+                const double fQ = fBX + ((fBX >= 0) ? +fS : -fS);
+                impCheckExtremumResult(fQ / fAX, rResults);
+                impCheckExtremumResult(fCX / fQ, rResults);
+            }
+        }
+        else if( !fTools::equalZero(fBX) )
+        {
+            // derivative is polynomial of order 1 => one extrema
+            impCheckExtremumResult(fCX / (2 * fBX), rResults);
+        }
+
+        // calculate the y-extrema parameters by zeroing first y-derivative
+        const double fAY = 3 * (maControlPointA.getY() - maControlPointB.getY()) + aRelativeEndPoint.getY();
+        const double fBY = 2 * maControlPointA.getY() - maControlPointB.getY() - maStartPoint.getY();
+        double fCY(maControlPointA.getY() - maStartPoint.getY());
+
+        if(fTools::equalZero(fCY))
+        {
+            // detect fCY equal zero and truncate to real zero value in that case
+            fCY = 0.0;
+        }
+
+        if( !fTools::equalZero(fAY) )
+        {
+            // derivative is polynomial of order 2 => use binomial formula
+            const double fD = fBY*fBY - fAY*fCY;
+            if( fD >= 0 )
+            {
+                const double fS = sqrt(fD);
+                // same as above but for very small fAX and/or fCX
+                // this has much better numerical stability
+                // see NRC chapter 5-6 (thanks THB!)
+                const double fQ = fBY + ((fBY >= 0) ? +fS : -fS);
+                impCheckExtremumResult(fQ / fAY, rResults);
+                impCheckExtremumResult(fCY / fQ, rResults);
+            }
+        }
+        else if( !fTools::equalZero(fBY) )
+        {
+            // derivative is polynomial of order 1 => one extrema
+            impCheckExtremumResult(fCY / (2 * fBY), rResults);
+        }
+    }
+
+    int B2DCubicBezier::getMaxDistancePositions( double pResult[2]) const
+    {
+        // the distance from the bezier to a line through start and end
+        // is proportional to (ENDx-STARTx,ENDy-STARTy)*(+BEZIERy(t),-BEZIERx(t))
+        // this distance becomes zero for at least t==0 and t==1
+        // its extrema that are between 0..1 are interesting as split candidates
+        // its derived function has the form dD/dt = fA*t^2 + 2*fB*t + fC
+        const B2DPoint aRelativeEndPoint(maEndPoint-maStartPoint);
+        const double fA = 3 * (maEndPoint.getX() - maControlPointB.getX()) * aRelativeEndPoint.getY()
+                - 3 * (maEndPoint.getY() - maControlPointB.getY()) * aRelativeEndPoint.getX();
+        const double fB = (maControlPointB.getX() - maControlPointA.getX()) * aRelativeEndPoint.getY()
+                - (maControlPointB.getY() - maControlPointA.getY()) * aRelativeEndPoint.getX();
+        const double fC = (maControlPointA.getX() - maStartPoint.getX()) * aRelativeEndPoint.getY()
+                - (maControlPointA.getY() - maStartPoint.getY()) * aRelativeEndPoint.getX();
+
+        // test for degenerated case: non-cubic curve
+        if( fTools::equalZero(fA) )
+        {
+            // test for degenerated case: straight line
+            if( fTools::equalZero(fB) )
+                return 0;
+
+            // degenerated case: quadratic bezier
+            pResult[0] = -fC / (2*fB);
+
+            // test root: ignore it when it is outside the curve
+            int nCount = ((pResult[0] > 0) && (pResult[0] < 1));
+            return nCount;
+        }
+
+        // derivative is polynomial of order 2
+        // check if the polynomial has non-imaginary roots
+        const double fD = fB*fB - fA*fC;
+        if( fD >= 0.0 ) // TODO: is this test needed? geometrically not IMHO
+        {
+            // calculate the first root
+            const double fS = sqrt(fD);
+            const double fQ = fB + ((fB >= 0) ? +fS : -fS);
+            pResult[0] = fQ / fA;
+            // test root: ignore it when it is outside the curve
+            int nCount = ((pResult[0] > 0) && (pResult[0] < 1));
+
+            // ignore multiplicit roots
+            if( !fTools::equalZero(fD) )
+            {
+                 // calculate the second root
+                const double fRoot = fC / fQ;
+                pResult[ nCount ] = fC / fQ;
+                // test root: ignore it when it is outside the curve
+                nCount += ((fRoot > 0) && (fRoot < 1));
+            }
+
+            return nCount;
+        }
+
+        return 0;
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/curve/b2dquadraticbezier.cxx b/basegfx/source/curve/b2dquadraticbezier.cxx
new file mode 100644
index 000000000000..6afba95e52c1
--- /dev/null
+++ b/basegfx/source/curve/b2dquadraticbezier.cxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/curve/b2dquadraticbezier.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    B2DQuadraticBezier::B2DQuadraticBezier(const B2DQuadraticBezier& rBezier)
+    :   maStartPoint(rBezier.maStartPoint),
+        maEndPoint(rBezier.maEndPoint),
+        maControlPoint(rBezier.maControlPoint)
+    {
+    }
+
+    B2DQuadraticBezier::B2DQuadraticBezier()
+    {
+    }
+
+    B2DQuadraticBezier::B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd)
+    :   maStartPoint(rStart),
+        maEndPoint(rEnd)
+    {
+    }
+
+    B2DQuadraticBezier::B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rControl, const ::basegfx::B2DPoint& rEnd)
+    :   maStartPoint(rStart),
+        maEndPoint(rEnd),
+        maControlPoint(rControl)
+    {
+    }
+
+    B2DQuadraticBezier::~B2DQuadraticBezier()
+    {
+    }
+
+    // assignment operator
+    B2DQuadraticBezier& B2DQuadraticBezier::operator=(const B2DQuadraticBezier& rBezier)
+    {
+        maStartPoint = rBezier.maStartPoint;
+        maEndPoint = rBezier.maEndPoint;
+        maControlPoint = rBezier.maControlPoint;
+
+        return *this;
+    }
+
+    // compare operators
+    bool B2DQuadraticBezier::operator==(const B2DQuadraticBezier& rBezier) const
+    {
+        return (
+            maStartPoint == rBezier.maStartPoint
+            && maEndPoint == rBezier.maEndPoint
+            && maControlPoint == rBezier.maControlPoint
+        );
+    }
+
+    bool B2DQuadraticBezier::operator!=(const B2DQuadraticBezier& rBezier) const
+    {
+        return (
+            maStartPoint != rBezier.maStartPoint
+            || maEndPoint != rBezier.maEndPoint
+            || maControlPoint != rBezier.maControlPoint
+        );
+    }
+
+    // test if control vector is used
+    bool B2DQuadraticBezier::isBezier() const
+    {
+        // if control vector is empty, bezier is not used
+        if(maControlPoint == maStartPoint || maControlPoint == maEndPoint)
+            return false;
+
+        return true;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/curve/makefile.mk b/basegfx/source/curve/makefile.mk
new file mode 100644
index 000000000000..88190cfdfe1a
--- /dev/null
+++ b/basegfx/source/curve/makefile.mk
@@ -0,0 +1,49 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=curve
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/b2dcubicbezier.obj		\
+                $(SLO)$/b2dquadraticbezier.obj	\
+                $(SLO)$/b2dbeziertools.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/inc/PolygonPoint.hxx b/basegfx/source/inc/PolygonPoint.hxx
new file mode 100644
index 000000000000..49b9cd19758b
--- /dev/null
+++ b/basegfx/source/inc/PolygonPoint.hxx
@@ -0,0 +1,538 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _POLYGON_POINT_HXX
+#define _POLYGON_POINT_HXX
+
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+template < class Point > class SimplePointEntry
+{
+    Point                                           maPoint;
+
+public:
+    SimplePointEntry()
+    :   maPoint(Point::getEmptyPoint())
+    {
+    }
+
+    SimplePointEntry(const Point& rInitPoint)
+    :   maPoint(rInitPoint)
+    {
+    }
+
+    const Point& getPoint() const
+    {
+        return maPoint;
+    }
+
+    void setPoint(const Point& rValue)
+    {
+        maPoint = rValue;
+    }
+
+    bool operator==(const SimplePointEntry& rEntry) const
+    {
+        return (maPoint == rEntry.maPoint);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+template < class Vector > class SimpleBezierEntry
+{
+    Vector                                          maBackward;
+    Vector                                          maForward;
+
+public:
+    SimpleBezierEntry()
+    :   maBackward(Vector::getEmptyVector()),
+        maForward(Vector::getEmptyVector())
+    {
+    }
+
+    SimpleBezierEntry(const Vector& rInitBackward, const Vector& rInitForward)
+    :   maBackward(rInitBackward),
+        maForward(rInitForward)
+    {
+    }
+
+    const Vector& getBackwardVector() const
+    {
+        return maBackward;
+    }
+
+    void setBackwardVector(const Vector& rValue)
+    {
+        maBackward = rValue;
+    }
+
+    const Vector& getForwardVector() const
+    {
+        return maForward;
+    }
+
+    void setForwardVector(const Vector& rValue)
+    {
+        maForward = rValue;
+    }
+
+    bool isBezierNeeded()
+    {
+        if(maBackward != Vector::getEmptyVector() || maForward != Vector::getEmptyVector())
+            return true;
+        return false;
+    }
+
+    bool operator==(const SimpleBezierEntry& rEntry) const
+    {
+        return ((maBackward == rEntry.maBackward) && (maForward == rEntry.maForward));
+    }
+
+    void doInvertForFlip()
+    {
+        maBackward = -maBackward;
+        maForward = -maForward;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+template < class Point, class Vector > class PolygonPointList
+{
+    typedef SimplePointEntry< Point > LocalSimplePointEntry;
+    typedef SimpleBezierEntry< Vector > LocalSimpleBezierEntry;
+    typedef ::std::vector< LocalSimplePointEntry > SimplePointVector;
+    typedef ::std::vector< LocalSimpleBezierEntry > SimpleBezierVector;
+
+    sal_uInt32                                      mnBezierCount;
+    SimplePointVector                               maPoints;
+    SimpleBezierVector*                             mpVectors;
+
+    unsigned                                        mbIsClosed : 1;
+
+    void implTryToReduceToPointVector()
+    {
+        if(!mnBezierCount && mpVectors)
+        {
+            delete mpVectors;
+            mpVectors = 0L;
+        }
+    }
+
+public:
+    bool isBezier() const
+    {
+        return bool(mnBezierCount);
+    }
+
+    bool isClosed() const
+    {
+        return bool(mbIsClosed);
+    }
+
+    void setClosed(bool bNew)
+    {
+        mbIsClosed = bNew;
+    }
+
+    sal_uInt32 count() const
+    {
+        return maPoints.size();
+    }
+
+    PolygonPointList()
+    :   mnBezierCount(0L),
+        mpVectors(0L),
+        mbIsClosed(false)
+    {
+        // complete initialization with defaults
+    }
+
+    PolygonPointList(const PolygonPointList& rSource)
+    :   mnBezierCount(0L),
+        maPoints(rSource.maPoints),
+        mpVectors(0L),
+        mbIsClosed(rSource.mbIsClosed)
+    {
+        // complete initialization using copy
+        if(rSource.mpVectors && rSource.mnBezierCount)
+        {
+            mpVectors = new SimpleBezierVector(*rSource.mpVectors);
+            mnBezierCount = rSource.mnBezierCount;
+        }
+    }
+
+    PolygonPointList(const PolygonPointList& rSource, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   mnBezierCount(0L),
+        maPoints(nCount),
+        mpVectors(0L),
+        mbIsClosed(rSource.mbIsClosed)
+    {
+        // complete initialization using partly copy
+        if(nCount)
+        {
+            // copy point data
+            {
+                SimplePointVector::const_iterator aStart(rSource.maPoints.begin());
+                aStart += nIndex;
+                SimplePointVector::const_iterator aEnd(aStart);
+                aEnd += nCount;
+                maPoints.insert(0L, aStart, aEnd);
+            }
+
+            // copy bezier data
+            if(rSource.mpVectors && rSource.mnBezierCount)
+            {
+                mpVectors = new SimpleBezierVector();
+                mpVectors->reserve(nCount);
+
+                SimpleBezierVector::iterator aStart(mpVectors->begin());
+                aStart += nIndex;
+                SimpleBezierVector::iterator aEnd(aStart);
+                aEnd += nCount;
+
+                for( ; aStart != aEnd; ++aStart )
+                {
+                    if(aStart->IsBezierNeeded())
+                    {
+                        mnBezierCount++;
+                    }
+
+                    mpVectors->push_back(*aStart);
+                }
+
+                // maybe vectors are not needed anymore, try to reduce memory footprint
+                implTryToReduceToPointVector();
+            }
+        }
+    }
+
+    ~PolygonPointList()
+    {
+        if(mpVectors)
+        {
+            delete mpVectors;
+        }
+    }
+
+    bool isEqual(const PolygonPointList& rPointList) const
+    {
+        // same point count?
+        if(maPoints.size() != rPointList.maPoints.size())
+            return false;
+
+        // if zero points the polys are equal
+        if(!maPoints.size())
+            return true;
+
+        // if bezier count used it needs to be equal
+        if(mnBezierCount != rPointList.mnBezierCount)
+            return false;
+
+        // compare point content
+        if(maPoints != rPointList.maPoints)
+            return false;
+
+        // beziercounts are equal: if it's zero, we are done
+        if(!mnBezierCount)
+            return true;
+
+        // beziercounts are equal and not zero; compare them
+        OSL_ENSURE(0L != mpVectors, "Error: Bezier list needs to exist here(!)");
+        OSL_ENSURE(0L != rPointList.mpVectors, "Error: Bezier list needs to exist here(!)");
+
+        return (*mpVectors == *rPointList.mpVectors);
+    }
+
+    const Point& getPoint(sal_uInt32 nIndex) const
+    {
+        return maPoints[nIndex].getPoint();
+    }
+
+    void setPoint(sal_uInt32 nIndex, const Point& rValue)
+    {
+        maPoints[nIndex].setPoint(rValue);
+    }
+
+    const Vector& getBackwardVector(sal_uInt32 nIndex) const
+    {
+        if(mpVectors)
+            return ((*mpVectors)[nIndex]).getBackwardVector();
+        else
+            return Vector::getEmptyVector();
+    }
+
+    void setBackwardVector(sal_uInt32 nIndex, const Vector& rValue)
+    {
+        if(mpVectors)
+        {
+            LocalSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
+            bool bBezierNeededBefore(rDest.isBezierNeeded());
+            ((*mpVectors)[nIndex]).setBackwardVector(rValue);
+            bool bBezierNeededAfter(rDest.isBezierNeeded());
+
+            if(bBezierNeededBefore != bBezierNeededAfter)
+            {
+                if(bBezierNeededAfter)
+                    mnBezierCount++;
+                else
+                    mnBezierCount--;
+            }
+        }
+        else
+        {
+            bool bEmptyVector(rValue == Vector::getEmptyVector());
+
+            if(bEmptyVector)
+                return;
+
+            mpVectors = new SimpleBezierVector(maPoints.size());
+            ((*mpVectors)[nIndex]).setBackwardVector(rValue);
+            mnBezierCount++;
+        }
+    }
+
+    const Vector& getForwardVector(sal_uInt32 nIndex) const
+    {
+        if(mpVectors)
+            return ((*mpVectors)[nIndex]).getForwardVector();
+        else
+            return Vector::getEmptyVector();
+    }
+
+    void setForwardVector(sal_uInt32 nIndex, const Vector& rValue)
+    {
+        if(mpVectors)
+        {
+            LocalSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
+            bool bBezierNeededBefore(rDest.isBezierNeeded());
+            ((*mpVectors)[nIndex]).setForwardVector(rValue);
+            bool bBezierNeededAfter(rDest.isBezierNeeded());
+
+            if(bBezierNeededBefore != bBezierNeededAfter)
+            {
+                if(bBezierNeededAfter)
+                    mnBezierCount++;
+                else
+                    mnBezierCount--;
+            }
+        }
+        else
+        {
+            bool bEmptyVector(rValue == Vector::getEmptyVector());
+
+            if(bEmptyVector)
+                return;
+
+            mpVectors = new SimpleBezierVector(maPoints.size());
+            ((*mpVectors)[nIndex]).setForwardVector(rValue);
+            mnBezierCount++;
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const Point& rPoint, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // maybe vectors are not needed anymore, try to reduce memory footprint
+            implTryToReduceToPointVector();
+
+            // add nCount copies of rPoint
+            {
+                LocalSimplePointEntry aNode(rPoint);
+                SimplePointVector::iterator aIndex(maPoints.begin());
+                aIndex += nIndex;
+                maPoints.insert(aIndex, nCount, aNode);
+            }
+
+            // add nCount empty entries to keep indices synchronized
+            if(mpVectors)
+            {
+                LocalSimpleBezierEntry aNode;
+                SimpleBezierVector::iterator aIndex(mpVectors->begin());
+                aIndex += nIndex;
+                mpVectors->insert(aIndex, nCount, aNode);
+            }
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const PolygonPointList& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maPoints.size());
+
+        if(nCount)
+        {
+            // instert point data
+            {
+                SimplePointVector::iterator aIndex(maPoints.begin());
+                aIndex += nIndex;
+
+                SimplePointVector::const_iterator aStart(rSource.maPoints.begin());
+                SimplePointVector::const_iterator aEnd(rSource.maPoints.end());
+
+                maPoints.insert(aIndex, aStart, aEnd);
+            }
+
+            // insert bezier data
+            if(rSource.mpVectors && rSource.mnBezierCount)
+            {
+                SimpleBezierVector::iterator aIndex(mpVectors->begin());
+                aIndex += nIndex;
+
+                SimpleBezierVector::iterator aStart(rSource.mpVectors->begin());
+                SimpleBezierVector::iterator aEnd(rSource.mpVectors->end());
+
+                if(!mpVectors)
+                {
+                    mpVectors = new SimpleBezierVector(maPoints.size() - nCount);
+                }
+
+                mpVectors->insert(aIndex, aStart, aEnd);
+
+                mnBezierCount += rSource.mnBezierCount;
+            }
+            else
+            {
+                // maybe vectors are not needed anymore, try to reduce memory footprint
+                implTryToReduceToPointVector();
+
+                // add nCount empty entries to keep indices synchronized
+                if(mpVectors)
+                {
+                    LocalSimpleBezierEntry aNode;
+                    SimpleBezierVector::iterator aIndex(mpVectors->begin());
+                    aIndex += nIndex;
+                    mpVectors->insert(aIndex, nCount, aNode);
+                }
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // maybe vectors are not needed anymore, try to reduce memory footprint
+            implTryToReduceToPointVector();
+
+            // remove point data
+            {
+                SimplePointVector::iterator aStart(maPoints.begin());
+                aStart += nIndex;
+                const SimplePointVector::iterator aEnd(aStart + nCount);
+
+                maPoints.erase(aStart, aEnd);
+            }
+
+            // remove bezier data
+            if(mpVectors)
+            {
+                SimpleBezierVector::iterator aStart(mpVectors->begin());
+                aStart += nIndex;
+                const SimpleBezierVector::iterator aEnd(aStart + nCount);
+
+                // take care for correct mnBezierCount BEFORE erase
+                if(mnBezierCount)
+                {
+                    SimpleBezierVector::iterator aTestIter(aStart);
+
+                    for( ; mnBezierCount && aTestIter != aEnd; ++aTestIter)
+                    {
+                        if(aTestIter->isBezierNeeded())
+                            mnBezierCount--;
+                    }
+                }
+
+                if(mnBezierCount)
+                {
+                    // erase nodes
+                    mpVectors->erase(aStart, aEnd);
+                }
+                else
+                {
+                    // try to reduce, maybe 0L == mnBezierCount
+                    implTryToReduceToPointVector();
+                }
+            }
+        }
+    }
+
+    void flip()
+    {
+        if(maPoints.size() > 1)
+        {
+            // maybe vectors are not needed anymore, try to reduce memory footprint
+            implTryToReduceToPointVector();
+
+            // calculate half size
+            const sal_uInt32 nHalfSize(maPoints.size() >> 1L);
+
+            // flip point data
+            {
+                SimplePointVector::iterator aStart(maPoints.begin());
+                SimplePointVector::iterator aEnd(maPoints.end());
+
+                for(sal_uInt32 a(0); a < nHalfSize; a++)
+                {
+                    LocalSimplePointEntry aTemp = *aStart;
+                    *aStart++ = *aEnd;
+                    *aEnd-- = aTemp;
+                }
+            }
+
+            // flip bezier data
+            if(mpVectors)
+            {
+                SimpleBezierVector::iterator aStart(mpVectors->begin());
+                SimpleBezierVector::iterator aEnd(mpVectors->end());
+
+                for(sal_uInt32 a(0); a < nHalfSize; a++)
+                {
+                    LocalSimpleBezierEntry aTemp = *aStart;
+                    aTemp.doInvertForFlip();
+                    *aStart = *aEnd;
+                    aStart->doInvertForFlip();
+                    aStart++;
+                    *aEnd-- = aTemp;
+                }
+
+                // also flip vectors of middle point (if existing)
+                if(maPoints.size() % 2)
+                {
+                    (*mpVectors)[nHalfSize].doInvertForFlip();
+                }
+            }
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif _POLYGON_POINT_HXX
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
new file mode 100644
index 000000000000..fe58ed260291
--- /dev/null
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -0,0 +1,613 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _HOMMATRIX_TEMPLATE_HXX
+#define _HOMMATRIX_TEMPLATE_HXX
+
+#include <sal/types.h>
+#include <basegfx/numeric/ftools.hxx>
+#include <math.h>
+#include <string.h>
+
+namespace basegfx
+{
+    namespace internal
+    {
+
+        inline double implGetDefaultValue(sal_uInt16 nRow, sal_uInt16 nColumn)
+        {
+            if(nRow == nColumn)
+                return 1.0;
+            return 0.0;
+        }
+
+        template < unsigned int _RowSize > class ImplMatLine
+        {
+            enum { RowSize = _RowSize };
+
+            double                                          mfValue[RowSize];
+
+        public:
+            ImplMatLine()
+            {
+            }
+
+            ImplMatLine(sal_uInt16 nRow, ImplMatLine< RowSize >* pToBeCopied = 0L)
+            {
+                if(pToBeCopied)
+                {
+                    memcpy(&mfValue, pToBeCopied, sizeof(double) * RowSize);
+                }
+                else
+                {
+                    for(sal_uInt16 a(0); a < RowSize; a++)
+                    {
+                        mfValue[a] = implGetDefaultValue(nRow, a);
+                    }
+                }
+            }
+
+            double get(sal_uInt16 nColumn) const
+            {
+                return mfValue[nColumn];
+            }
+
+            void set(sal_uInt16 nColumn, const double& rValue)
+            {
+                mfValue[nColumn] = rValue;
+            }
+        };
+
+        template < unsigned int _RowSize > class ImplHomMatrixTemplate
+        {
+            enum { RowSize = _RowSize };
+
+            ImplMatLine< RowSize >                          maLine[RowSize - 1];
+            ImplMatLine< RowSize >*                         mpLine;
+
+        public:
+            // Is last line used?
+            bool isLastLineDefault() const
+            {
+                if(!mpLine)
+                    return true;
+
+                for(sal_uInt16 a(0); a < RowSize; a++)
+                {
+                    const double fDefault(implGetDefaultValue((RowSize - 1), a));
+                    const double fLineValue(mpLine->get(a));
+
+                    if(!::basegfx::fTools::equal(fDefault, fLineValue))
+                    {
+                        return false;
+                    }
+                }
+
+                // reset last line, it equals default
+                delete ((ImplHomMatrixTemplate< RowSize >*)this)->mpLine;
+                ((ImplHomMatrixTemplate< RowSize >*)this)->mpLine = 0L;
+
+                return true;
+            }
+
+            ImplHomMatrixTemplate()
+                :   mpLine(0L)
+            {
+                // complete initialization with identity matrix, all lines
+                // were initialized with a trailing 1 followed by 0's.
+                for(sal_uInt16 a(0); a < RowSize-1; a++)
+                {
+                    for(sal_uInt16 b(0); b < RowSize; b++)
+                        maLine[a].set(b, implGetDefaultValue(a, b) );
+                }
+            }
+
+            ImplHomMatrixTemplate(const ImplHomMatrixTemplate& rToBeCopied)
+                :   mpLine(0L)
+            {
+                // complete initialization using copy
+                for(sal_uInt16 a(0); a < (RowSize - 1); a++)
+                {
+                    memcpy(&maLine[a], &rToBeCopied.maLine[a], sizeof(ImplMatLine< RowSize >));
+                }
+
+                if(rToBeCopied.mpLine)
+                {
+                    mpLine = new ImplMatLine< RowSize >((RowSize - 1), rToBeCopied.mpLine);
+                }
+            }
+
+            ~ImplHomMatrixTemplate()
+            {
+                if(mpLine)
+                {
+                    delete mpLine;
+                }
+            }
+
+            sal_uInt16 getEdgeLength() const { return RowSize; }
+
+            double get(sal_uInt16 nRow, sal_uInt16 nColumn) const
+            {
+                if(nRow < (RowSize - 1))
+                {
+                    return maLine[nRow].get(nColumn);
+                }
+
+                if(mpLine)
+                {
+                    return mpLine->get(nColumn);
+                }
+
+                return implGetDefaultValue((RowSize - 1), nColumn);
+            }
+
+            void set(sal_uInt16 nRow, sal_uInt16 nColumn, const double& rValue)
+            {
+                if(nRow < (RowSize - 1))
+                {
+                    maLine[nRow].set(nColumn, rValue);
+                }
+                else if(mpLine)
+                {
+                    mpLine->set(nColumn, rValue);
+                }
+                else
+                {
+                    const double fDefault(implGetDefaultValue((RowSize - 1), nColumn));
+
+                    if(!::basegfx::fTools::equal(fDefault, rValue))
+                    {
+                        mpLine = new ImplMatLine< RowSize >((RowSize - 1), 0L);
+                        mpLine->set(nColumn, rValue);
+                    }
+                }
+            }
+
+            void testLastLine()
+            {
+                if(mpLine)
+                {
+                    bool bNecessary(false);
+
+                    for(sal_uInt16 a(0);!bNecessary && a < RowSize; a++)
+                    {
+                        const double fDefault(implGetDefaultValue((RowSize - 1), a));
+                        const double fLineValue(mpLine->get(a));
+
+                        if(!::basegfx::fTools::equal(fDefault, fLineValue))
+                        {
+                            bNecessary = true;
+                        }
+                    }
+
+                    if(!bNecessary)
+                    {
+                        delete mpLine;
+                        mpLine = 0L;
+                    }
+                }
+            }
+
+            // Left-upper decompositon
+            bool ludcmp(sal_uInt16 nIndex[], sal_Int16& nParity)
+            {
+                double fBig, fSum, fDum;
+                double fStorage[RowSize];
+                sal_uInt16 a, b, c;
+
+                // #i30874# Initialize nAMax (compiler warns)
+                sal_uInt16 nAMax = 0;
+
+                nParity = 1;
+
+                // Calc the max of each line. If a line is empty,
+                // stop immediately since matrix is not invertible then.
+                for(a = 0; a < RowSize; a++)
+                {
+                    fBig = 0.0;
+
+                    for(b = 0; b < RowSize; b++)
+                    {
+                        double fTemp(fabs(get(a, b)));
+
+                        if(::basegfx::fTools::more(fTemp, fBig))
+                        {
+                            fBig = fTemp;
+                        }
+                    }
+
+                    if(::basegfx::fTools::equalZero(fBig))
+                    {
+                        return false;
+                    }
+
+                    fStorage[a] = 1.0 / fBig;
+                }
+
+                // start normalizing
+                for(b = 0; b < RowSize; b++)
+                {
+                    for(a = 0; a < b; a++)
+                    {
+                        fSum = get(a, b);
+
+                        for(c = 0; c < a; c++)
+                        {
+                            fSum -= get(a, c) * get(c, b);
+                        }
+
+                        set(a, b, fSum);
+                    }
+
+                    fBig = 0.0;
+
+                    for(a = b; a < RowSize; a++)
+                    {
+                        fSum = get(a, b);
+
+                        for(c = 0; c < b; c++)
+                        {
+                            fSum -= get(a, c) * get(c, b);
+                        }
+
+                        set(a, b, fSum);
+                        fDum = fStorage[a] * fabs(fSum);
+
+                        if(::basegfx::fTools::moreOrEqual(fDum, fBig))
+                        {
+                            fBig = fDum;
+                            nAMax = a;
+                        }
+                    }
+
+                    if(b != nAMax)
+                    {
+                        for(c = 0; c < RowSize; c++)
+                        {
+                            fDum = get(nAMax, c);
+                            set(nAMax, c, get(b, c));
+                            set(b, c, fDum);
+                        }
+
+                        nParity = -nParity;
+                        fStorage[nAMax] = fStorage[b];
+                    }
+
+                    nIndex[b] = nAMax;
+
+                    // here the failure of precision occurs
+                    const double fValBB(fabs(get(b, b)));
+
+                    if(::basegfx::fTools::equalZero(fValBB))
+                    {
+                        return false;
+                    }
+
+                    if(b != (RowSize - 1))
+                    {
+                        fDum = 1.0 / get(b, b);
+
+                        for(a = b + 1; a < RowSize; a++)
+                        {
+                            set(a, b, get(a, b) * fDum);
+                        }
+                    }
+                }
+
+                return true;
+            }
+
+            void lubksb(const sal_uInt16 nIndex[], double fRow[]) const
+            {
+                sal_uInt16 b, ip;
+                sal_Int16 a, a2 = -1;
+                double fSum;
+
+                for(a = 0; a < RowSize; a++)
+                {
+                    ip = nIndex[a];
+                    fSum = fRow[ip];
+                    fRow[ip] = fRow[a];
+
+                    if(a2 >= 0)
+                    {
+                        for(b = a2; b < a; b++)
+                        {
+                            fSum -= get(a, b) * fRow[b];
+                        }
+                    }
+                    else if(!::basegfx::fTools::equalZero(fSum))
+                    {
+                        a2 = a;
+                    }
+
+                    fRow[a] = fSum;
+                }
+
+                for(a = (RowSize - 1); a >= 0; a--)
+                {
+                    fSum = fRow[a];
+
+                    for(b = a + 1; b < RowSize; b++)
+                    {
+                        fSum -= get(a, b) * fRow[b];
+                    }
+
+                    const double fValueAA(get(a, a));
+
+                    if(!::basegfx::fTools::equalZero(fValueAA))
+                    {
+                        fRow[a] = fSum / get(a, a);
+                    }
+                }
+            }
+
+            bool isIdentity() const
+            {
+                // last line needs no testing if not existing
+                const sal_uInt16 nMaxLine(
+                    sal::static_int_cast<sal_uInt16>(mpLine ? RowSize : (RowSize - 1)) );
+
+                for(sal_uInt16 a(0); a < nMaxLine; a++)
+                {
+                    for(sal_uInt16 b(0); b < RowSize; b++)
+                    {
+                        const double fDefault(implGetDefaultValue(a, b));
+                        const double fValueAB(get(a, b));
+
+                        if(!::basegfx::fTools::equal(fDefault, fValueAB))
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+
+            bool isInvertible() const
+            {
+                ImplHomMatrixTemplate aWork(*this);
+                sal_uInt16 nIndex[RowSize];
+                sal_Int16 nParity;
+
+                return aWork.ludcmp(nIndex, nParity);
+            }
+
+            bool isNormalized() const
+            {
+                if(!mpLine)
+                    return true;
+
+                const double fHomValue(get((RowSize - 1), (RowSize - 1)));
+
+                if(::basegfx::fTools::equalZero(fHomValue))
+                {
+                    return true;
+                }
+
+                const double fOne(1.0);
+
+                if(::basegfx::fTools::equal(fOne, fHomValue))
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            void doInvert(const ImplHomMatrixTemplate& rWork, const sal_uInt16 nIndex[])
+            {
+                double fArray[RowSize];
+
+                for(sal_uInt16 a(0); a < RowSize; a++)
+                {
+                    // prepare line
+            sal_uInt16 b;
+                    for( b = 0; b < RowSize; b++)
+                    {
+                        fArray[b] = implGetDefaultValue(a, b);
+                    }
+
+                    // expand line
+                    rWork.lubksb(nIndex, fArray);
+
+                    // copy line transposed to this matrix
+                    for( b = 0; b < RowSize; b++)
+                    {
+                        set(b, a, fArray[b]);
+                    }
+                }
+
+                // evtl. get rid of last matrix line
+                testLastLine();
+            }
+
+            void doNormalize()
+            {
+                if(mpLine)
+                {
+                    const double fHomValue(get((RowSize - 1), (RowSize - 1)));
+
+                    for(sal_uInt16 a(0); a < RowSize; a++)
+                    {
+                        for(sal_uInt16 b(0); b < RowSize; b++)
+                        {
+                            set(a, b, get(a, b) / fHomValue);
+                        }
+                    }
+
+                    // evtl. get rid of last matrix line
+                    testLastLine();
+                }
+            }
+
+            double doDeterminant() const
+            {
+                ImplHomMatrixTemplate aWork(*this);
+                sal_uInt16 nIndex[RowSize];
+                sal_Int16 nParity;
+                double fRetval(0.0);
+
+                if(aWork.ludcmp(nIndex, nParity))
+                {
+                    fRetval = (double)nParity;
+
+                    // last line needs no multiply if not existing; default value would be 1.
+                    const sal_uInt16 nMaxLine(
+                        sal::static_int_cast<sal_uInt16>(aWork.mpLine ? RowSize : (RowSize - 1)) );
+
+                    for(sal_uInt16 a(0); a < nMaxLine; a++)
+                    {
+                        fRetval *= aWork.get(a, a);
+                    }
+                }
+
+                return fRetval;
+            }
+
+            double doTrace() const
+            {
+                double fTrace = (mpLine) ? 0.0 : 1.0;
+                const sal_uInt16 nMaxLine(
+                    sal::static_int_cast<sal_uInt16>(mpLine ? RowSize : (RowSize - 1)) );
+
+                for(sal_uInt16 a(0); a < nMaxLine; a++)
+                {
+                    fTrace += get(a, a);
+                }
+
+                return fTrace;
+            }
+
+            void doTranspose()
+            {
+                for(sal_uInt16 a(0); a < (RowSize - 1); a++)
+                {
+                    for(sal_uInt16 b(a + 1); b < RowSize; b++)
+                    {
+                        const double fTemp(get(a, b));
+                        set(a, b, get(b, a));
+                        set(b, a, fTemp);
+                    }
+                }
+
+                testLastLine();
+            }
+
+            void doAddMatrix(const ImplHomMatrixTemplate& rMat)
+            {
+                for(sal_uInt16 a(0); a < RowSize; a++)
+                {
+                    for(sal_uInt16 b(0); b < RowSize; b++)
+                    {
+                        set(a, b, get(a, b) + rMat.get(a, b));
+                    }
+                }
+
+                testLastLine();
+            }
+
+            void doSubMatrix(const ImplHomMatrixTemplate& rMat)
+            {
+                for(sal_uInt16 a(0); a < RowSize; a++)
+                {
+                    for(sal_uInt16 b(0); b < RowSize; b++)
+                    {
+                        set(a, b, get(a, b) - rMat.get(a, b));
+                    }
+                }
+
+                testLastLine();
+            }
+
+            void doMulMatrix(const double& rfValue)
+            {
+                for(sal_uInt16 a(0); a < RowSize; a++)
+                {
+                    for(sal_uInt16 b(0); b < RowSize; b++)
+                    {
+                        set(a, b, get(a, b) * rfValue);
+                    }
+                }
+
+                testLastLine();
+            }
+
+            void doMulMatrix(const ImplHomMatrixTemplate& rMat)
+            {
+                // create a copy as source for the original values
+                const ImplHomMatrixTemplate aCopy(*this);
+
+                // TODO: maybe optimize cases where last line is [0 0 1].
+
+                double fValue(0.0);
+
+                for(sal_uInt16 a(0); a < RowSize; ++a)
+                {
+                    for(sal_uInt16 b(0); b < RowSize; ++b)
+                    {
+                        fValue = 0.0;
+
+                        for(sal_uInt16 c(0); c < RowSize; ++c)
+                            fValue += aCopy.get(c, b) * rMat.get(a, c);
+
+                        set(a, b, fValue);
+                    }
+                }
+
+                testLastLine();
+            }
+
+            bool isEqual(const ImplHomMatrixTemplate& rMat) const
+            {
+                const sal_uInt16 nMaxLine(
+                    sal::static_int_cast<sal_uInt16>((mpLine || rMat.mpLine) ? RowSize : (RowSize - 1)) );
+
+                for(sal_uInt16 a(0); a < nMaxLine; a++)
+                {
+                    for(sal_uInt16 b(0); b < RowSize; b++)
+                    {
+                        const double fValueA(get(a, b));
+                        const double fValueB(rMat.get(a, b));
+
+                        if(!::basegfx::fTools::equal(fValueA, fValueB))
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+        };
+
+    } // namespace internal
+} // namespace basegfx
+
+#endif /* _HOMMATRIX_TEMPLATE_HXX */
diff --git a/basegfx/source/inc/polygontemplate.hxx b/basegfx/source/inc/polygontemplate.hxx
new file mode 100644
index 000000000000..9ab7fdd941bd
--- /dev/null
+++ b/basegfx/source/inc/polygontemplate.hxx
@@ -0,0 +1,538 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _POLYGON_TEMPLATE_HXX
+#define _POLYGON_TEMPLATE_HXX
+
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+template < class Point > class ImplSimplePointEntry
+{
+    Point                                           maPoint;
+
+public:
+    ImplSimplePointEntry()
+    :   maPoint(Point::getEmptyPoint())
+    {
+    }
+
+    ImplSimplePointEntry(const Point& rInitPoint)
+    :   maPoint(rInitPoint)
+    {
+    }
+
+    const Point& getPoint() const
+    {
+        return maPoint;
+    }
+
+    void setPoint(const Point& rValue)
+    {
+        maPoint = rValue;
+    }
+
+    bool operator==(const ImplSimplePointEntry& rEntry) const
+    {
+        return (maPoint == rEntry.maPoint);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+template < class Vector > class ImplSimpleBezierEntry
+{
+    Vector                                          maBackward;
+    Vector                                          maForward;
+
+public:
+    ImplSimpleBezierEntry()
+    :   maBackward(Vector::getEmptyVector()),
+        maForward(Vector::getEmptyVector())
+    {
+    }
+
+    ImplSimpleBezierEntry(const Vector& rInitBackward, const Vector& rInitForward)
+    :   maBackward(rInitBackward),
+        maForward(rInitForward)
+    {
+    }
+
+    const Vector& getBackwardVector() const
+    {
+        return maBackward;
+    }
+
+    void setBackwardVector(const Vector& rValue)
+    {
+        maBackward = rValue;
+    }
+
+    const Vector& getForwardVector() const
+    {
+        return maForward;
+    }
+
+    void setForwardVector(const Vector& rValue)
+    {
+        maForward = rValue;
+    }
+
+    bool isBezierNeeded()
+    {
+        if(!maBackward.equalZero() || !maForward.equalZero())
+            return true;
+        return false;
+    }
+
+    bool operator==(const ImplSimpleBezierEntry& rEntry) const
+    {
+        return ((maBackward == rEntry.maBackward) && (maForward == rEntry.maForward));
+    }
+
+    void doInvertForFlip()
+    {
+        maBackward = -maBackward;
+        maForward = -maForward;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+template < class Point, class Vector > class ImplPolygonTemplate
+{
+    typedef ImplSimplePointEntry< Point > LocalImplSimplePointEntry;
+    typedef ImplSimpleBezierEntry< Vector > LocalImplSimpleBezierEntry;
+    typedef ::std::vector< LocalImplSimplePointEntry > SimplePointVector;
+    typedef ::std::vector< LocalImplSimpleBezierEntry > SimpleBezierVector;
+
+    sal_uInt32                                      mnBezierCount;
+    SimplePointVector                               maPoints;
+    SimpleBezierVector*                             mpVectors;
+
+    unsigned                                        mbIsClosed : 1;
+
+    void implTryToReduceToPointVector()
+    {
+        if(!mnBezierCount && mpVectors)
+        {
+            delete mpVectors;
+            mpVectors = 0L;
+        }
+    }
+
+public:
+    bool isBezier() const
+    {
+        return bool(mnBezierCount);
+    }
+
+    bool isClosed() const
+    {
+        return bool(mbIsClosed);
+    }
+
+    void setClosed(bool bNew)
+    {
+        mbIsClosed = bNew;
+    }
+
+    sal_uInt32 count() const
+    {
+        return maPoints.size();
+    }
+
+    ImplPolygonTemplate()
+    :   mnBezierCount(0L),
+        mpVectors(0L),
+        mbIsClosed(false)
+    {
+        // complete initialization with defaults
+    }
+
+    ImplPolygonTemplate(const ImplPolygonTemplate& rSource)
+    :   mnBezierCount(0L),
+        maPoints(rSource.maPoints),
+        mpVectors(0L),
+        mbIsClosed(rSource.mbIsClosed)
+    {
+        // complete initialization using copy
+        if(rSource.mpVectors && rSource.mnBezierCount)
+        {
+            mpVectors = new SimpleBezierVector(*rSource.mpVectors);
+            mnBezierCount = rSource.mnBezierCount;
+        }
+    }
+
+    ImplPolygonTemplate(const ImplPolygonTemplate& rSource, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   mnBezierCount(0L),
+        maPoints(nCount),
+        mpVectors(0L),
+        mbIsClosed(rSource.mbIsClosed)
+    {
+        // complete initialization using partly copy
+        if(nCount)
+        {
+            // copy point data
+            {
+                SimplePointVector::const_iterator aStart(rSource.maPoints.begin());
+                aStart += nIndex;
+                SimplePointVector::const_iterator aEnd(aStart);
+                aEnd += nCount;
+                maPoints.insert(0L, aStart, aEnd);
+            }
+
+            // copy bezier data
+            if(rSource.mpVectors && rSource.mnBezierCount)
+            {
+                mpVectors = new SimpleBezierVector();
+                mpVectors->reserve(nCount);
+
+                SimpleBezierVector::iterator aStart(mpVectors->begin());
+                aStart += nIndex;
+                SimpleBezierVector::iterator aEnd(aStart);
+                aEnd += nCount;
+
+                for( ; aStart != aEnd; ++aStart )
+                {
+                    if(aStart->isBezierNeeded())
+                    {
+                        mnBezierCount++;
+                    }
+
+                    mpVectors->push_back(*aStart);
+                }
+
+                // maybe vectors are not needed anymore, try to reduce memory footprint
+                implTryToReduceToPointVector();
+            }
+        }
+    }
+
+    ~ImplPolygonTemplate()
+    {
+        if(mpVectors)
+        {
+            delete mpVectors;
+        }
+    }
+
+    bool isEqual(const ImplPolygonTemplate& rPointList) const
+    {
+        // same point count?
+        if(maPoints.size() != rPointList.maPoints.size())
+            return false;
+
+        // if zero points the polys are equal
+        if(!maPoints.size())
+            return true;
+
+        // if bezier count used it needs to be equal
+        if(mnBezierCount != rPointList.mnBezierCount)
+            return false;
+
+        // compare point content
+        if(maPoints != rPointList.maPoints)
+            return false;
+
+        // beziercounts are equal: if it's zero, we are done
+        if(!mnBezierCount)
+            return true;
+
+        // beziercounts are equal and not zero; compare them
+        OSL_ENSURE(0L != mpVectors, "Error: Bezier list needs to exist here(!)");
+        OSL_ENSURE(0L != rPointList.mpVectors, "Error: Bezier list needs to exist here(!)");
+
+        return (*mpVectors == *rPointList.mpVectors);
+    }
+
+    const Point& getPoint(sal_uInt32 nIndex) const
+    {
+        return maPoints[nIndex].getPoint();
+    }
+
+    void setPoint(sal_uInt32 nIndex, const Point& rValue)
+    {
+        maPoints[nIndex].setPoint(rValue);
+    }
+
+    const Vector& getBackwardVector(sal_uInt32 nIndex) const
+    {
+        if(mpVectors)
+            return ((*mpVectors)[nIndex]).getBackwardVector();
+        else
+            return Vector::getEmptyVector();
+    }
+
+    void setBackwardVector(sal_uInt32 nIndex, const Vector& rValue)
+    {
+        if(mpVectors)
+        {
+            LocalImplSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
+            bool bBezierNeededBefore(rDest.isBezierNeeded());
+            ((*mpVectors)[nIndex]).setBackwardVector(rValue);
+            bool bBezierNeededAfter(rDest.isBezierNeeded());
+
+            if(bBezierNeededBefore != bBezierNeededAfter)
+            {
+                if(bBezierNeededAfter)
+                    mnBezierCount++;
+                else
+                    mnBezierCount--;
+            }
+        }
+        else
+        {
+            bool bEmptyVector(rValue.equalZero());
+
+            if(bEmptyVector)
+                return;
+
+            mpVectors = new SimpleBezierVector(maPoints.size());
+            ((*mpVectors)[nIndex]).setBackwardVector(rValue);
+            mnBezierCount++;
+        }
+    }
+
+    const Vector& getForwardVector(sal_uInt32 nIndex) const
+    {
+        if(mpVectors)
+            return ((*mpVectors)[nIndex]).getForwardVector();
+        else
+            return Vector::getEmptyVector();
+    }
+
+    void setForwardVector(sal_uInt32 nIndex, const Vector& rValue)
+    {
+        if(mpVectors)
+        {
+            LocalImplSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
+            bool bBezierNeededBefore(rDest.isBezierNeeded());
+            ((*mpVectors)[nIndex]).setForwardVector(rValue);
+            bool bBezierNeededAfter(rDest.isBezierNeeded());
+
+            if(bBezierNeededBefore != bBezierNeededAfter)
+            {
+                if(bBezierNeededAfter)
+                    mnBezierCount++;
+                else
+                    mnBezierCount--;
+            }
+        }
+        else
+        {
+            bool bEmptyVector(rValue.equalZero());
+
+            if(bEmptyVector)
+                return;
+
+            mpVectors = new SimpleBezierVector(maPoints.size());
+            ((*mpVectors)[nIndex]).setForwardVector(rValue);
+            mnBezierCount++;
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const Point& rPoint, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // maybe vectors are not needed anymore, try to reduce memory footprint
+            implTryToReduceToPointVector();
+
+            // add nCount copies of rPoint
+            {
+                LocalImplSimplePointEntry aNode(rPoint);
+                SimplePointVector::iterator aIndex(maPoints.begin());
+                aIndex += nIndex;
+                maPoints.insert(aIndex, nCount, aNode);
+            }
+
+            // add nCount empty entries to keep indices synchronized
+            if(mpVectors)
+            {
+                LocalImplSimpleBezierEntry aNode;
+                SimpleBezierVector::iterator aIndex(mpVectors->begin());
+                aIndex += nIndex;
+                mpVectors->insert(aIndex, nCount, aNode);
+            }
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const ImplPolygonTemplate& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maPoints.size());
+
+        if(nCount)
+        {
+            // instert point data
+            {
+                SimplePointVector::iterator aIndex(maPoints.begin());
+                aIndex += nIndex;
+
+                SimplePointVector::const_iterator aStart(rSource.maPoints.begin());
+                SimplePointVector::const_iterator aEnd(rSource.maPoints.end());
+
+                maPoints.insert(aIndex, aStart, aEnd);
+            }
+
+            // insert bezier data
+            if(rSource.mpVectors && rSource.mnBezierCount)
+            {
+                SimpleBezierVector::iterator aIndex(mpVectors->begin());
+                aIndex += nIndex;
+
+                SimpleBezierVector::iterator aStart(rSource.mpVectors->begin());
+                SimpleBezierVector::iterator aEnd(rSource.mpVectors->end());
+
+                if(!mpVectors)
+                {
+                    mpVectors = new SimpleBezierVector(maPoints.size() - nCount);
+                }
+
+                mpVectors->insert(aIndex, aStart, aEnd);
+
+                mnBezierCount += rSource.mnBezierCount;
+            }
+            else
+            {
+                // maybe vectors are not needed anymore, try to reduce memory footprint
+                implTryToReduceToPointVector();
+
+                // add nCount empty entries to keep indices synchronized
+                if(mpVectors)
+                {
+                    LocalImplSimpleBezierEntry aNode;
+                    SimpleBezierVector::iterator aIndex(mpVectors->begin());
+                    aIndex += nIndex;
+                    mpVectors->insert(aIndex, nCount, aNode);
+                }
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // maybe vectors are not needed anymore, try to reduce memory footprint
+            implTryToReduceToPointVector();
+
+            // remove point data
+            {
+                SimplePointVector::iterator aStart(maPoints.begin());
+                aStart += nIndex;
+                const SimplePointVector::iterator aEnd(aStart + nCount);
+
+                maPoints.erase(aStart, aEnd);
+            }
+
+            // remove bezier data
+            if(mpVectors)
+            {
+                SimpleBezierVector::iterator aStart(mpVectors->begin());
+                aStart += nIndex;
+                const SimpleBezierVector::iterator aEnd(aStart + nCount);
+
+                // take care for correct mnBezierCount BEFORE erase
+                if(mnBezierCount)
+                {
+                    SimpleBezierVector::iterator aTestIter(aStart);
+
+                    for( ; mnBezierCount && aTestIter != aEnd; ++aTestIter)
+                    {
+                        if(aTestIter->isBezierNeeded())
+                            mnBezierCount--;
+                    }
+                }
+
+                if(mnBezierCount)
+                {
+                    // erase nodes
+                    mpVectors->erase(aStart, aEnd);
+                }
+                else
+                {
+                    // try to reduce, maybe 0L == mnBezierCount
+                    implTryToReduceToPointVector();
+                }
+            }
+        }
+    }
+
+    void flip()
+    {
+        if(maPoints.size() > 1)
+        {
+            // maybe vectors are not needed anymore, try to reduce memory footprint
+            implTryToReduceToPointVector();
+
+            // calculate half size
+            const sal_uInt32 nHalfSize(maPoints.size() >> 1L);
+
+            // flip point data
+            {
+                SimplePointVector::iterator aStart(maPoints.begin());
+                SimplePointVector::iterator aEnd(maPoints.end());
+
+                for(sal_uInt32 a(0); a < nHalfSize; a++)
+                {
+                    LocalImplSimplePointEntry aTemp = *aStart;
+                    *aStart++ = *aEnd;
+                    *aEnd-- = aTemp;
+                }
+            }
+
+            // flip bezier data
+            if(mpVectors)
+            {
+                SimpleBezierVector::iterator aStart(mpVectors->begin());
+                SimpleBezierVector::iterator aEnd(mpVectors->end());
+
+                for(sal_uInt32 a(0); a < nHalfSize; a++)
+                {
+                    LocalImplSimpleBezierEntry aTemp = *aStart;
+                    aTemp.doInvertForFlip();
+                    *aStart = *aEnd;
+                    aStart->doInvertForFlip();
+                    aStart++;
+                    *aEnd-- = aTemp;
+                }
+
+                // also flip vectors of middle point (if existing)
+                if(maPoints.size() % 2)
+                {
+                    (*mpVectors)[nHalfSize].doInvertForFlip();
+                }
+            }
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif _POLYGON_TEMPLATE_HXX
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx
new file mode 100644
index 000000000000..96d3bdb01c01
--- /dev/null
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -0,0 +1,454 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <osl/diagnose.h>
+#include <rtl/instance.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <hommatrixtemplate.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    class Impl2DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 3 >
+    {
+    };
+
+    namespace { struct IdentityMatrix : public rtl::Static< B2DHomMatrix::ImplType,
+                                                            IdentityMatrix > {}; }
+
+    B2DHomMatrix::B2DHomMatrix() :
+        mpImpl( IdentityMatrix::get() ) // use common identity matrix
+    {
+    }
+
+    B2DHomMatrix::B2DHomMatrix(const B2DHomMatrix& rMat) :
+        mpImpl(rMat.mpImpl)
+    {
+    }
+
+    B2DHomMatrix::~B2DHomMatrix()
+    {
+    }
+
+    B2DHomMatrix::B2DHomMatrix(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2)
+    :   mpImpl( IdentityMatrix::get() ) // use common identity matrix, will be made unique with 1st set-call
+    {
+        mpImpl->set(0, 0, f_0x0);
+        mpImpl->set(0, 1, f_0x1);
+        mpImpl->set(0, 2, f_0x2);
+        mpImpl->set(1, 0, f_1x0);
+        mpImpl->set(1, 1, f_1x1);
+        mpImpl->set(1, 2, f_1x2);
+    }
+
+    B2DHomMatrix& B2DHomMatrix::operator=(const B2DHomMatrix& rMat)
+    {
+        mpImpl = rMat.mpImpl;
+        return *this;
+    }
+
+    void B2DHomMatrix::makeUnique()
+    {
+        mpImpl.make_unique();
+    }
+
+    double B2DHomMatrix::get(sal_uInt16 nRow, sal_uInt16 nColumn) const
+    {
+        return mpImpl->get(nRow, nColumn);
+    }
+
+    void B2DHomMatrix::set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue)
+    {
+        mpImpl->set(nRow, nColumn, fValue);
+    }
+
+    void B2DHomMatrix::set3x2(double f_0x0, double f_0x1, double f_0x2, double f_1x0, double f_1x1, double f_1x2)
+    {
+        mpImpl->set(0, 0, f_0x0);
+        mpImpl->set(0, 1, f_0x1);
+        mpImpl->set(0, 2, f_0x2);
+        mpImpl->set(1, 0, f_1x0);
+        mpImpl->set(1, 1, f_1x1);
+        mpImpl->set(1, 2, f_1x2);
+    }
+
+    bool B2DHomMatrix::isLastLineDefault() const
+    {
+        return mpImpl->isLastLineDefault();
+    }
+
+    bool B2DHomMatrix::isIdentity() const
+    {
+        if(mpImpl.same_object(IdentityMatrix::get()))
+            return true;
+
+        return mpImpl->isIdentity();
+    }
+
+    void B2DHomMatrix::identity()
+    {
+        mpImpl = IdentityMatrix::get();
+    }
+
+    bool B2DHomMatrix::isInvertible() const
+    {
+        return mpImpl->isInvertible();
+    }
+
+    bool B2DHomMatrix::invert()
+    {
+        Impl2DHomMatrix aWork(*mpImpl);
+        sal_uInt16* pIndex = new sal_uInt16[mpImpl->getEdgeLength()];
+        sal_Int16 nParity;
+
+        if(aWork.ludcmp(pIndex, nParity))
+        {
+            mpImpl->doInvert(aWork, pIndex);
+            delete[] pIndex;
+
+            return true;
+        }
+
+        delete[] pIndex;
+        return false;
+    }
+
+    bool B2DHomMatrix::isNormalized() const
+    {
+        return mpImpl->isNormalized();
+    }
+
+    void B2DHomMatrix::normalize()
+    {
+        if(!const_cast<const B2DHomMatrix*>(this)->mpImpl->isNormalized())
+            mpImpl->doNormalize();
+    }
+
+    double B2DHomMatrix::determinant() const
+    {
+        return mpImpl->doDeterminant();
+    }
+
+    double B2DHomMatrix::trace() const
+    {
+        return mpImpl->doTrace();
+    }
+
+    void B2DHomMatrix::transpose()
+    {
+        mpImpl->doTranspose();
+    }
+
+    B2DHomMatrix& B2DHomMatrix::operator+=(const B2DHomMatrix& rMat)
+    {
+        mpImpl->doAddMatrix(*rMat.mpImpl);
+        return *this;
+    }
+
+    B2DHomMatrix& B2DHomMatrix::operator-=(const B2DHomMatrix& rMat)
+    {
+        mpImpl->doSubMatrix(*rMat.mpImpl);
+        return *this;
+    }
+
+    B2DHomMatrix& B2DHomMatrix::operator*=(double fValue)
+    {
+        const double fOne(1.0);
+
+        if(!fTools::equal(fOne, fValue))
+            mpImpl->doMulMatrix(fValue);
+
+        return *this;
+    }
+
+    B2DHomMatrix& B2DHomMatrix::operator/=(double fValue)
+    {
+        const double fOne(1.0);
+
+        if(!fTools::equal(fOne, fValue))
+            mpImpl->doMulMatrix(1.0 / fValue);
+
+        return *this;
+    }
+
+    B2DHomMatrix& B2DHomMatrix::operator*=(const B2DHomMatrix& rMat)
+    {
+        if(!rMat.isIdentity())
+            mpImpl->doMulMatrix(*rMat.mpImpl);
+
+        return *this;
+    }
+
+    bool B2DHomMatrix::operator==(const B2DHomMatrix& rMat) const
+    {
+        if(mpImpl.same_object(rMat.mpImpl))
+            return true;
+
+        return mpImpl->isEqual(*rMat.mpImpl);
+    }
+
+    bool B2DHomMatrix::operator!=(const B2DHomMatrix& rMat) const
+    {
+        return !(*this == rMat);
+    }
+
+    void B2DHomMatrix::rotate(double fRadiant)
+    {
+        if(!fTools::equalZero(fRadiant))
+        {
+            double fSin(0.0);
+            double fCos(1.0);
+
+            tools::createSinCosOrthogonal(fSin, fCos, fRadiant);
+            Impl2DHomMatrix aRotMat;
+
+            aRotMat.set(0, 0, fCos);
+            aRotMat.set(1, 1, fCos);
+            aRotMat.set(1, 0, fSin);
+            aRotMat.set(0, 1, -fSin);
+
+            mpImpl->doMulMatrix(aRotMat);
+        }
+    }
+
+    void B2DHomMatrix::translate(double fX, double fY)
+    {
+        if(!fTools::equalZero(fX) || !fTools::equalZero(fY))
+        {
+            Impl2DHomMatrix aTransMat;
+
+            aTransMat.set(0, 2, fX);
+            aTransMat.set(1, 2, fY);
+
+            mpImpl->doMulMatrix(aTransMat);
+        }
+    }
+
+    void B2DHomMatrix::scale(double fX, double fY)
+    {
+        const double fOne(1.0);
+
+        if(!fTools::equal(fOne, fX) || !fTools::equal(fOne, fY))
+        {
+            Impl2DHomMatrix aScaleMat;
+
+            aScaleMat.set(0, 0, fX);
+            aScaleMat.set(1, 1, fY);
+
+            mpImpl->doMulMatrix(aScaleMat);
+        }
+    }
+
+    void B2DHomMatrix::shearX(double fSx)
+    {
+        // #i76239# do not test againt 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
+        if(!fTools::equalZero(fSx))
+        {
+            Impl2DHomMatrix aShearXMat;
+
+            aShearXMat.set(0, 1, fSx);
+
+            mpImpl->doMulMatrix(aShearXMat);
+        }
+    }
+
+    void B2DHomMatrix::shearY(double fSy)
+    {
+        // #i76239# do not test againt 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
+        if(!fTools::equalZero(fSy))
+        {
+            Impl2DHomMatrix aShearYMat;
+
+            aShearYMat.set(1, 0, fSy);
+
+            mpImpl->doMulMatrix(aShearYMat);
+        }
+    }
+
+    /** Decomposition
+
+       New, optimized version with local shearX detection. Old version (keeping
+       below, is working well, too) used the 3D matrix decomposition when
+       shear was used. Keeping old version as comment below since it may get
+       necessary to add the determinant() test from there here, too.
+    */
+    bool B2DHomMatrix::decompose(B2DTuple& rScale, B2DTuple& rTranslate, double& rRotate, double& rShearX) const
+    {
+        // when perspective is used, decompose is not made here
+        if(!mpImpl->isLastLineDefault())
+        {
+            return false;
+        }
+
+        // reset rotate and shear and copy translation values in every case
+        rRotate = rShearX = 0.0;
+        rTranslate.setX(get(0, 2));
+        rTranslate.setY(get(1, 2));
+
+        // test for rotation and shear
+        if(fTools::equalZero(get(0, 1)) && fTools::equalZero(get(1, 0)))
+        {
+            // no rotation and shear, copy scale values
+            rScale.setX(get(0, 0));
+            rScale.setY(get(1, 1));
+        }
+        else
+        {
+            // get the unit vectors of the transformation -> the perpendicular vectors
+            B2DVector aUnitVecX(get(0, 0), get(1, 0));
+            B2DVector aUnitVecY(get(0, 1), get(1, 1));
+            const double fScalarXY(aUnitVecX.scalar(aUnitVecY));
+
+            // Test if shear is zero. That's the case if the unit vectors in the matrix
+            // are perpendicular -> scalar is zero. This is also the case when one of
+            // the unit vectors is zero.
+            if(fTools::equalZero(fScalarXY))
+            {
+                // calculate unsigned scale values
+                rScale.setX(aUnitVecX.getLength());
+                rScale.setY(aUnitVecY.getLength());
+
+                // check unit vectors for zero lengths
+                const bool bXIsZero(fTools::equalZero(rScale.getX()));
+                const bool bYIsZero(fTools::equalZero(rScale.getY()));
+
+                if(bXIsZero || bYIsZero)
+                {
+                    // still extract as much as possible. Scalings are already set
+                    if(!bXIsZero)
+                    {
+                        // get rotation of X-Axis
+                        rRotate = atan2(aUnitVecX.getY(), aUnitVecX.getX());
+                    }
+                    else if(!bYIsZero)
+                    {
+                        // get rotation of X-Axis. When assuming X and Y perpendicular
+                        // and correct rotation, it's the Y-Axis rotation minus 90 degrees
+                        rRotate = atan2(aUnitVecY.getY(), aUnitVecY.getX()) - M_PI_2;
+                    }
+
+                    // one or both unit vectors do not extist, determinant is zero, no decomposition possible.
+                    // Eventually used rotations or shears are lost
+                    return false;
+                }
+                else
+                {
+                    // no shear
+                    // calculate rotation of X unit vector relative to (1, 0)
+                    rRotate = atan2(aUnitVecX.getY(), aUnitVecX.getX());
+
+                    // use orientation to evtl. correct sign of Y-Scale
+                    const double fCrossXY(aUnitVecX.cross(aUnitVecY));
+
+                    if(fCrossXY < 0.0)
+                    {
+                        rScale.setY(-rScale.getY());
+                    }
+                }
+            }
+            else
+            {
+                // fScalarXY is not zero, thus both unit vectors exist. No need to handle that here
+                // shear, extract it
+                double fCrossXY(aUnitVecX.cross(aUnitVecY));
+
+                // get rotation by calculating angle of X unit vector relative to (1, 0).
+                // This is before the parallell test following the motto to extract
+                // as much as possible
+                rRotate = atan2(aUnitVecX.getY(), aUnitVecX.getX());
+
+                // get unsigned scale value for X. It will not change and is useful
+                // for further corrections
+                rScale.setX(aUnitVecX.getLength());
+
+                if(fTools::equalZero(fCrossXY))
+                {
+                    // extract as much as possible
+                    rScale.setY(aUnitVecY.getLength());
+
+                    // unit vectors are parallel, thus not linear independent. No
+                    // useful decomposition possible. This should not happen since
+                    // the only way to get the unit vectors nearly parallell is
+                    // a very big shearing. Anyways, be prepared for hand-filled
+                    // matrices
+                    // Eventually used rotations or shears are lost
+                    return false;
+                }
+                else
+                {
+                    // calculate the contained shear
+                    rShearX = fScalarXY / fCrossXY;
+
+                    if(!fTools::equalZero(rRotate))
+                    {
+                        // To be able to correct the shear for aUnitVecY, rotation needs to be
+                        // removed first. Correction of aUnitVecX is easy, it will be rotated back to (1, 0).
+                        aUnitVecX.setX(rScale.getX());
+                        aUnitVecX.setY(0.0);
+
+                        // for Y correction we rotate the UnitVecY back about -rRotate
+                        const double fNegRotate(-rRotate);
+                        const double fSin(sin(fNegRotate));
+                        const double fCos(cos(fNegRotate));
+
+                        const double fNewX(aUnitVecY.getX() * fCos - aUnitVecY.getY() * fSin);
+                        const double fNewY(aUnitVecY.getX() * fSin + aUnitVecY.getY() * fCos);
+
+                        aUnitVecY.setX(fNewX);
+                        aUnitVecY.setY(fNewY);
+                    }
+
+                    // Correct aUnitVecY and fCrossXY to fShear=0. Rotation is already removed.
+                    // Shear correction can only work with removed rotation
+                    aUnitVecY.setX(aUnitVecY.getX() - (aUnitVecY.getY() * rShearX));
+                    fCrossXY = aUnitVecX.cross(aUnitVecY);
+
+                    // calculate unsigned scale value for Y, after the corrections since
+                    // the shear correction WILL change the length of aUnitVecY
+                    rScale.setY(aUnitVecY.getLength());
+
+                    // use orientation to set sign of Y-Scale
+                    if(fCrossXY < 0.0)
+                    {
+                        rScale.setY(-rScale.getY());
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+} // end of namespace basegfx
+
+///////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx
new file mode 100644
index 000000000000..0b85ee229ecc
--- /dev/null
+++ b/basegfx/source/matrix/b2dhommatrixtools.cxx
@@ -0,0 +1,401 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    ::rtl::OUString exportToSvg( const B2DHomMatrix& rMatrix )
+    {
+        rtl::OUStringBuffer aStrBuf;
+        aStrBuf.appendAscii("matrix(");
+
+        aStrBuf.append(rMatrix.get(0,0));
+        aStrBuf.appendAscii(", ");
+
+        aStrBuf.append(rMatrix.get(1,0));
+        aStrBuf.appendAscii(", ");
+
+        aStrBuf.append(rMatrix.get(0,1));
+        aStrBuf.appendAscii(", ");
+
+        aStrBuf.append(rMatrix.get(1,1));
+        aStrBuf.appendAscii(", ");
+
+        aStrBuf.append(rMatrix.get(0,2));
+        aStrBuf.appendAscii(", ");
+
+        aStrBuf.append(rMatrix.get(1,2));
+        aStrBuf.appendAscii(")");
+
+        return aStrBuf.makeStringAndClear();
+    }
+
+    namespace tools
+    {
+        void createSinCosOrthogonal(double& o_rSin, double& o_rCos, double fRadiant)
+        {
+            if( fTools::equalZero( fmod( fRadiant, F_PI2 ) ) )
+            {
+                // determine quadrant
+                const sal_Int32 nQuad(
+                    (4 + fround( 4/F_2PI*fmod( fRadiant, F_2PI ) )) % 4 );
+                switch( nQuad )
+                {
+                    case 0: // -2pi,0,2pi
+                        o_rSin = 0.0;
+                        o_rCos = 1.0;
+                        break;
+
+                    case 1: // -3/2pi,1/2pi
+                        o_rSin = 1.0;
+                        o_rCos = 0.0;
+                        break;
+
+                    case 2: // -pi,pi
+                        o_rSin = 0.0;
+                        o_rCos = -1.0;
+                        break;
+
+                    case 3: // -1/2pi,3/2pi
+                        o_rSin = -1.0;
+                        o_rCos = 0.0;
+                        break;
+
+                    default:
+                        OSL_ENSURE( false, "createSinCos: Impossible case reached" );
+                }
+            }
+            else
+            {
+                // TODO(P1): Maybe use glibc's sincos here (though
+                // that's kinda non-portable...)
+                o_rSin = sin(fRadiant);
+                o_rCos = cos(fRadiant);
+            }
+        }
+
+        B2DHomMatrix createScaleB2DHomMatrix(double fScaleX, double fScaleY)
+        {
+            B2DHomMatrix aRetval;
+            const double fOne(1.0);
+
+            if(!fTools::equal(fScaleX, fOne))
+            {
+                aRetval.set(0, 0, fScaleX);
+            }
+
+            if(!fTools::equal(fScaleY, fOne))
+            {
+                aRetval.set(1, 1, fScaleY);
+            }
+
+            return aRetval;
+        }
+
+        B2DHomMatrix createShearXB2DHomMatrix(double fShearX)
+        {
+            B2DHomMatrix aRetval;
+
+            if(!fTools::equalZero(fShearX))
+            {
+                aRetval.set(0, 1, fShearX);
+            }
+
+            return aRetval;
+        }
+
+        B2DHomMatrix createShearYB2DHomMatrix(double fShearY)
+        {
+            B2DHomMatrix aRetval;
+
+            if(!fTools::equalZero(fShearY))
+            {
+                aRetval.set(1, 0, fShearY);
+            }
+
+            return aRetval;
+        }
+
+        B2DHomMatrix createRotateB2DHomMatrix(double fRadiant)
+        {
+            B2DHomMatrix aRetval;
+
+            if(!fTools::equalZero(fRadiant))
+            {
+                double fSin(0.0);
+                double fCos(1.0);
+
+                createSinCosOrthogonal(fSin, fCos, fRadiant);
+                aRetval.set(0, 0, fCos);
+                aRetval.set(1, 1, fCos);
+                aRetval.set(1, 0, fSin);
+                aRetval.set(0, 1, -fSin);
+            }
+
+            return aRetval;
+        }
+
+        B2DHomMatrix createTranslateB2DHomMatrix(double fTranslateX, double fTranslateY)
+        {
+            B2DHomMatrix aRetval;
+
+            if(!(fTools::equalZero(fTranslateX) && fTools::equalZero(fTranslateY)))
+            {
+                aRetval.set(0, 2, fTranslateX);
+                aRetval.set(1, 2, fTranslateY);
+            }
+
+            return aRetval;
+        }
+
+        B2DHomMatrix createScaleShearXRotateTranslateB2DHomMatrix(
+            double fScaleX, double fScaleY,
+            double fShearX,
+            double fRadiant,
+            double fTranslateX, double fTranslateY)
+        {
+            const double fOne(1.0);
+
+            if(fTools::equal(fScaleX, fOne) && fTools::equal(fScaleY, fOne))
+            {
+                /// no scale, take shortcut
+                return createShearXRotateTranslateB2DHomMatrix(fShearX, fRadiant, fTranslateX, fTranslateY);
+            }
+            else
+            {
+                /// scale used
+                if(fTools::equalZero(fShearX))
+                {
+                    /// no shear
+                    if(fTools::equalZero(fRadiant))
+                    {
+                        /// no rotate, take shortcut
+                        return createScaleTranslateB2DHomMatrix(fScaleX, fScaleY, fTranslateX, fTranslateY);
+                    }
+                    else
+                    {
+                        /// rotate and scale used, no shear
+                        double fSin(0.0);
+                        double fCos(1.0);
+
+                        createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+                        B2DHomMatrix aRetval(
+                            /* Row 0, Column 0 */ fCos * fScaleX,
+                            /* Row 0, Column 1 */ fScaleY * -fSin,
+                            /* Row 0, Column 2 */ fTranslateX,
+                            /* Row 1, Column 0 */ fSin * fScaleX,
+                            /* Row 1, Column 1 */ fScaleY * fCos,
+                            /* Row 1, Column 2 */ fTranslateY);
+
+                        return aRetval;
+                    }
+                }
+                else
+                {
+                    /// scale and shear used
+                    if(fTools::equalZero(fRadiant))
+                    {
+                        /// scale and shear, but no rotate
+                        B2DHomMatrix aRetval(
+                            /* Row 0, Column 0 */ fScaleX,
+                            /* Row 0, Column 1 */ fScaleY * fShearX,
+                            /* Row 0, Column 2 */ fTranslateX,
+                            /* Row 1, Column 0 */ 0.0,
+                            /* Row 1, Column 1 */ fScaleY,
+                            /* Row 1, Column 2 */ fTranslateY);
+
+                        return aRetval;
+                    }
+                    else
+                    {
+                        /// scale, shear and rotate used
+                        double fSin(0.0);
+                        double fCos(1.0);
+
+                        createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+                        B2DHomMatrix aRetval(
+                            /* Row 0, Column 0 */ fCos * fScaleX,
+                            /* Row 0, Column 1 */ fScaleY * ((fCos * fShearX) - fSin),
+                            /* Row 0, Column 2 */ fTranslateX,
+                            /* Row 1, Column 0 */ fSin * fScaleX,
+                            /* Row 1, Column 1 */ fScaleY * ((fSin * fShearX) + fCos),
+                            /* Row 1, Column 2 */ fTranslateY);
+
+                        return aRetval;
+                    }
+                }
+            }
+        }
+
+        B2DHomMatrix createShearXRotateTranslateB2DHomMatrix(
+            double fShearX,
+            double fRadiant,
+            double fTranslateX, double fTranslateY)
+        {
+            if(fTools::equalZero(fShearX))
+            {
+                /// no shear
+                if(fTools::equalZero(fRadiant))
+                {
+                    /// no shear, no rotate, take shortcut
+                    return createTranslateB2DHomMatrix(fTranslateX, fTranslateY);
+                }
+                else
+                {
+                    /// no shear, but rotate used
+                    double fSin(0.0);
+                    double fCos(1.0);
+
+                    createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+                    B2DHomMatrix aRetval(
+                        /* Row 0, Column 0 */ fCos,
+                        /* Row 0, Column 1 */ -fSin,
+                        /* Row 0, Column 2 */ fTranslateX,
+                        /* Row 1, Column 0 */ fSin,
+                        /* Row 1, Column 1 */ fCos,
+                        /* Row 1, Column 2 */ fTranslateY);
+
+                    return aRetval;
+                }
+            }
+            else
+            {
+                /// shear used
+                if(fTools::equalZero(fRadiant))
+                {
+                    /// no rotate, but shear used
+                    B2DHomMatrix aRetval(
+                        /* Row 0, Column 0 */ 1.0,
+                        /* Row 0, Column 1 */ fShearX,
+                        /* Row 0, Column 2 */ fTranslateX,
+                        /* Row 1, Column 0 */ 0.0,
+                        /* Row 1, Column 1 */ 1.0,
+                        /* Row 1, Column 2 */ fTranslateY);
+
+                    return aRetval;
+                }
+                else
+                {
+                    /// shear and rotate used
+                    double fSin(0.0);
+                    double fCos(1.0);
+
+                    createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+                    B2DHomMatrix aRetval(
+                        /* Row 0, Column 0 */ fCos,
+                        /* Row 0, Column 1 */ (fCos * fShearX) - fSin,
+                        /* Row 0, Column 2 */ fTranslateX,
+                        /* Row 1, Column 0 */ fSin,
+                        /* Row 1, Column 1 */ (fSin * fShearX) + fCos,
+                        /* Row 1, Column 2 */ fTranslateY);
+
+                    return aRetval;
+                }
+            }
+        }
+
+        B2DHomMatrix createScaleTranslateB2DHomMatrix(
+            double fScaleX, double fScaleY,
+            double fTranslateX, double fTranslateY)
+        {
+            const double fOne(1.0);
+
+            if(fTools::equal(fScaleX, fOne) && fTools::equal(fScaleY, fOne))
+            {
+                /// no scale, take shortcut
+                return createTranslateB2DHomMatrix(fTranslateX, fTranslateY);
+            }
+            else
+            {
+                /// scale used
+                if(fTools::equalZero(fTranslateX) && fTools::equalZero(fTranslateY))
+                {
+                    /// no translate, but scale.
+                    B2DHomMatrix aRetval;
+
+                    aRetval.set(0, 0, fScaleX);
+                    aRetval.set(1, 1, fScaleY);
+
+                    return aRetval;
+                }
+                else
+                {
+                    /// translate and scale
+                    B2DHomMatrix aRetval(
+                        /* Row 0, Column 0 */ fScaleX,
+                        /* Row 0, Column 1 */ 0.0,
+                        /* Row 0, Column 2 */ fTranslateX,
+                        /* Row 1, Column 0 */ 0.0,
+                        /* Row 1, Column 1 */ fScaleY,
+                        /* Row 1, Column 2 */ fTranslateY);
+
+                    return aRetval;
+                }
+            }
+        }
+
+        B2DHomMatrix createRotateAroundPoint(
+            double fPointX, double fPointY,
+            double fRadiant)
+        {
+            B2DHomMatrix aRetval;
+
+            if(!fTools::equalZero(fRadiant))
+            {
+                double fSin(0.0);
+                double fCos(1.0);
+
+                createSinCosOrthogonal(fSin, fCos, fRadiant);
+
+                aRetval.set3x2(
+                    /* Row 0, Column 0 */ fCos,
+                    /* Row 0, Column 1 */ -fSin,
+                    /* Row 0, Column 2 */ (fPointX * (1.0 - fCos)) + (fSin * fPointY),
+                    /* Row 1, Column 0 */ fSin,
+                    /* Row 1, Column 1 */ fCos,
+                    /* Row 1, Column 2 */ (fPointY * (1.0 - fCos)) - (fSin * fPointX));
+            }
+
+            return aRetval;
+        }
+    } // end of namespace tools
+} // end of namespace basegfx
+
+///////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
new file mode 100644
index 000000000000..bc3c3b0b55dd
--- /dev/null
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -0,0 +1,596 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <rtl/instance.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <hommatrixtemplate.hxx>
+#include <basegfx/vector/b3dvector.hxx>
+
+namespace basegfx
+{
+    class Impl3DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 4 >
+    {
+    };
+
+    namespace { struct IdentityMatrix : public rtl::Static< B3DHomMatrix::ImplType,
+                                                            IdentityMatrix > {}; }
+
+    B3DHomMatrix::B3DHomMatrix() :
+        mpImpl( IdentityMatrix::get() ) // use common identity matrix
+    {
+    }
+
+    B3DHomMatrix::B3DHomMatrix(const B3DHomMatrix& rMat) :
+        mpImpl(rMat.mpImpl)
+    {
+    }
+
+    B3DHomMatrix::~B3DHomMatrix()
+    {
+    }
+
+    B3DHomMatrix& B3DHomMatrix::operator=(const B3DHomMatrix& rMat)
+    {
+        mpImpl = rMat.mpImpl;
+        return *this;
+    }
+
+    void B3DHomMatrix::makeUnique()
+    {
+        mpImpl.make_unique();
+    }
+
+    double B3DHomMatrix::get(sal_uInt16 nRow, sal_uInt16 nColumn) const
+    {
+        return mpImpl->get(nRow, nColumn);
+    }
+
+    void B3DHomMatrix::set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue)
+    {
+        mpImpl->set(nRow, nColumn, fValue);
+    }
+
+    bool B3DHomMatrix::isLastLineDefault() const
+    {
+        return mpImpl->isLastLineDefault();
+    }
+
+    bool B3DHomMatrix::isIdentity() const
+    {
+        if(mpImpl.same_object(IdentityMatrix::get()))
+            return true;
+
+        return mpImpl->isIdentity();
+    }
+
+    void B3DHomMatrix::identity()
+    {
+        mpImpl = IdentityMatrix::get();
+    }
+
+    bool B3DHomMatrix::isInvertible() const
+    {
+        return mpImpl->isInvertible();
+    }
+
+    bool B3DHomMatrix::invert()
+    {
+        Impl3DHomMatrix aWork(*mpImpl);
+        sal_uInt16* pIndex = new sal_uInt16[mpImpl->getEdgeLength()];
+        sal_Int16 nParity;
+
+        if(aWork.ludcmp(pIndex, nParity))
+        {
+            mpImpl->doInvert(aWork, pIndex);
+            delete[] pIndex;
+
+            return true;
+        }
+
+        delete[] pIndex;
+        return false;
+    }
+
+    bool B3DHomMatrix::isNormalized() const
+    {
+        return mpImpl->isNormalized();
+    }
+
+    void B3DHomMatrix::normalize()
+    {
+        if(!const_cast<const B3DHomMatrix*>(this)->mpImpl->isNormalized())
+            mpImpl->doNormalize();
+    }
+
+    double B3DHomMatrix::determinant() const
+    {
+        return mpImpl->doDeterminant();
+    }
+
+    double B3DHomMatrix::trace() const
+    {
+        return mpImpl->doTrace();
+    }
+
+    void B3DHomMatrix::transpose()
+    {
+        mpImpl->doTranspose();
+    }
+
+    B3DHomMatrix& B3DHomMatrix::operator+=(const B3DHomMatrix& rMat)
+    {
+        mpImpl->doAddMatrix(*rMat.mpImpl);
+        return *this;
+    }
+
+    B3DHomMatrix& B3DHomMatrix::operator-=(const B3DHomMatrix& rMat)
+    {
+        mpImpl->doSubMatrix(*rMat.mpImpl);
+        return *this;
+    }
+
+    B3DHomMatrix& B3DHomMatrix::operator*=(double fValue)
+    {
+        const double fOne(1.0);
+
+        if(!fTools::equal(fOne, fValue))
+            mpImpl->doMulMatrix(fValue);
+
+        return *this;
+    }
+
+    B3DHomMatrix& B3DHomMatrix::operator/=(double fValue)
+    {
+        const double fOne(1.0);
+
+        if(!fTools::equal(fOne, fValue))
+            mpImpl->doMulMatrix(1.0 / fValue);
+
+        return *this;
+    }
+
+    B3DHomMatrix& B3DHomMatrix::operator*=(const B3DHomMatrix& rMat)
+    {
+        if(!rMat.isIdentity())
+            mpImpl->doMulMatrix(*rMat.mpImpl);
+
+        return *this;
+    }
+
+    bool B3DHomMatrix::operator==(const B3DHomMatrix& rMat) const
+    {
+        if(mpImpl.same_object(rMat.mpImpl))
+            return true;
+
+        return mpImpl->isEqual(*rMat.mpImpl);
+    }
+
+    bool B3DHomMatrix::operator!=(const B3DHomMatrix& rMat) const
+    {
+        return !(*this == rMat);
+    }
+
+    void B3DHomMatrix::rotate(double fAngleX,double fAngleY,double fAngleZ)
+    {
+        if(!fTools::equalZero(fAngleX) || !fTools::equalZero(fAngleY) || !fTools::equalZero(fAngleZ))
+        {
+            if(!fTools::equalZero(fAngleX))
+            {
+                Impl3DHomMatrix aRotMatX;
+                double fSin(sin(fAngleX));
+                double fCos(cos(fAngleX));
+
+                aRotMatX.set(1, 1, fCos);
+                aRotMatX.set(2, 2, fCos);
+                aRotMatX.set(2, 1, fSin);
+                aRotMatX.set(1, 2, -fSin);
+
+                mpImpl->doMulMatrix(aRotMatX);
+            }
+
+            if(!fTools::equalZero(fAngleY))
+            {
+                Impl3DHomMatrix aRotMatY;
+                double fSin(sin(fAngleY));
+                double fCos(cos(fAngleY));
+
+                aRotMatY.set(0, 0, fCos);
+                aRotMatY.set(2, 2, fCos);
+                aRotMatY.set(0, 2, fSin);
+                aRotMatY.set(2, 0, -fSin);
+
+                mpImpl->doMulMatrix(aRotMatY);
+            }
+
+            if(!fTools::equalZero(fAngleZ))
+            {
+                Impl3DHomMatrix aRotMatZ;
+                double fSin(sin(fAngleZ));
+                double fCos(cos(fAngleZ));
+
+                aRotMatZ.set(0, 0, fCos);
+                aRotMatZ.set(1, 1, fCos);
+                aRotMatZ.set(1, 0, fSin);
+                aRotMatZ.set(0, 1, -fSin);
+
+                mpImpl->doMulMatrix(aRotMatZ);
+            }
+        }
+    }
+
+    void B3DHomMatrix::translate(double fX, double fY, double fZ)
+    {
+        if(!fTools::equalZero(fX) || !fTools::equalZero(fY) || !fTools::equalZero(fZ))
+        {
+            Impl3DHomMatrix aTransMat;
+
+            aTransMat.set(0, 3, fX);
+            aTransMat.set(1, 3, fY);
+            aTransMat.set(2, 3, fZ);
+
+            mpImpl->doMulMatrix(aTransMat);
+        }
+    }
+
+    void B3DHomMatrix::scale(double fX, double fY, double fZ)
+    {
+        const double fOne(1.0);
+
+        if(!fTools::equal(fOne, fX) || !fTools::equal(fOne, fY) ||!fTools::equal(fOne, fZ))
+        {
+            Impl3DHomMatrix aScaleMat;
+
+            aScaleMat.set(0, 0, fX);
+            aScaleMat.set(1, 1, fY);
+            aScaleMat.set(2, 2, fZ);
+
+            mpImpl->doMulMatrix(aScaleMat);
+        }
+    }
+
+    void B3DHomMatrix::shearXY(double fSx, double fSy)
+    {
+        // #i76239# do not test againt 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
+        if(!fTools::equalZero(fSx) || !fTools::equalZero(fSy))
+        {
+            Impl3DHomMatrix aShearXYMat;
+
+            aShearXYMat.set(0, 2, fSx);
+            aShearXYMat.set(1, 2, fSy);
+
+            mpImpl->doMulMatrix(aShearXYMat);
+        }
+    }
+
+    void B3DHomMatrix::shearYZ(double fSy, double fSz)
+    {
+        // #i76239# do not test againt 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
+        if(!fTools::equalZero(fSy) || !fTools::equalZero(fSz))
+        {
+            Impl3DHomMatrix aShearYZMat;
+
+            aShearYZMat.set(1, 0, fSy);
+            aShearYZMat.set(2, 0, fSz);
+
+            mpImpl->doMulMatrix(aShearYZMat);
+        }
+    }
+
+    void B3DHomMatrix::shearXZ(double fSx, double fSz)
+    {
+        // #i76239# do not test againt 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
+        if(!fTools::equalZero(fSx) || !fTools::equalZero(fSz))
+        {
+            Impl3DHomMatrix aShearXZMat;
+
+            aShearXZMat.set(0, 1, fSx);
+            aShearXZMat.set(2, 1, fSz);
+
+            mpImpl->doMulMatrix(aShearXZMat);
+        }
+    }
+
+    void B3DHomMatrix::frustum(double fLeft, double fRight, double fBottom, double fTop, double fNear, double fFar)
+    {
+        const double fZero(0.0);
+        const double fOne(1.0);
+
+        if(!fTools::more(fNear, fZero))
+        {
+            fNear = 0.001;
+        }
+
+        if(!fTools::more(fFar, fZero))
+        {
+            fFar = fOne;
+        }
+
+        if(fTools::equal(fNear, fFar))
+        {
+            fFar = fNear + fOne;
+        }
+
+        if(fTools::equal(fLeft, fRight))
+        {
+            fLeft -= fOne;
+            fRight += fOne;
+        }
+
+        if(fTools::equal(fTop, fBottom))
+        {
+            fBottom -= fOne;
+            fTop += fOne;
+        }
+
+        Impl3DHomMatrix aFrustumMat;
+
+        aFrustumMat.set(0, 0, 2.0 * fNear / (fRight - fLeft));
+        aFrustumMat.set(1, 1, 2.0 * fNear / (fTop - fBottom));
+        aFrustumMat.set(0, 2, (fRight + fLeft) / (fRight - fLeft));
+        aFrustumMat.set(1, 2, (fTop + fBottom) / (fTop - fBottom));
+        aFrustumMat.set(2, 2, -fOne * ((fFar + fNear) / (fFar - fNear)));
+        aFrustumMat.set(3, 2, -fOne);
+        aFrustumMat.set(2, 3, -fOne * ((2.0 * fFar * fNear) / (fFar - fNear)));
+        aFrustumMat.set(3, 3, fZero);
+
+        mpImpl->doMulMatrix(aFrustumMat);
+    }
+
+    void B3DHomMatrix::ortho(double fLeft, double fRight, double fBottom, double fTop, double fNear, double fFar)
+    {
+        if(fTools::equal(fNear, fFar))
+        {
+            fFar = fNear + 1.0;
+        }
+
+        if(fTools::equal(fLeft, fRight))
+        {
+            fLeft -= 1.0;
+            fRight += 1.0;
+        }
+
+        if(fTools::equal(fTop, fBottom))
+        {
+            fBottom -= 1.0;
+            fTop += 1.0;
+        }
+
+        Impl3DHomMatrix aOrthoMat;
+
+        aOrthoMat.set(0, 0, 2.0 / (fRight - fLeft));
+        aOrthoMat.set(1, 1, 2.0 / (fTop - fBottom));
+        aOrthoMat.set(2, 2, -1.0 * (2.0 / (fFar - fNear)));
+        aOrthoMat.set(0, 3, -1.0 * ((fRight + fLeft) / (fRight - fLeft)));
+        aOrthoMat.set(1, 3, -1.0 * ((fTop + fBottom) / (fTop - fBottom)));
+        aOrthoMat.set(2, 3, -1.0 * ((fFar + fNear) / (fFar - fNear)));
+
+        mpImpl->doMulMatrix(aOrthoMat);
+    }
+
+    void B3DHomMatrix::orientation(B3DPoint aVRP, B3DVector aVPN, B3DVector aVUV)
+    {
+        Impl3DHomMatrix aOrientationMat;
+
+        // translate -VRP
+        aOrientationMat.set(0, 3, -aVRP.getX());
+        aOrientationMat.set(1, 3, -aVRP.getY());
+        aOrientationMat.set(2, 3, -aVRP.getZ());
+
+        // build rotation
+        aVUV.normalize();
+        aVPN.normalize();
+
+        // build x-axis as peroendicular fron aVUV and aVPN
+        B3DVector aRx(aVUV.getPerpendicular(aVPN));
+        aRx.normalize();
+
+        // y-axis perpendicular to that
+        B3DVector aRy(aVPN.getPerpendicular(aRx));
+        aRy.normalize();
+
+        // the calculated normals are the line vectors of the rotation matrix,
+        // set them to create rotation
+        aOrientationMat.set(0, 0, aRx.getX());
+        aOrientationMat.set(0, 1, aRx.getY());
+        aOrientationMat.set(0, 2, aRx.getZ());
+        aOrientationMat.set(1, 0, aRy.getX());
+        aOrientationMat.set(1, 1, aRy.getY());
+        aOrientationMat.set(1, 2, aRy.getZ());
+        aOrientationMat.set(2, 0, aVPN.getX());
+        aOrientationMat.set(2, 1, aVPN.getY());
+        aOrientationMat.set(2, 2, aVPN.getZ());
+
+        mpImpl->doMulMatrix(aOrientationMat);
+    }
+
+    bool B3DHomMatrix::decompose(B3DTuple& rScale, B3DTuple& rTranslate, B3DTuple& rRotate, B3DTuple& rShear) const
+    {
+        // when perspective is used, decompose is not made here
+        if(!mpImpl->isLastLineDefault())
+            return false;
+
+        // If determinant is zero, decomposition is not possible
+        if(0.0 == determinant())
+            return false;
+
+        // isolate translation
+        rTranslate.setX(mpImpl->get(0, 3));
+        rTranslate.setY(mpImpl->get(1, 3));
+        rTranslate.setZ(mpImpl->get(2, 3));
+
+        // correct translate values
+        rTranslate.correctValues();
+
+        // get scale and shear
+        B3DVector aCol0(mpImpl->get(0, 0), mpImpl->get(1, 0), mpImpl->get(2, 0));
+        B3DVector aCol1(mpImpl->get(0, 1), mpImpl->get(1, 1), mpImpl->get(2, 1));
+        B3DVector aCol2(mpImpl->get(0, 2), mpImpl->get(1, 2), mpImpl->get(2, 2));
+        B3DVector aTemp;
+
+        // get ScaleX
+        rScale.setX(aCol0.getLength());
+        aCol0.normalize();
+
+        // get ShearXY
+        rShear.setX(aCol0.scalar(aCol1));
+
+        if(fTools::equalZero(rShear.getX()))
+        {
+            rShear.setX(0.0);
+        }
+        else
+        {
+            aTemp.setX(aCol1.getX() - rShear.getX() * aCol0.getX());
+            aTemp.setY(aCol1.getY() - rShear.getX() * aCol0.getY());
+            aTemp.setZ(aCol1.getZ() - rShear.getX() * aCol0.getZ());
+            aCol1 = aTemp;
+        }
+
+        // get ScaleY
+        rScale.setY(aCol1.getLength());
+        aCol1.normalize();
+
+        const double fShearX(rShear.getX());
+
+        if(!fTools::equalZero(fShearX))
+        {
+            rShear.setX(rShear.getX() / rScale.getY());
+        }
+
+        // get ShearXZ
+        rShear.setY(aCol0.scalar(aCol2));
+
+        if(fTools::equalZero(rShear.getY()))
+        {
+            rShear.setY(0.0);
+        }
+        else
+        {
+            aTemp.setX(aCol2.getX() - rShear.getY() * aCol0.getX());
+            aTemp.setY(aCol2.getY() - rShear.getY() * aCol0.getY());
+            aTemp.setZ(aCol2.getZ() - rShear.getY() * aCol0.getZ());
+            aCol2 = aTemp;
+        }
+
+        // get ShearYZ
+        rShear.setZ(aCol1.scalar(aCol2));
+
+        if(fTools::equalZero(rShear.getZ()))
+        {
+            rShear.setZ(0.0);
+        }
+        else
+        {
+            aTemp.setX(aCol2.getX() - rShear.getZ() * aCol1.getX());
+            aTemp.setY(aCol2.getY() - rShear.getZ() * aCol1.getY());
+            aTemp.setZ(aCol2.getZ() - rShear.getZ() * aCol1.getZ());
+            aCol2 = aTemp;
+        }
+
+        // get ScaleZ
+        rScale.setZ(aCol2.getLength());
+        aCol2.normalize();
+
+        const double fShearY(rShear.getY());
+
+        if(!fTools::equalZero(fShearY))
+        {
+            rShear.setY(rShear.getY() / rScale.getZ());
+        }
+
+        const double fShearZ(rShear.getZ());
+
+        if(!fTools::equalZero(fShearZ))
+        {
+            rShear.setZ(rShear.getZ() / rScale.getZ());
+        }
+
+        // correct shear values
+        rShear.correctValues();
+
+        // Coordinate system flip?
+        if(0.0 > aCol0.scalar(aCol1.getPerpendicular(aCol2)))
+        {
+            rScale = -rScale;
+            aCol0 = -aCol0;
+            aCol1 = -aCol1;
+            aCol2 = -aCol2;
+        }
+
+        // correct scale values
+        rScale.correctValues(1.0);
+
+        // Get rotations
+        {
+            double fy=0;
+            double cy=0;
+
+            if( ::basegfx::fTools::equal( aCol0.getZ(), 1.0 )
+                || aCol0.getZ() > 1.0 )
+            {
+                fy = -F_PI/2.0;
+                cy = 0.0;
+            }
+            else if( ::basegfx::fTools::equal( aCol0.getZ(), -1.0 )
+                || aCol0.getZ() < -1.0 )
+            {
+                fy = F_PI/2.0;
+                cy = 0.0;
+            }
+            else
+            {
+                fy = asin( -aCol0.getZ() );
+                cy = cos(fy);
+            }
+
+            rRotate.setY(fy);
+            if( ::basegfx::fTools::equalZero( cy ) )
+            {
+                if( aCol0.getZ() > 0.0 )
+                    rRotate.setX(atan2(-1.0*aCol1.getX(), aCol1.getY()));
+                else
+                    rRotate.setX(atan2(aCol1.getX(), aCol1.getY()));
+                rRotate.setZ(0.0);
+            }
+            else
+            {
+                rRotate.setX(atan2(aCol1.getZ(), aCol2.getZ()));
+                rRotate.setZ(atan2(aCol0.getY(), aCol0.getX()));
+            }
+
+            // corrcet rotate values
+            rRotate.correctValues();
+        }
+
+        return true;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/matrix/makefile.mk b/basegfx/source/matrix/makefile.mk
new file mode 100644
index 000000000000..35ea4d0cb86f
--- /dev/null
+++ b/basegfx/source/matrix/makefile.mk
@@ -0,0 +1,49 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=matrix
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+#ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/b2dhommatrix.obj		\
+                $(SLO)$/b2dhommatrixtools.obj	\
+                $(SLO)$/b3dhommatrix.obj
+            
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
new file mode 100644
index 000000000000..3111b26a1818
--- /dev/null
+++ b/basegfx/source/numeric/ftools.cxx
@@ -0,0 +1,38 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    // init static member of class fTools
+    double ::basegfx::fTools::mfSmallValue = 0.000000001;
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/numeric/makefile.mk b/basegfx/source/numeric/makefile.mk
new file mode 100644
index 000000000000..83abbbde4d82
--- /dev/null
+++ b/basegfx/source/numeric/makefile.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=numeric
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+#ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/ftools.obj
+            
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/pixel/bpixel.cxx b/basegfx/source/pixel/bpixel.cxx
new file mode 100644
index 000000000000..57de666787ab
--- /dev/null
+++ b/basegfx/source/pixel/bpixel.cxx
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/pixel/bpixel.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyBPixel : public rtl::Static<basegfx::BPixel, EmptyBPixel> {}; }
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    const BPixel& BPixel::getEmptyBPixel()
+    {
+        return EmptyBPixel::get();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // external operators
+
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/pixel/makefile.mk b/basegfx/source/pixel/makefile.mk
new file mode 100644
index 000000000000..75192dc5c180
--- /dev/null
+++ b/basegfx/source/pixel/makefile.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=pixel
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+#ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/bpixel.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/point/b2dhompoint.cxx b/basegfx/source/point/b2dhompoint.cxx
new file mode 100644
index 000000000000..979fbd4cdd3b
--- /dev/null
+++ b/basegfx/source/point/b2dhompoint.cxx
@@ -0,0 +1,259 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/point/b2dhompoint.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    bool B2DHomPoint::implIsHomogenized() const
+    {
+        const double fOne(1.0);
+        return ::basegfx::fTools::equal(fOne, mfW);
+    }
+
+    void B2DHomPoint::implHomogenize()
+    {
+        const double fFactor(1.0 / mfW);
+        maTuple.setX(maTuple.getX() * fFactor);
+        maTuple.setY(maTuple.getY() * fFactor);
+        mfW = 1.0;
+    }
+
+    void B2DHomPoint::implTestAndHomogenize() const
+    {
+        if(!implIsHomogenized())
+            ((B2DHomPoint*)this)->implHomogenize();
+    }
+
+    B2DPoint B2DHomPoint::getB2DPoint() const
+    {
+        implTestAndHomogenize();
+        return B2DPoint(maTuple.getX(), maTuple.getY());
+    }
+
+    double B2DHomPoint::getX() const
+    {
+        implTestAndHomogenize();
+        return maTuple.getX();
+    }
+
+    double B2DHomPoint::getY() const
+    {
+        implTestAndHomogenize();
+        return maTuple.getY();
+    }
+
+    void B2DHomPoint::setX(double fX)
+    {
+        maTuple.setX(implIsHomogenized() ? fX : fX * mfW );
+    }
+
+    void B2DHomPoint::setY(double fY)
+    {
+        maTuple.setY(implIsHomogenized() ? fY : fY * mfW );
+    }
+
+    B2DHomPoint& B2DHomPoint::operator+=( const B2DHomPoint& rPnt )
+    {
+        maTuple.setX(getX() * rPnt.mfW + rPnt.getX() * mfW);
+        maTuple.setY(getY() * rPnt.mfW + rPnt.getY() * mfW);
+        mfW = mfW * rPnt.mfW;
+
+        return *this;
+    }
+
+    B2DHomPoint& B2DHomPoint::operator-=( const B2DHomPoint& rPnt )
+    {
+        maTuple.setX(getX() * rPnt.mfW - rPnt.getX() * mfW);
+        maTuple.setY(getY() * rPnt.mfW - rPnt.getY() * mfW);
+        mfW = mfW * rPnt.mfW;
+
+        return *this;
+    }
+
+    B2DHomPoint& B2DHomPoint::operator*=(double t)
+    {
+        if(!::basegfx::fTools::equalZero(t))
+        {
+            mfW /= t;
+        }
+
+        return *this;
+    }
+
+    B2DHomPoint& B2DHomPoint::operator*=( const B2DHomMatrix& rMat )
+    {
+        const double fTempX( rMat.get(0,0)*maTuple.getX() +
+                            rMat.get(0,1)*maTuple.getY() +
+                            rMat.get(0,2)*mfW );
+
+        const double fTempY( rMat.get(1,0)*maTuple.getX() +
+                            rMat.get(1,1)*maTuple.getY() +
+                            rMat.get(1,2)*mfW );
+
+        const double fTempZ( rMat.get(2,0)*maTuple.getX() +
+                            rMat.get(2,1)*maTuple.getY() +
+                            rMat.get(2,2)*mfW );
+        maTuple.setX( fTempX );
+        maTuple.setY( fTempY );
+        mfW = fTempZ;
+
+        return *this;
+    }
+
+    B2DHomPoint& B2DHomPoint::operator/=(double t)
+    {
+        mfW *= t;
+        return *this;
+    }
+
+    B2DHomPoint& B2DHomPoint::operator-(void)
+    {
+        mfW = -mfW;
+        return *this;
+    }
+
+    bool B2DHomPoint::operator==( const B2DHomPoint& rPnt ) const
+    {
+        implTestAndHomogenize();
+        return (maTuple == rPnt.maTuple);
+    }
+
+    bool B2DHomPoint::operator!=( const B2DHomPoint& rPnt ) const
+    {
+        implTestAndHomogenize();
+        return (maTuple != rPnt.maTuple);
+    }
+
+    B2DHomPoint& B2DHomPoint::operator=( const B2DHomPoint& rPnt )
+    {
+        maTuple = rPnt.maTuple;
+        mfW = rPnt.mfW;
+        return *this;
+    }
+
+    B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
+    {
+        B2DHomPoint aMin(
+            (rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
+            (rVecB.getY() < rVecA.getY()) ? rVecB.getY() : rVecA.getY());
+        return aMin;
+    }
+
+    B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
+    {
+        B2DHomPoint aMax(
+            (rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
+            (rVecB.getY() > rVecA.getY()) ? rVecB.getY() : rVecA.getY());
+        return aMax;
+    }
+    B2DHomPoint absolute(const B2DHomPoint& rVec)
+    {
+        B2DHomPoint aAbs(
+            (0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(),
+            (0.0 > rVec.getY()) ? -rVec.getY() : rVec.getY());
+        return aAbs;
+    }
+
+    B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t)
+    {
+        B2DHomPoint aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+        return aInt;
+    }
+
+    B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2)
+    {
+        B2DHomPoint aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5);
+        return aAvg;
+    }
+
+    B2DHomPoint average(B2DHomPoint& rOld1, B2DHomPoint& rOld2, B2DHomPoint& rOld3)
+    {
+        B2DHomPoint aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    B2DHomPoint operator+(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
+    {
+        B2DHomPoint aSum(rVecA);
+        aSum += rVecB;
+        return aSum;
+    }
+
+    B2DHomPoint operator-(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB)
+    {
+        B2DHomPoint aSub(rVecA);
+        aSub -= rVecB;
+        return aSub;
+    }
+
+    B2DHomPoint operator*(const B2DHomPoint& rVec, double t)
+    {
+        B2DHomPoint aNew(rVec);
+        aNew *= t;
+        return aNew;
+    }
+
+    B2DHomPoint operator*(double t, const B2DHomPoint& rVec)
+    {
+        B2DHomPoint aNew(rVec);
+        aNew *= t;
+        return aNew;
+    }
+
+    B2DHomPoint operator*( const B2DHomMatrix& rMat, const B2DHomPoint& rPoint )
+    {
+        B2DHomPoint aNew(rPoint);
+        return aNew*=rMat;
+    }
+
+    B2DHomPoint operator/(const B2DHomPoint& rVec, double t)
+    {
+        B2DHomPoint aNew(rVec);
+        aNew /= t;
+        return aNew;
+    }
+
+    B2DHomPoint operator/(double t, const B2DHomPoint& rVec)
+    {
+        B2DHomPoint aNew(rVec);
+        aNew /= t;
+        return aNew;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/point/b2dpoint.cxx b/basegfx/source/point/b2dpoint.cxx
new file mode 100644
index 000000000000..39b5eaa6fcbf
--- /dev/null
+++ b/basegfx/source/point/b2dpoint.cxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    B2DPoint& B2DPoint::operator=( const ::basegfx::B2DTuple& rPoint )
+    {
+        mfX = rPoint.getX();
+        mfY = rPoint.getY();
+        return *this;
+    }
+
+    B2DPoint& B2DPoint::operator*=( const ::basegfx::B2DHomMatrix& rMat )
+    {
+        double fTempX(
+            rMat.get(0, 0) * mfX +
+            rMat.get(0, 1) * mfY +
+            rMat.get(0, 2));
+        double fTempY(
+            rMat.get(1, 0) * mfX +
+            rMat.get(1, 1) * mfY +
+            rMat.get(1, 2));
+
+        if(!rMat.isLastLineDefault())
+        {
+            const double fOne(1.0);
+            const double fTempM(
+                rMat.get(2, 0) * mfX +
+                rMat.get(2, 1) * mfY +
+                rMat.get(2, 2));
+
+            if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
+            {
+                fTempX /= fTempM;
+                fTempY /= fTempM;
+            }
+        }
+
+        mfX = fTempX;
+        mfY = fTempY;
+
+        return *this;
+    }
+
+    B2DPoint operator*( const ::basegfx::B2DHomMatrix& rMat, const B2DPoint& rPoint )
+    {
+        B2DPoint aRes( rPoint );
+        return aRes *= rMat;
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/point/b2ipoint.cxx b/basegfx/source/point/b2ipoint.cxx
new file mode 100644
index 000000000000..09af767518b3
--- /dev/null
+++ b/basegfx/source/point/b2ipoint.cxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    B2IPoint& B2IPoint::operator=( const ::basegfx::B2ITuple& rPoint )
+    {
+        mnX = rPoint.getX();
+        mnY = rPoint.getY();
+        return *this;
+    }
+
+    B2IPoint& B2IPoint::operator*=( const ::basegfx::B2DHomMatrix& rMat )
+    {
+        double fTempX(
+            rMat.get(0, 0) * mnX +
+            rMat.get(0, 1) * mnY +
+            rMat.get(0, 2));
+        double fTempY(
+            rMat.get(1, 0) * mnX +
+            rMat.get(1, 1) * mnY +
+            rMat.get(1, 2));
+
+        if(!rMat.isLastLineDefault())
+        {
+            const double fOne(1.0);
+            const double fTempM(
+                rMat.get(2, 0) * mnX +
+                rMat.get(2, 1) * mnY +
+                rMat.get(2, 2));
+
+            if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
+            {
+                fTempX /= fTempM;
+                fTempY /= fTempM;
+            }
+        }
+
+        mnX = fround(fTempX);
+        mnY = fround(fTempY);
+
+        return *this;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/point/b3dhompoint.cxx b/basegfx/source/point/b3dhompoint.cxx
new file mode 100644
index 000000000000..34dee5bc01d0
--- /dev/null
+++ b/basegfx/source/point/b3dhompoint.cxx
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/point/b3dhompoint.hxx>
+
+namespace basegfx
+{
+    void B3DHomPoint::implHomogenize()
+    {
+        const double fFactor(1.0 / mfW);
+        maTuple.setX(maTuple.getX() * fFactor);
+        maTuple.setY(maTuple.getY() * fFactor);
+        maTuple.setZ(maTuple.getZ() * fFactor);
+        mfW = 1.0;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/point/b3dpoint.cxx b/basegfx/source/point/b3dpoint.cxx
new file mode 100644
index 000000000000..8bc1f06f3356
--- /dev/null
+++ b/basegfx/source/point/b3dpoint.cxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    B3DPoint& B3DPoint::operator*=( const ::basegfx::B3DHomMatrix& rMat )
+    {
+        double fTempX(
+            rMat.get(0, 0) * mfX +
+            rMat.get(0, 1) * mfY +
+            rMat.get(0, 2) * mfZ +
+            rMat.get(0, 3));
+        double fTempY(
+            rMat.get(1, 0) * mfX +
+            rMat.get(1, 1) * mfY +
+            rMat.get(1, 2) * mfZ +
+            rMat.get(1, 3));
+        double fTempZ(
+            rMat.get(2, 0) * mfX +
+            rMat.get(2, 1) * mfY +
+            rMat.get(2, 2) * mfZ +
+            rMat.get(2, 3));
+
+        if(!rMat.isLastLineDefault())
+        {
+            const double fOne(1.0);
+            const double fTempM(
+                rMat.get(3, 0) * mfX +
+                rMat.get(3, 1) * mfY +
+                rMat.get(3, 2) * mfZ +
+                rMat.get(3, 3));
+
+            if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
+            {
+                fTempX /= fTempM;
+                fTempY /= fTempM;
+                fTempZ /= fTempM;
+            }
+        }
+
+        mfX = fTempX;
+        mfY = fTempY;
+        mfZ = fTempZ;
+
+        return *this;
+    }
+
+    B3DPoint operator*( const ::basegfx::B3DHomMatrix& rMat, const B3DPoint& rPoint )
+    {
+        B3DPoint aRes( rPoint );
+        return aRes *= rMat;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/point/b3ipoint.cxx b/basegfx/source/point/b3ipoint.cxx
new file mode 100644
index 000000000000..19bb25b8bf46
--- /dev/null
+++ b/basegfx/source/point/b3ipoint.cxx
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/point/b3ipoint.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    B3IPoint& B3IPoint::operator*=( const ::basegfx::B3DHomMatrix& rMat )
+    {
+        double fTempX(
+            rMat.get(0, 0) * mnX +
+            rMat.get(0, 1) * mnY +
+            rMat.get(0, 2) * mnZ +
+            rMat.get(0, 3));
+        double fTempY(
+            rMat.get(1, 0) * mnX +
+            rMat.get(1, 1) * mnY +
+            rMat.get(1, 2) * mnZ +
+            rMat.get(1, 3));
+        double fTempZ(
+            rMat.get(2, 0) * mnX +
+            rMat.get(2, 1) * mnY +
+            rMat.get(2, 2) * mnZ +
+            rMat.get(2, 3));
+
+        if(!rMat.isLastLineDefault())
+        {
+            const double fOne(1.0);
+            const double fTempM(
+                rMat.get(3, 0) * mnX +
+                rMat.get(3, 1) * mnY +
+                rMat.get(3, 2) * mnZ +
+                rMat.get(3, 3));
+
+            if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
+            {
+                fTempX /= fTempM;
+                fTempY /= fTempM;
+                fTempZ /= fTempM;
+            }
+        }
+
+        mnX = fround(fTempX);
+        mnY = fround(fTempY);
+        mnZ = fround(fTempZ);
+
+        return *this;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/point/makefile.mk b/basegfx/source/point/makefile.mk
new file mode 100644
index 000000000000..96798eb35cc9
--- /dev/null
+++ b/basegfx/source/point/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=point
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+#ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/b2dpoint.obj		\
+                $(SLO)$/b2dhompoint.obj		\
+                $(SLO)$/b3dpoint.obj		\
+                $(SLO)$/b3dhompoint.obj		\
+                $(SLO)$/b2ipoint.obj		\
+                $(SLO)$/b3ipoint.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
new file mode 100644
index 000000000000..0db5efbfb86d
--- /dev/null
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -0,0 +1,725 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <cstdio>
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        B2DPolyPolygon createAreaGeometryForLineStartEnd(
+            const B2DPolygon& rCandidate,
+            const B2DPolyPolygon& rArrow,
+            bool bStart,
+            double fWidth,
+            double fCandidateLength,
+            double fDockingPosition, // 0->top, 1->bottom
+            double* pConsumedLength)
+        {
+            B2DPolyPolygon aRetval;
+            OSL_ENSURE(rCandidate.count() > 1L, "createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
+            OSL_ENSURE(rArrow.count() > 0L, "createAreaGeometryForLineStartEnd: Empty arrow PolyPolygon (!)");
+            OSL_ENSURE(fWidth > 0.0, "createAreaGeometryForLineStartEnd: Width too small (!)");
+            OSL_ENSURE(fDockingPosition >= 0.0 && fDockingPosition <= 1.0,
+                "createAreaGeometryForLineStartEnd: fDockingPosition out of range [0.0 .. 1.0] (!)");
+
+            if(fWidth < 0.0)
+            {
+                fWidth = -fWidth;
+            }
+
+            if(rCandidate.count() > 1 && rArrow.count() && !fTools::equalZero(fWidth))
+            {
+                if(fDockingPosition < 0.0)
+                {
+                    fDockingPosition = 0.0;
+                }
+                else if(fDockingPosition > 1.0)
+                {
+                    fDockingPosition = 1.0;
+                }
+
+                // init return value from arrow
+                aRetval.append(rArrow);
+
+                // get size of the arrow
+                const B2DRange aArrowSize(getRange(rArrow));
+
+                // build ArrowTransform; center in X, align with axis in Y
+                B2DHomMatrix aArrowTransform(basegfx::tools::createTranslateB2DHomMatrix(
+                    -aArrowSize.getCenter().getX(), -aArrowSize.getMinimum().getY()));
+
+                // scale to target size
+                const double fArrowScale(fWidth / (aArrowSize.getRange().getX()));
+                aArrowTransform.scale(fArrowScale, fArrowScale);
+
+                // get arrow size in Y
+                B2DPoint aUpperCenter(aArrowSize.getCenter().getX(), aArrowSize.getMaximum().getY());
+                aUpperCenter *= aArrowTransform;
+                const double fArrowYLength(B2DVector(aUpperCenter).getLength());
+
+                // move arrow to have docking position centered
+                aArrowTransform.translate(0.0, -fArrowYLength * fDockingPosition);
+
+                // prepare polygon length
+                if(fTools::equalZero(fCandidateLength))
+                {
+                    fCandidateLength = getLength(rCandidate);
+                }
+
+                // get the polygon vector we want to plant this arrow on
+                const double fConsumedLength(fArrowYLength * (1.0 - fDockingPosition));
+                const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0L : rCandidate.count() - 1L));
+                const B2DVector aTail(getPositionAbsolute(rCandidate,
+                    (bStart) ? fConsumedLength : fCandidateLength - fConsumedLength, fCandidateLength));
+
+                // from that vector, take the needed rotation and add rotate for arrow to transformation
+                const B2DVector aTargetDirection(aHead - aTail);
+                const double fRotation(atan2(aTargetDirection.getY(), aTargetDirection.getX()) + (90.0 * F_PI180));
+
+                // rotate around docking position
+                aArrowTransform.rotate(fRotation);
+
+                // move arrow docking position to polygon head
+                aArrowTransform.translate(aHead.getX(), aHead.getY());
+
+                // transform retval and close
+                aRetval.transform(aArrowTransform);
+                aRetval.setClosed(true);
+
+                // if pConsumedLength is asked for, fill it
+                if(pConsumedLength)
+                {
+                    *pConsumedLength = fConsumedLength;
+                }
+            }
+
+            return aRetval;
+        }
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    // anonymus namespace for local helpers
+    namespace
+    {
+        bool impIsSimpleEdge(const B2DCubicBezier& rCandidate, double fMaxCosQuad, double fMaxPartOfEdgeQuad)
+        {
+            // isBezier() is true, already tested by caller
+            const B2DVector aEdge(rCandidate.getEndPoint() - rCandidate.getStartPoint());
+
+            if(aEdge.equalZero())
+            {
+                // start and end point the same, but control vectors used -> baloon curve loop
+                // is not a simple edge
+                return false;
+            }
+
+            // get tangentA and scalar with edge
+            const B2DVector aTangentA(rCandidate.getTangent(0.0));
+            const double fScalarAE(aEdge.scalar(aTangentA));
+
+            if(fTools::lessOrEqual(fScalarAE, 0.0))
+            {
+                // angle between TangentA and Edge is bigger or equal 90 degrees
+                return false;
+            }
+
+            // get self-scalars for E and A
+            const double fScalarE(aEdge.scalar(aEdge));
+            const double fScalarA(aTangentA.scalar(aTangentA));
+            const double fLengthCompareE(fScalarE * fMaxPartOfEdgeQuad);
+
+            if(fTools::moreOrEqual(fScalarA, fLengthCompareE))
+            {
+                // length of TangentA is more than fMaxPartOfEdge of length of edge
+                return false;
+            }
+
+            if(fTools::lessOrEqual(fScalarAE * fScalarAE, fScalarA * fScalarE * fMaxCosQuad))
+            {
+                // angle between TangentA and Edge is bigger or equal angle defined by fMaxCos
+                return false;
+            }
+
+            // get tangentB and scalar with edge
+            const B2DVector aTangentB(rCandidate.getTangent(1.0));
+            const double fScalarBE(aEdge.scalar(aTangentB));
+
+            if(fTools::lessOrEqual(fScalarBE, 0.0))
+            {
+                // angle between TangentB and Edge is bigger or equal 90 degrees
+                return false;
+            }
+
+            // get self-scalar for B
+            const double fScalarB(aTangentB.scalar(aTangentB));
+
+            if(fTools::moreOrEqual(fScalarB, fLengthCompareE))
+            {
+                // length of TangentB is more than fMaxPartOfEdge of length of edge
+                return false;
+            }
+
+            if(fTools::lessOrEqual(fScalarBE * fScalarBE, fScalarB * fScalarE * fMaxCosQuad))
+            {
+                // angle between TangentB and Edge is bigger or equal defined by fMaxCos
+                return false;
+            }
+
+            return true;
+        }
+
+        void impSubdivideToSimple(const B2DCubicBezier& rCandidate, B2DPolygon& rTarget, double fMaxCosQuad, double fMaxPartOfEdgeQuad, sal_uInt32 nMaxRecursionDepth)
+        {
+            if(!nMaxRecursionDepth || impIsSimpleEdge(rCandidate, fMaxCosQuad, fMaxPartOfEdgeQuad))
+            {
+                rTarget.appendBezierSegment(rCandidate.getControlPointA(), rCandidate.getControlPointB(), rCandidate.getEndPoint());
+            }
+            else
+            {
+                B2DCubicBezier aLeft, aRight;
+                rCandidate.split(0.5, &aLeft, &aRight);
+
+                impSubdivideToSimple(aLeft, rTarget, fMaxCosQuad, fMaxPartOfEdgeQuad, nMaxRecursionDepth - 1);
+                impSubdivideToSimple(aRight, rTarget, fMaxCosQuad, fMaxPartOfEdgeQuad, nMaxRecursionDepth - 1);
+            }
+        }
+
+        B2DPolygon subdivideToSimple(const B2DPolygon& rCandidate, double fMaxCosQuad, double fMaxPartOfEdgeQuad)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(rCandidate.areControlPointsUsed() && nPointCount)
+            {
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                B2DPolygon aRetval;
+                B2DCubicBezier aEdge;
+
+                // prepare edge for loop
+                aEdge.setStartPoint(rCandidate.getB2DPoint(0));
+                aRetval.append(aEdge.getStartPoint());
+
+                for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                {
+                    // fill B2DCubicBezier
+                    const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                    aEdge.setControlPointA(rCandidate.getNextControlPoint(a));
+                    aEdge.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                    aEdge.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+
+                    // get rid of unnecessary bezier segments
+                    aEdge.testAndSolveTrivialBezier();
+
+                    if(aEdge.isBezier())
+                    {
+                        // before splitting recursively with internal simple criteria, use
+                        // ExtremumPosFinder to remove those
+                        ::std::vector< double > aExtremumPositions;
+
+                        aExtremumPositions.reserve(4);
+                        aEdge.getAllExtremumPositions(aExtremumPositions);
+
+                        const sal_uInt32 nCount(aExtremumPositions.size());
+
+                        if(nCount)
+                        {
+                            if(nCount > 1)
+                            {
+                                // create order from left to right
+                                ::std::sort(aExtremumPositions.begin(), aExtremumPositions.end());
+                            }
+
+                            for(sal_uInt32 b(0); b < nCount;)
+                            {
+                                // split aEdge at next split pos
+                                B2DCubicBezier aLeft;
+                                const double fSplitPos(aExtremumPositions[b++]);
+
+                                aEdge.split(fSplitPos, &aLeft, &aEdge);
+                                aLeft.testAndSolveTrivialBezier();
+
+                                // consume left part
+                                if(aLeft.isBezier())
+                                {
+                                    impSubdivideToSimple(aLeft, aRetval, fMaxCosQuad, fMaxPartOfEdgeQuad, 6);
+                                }
+                                else
+                                {
+                                    aRetval.append(aLeft.getEndPoint());
+                                }
+
+                                if(b < nCount)
+                                {
+                                    // correct the remaining split positions to fit to shortened aEdge
+                                    const double fScaleFactor(1.0 / (1.0 - fSplitPos));
+
+                                    for(sal_uInt32 c(b); c < nCount; c++)
+                                    {
+                                        aExtremumPositions[c] = (aExtremumPositions[c] - fSplitPos) * fScaleFactor;
+                                    }
+                                }
+                            }
+
+                            // test the shortened rest of aEdge
+                            aEdge.testAndSolveTrivialBezier();
+
+                            // consume right part
+                            if(aEdge.isBezier())
+                            {
+                                impSubdivideToSimple(aEdge, aRetval, fMaxCosQuad, fMaxPartOfEdgeQuad, 6);
+                            }
+                            else
+                            {
+                                aRetval.append(aEdge.getEndPoint());
+                            }
+                        }
+                        else
+                        {
+                            impSubdivideToSimple(aEdge, aRetval, fMaxCosQuad, fMaxPartOfEdgeQuad, 6);
+                        }
+                    }
+                    else
+                    {
+                        // straight edge, add point
+                        aRetval.append(aEdge.getEndPoint());
+                    }
+
+                    // prepare edge for next step
+                    aEdge.setStartPoint(aEdge.getEndPoint());
+                }
+
+                // copy closed flag and check for double points
+                aRetval.setClosed(rCandidate.isClosed());
+                aRetval.removeDoublePoints();
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolygon createAreaGeometryForEdge(const B2DCubicBezier& rEdge, double fHalfLineWidth)
+        {
+            // create polygon for edge
+            // Unfortunately, while it would be geometrically correct to not add
+            // the in-between points EdgeEnd and EdgeStart, it leads to rounding
+            // errors when converting to integer polygon coordinates for painting
+            if(rEdge.isBezier())
+            {
+                // prepare target and data common for upper and lower
+                B2DPolygon aBezierPolygon;
+                const B2DVector aPureEdgeVector(rEdge.getEndPoint() - rEdge.getStartPoint());
+                const double fEdgeLength(aPureEdgeVector.getLength());
+                const bool bIsEdgeLengthZero(fTools::equalZero(fEdgeLength));
+                const B2DVector aTangentA(rEdge.getTangent(0.0));
+                const B2DVector aTangentB(rEdge.getTangent(1.0));
+
+                // create upper edge.
+                {
+                    // create displacement vectors and check if they cut
+                    const B2DVector aPerpendStart(getNormalizedPerpendicular(aTangentA) * -fHalfLineWidth);
+                    const B2DVector aPerpendEnd(getNormalizedPerpendicular(aTangentB) * -fHalfLineWidth);
+                    double fCut(0.0);
+                    const tools::CutFlagValue aCut(tools::findCut(
+                        rEdge.getStartPoint(), aPerpendStart,
+                        rEdge.getEndPoint(), aPerpendEnd,
+                        CUTFLAG_ALL, &fCut));
+
+                    if(CUTFLAG_NONE != aCut)
+                    {
+                        // calculate cut point and add
+                        const B2DPoint aCutPoint(rEdge.getStartPoint() + (aPerpendStart * fCut));
+                        aBezierPolygon.append(aCutPoint);
+                    }
+                    else
+                    {
+                        // create scaled bezier segment
+                        const B2DPoint aStart(rEdge.getStartPoint() + aPerpendStart);
+                        const B2DPoint aEnd(rEdge.getEndPoint() + aPerpendEnd);
+                        const B2DVector aEdge(aEnd - aStart);
+                        const double fLength(aEdge.getLength());
+                        const double fScale(bIsEdgeLengthZero ? 1.0 : fLength / fEdgeLength);
+                        const B2DVector fRelNext(rEdge.getControlPointA() - rEdge.getStartPoint());
+                        const B2DVector fRelPrev(rEdge.getControlPointB() - rEdge.getEndPoint());
+
+                        aBezierPolygon.append(aStart);
+                        aBezierPolygon.appendBezierSegment(aStart + (fRelNext * fScale), aEnd + (fRelPrev * fScale), aEnd);
+                    }
+                }
+
+                // append original in-between point
+                aBezierPolygon.append(rEdge.getEndPoint());
+
+                // create lower edge.
+                {
+                    // create displacement vectors and check if they cut
+                    const B2DVector aPerpendStart(getNormalizedPerpendicular(aTangentA) * fHalfLineWidth);
+                    const B2DVector aPerpendEnd(getNormalizedPerpendicular(aTangentB) * fHalfLineWidth);
+                    double fCut(0.0);
+                    const tools::CutFlagValue aCut(tools::findCut(
+                        rEdge.getEndPoint(), aPerpendEnd,
+                        rEdge.getStartPoint(), aPerpendStart,
+                        CUTFLAG_ALL, &fCut));
+
+                    if(CUTFLAG_NONE != aCut)
+                    {
+                        // calculate cut point and add
+                        const B2DPoint aCutPoint(rEdge.getEndPoint() + (aPerpendEnd * fCut));
+                        aBezierPolygon.append(aCutPoint);
+                    }
+                    else
+                    {
+                        // create scaled bezier segment
+                        const B2DPoint aStart(rEdge.getEndPoint() + aPerpendEnd);
+                        const B2DPoint aEnd(rEdge.getStartPoint() + aPerpendStart);
+                        const B2DVector aEdge(aEnd - aStart);
+                        const double fLength(aEdge.getLength());
+                        const double fScale(bIsEdgeLengthZero ? 1.0 : fLength / fEdgeLength);
+                        const B2DVector fRelNext(rEdge.getControlPointB() - rEdge.getEndPoint());
+                        const B2DVector fRelPrev(rEdge.getControlPointA() - rEdge.getStartPoint());
+
+                        aBezierPolygon.append(aStart);
+                        aBezierPolygon.appendBezierSegment(aStart + (fRelNext * fScale), aEnd + (fRelPrev * fScale), aEnd);
+                    }
+                }
+
+                // append original in-between point
+                aBezierPolygon.append(rEdge.getStartPoint());
+
+                // close and return
+                aBezierPolygon.setClosed(true);
+                return aBezierPolygon;
+            }
+            else
+            {
+                // #i101491# emulate rEdge.getTangent call which applies a factor of 0.3 to the
+                // full-length edge vector to have numerically exactly the same results as in the
+                // createAreaGeometryForJoin implementation
+                const B2DVector aEdgeTangent((rEdge.getEndPoint() - rEdge.getStartPoint()) * 0.3);
+                const B2DVector aPerpendEdgeVector(getNormalizedPerpendicular(aEdgeTangent) * fHalfLineWidth);
+                B2DPolygon aEdgePolygon;
+
+                // create upper edge
+                aEdgePolygon.append(rEdge.getStartPoint() - aPerpendEdgeVector);
+                aEdgePolygon.append(rEdge.getEndPoint() - aPerpendEdgeVector);
+
+                // append original in-between point
+                aEdgePolygon.append(rEdge.getEndPoint());
+
+                // create lower edge
+                aEdgePolygon.append(rEdge.getEndPoint() + aPerpendEdgeVector);
+                aEdgePolygon.append(rEdge.getStartPoint() + aPerpendEdgeVector);
+
+                // append original in-between point
+                aEdgePolygon.append(rEdge.getStartPoint());
+
+                // close and return
+                aEdgePolygon.setClosed(true);
+                return aEdgePolygon;
+            }
+        }
+
+        B2DPolygon createAreaGeometryForJoin(
+            const B2DVector& rTangentPrev,
+            const B2DVector& rTangentEdge,
+            const B2DVector& rPerpendPrev,
+            const B2DVector& rPerpendEdge,
+            const B2DPoint& rPoint,
+            double fHalfLineWidth,
+            B2DLineJoin eJoin,
+            double fMiterMinimumAngle)
+        {
+            OSL_ENSURE(fHalfLineWidth > 0.0, "createAreaGeometryForJoin: LineWidth too small (!)");
+            OSL_ENSURE(B2DLINEJOIN_NONE != eJoin, "createAreaGeometryForJoin: B2DLINEJOIN_NONE not allowed (!)");
+
+            // LineJoin from tangent rPerpendPrev to tangent rPerpendEdge in rPoint
+            B2DPolygon aEdgePolygon;
+            const B2DPoint aStartPoint(rPoint + rPerpendPrev);
+            const B2DPoint aEndPoint(rPoint + rPerpendEdge);
+
+            // test if for Miter, the angle is too small and the fallback
+            // to bevel needs to be used
+            if(B2DLINEJOIN_MITER == eJoin)
+            {
+                const double fAngle(fabs(rPerpendPrev.angle(rPerpendEdge)));
+
+                if((F_PI - fAngle) < fMiterMinimumAngle)
+                {
+                    // fallback to bevel
+                    eJoin = B2DLINEJOIN_BEVEL;
+                }
+            }
+
+            switch(eJoin)
+            {
+                case B2DLINEJOIN_MITER :
+                {
+                    aEdgePolygon.append(aEndPoint);
+                    aEdgePolygon.append(rPoint);
+                    aEdgePolygon.append(aStartPoint);
+
+                    // Look for the cut point between start point along rTangentPrev and
+                    // end point along rTangentEdge. -rTangentEdge should be used, but since
+                    // the cut value is used for interpolating along the first edge, the negation
+                    // is not needed since the same fCut will be found on the first edge.
+                    // If it exists, insert it to complete the mitered fill polygon.
+                    double fCutPos(0.0);
+                    tools::findCut(aStartPoint, rTangentPrev, aEndPoint, rTangentEdge, CUTFLAG_ALL, &fCutPos);
+
+                    if(0.0 != fCutPos)
+                    {
+                        const B2DPoint aCutPoint(interpolate(aStartPoint, aStartPoint + rTangentPrev, fCutPos));
+                        aEdgePolygon.append(aCutPoint);
+                    }
+
+                    break;
+                }
+                case B2DLINEJOIN_ROUND :
+                {
+                    // use tooling to add needed EllipseSegment
+                    double fAngleStart(atan2(rPerpendPrev.getY(), rPerpendPrev.getX()));
+                    double fAngleEnd(atan2(rPerpendEdge.getY(), rPerpendEdge.getX()));
+
+                    // atan2 results are [-PI .. PI], consolidate to [0.0 .. 2PI]
+                    if(fAngleStart < 0.0)
+                    {
+                        fAngleStart += F_2PI;
+                    }
+
+                    if(fAngleEnd < 0.0)
+                    {
+                        fAngleEnd += F_2PI;
+                    }
+
+                    const B2DPolygon aBow(tools::createPolygonFromEllipseSegment(rPoint, fHalfLineWidth, fHalfLineWidth, fAngleStart, fAngleEnd));
+
+                    if(aBow.count() > 1)
+                    {
+                        // #i101491#
+                        // use the original start/end positions; the ones from bow creation may be numerically
+                        // different due to their different creation. To guarantee good merging quality with edges
+                        // and edge roundings (and to reduce point count)
+                        aEdgePolygon = aBow;
+                        aEdgePolygon.setB2DPoint(0, aStartPoint);
+                        aEdgePolygon.setB2DPoint(aEdgePolygon.count() - 1, aEndPoint);
+                        aEdgePolygon.append(rPoint);
+
+                        break;
+                    }
+                    else
+                    {
+                        // wanted fall-through to default
+                    }
+                }
+                default: // B2DLINEJOIN_BEVEL
+                {
+                    aEdgePolygon.append(aEndPoint);
+                    aEdgePolygon.append(rPoint);
+                    aEdgePolygon.append(aStartPoint);
+
+                    break;
+                }
+            }
+
+            // create last polygon part for edge
+            aEdgePolygon.setClosed(true);
+
+            return aEdgePolygon;
+        }
+    } // end of anonymus namespace
+
+    namespace tools
+    {
+        B2DPolyPolygon createAreaGeometry(
+            const B2DPolygon& rCandidate,
+            double fHalfLineWidth,
+            B2DLineJoin eJoin,
+            double fMaxAllowedAngle,
+            double fMaxPartOfEdge,
+            double fMiterMinimumAngle)
+        {
+            if(fMaxAllowedAngle > F_PI2)
+            {
+                fMaxAllowedAngle = F_PI2;
+            }
+            else if(fMaxAllowedAngle < 0.01 * F_PI2)
+            {
+                fMaxAllowedAngle = 0.01 * F_PI2;
+            }
+
+            if(fMaxPartOfEdge > 1.0)
+            {
+                fMaxPartOfEdge = 1.0;
+            }
+            else if(fMaxPartOfEdge < 0.01)
+            {
+                fMaxPartOfEdge = 0.01;
+            }
+
+            if(fMiterMinimumAngle > F_PI)
+            {
+                fMiterMinimumAngle = F_PI;
+            }
+            else if(fMiterMinimumAngle < 0.01 * F_PI)
+            {
+                fMiterMinimumAngle = 0.01 * F_PI;
+            }
+
+            B2DPolygon aCandidate(rCandidate);
+            const double fMaxCos(cos(fMaxAllowedAngle));
+
+            aCandidate.removeDoublePoints();
+            aCandidate = subdivideToSimple(aCandidate, fMaxCos * fMaxCos, fMaxPartOfEdge * fMaxPartOfEdge);
+
+            const sal_uInt32 nPointCount(aCandidate.count());
+
+            if(nPointCount)
+            {
+                B2DPolyPolygon aRetval;
+                const bool bEventuallyCreateLineJoin(B2DLINEJOIN_NONE != eJoin);
+                const bool bIsClosed(aCandidate.isClosed());
+                const sal_uInt32 nEdgeCount(bIsClosed ? nPointCount : nPointCount - 1);
+
+                if(nEdgeCount)
+                {
+                    B2DCubicBezier aEdge;
+                    B2DCubicBezier aPrev;
+
+                    // prepare edge
+                    aEdge.setStartPoint(aCandidate.getB2DPoint(0));
+
+                    if(bIsClosed && bEventuallyCreateLineJoin)
+                    {
+                        // prepare previous edge
+                        const sal_uInt32 nPrevIndex(nPointCount - 1);
+                        aPrev.setStartPoint(aCandidate.getB2DPoint(nPrevIndex));
+                        aPrev.setControlPointA(aCandidate.getNextControlPoint(nPrevIndex));
+                        aPrev.setControlPointB(aCandidate.getPrevControlPoint(0));
+                        aPrev.setEndPoint(aEdge.getStartPoint());
+                    }
+
+                    for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                    {
+                        // fill current Edge
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        aEdge.setControlPointA(aCandidate.getNextControlPoint(a));
+                        aEdge.setControlPointB(aCandidate.getPrevControlPoint(nNextIndex));
+                        aEdge.setEndPoint(aCandidate.getB2DPoint(nNextIndex));
+
+                        // check and create linejoin
+                        if(bEventuallyCreateLineJoin && (bIsClosed || 0 != a))
+                        {
+                            const B2DVector aTangentPrev(aPrev.getTangent(1.0));
+                            const B2DVector aTangentEdge(aEdge.getTangent(0.0));
+                            B2VectorOrientation aOrientation(getOrientation(aTangentPrev, aTangentEdge));
+
+                            if(ORIENTATION_NEUTRAL == aOrientation)
+                            {
+                                // they are parallell or empty; if they are both not zero and point
+                                // in opposite direction, a half-circle is needed
+                                if(!aTangentPrev.equalZero() && !aTangentEdge.equalZero())
+                                {
+                                    const double fAngle(fabs(aTangentPrev.angle(aTangentEdge)));
+
+                                    if(fTools::equal(fAngle, F_PI))
+                                    {
+                                        // for half-circle production, fallback to positive
+                                        // orientation
+                                        aOrientation = ORIENTATION_POSITIVE;
+                                    }
+                                }
+                            }
+
+                            if(ORIENTATION_POSITIVE == aOrientation)
+                            {
+                                const B2DVector aPerpendPrev(getNormalizedPerpendicular(aTangentPrev) * -fHalfLineWidth);
+                                const B2DVector aPerpendEdge(getNormalizedPerpendicular(aTangentEdge) * -fHalfLineWidth);
+
+                                aRetval.append(createAreaGeometryForJoin(
+                                    aTangentPrev, aTangentEdge,
+                                    aPerpendPrev, aPerpendEdge,
+                                    aEdge.getStartPoint(), fHalfLineWidth,
+                                    eJoin, fMiterMinimumAngle));
+                            }
+                            else if(ORIENTATION_NEGATIVE == aOrientation)
+                            {
+                                const B2DVector aPerpendPrev(getNormalizedPerpendicular(aTangentPrev) * fHalfLineWidth);
+                                const B2DVector aPerpendEdge(getNormalizedPerpendicular(aTangentEdge) * fHalfLineWidth);
+
+                                aRetval.append(createAreaGeometryForJoin(
+                                    aTangentEdge, aTangentPrev,
+                                    aPerpendEdge, aPerpendPrev,
+                                    aEdge.getStartPoint(), fHalfLineWidth,
+                                    eJoin, fMiterMinimumAngle));
+                            }
+                        }
+
+                        // create geometry for edge
+                        aRetval.append(createAreaGeometryForEdge(aEdge, fHalfLineWidth));
+
+                        // prepare next step
+                        if(bEventuallyCreateLineJoin)
+                        {
+                            aPrev = aEdge;
+                        }
+
+                        aEdge.setStartPoint(aEdge.getEndPoint());
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return B2DPolyPolygon(rCandidate);
+            }
+        }
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
new file mode 100644
index 000000000000..d8255dc7ec10
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -0,0 +1,1652 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <rtl/instance.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <boost/scoped_ptr.hpp>
+#include <vector>
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+
+struct CoordinateData2D : public basegfx::B2DPoint
+{
+public:
+    CoordinateData2D() {}
+
+    explicit CoordinateData2D(const basegfx::B2DPoint& rData)
+    :   B2DPoint(rData)
+    {}
+
+    CoordinateData2D& operator=(const basegfx::B2DPoint& rData)
+    {
+        B2DPoint::operator=(rData);
+        return *this;
+    }
+
+    void transform(const basegfx::B2DHomMatrix& rMatrix)
+    {
+        *this *= rMatrix;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class CoordinateDataArray2D
+{
+    typedef ::std::vector< CoordinateData2D > CoordinateData2DVector;
+
+    CoordinateData2DVector                          maVector;
+
+public:
+    explicit CoordinateDataArray2D(sal_uInt32 nCount)
+    :   maVector(nCount)
+    {
+    }
+
+    explicit CoordinateDataArray2D(const CoordinateDataArray2D& rOriginal)
+    :   maVector(rOriginal.maVector)
+    {
+    }
+
+    CoordinateDataArray2D(const CoordinateDataArray2D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maVector(rOriginal.maVector.begin() + nIndex, rOriginal.maVector.begin() + (nIndex + nCount))
+    {
+    }
+
+    sal_uInt32 count() const
+    {
+        return maVector.size();
+    }
+
+    bool operator==(const CoordinateDataArray2D& rCandidate) const
+    {
+        return (maVector == rCandidate.maVector);
+    }
+
+    const basegfx::B2DPoint& getCoordinate(sal_uInt32 nIndex) const
+    {
+        return maVector[nIndex];
+    }
+
+    void setCoordinate(sal_uInt32 nIndex, const basegfx::B2DPoint& rValue)
+    {
+        maVector[nIndex] = rValue;
+    }
+
+    void reserve(sal_uInt32 nCount)
+    {
+        maVector.reserve(nCount);
+    }
+
+    void append(const CoordinateData2D& rValue)
+    {
+        maVector.push_back(rValue);
+    }
+
+    void insert(sal_uInt32 nIndex, const CoordinateData2D& rValue, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rValue
+            CoordinateData2DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            maVector.insert(aIndex, nCount, rValue);
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const CoordinateDataArray2D& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maVector.size());
+
+        if(nCount)
+        {
+            // insert data
+            CoordinateData2DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            CoordinateData2DVector::const_iterator aStart(rSource.maVector.begin());
+            CoordinateData2DVector::const_iterator aEnd(rSource.maVector.end());
+            maVector.insert(aIndex, aStart, aEnd);
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // remove point data
+            CoordinateData2DVector::iterator aStart(maVector.begin());
+            aStart += nIndex;
+            const CoordinateData2DVector::iterator aEnd(aStart + nCount);
+            maVector.erase(aStart, aEnd);
+        }
+    }
+
+    void flip(bool bIsClosed)
+    {
+        if(maVector.size() > 1)
+        {
+            // to keep the same point at index 0, just flip all points except the
+            // first one when closed
+            const sal_uInt32 nHalfSize(bIsClosed ? (maVector.size() - 1) >> 1 : maVector.size() >> 1);
+            CoordinateData2DVector::iterator aStart(bIsClosed ? maVector.begin() + 1 : maVector.begin());
+            CoordinateData2DVector::iterator aEnd(maVector.end() - 1);
+
+            for(sal_uInt32 a(0); a < nHalfSize; a++)
+            {
+                ::std::swap(*aStart, *aEnd);
+                aStart++;
+                aEnd--;
+            }
+        }
+    }
+
+    void removeDoublePointsAtBeginEnd()
+    {
+        // remove from end as long as there are at least two points
+        // and begin/end are equal
+        while((maVector.size() > 1) && (maVector[0] == maVector[maVector.size() - 1]))
+        {
+            maVector.pop_back();
+        }
+    }
+
+    void removeDoublePointsWholeTrack()
+    {
+        sal_uInt32 nIndex(0);
+
+        // test as long as there are at least two points and as long as the index
+        // is smaller or equal second last point
+        while((maVector.size() > 1) && (nIndex <= maVector.size() - 2))
+        {
+            if(maVector[nIndex] == maVector[nIndex + 1])
+            {
+                // if next is same as index, delete next
+                maVector.erase(maVector.begin() + (nIndex + 1));
+            }
+            else
+            {
+                // if different, step forward
+                nIndex++;
+            }
+        }
+    }
+
+    void transform(const basegfx::B2DHomMatrix& rMatrix)
+    {
+        CoordinateData2DVector::iterator aStart(maVector.begin());
+        CoordinateData2DVector::iterator aEnd(maVector.end());
+
+        for(; aStart != aEnd; aStart++)
+        {
+            aStart->transform(rMatrix);
+        }
+    }
+
+    const basegfx::B2DPoint* begin() const
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return &maVector.front();
+    }
+
+    const basegfx::B2DPoint* end() const
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return (&maVector.back())+1;
+    }
+
+    basegfx::B2DPoint* begin()
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return &maVector.front();
+    }
+
+    basegfx::B2DPoint* end()
+    {
+        if(maVector.empty())
+            return 0;
+        else
+            return (&maVector.back())+1;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ControlVectorPair2D
+{
+    basegfx::B2DVector                          maPrevVector;
+    basegfx::B2DVector                          maNextVector;
+
+public:
+    const basegfx::B2DVector& getPrevVector() const
+    {
+        return maPrevVector;
+    }
+
+    void setPrevVector(const basegfx::B2DVector& rValue)
+    {
+        if(rValue != maPrevVector)
+            maPrevVector = rValue;
+    }
+
+    const basegfx::B2DVector& getNextVector() const
+    {
+        return maNextVector;
+    }
+
+    void setNextVector(const basegfx::B2DVector& rValue)
+    {
+        if(rValue != maNextVector)
+            maNextVector = rValue;
+    }
+
+    bool operator==(const ControlVectorPair2D& rData) const
+    {
+        return (maPrevVector == rData.getPrevVector() && maNextVector == rData.getNextVector());
+    }
+
+    void flip()
+    {
+        ::std::swap(maPrevVector, maNextVector);
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ControlVectorArray2D
+{
+    typedef ::std::vector< ControlVectorPair2D > ControlVectorPair2DVector;
+
+    ControlVectorPair2DVector                           maVector;
+    sal_uInt32                                          mnUsedVectors;
+
+public:
+    explicit ControlVectorArray2D(sal_uInt32 nCount)
+    :   maVector(nCount),
+        mnUsedVectors(0)
+    {}
+
+    ControlVectorArray2D(const ControlVectorArray2D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maVector(),
+        mnUsedVectors(0)
+    {
+        ControlVectorPair2DVector::const_iterator aStart(rOriginal.maVector.begin());
+        aStart += nIndex;
+        ControlVectorPair2DVector::const_iterator aEnd(aStart);
+        aEnd += nCount;
+        maVector.reserve(nCount);
+
+        for(; aStart != aEnd; aStart++)
+        {
+            if(!aStart->getPrevVector().equalZero())
+                mnUsedVectors++;
+
+            if(!aStart->getNextVector().equalZero())
+                mnUsedVectors++;
+
+            maVector.push_back(*aStart);
+        }
+    }
+
+    sal_uInt32 count() const
+    {
+        return maVector.size();
+    }
+
+    bool operator==(const ControlVectorArray2D& rCandidate) const
+    {
+        return (maVector == rCandidate.maVector);
+    }
+
+    bool isUsed() const
+    {
+        return (0 != mnUsedVectors);
+    }
+
+    const basegfx::B2DVector& getPrevVector(sal_uInt32 nIndex) const
+    {
+        return maVector[nIndex].getPrevVector();
+    }
+
+    void setPrevVector(sal_uInt32 nIndex, const basegfx::B2DVector& rValue)
+    {
+        bool bWasUsed(mnUsedVectors && !maVector[nIndex].getPrevVector().equalZero());
+        bool bIsUsed(!rValue.equalZero());
+
+        if(bWasUsed)
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex].setPrevVector(rValue);
+            }
+            else
+            {
+                maVector[nIndex].setPrevVector(basegfx::B2DVector::getEmptyVector());
+                mnUsedVectors--;
+            }
+        }
+        else
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex].setPrevVector(rValue);
+                mnUsedVectors++;
+            }
+        }
+    }
+
+    const basegfx::B2DVector& getNextVector(sal_uInt32 nIndex) const
+    {
+        return maVector[nIndex].getNextVector();
+    }
+
+    void setNextVector(sal_uInt32 nIndex, const basegfx::B2DVector& rValue)
+    {
+        bool bWasUsed(mnUsedVectors && !maVector[nIndex].getNextVector().equalZero());
+        bool bIsUsed(!rValue.equalZero());
+
+        if(bWasUsed)
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex].setNextVector(rValue);
+            }
+            else
+            {
+                maVector[nIndex].setNextVector(basegfx::B2DVector::getEmptyVector());
+                mnUsedVectors--;
+            }
+        }
+        else
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex].setNextVector(rValue);
+                mnUsedVectors++;
+            }
+        }
+    }
+
+    void append(const ControlVectorPair2D& rValue)
+    {
+        maVector.push_back(rValue);
+
+        if(!rValue.getPrevVector().equalZero())
+            mnUsedVectors += 1;
+
+        if(!rValue.getNextVector().equalZero())
+            mnUsedVectors += 1;
+    }
+
+    void insert(sal_uInt32 nIndex, const ControlVectorPair2D& rValue, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rValue
+            ControlVectorPair2DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            maVector.insert(aIndex, nCount, rValue);
+
+            if(!rValue.getPrevVector().equalZero())
+                mnUsedVectors += nCount;
+
+            if(!rValue.getNextVector().equalZero())
+                mnUsedVectors += nCount;
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const ControlVectorArray2D& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maVector.size());
+
+        if(nCount)
+        {
+            // insert data
+            ControlVectorPair2DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            ControlVectorPair2DVector::const_iterator aStart(rSource.maVector.begin());
+            ControlVectorPair2DVector::const_iterator aEnd(rSource.maVector.end());
+            maVector.insert(aIndex, aStart, aEnd);
+
+            for(; aStart != aEnd; aStart++)
+            {
+                if(!aStart->getPrevVector().equalZero())
+                    mnUsedVectors++;
+
+                if(!aStart->getNextVector().equalZero())
+                    mnUsedVectors++;
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            const ControlVectorPair2DVector::iterator aDeleteStart(maVector.begin() + nIndex);
+            const ControlVectorPair2DVector::iterator aDeleteEnd(aDeleteStart + nCount);
+            ControlVectorPair2DVector::const_iterator aStart(aDeleteStart);
+
+            for(; mnUsedVectors && aStart != aDeleteEnd; aStart++)
+            {
+                if(!aStart->getPrevVector().equalZero())
+                    mnUsedVectors--;
+
+                if(mnUsedVectors && !aStart->getNextVector().equalZero())
+                    mnUsedVectors--;
+            }
+
+            // remove point data
+            maVector.erase(aDeleteStart, aDeleteEnd);
+        }
+    }
+
+    void flip(bool bIsClosed)
+    {
+        if(maVector.size() > 1)
+        {
+            // to keep the same point at index 0, just flip all points except the
+            // first one when closed
+            const sal_uInt32 nHalfSize(bIsClosed ? (maVector.size() - 1) >> 1 : maVector.size() >> 1);
+            ControlVectorPair2DVector::iterator aStart(bIsClosed ? maVector.begin() + 1 : maVector.begin());
+            ControlVectorPair2DVector::iterator aEnd(maVector.end() - 1);
+
+            for(sal_uInt32 a(0); a < nHalfSize; a++)
+            {
+                // swap Prev and Next
+                aStart->flip();
+                aEnd->flip();
+
+                // swap entries
+                ::std::swap(*aStart, *aEnd);
+
+                aStart++;
+                aEnd--;
+            }
+
+            if(aStart == aEnd)
+            {
+                // swap Prev and Next at middle element (if exists)
+                aStart->flip();
+            }
+
+            if(bIsClosed)
+            {
+                // swap Prev and Next at start element
+                maVector.begin()->flip();
+            }
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ImplBufferedData
+{
+private:
+    // Possibility to hold the last subdivision
+    boost::scoped_ptr< basegfx::B2DPolygon >        mpDefaultSubdivision;
+
+    // Possibility to hold the last B2DRange calculation
+    boost::scoped_ptr< basegfx::B2DRange >          mpB2DRange;
+
+public:
+    ImplBufferedData()
+    :   mpDefaultSubdivision(),
+        mpB2DRange()
+    {}
+
+    const basegfx::B2DPolygon& getDefaultAdaptiveSubdivision(const basegfx::B2DPolygon& rSource) const
+    {
+        if(!mpDefaultSubdivision)
+        {
+            const_cast< ImplBufferedData* >(this)->mpDefaultSubdivision.reset(new basegfx::B2DPolygon(basegfx::tools::adaptiveSubdivideByCount(rSource, 9)));
+        }
+
+        return *mpDefaultSubdivision;
+    }
+
+    const basegfx::B2DRange& getB2DRange(const basegfx::B2DPolygon& rSource) const
+    {
+        if(!mpB2DRange)
+        {
+            basegfx::B2DRange aNewRange;
+            const sal_uInt32 nPointCount(rSource.count());
+
+            if(nPointCount)
+            {
+                for(sal_uInt32 a(0); a < nPointCount; a++)
+                {
+                    aNewRange.expand(rSource.getB2DPoint(a));
+                }
+
+                if(rSource.areControlPointsUsed())
+                {
+                    const sal_uInt32 nEdgeCount(rSource.isClosed() ? nPointCount : nPointCount - 1);
+
+                    if(nEdgeCount)
+                    {
+                        basegfx::B2DCubicBezier aEdge;
+                        aEdge.setStartPoint(rSource.getB2DPoint(0));
+
+                        for(sal_uInt32 b(0); b < nEdgeCount; b++)
+                        {
+                            const sal_uInt32 nNextIndex((b + 1) % nPointCount);
+                            aEdge.setControlPointA(rSource.getNextControlPoint(b));
+                            aEdge.setControlPointB(rSource.getPrevControlPoint(nNextIndex));
+                            aEdge.setEndPoint(rSource.getB2DPoint(nNextIndex));
+
+                            if(aEdge.isBezier())
+                            {
+                                const basegfx::B2DRange aBezierRangeWithControlPoints(aEdge.getRange());
+
+                                if(!aNewRange.isInside(aBezierRangeWithControlPoints))
+                                {
+                                    // the range with control points of the current edge is not completely
+                                    // inside the current range without control points. Expand current range by
+                                    // subdividing the bezier segment.
+                                    // Ideal here is a subdivision at the extreme values, so use
+                                    // getAllExtremumPositions to get all extremas in one run
+                                    ::std::vector< double > aExtremas;
+
+                                    aExtremas.reserve(4);
+                                    aEdge.getAllExtremumPositions(aExtremas);
+
+                                    const sal_uInt32 nExtremaCount(aExtremas.size());
+
+                                    for(sal_uInt32 c(0); c < nExtremaCount; c++)
+                                    {
+                                        aNewRange.expand(aEdge.interpolatePoint(aExtremas[c]));
+                                    }
+                                }
+                            }
+
+                            // prepare next edge
+                            aEdge.setStartPoint(aEdge.getEndPoint());
+                        }
+                    }
+                }
+            }
+
+            const_cast< ImplBufferedData* >(this)->mpB2DRange.reset(new basegfx::B2DRange(aNewRange));
+        }
+
+        return *mpB2DRange;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ImplB2DPolygon
+{
+private:
+    // The point vector. This vector exists always and defines the
+    // count of members.
+    CoordinateDataArray2D                           maPoints;
+
+    // The control point vectors. This vectors are created on demand
+    // and may be zero.
+    boost::scoped_ptr< ControlVectorArray2D >       mpControlVector;
+
+    // buffered data for e.g. default subdivision and range
+    boost::scoped_ptr< ImplBufferedData >           mpBufferedData;
+
+    // flag which decides if this polygon is opened or closed
+    bool                                            mbIsClosed;
+
+public:
+    const basegfx::B2DPolygon& getDefaultAdaptiveSubdivision(const basegfx::B2DPolygon& rSource) const
+    {
+        if(!mpControlVector || !mpControlVector->isUsed())
+        {
+            return rSource;
+        }
+
+        if(!mpBufferedData)
+        {
+            const_cast< ImplB2DPolygon* >(this)->mpBufferedData.reset(new ImplBufferedData);
+        }
+
+        return mpBufferedData->getDefaultAdaptiveSubdivision(rSource);
+    }
+
+    const basegfx::B2DRange& getB2DRange(const basegfx::B2DPolygon& rSource) const
+    {
+        if(!mpBufferedData)
+        {
+            const_cast< ImplB2DPolygon* >(this)->mpBufferedData.reset(new ImplBufferedData);
+        }
+
+        return mpBufferedData->getB2DRange(rSource);
+    }
+
+    ImplB2DPolygon()
+    :   maPoints(0),
+        mpControlVector(),
+        mpBufferedData(),
+        mbIsClosed(false)
+    {}
+
+    ImplB2DPolygon(const ImplB2DPolygon& rToBeCopied)
+    :   maPoints(rToBeCopied.maPoints),
+        mpControlVector(),
+        mpBufferedData(),
+        mbIsClosed(rToBeCopied.mbIsClosed)
+    {
+        // complete initialization using copy
+        if(rToBeCopied.mpControlVector && rToBeCopied.mpControlVector->isUsed())
+        {
+            mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector) );
+        }
+    }
+
+    ImplB2DPolygon(const ImplB2DPolygon& rToBeCopied, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maPoints(rToBeCopied.maPoints, nIndex, nCount),
+        mpControlVector(),
+        mpBufferedData(),
+        mbIsClosed(rToBeCopied.mbIsClosed)
+    {
+        // complete initialization using partly copy
+        if(rToBeCopied.mpControlVector && rToBeCopied.mpControlVector->isUsed())
+        {
+            mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector, nIndex, nCount) );
+
+            if(!mpControlVector->isUsed())
+                mpControlVector.reset();
+        }
+    }
+
+    ImplB2DPolygon& operator=( const ImplB2DPolygon& rToBeCopied )
+    {
+        maPoints = rToBeCopied.maPoints;
+        mpControlVector.reset();
+        mpBufferedData.reset();
+        mbIsClosed = rToBeCopied.mbIsClosed;
+
+        // complete initialization using copy
+        if(rToBeCopied.mpControlVector && rToBeCopied.mpControlVector->isUsed())
+            mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector) );
+
+        return *this;
+    }
+
+    sal_uInt32 count() const
+    {
+        return maPoints.count();
+    }
+
+    bool isClosed() const
+    {
+        return mbIsClosed;
+    }
+
+    void setClosed(bool bNew)
+    {
+        if(bNew != mbIsClosed)
+        {
+            mpBufferedData.reset();
+            mbIsClosed = bNew;
+        }
+    }
+
+    bool operator==(const ImplB2DPolygon& rCandidate) const
+    {
+        if(mbIsClosed == rCandidate.mbIsClosed)
+        {
+            if(maPoints == rCandidate.maPoints)
+            {
+                bool bControlVectorsAreEqual(true);
+
+                if(mpControlVector)
+                {
+                    if(rCandidate.mpControlVector)
+                    {
+                        bControlVectorsAreEqual = ((*mpControlVector) == (*rCandidate.mpControlVector));
+                    }
+                    else
+                    {
+                        // candidate has no control vector, so it's assumed all unused.
+                        bControlVectorsAreEqual = !mpControlVector->isUsed();
+                    }
+                }
+                else
+                {
+                    if(rCandidate.mpControlVector)
+                    {
+                        // we have no control vector, so it's assumed all unused.
+                        bControlVectorsAreEqual = !rCandidate.mpControlVector->isUsed();
+                    }
+                }
+
+                if(bControlVectorsAreEqual)
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    const basegfx::B2DPoint& getPoint(sal_uInt32 nIndex) const
+    {
+        return maPoints.getCoordinate(nIndex);
+    }
+
+    void setPoint(sal_uInt32 nIndex, const basegfx::B2DPoint& rValue)
+    {
+        mpBufferedData.reset();
+        maPoints.setCoordinate(nIndex, rValue);
+    }
+
+    void reserve(sal_uInt32 nCount)
+    {
+        maPoints.reserve(nCount);
+    }
+
+    void append(const basegfx::B2DPoint& rPoint)
+    {
+        mpBufferedData.reset(); // TODO: is this needed?
+        const CoordinateData2D aCoordinate(rPoint);
+        maPoints.append(aCoordinate);
+
+        if(mpControlVector)
+        {
+            const ControlVectorPair2D aVectorPair;
+            mpControlVector->append(aVectorPair);
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const basegfx::B2DPoint& rPoint, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            mpBufferedData.reset();
+            CoordinateData2D aCoordinate(rPoint);
+            maPoints.insert(nIndex, aCoordinate, nCount);
+
+            if(mpControlVector)
+            {
+                ControlVectorPair2D aVectorPair;
+                mpControlVector->insert(nIndex, aVectorPair, nCount);
+            }
+        }
+    }
+
+    const basegfx::B2DVector& getPrevControlVector(sal_uInt32 nIndex) const
+    {
+        if(mpControlVector)
+        {
+            return mpControlVector->getPrevVector(nIndex);
+        }
+        else
+        {
+            return basegfx::B2DVector::getEmptyVector();
+        }
+    }
+
+    void setPrevControlVector(sal_uInt32 nIndex, const basegfx::B2DVector& rValue)
+    {
+        if(!mpControlVector)
+        {
+            if(!rValue.equalZero())
+            {
+                mpBufferedData.reset();
+                mpControlVector.reset( new ControlVectorArray2D(maPoints.count()) );
+                mpControlVector->setPrevVector(nIndex, rValue);
+            }
+        }
+        else
+        {
+            mpBufferedData.reset();
+            mpControlVector->setPrevVector(nIndex, rValue);
+
+            if(!mpControlVector->isUsed())
+                mpControlVector.reset();
+        }
+    }
+
+    const basegfx::B2DVector& getNextControlVector(sal_uInt32 nIndex) const
+    {
+        if(mpControlVector)
+        {
+            return mpControlVector->getNextVector(nIndex);
+        }
+        else
+        {
+            return basegfx::B2DVector::getEmptyVector();
+        }
+    }
+
+    void setNextControlVector(sal_uInt32 nIndex, const basegfx::B2DVector& rValue)
+    {
+        if(!mpControlVector)
+        {
+            if(!rValue.equalZero())
+            {
+                mpBufferedData.reset();
+                mpControlVector.reset( new ControlVectorArray2D(maPoints.count()) );
+                mpControlVector->setNextVector(nIndex, rValue);
+            }
+        }
+        else
+        {
+            mpBufferedData.reset();
+            mpControlVector->setNextVector(nIndex, rValue);
+
+            if(!mpControlVector->isUsed())
+                mpControlVector.reset();
+        }
+    }
+
+    bool areControlPointsUsed() const
+    {
+        return (mpControlVector && mpControlVector->isUsed());
+    }
+
+    void resetControlVectors(sal_uInt32 nIndex)
+    {
+        setPrevControlVector(nIndex, basegfx::B2DVector::getEmptyVector());
+        setNextControlVector(nIndex, basegfx::B2DVector::getEmptyVector());
+    }
+
+    void resetControlVectors()
+    {
+        mpBufferedData.reset();
+        mpControlVector.reset();
+    }
+
+    void setControlVectors(sal_uInt32 nIndex, const basegfx::B2DVector& rPrev, const basegfx::B2DVector& rNext)
+    {
+        setPrevControlVector(nIndex, rPrev);
+        setNextControlVector(nIndex, rNext);
+    }
+
+    void appendBezierSegment(const basegfx::B2DVector& rNext, const basegfx::B2DVector& rPrev, const basegfx::B2DPoint& rPoint)
+    {
+        mpBufferedData.reset();
+        const sal_uInt32 nCount(maPoints.count());
+
+        if(nCount)
+        {
+            setNextControlVector(nCount - 1, rNext);
+        }
+
+        insert(nCount, rPoint, 1);
+        setPrevControlVector(nCount, rPrev);
+    }
+
+    void insert(sal_uInt32 nIndex, const ImplB2DPolygon& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maPoints.count());
+
+        if(nCount)
+        {
+            mpBufferedData.reset();
+
+            if(rSource.mpControlVector && rSource.mpControlVector->isUsed() && !mpControlVector)
+            {
+                mpControlVector.reset( new ControlVectorArray2D(maPoints.count()) );
+            }
+
+            maPoints.insert(nIndex, rSource.maPoints);
+
+            if(rSource.mpControlVector)
+            {
+                mpControlVector->insert(nIndex, *rSource.mpControlVector);
+
+                if(!mpControlVector->isUsed())
+                    mpControlVector.reset();
+            }
+            else if(mpControlVector)
+            {
+                ControlVectorPair2D aVectorPair;
+                mpControlVector->insert(nIndex, aVectorPair, nCount);
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            mpBufferedData.reset();
+            maPoints.remove(nIndex, nCount);
+
+            if(mpControlVector)
+            {
+                mpControlVector->remove(nIndex, nCount);
+
+                if(!mpControlVector->isUsed())
+                    mpControlVector.reset();
+            }
+        }
+    }
+
+    void flip()
+    {
+        if(maPoints.count() > 1)
+        {
+            mpBufferedData.reset();
+
+            // flip points
+            maPoints.flip(mbIsClosed);
+
+            if(mpControlVector)
+            {
+                // flip control vector
+                mpControlVector->flip(mbIsClosed);
+            }
+        }
+    }
+
+    bool hasDoublePoints() const
+    {
+        if(mbIsClosed)
+        {
+            // check for same start and end point
+            const sal_uInt32 nIndex(maPoints.count() - 1);
+
+            if(maPoints.getCoordinate(0) == maPoints.getCoordinate(nIndex))
+            {
+                if(mpControlVector)
+                {
+                    if(mpControlVector->getNextVector(nIndex).equalZero() && mpControlVector->getPrevVector(0).equalZero())
+                    {
+                        return true;
+                    }
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+
+        // test for range
+        for(sal_uInt32 a(0); a < maPoints.count() - 1; a++)
+        {
+            if(maPoints.getCoordinate(a) == maPoints.getCoordinate(a + 1))
+            {
+                if(mpControlVector)
+                {
+                    if(mpControlVector->getNextVector(a).equalZero() && mpControlVector->getPrevVector(a + 1).equalZero())
+                    {
+                        return true;
+                    }
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    void removeDoublePointsAtBeginEnd()
+    {
+        // Only remove DoublePoints at Begin and End when poly is closed
+        if(mbIsClosed)
+        {
+            mpBufferedData.reset();
+
+            if(mpControlVector)
+            {
+                bool bRemove;
+
+                do
+                {
+                    bRemove = false;
+
+                    if(maPoints.count() > 1)
+                    {
+                        const sal_uInt32 nIndex(maPoints.count() - 1);
+
+                        if(maPoints.getCoordinate(0) == maPoints.getCoordinate(nIndex))
+                        {
+                            if(mpControlVector)
+                            {
+                                if(mpControlVector->getNextVector(nIndex).equalZero() && mpControlVector->getPrevVector(0).equalZero())
+                                {
+                                    bRemove = true;
+                                }
+                            }
+                            else
+                            {
+                                bRemove = true;
+                            }
+                        }
+                    }
+
+                    if(bRemove)
+                    {
+                        const sal_uInt32 nIndex(maPoints.count() - 1);
+
+                        if(mpControlVector && !mpControlVector->getPrevVector(nIndex).equalZero())
+                        {
+                            mpControlVector->setPrevVector(0, mpControlVector->getPrevVector(nIndex));
+                        }
+
+                        remove(nIndex, 1);
+                    }
+                }
+                while(bRemove);
+            }
+            else
+            {
+                maPoints.removeDoublePointsAtBeginEnd();
+            }
+        }
+    }
+
+    void removeDoublePointsWholeTrack()
+    {
+        mpBufferedData.reset();
+
+        if(mpControlVector)
+        {
+            sal_uInt32 nIndex(0);
+
+            // test as long as there are at least two points and as long as the index
+            // is smaller or equal second last point
+            while((maPoints.count() > 1) && (nIndex <= maPoints.count() - 2))
+            {
+                bool bRemove(maPoints.getCoordinate(nIndex) == maPoints.getCoordinate(nIndex + 1));
+
+                if(bRemove)
+                {
+                    if(mpControlVector)
+                    {
+                        if(!mpControlVector->getNextVector(nIndex).equalZero() || !mpControlVector->getPrevVector(nIndex + 1).equalZero())
+                        {
+                            bRemove = false;
+                        }
+                    }
+                }
+
+                if(bRemove)
+                {
+                    if(mpControlVector && !mpControlVector->getPrevVector(nIndex).equalZero())
+                    {
+                        mpControlVector->setPrevVector(nIndex + 1, mpControlVector->getPrevVector(nIndex));
+                    }
+
+                    // if next is same as index and the control vectors are unused, delete index
+                    remove(nIndex, 1);
+                }
+                else
+                {
+                    // if different, step forward
+                    nIndex++;
+                }
+            }
+        }
+        else
+        {
+            maPoints.removeDoublePointsWholeTrack();
+        }
+    }
+
+    void transform(const basegfx::B2DHomMatrix& rMatrix)
+    {
+        mpBufferedData.reset();
+
+        if(mpControlVector)
+        {
+            for(sal_uInt32 a(0); a < maPoints.count(); a++)
+            {
+                basegfx::B2DPoint aCandidate = maPoints.getCoordinate(a);
+
+                if(mpControlVector->isUsed())
+                {
+                    const basegfx::B2DVector& rPrevVector(mpControlVector->getPrevVector(a));
+                    const basegfx::B2DVector& rNextVector(mpControlVector->getNextVector(a));
+
+                    if(!rPrevVector.equalZero())
+                    {
+                        basegfx::B2DVector aPrevVector(rMatrix * rPrevVector);
+                        mpControlVector->setPrevVector(a, aPrevVector);
+                    }
+
+                    if(!rNextVector.equalZero())
+                    {
+                        basegfx::B2DVector aNextVector(rMatrix * rNextVector);
+                        mpControlVector->setNextVector(a, aNextVector);
+                    }
+                }
+
+                aCandidate *= rMatrix;
+                maPoints.setCoordinate(a, aCandidate);
+            }
+
+            if(!mpControlVector->isUsed())
+                mpControlVector.reset();
+        }
+        else
+        {
+            maPoints.transform(rMatrix);
+        }
+    }
+
+    const basegfx::B2DPoint* begin() const
+    {
+        return maPoints.begin();
+    }
+
+    const basegfx::B2DPoint* end() const
+    {
+        return maPoints.end();
+    }
+
+    basegfx::B2DPoint* begin()
+    {
+       mpBufferedData.reset();
+       return maPoints.begin();
+    }
+
+    basegfx::B2DPoint* end()
+    {
+        mpBufferedData.reset();
+        return maPoints.end();
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        struct DefaultPolygon: public rtl::Static<B2DPolygon::ImplType, DefaultPolygon> {};
+    }
+
+    B2DPolygon::B2DPolygon()
+    :   mpPolygon(DefaultPolygon::get())
+    {}
+
+    B2DPolygon::B2DPolygon(const B2DPolygon& rPolygon)
+    :   mpPolygon(rPolygon.mpPolygon)
+    {}
+
+    B2DPolygon::B2DPolygon(const B2DPolygon& rPolygon, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   mpPolygon(ImplB2DPolygon(*rPolygon.mpPolygon, nIndex, nCount))
+    {
+        // TODO(P2): one extra temporary here (cow_wrapper copies
+        // given ImplB2DPolygon into its internal impl_t wrapper type)
+        OSL_ENSURE(nIndex + nCount <= rPolygon.mpPolygon->count(), "B2DPolygon constructor outside range (!)");
+    }
+
+    B2DPolygon::~B2DPolygon()
+    {
+    }
+
+    B2DPolygon& B2DPolygon::operator=(const B2DPolygon& rPolygon)
+    {
+        mpPolygon = rPolygon.mpPolygon;
+        return *this;
+    }
+
+    void B2DPolygon::makeUnique()
+    {
+        mpPolygon.make_unique();
+    }
+
+    bool B2DPolygon::operator==(const B2DPolygon& rPolygon) const
+    {
+        if(mpPolygon.same_object(rPolygon.mpPolygon))
+            return true;
+
+        return ((*mpPolygon) == (*rPolygon.mpPolygon));
+    }
+
+    bool B2DPolygon::operator!=(const B2DPolygon& rPolygon) const
+    {
+        return !(*this == rPolygon);
+    }
+
+    sal_uInt32 B2DPolygon::count() const
+    {
+        return mpPolygon->count();
+    }
+
+    B2DPoint B2DPolygon::getB2DPoint(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        return mpPolygon->getPoint(nIndex);
+    }
+
+    void B2DPolygon::setB2DPoint(sal_uInt32 nIndex, const B2DPoint& rValue)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(getB2DPoint(nIndex) != rValue)
+        {
+            mpPolygon->setPoint(nIndex, rValue);
+        }
+    }
+
+    void B2DPolygon::reserve(sal_uInt32 nCount)
+    {
+        mpPolygon->reserve(nCount);
+    }
+
+    void B2DPolygon::insert(sal_uInt32 nIndex, const B2DPoint& rPoint, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex <= mpPolygon->count(), "B2DPolygon Insert outside range (!)");
+
+        if(nCount)
+        {
+            mpPolygon->insert(nIndex, rPoint, nCount);
+        }
+    }
+
+    void B2DPolygon::append(const B2DPoint& rPoint, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            mpPolygon->insert(mpPolygon->count(), rPoint, nCount);
+        }
+    }
+
+    void B2DPolygon::append(const B2DPoint& rPoint)
+    {
+        mpPolygon->append(rPoint);
+    }
+
+    B2DPoint B2DPolygon::getPrevControlPoint(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(mpPolygon->areControlPointsUsed())
+        {
+            return mpPolygon->getPoint(nIndex) + mpPolygon->getPrevControlVector(nIndex);
+        }
+        else
+        {
+            return mpPolygon->getPoint(nIndex);
+        }
+    }
+
+    B2DPoint B2DPolygon::getNextControlPoint(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(mpPolygon->areControlPointsUsed())
+        {
+            return mpPolygon->getPoint(nIndex) + mpPolygon->getNextControlVector(nIndex);
+        }
+        else
+        {
+            return mpPolygon->getPoint(nIndex);
+        }
+    }
+
+    void B2DPolygon::setPrevControlPoint(sal_uInt32 nIndex, const B2DPoint& rValue)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+        const basegfx::B2DVector aNewVector(rValue - mpPolygon->getPoint(nIndex));
+
+        if(mpPolygon->getPrevControlVector(nIndex) != aNewVector)
+        {
+            mpPolygon->setPrevControlVector(nIndex, aNewVector);
+        }
+    }
+
+    void B2DPolygon::setNextControlPoint(sal_uInt32 nIndex, const B2DPoint& rValue)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+        const basegfx::B2DVector aNewVector(rValue - mpPolygon->getPoint(nIndex));
+
+        if(mpPolygon->getNextControlVector(nIndex) != aNewVector)
+        {
+            mpPolygon->setNextControlVector(nIndex, aNewVector);
+        }
+    }
+
+    void B2DPolygon::setControlPoints(sal_uInt32 nIndex, const basegfx::B2DPoint& rPrev, const basegfx::B2DPoint& rNext)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+        const B2DPoint aPoint(mpPolygon->getPoint(nIndex));
+        const basegfx::B2DVector aNewPrev(rPrev - aPoint);
+        const basegfx::B2DVector aNewNext(rNext - aPoint);
+
+        if(mpPolygon->getPrevControlVector(nIndex) != aNewPrev || mpPolygon->getNextControlVector(nIndex) != aNewNext)
+        {
+            mpPolygon->setControlVectors(nIndex, aNewPrev, aNewNext);
+        }
+    }
+
+    void B2DPolygon::resetPrevControlPoint(sal_uInt32 nIndex)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(mpPolygon->areControlPointsUsed() && !mpPolygon->getPrevControlVector(nIndex).equalZero())
+        {
+            mpPolygon->setPrevControlVector(nIndex, B2DVector::getEmptyVector());
+        }
+    }
+
+    void B2DPolygon::resetNextControlPoint(sal_uInt32 nIndex)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(mpPolygon->areControlPointsUsed() && !mpPolygon->getNextControlVector(nIndex).equalZero())
+        {
+            mpPolygon->setNextControlVector(nIndex, B2DVector::getEmptyVector());
+        }
+    }
+
+    void B2DPolygon::resetControlPoints(sal_uInt32 nIndex)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(mpPolygon->areControlPointsUsed() &&
+            (!mpPolygon->getPrevControlVector(nIndex).equalZero() || !mpPolygon->getNextControlVector(nIndex).equalZero()))
+        {
+            mpPolygon->resetControlVectors(nIndex);
+        }
+    }
+
+    void B2DPolygon::resetControlPoints()
+    {
+        if(mpPolygon->areControlPointsUsed())
+        {
+            mpPolygon->resetControlVectors();
+        }
+    }
+
+    void B2DPolygon::appendBezierSegment(
+        const B2DPoint& rNextControlPoint,
+        const B2DPoint& rPrevControlPoint,
+        const B2DPoint& rPoint)
+    {
+        const B2DVector aNewNextVector(mpPolygon->count() ? B2DVector(rNextControlPoint - mpPolygon->getPoint(mpPolygon->count() - 1)) : B2DVector::getEmptyVector());
+        const B2DVector aNewPrevVector(rPrevControlPoint - rPoint);
+
+        if(aNewNextVector.equalZero() && aNewPrevVector.equalZero())
+        {
+            mpPolygon->insert(mpPolygon->count(), rPoint, 1);
+        }
+        else
+        {
+            mpPolygon->appendBezierSegment(aNewNextVector, aNewPrevVector, rPoint);
+        }
+    }
+
+    bool B2DPolygon::areControlPointsUsed() const
+    {
+        return mpPolygon->areControlPointsUsed();
+    }
+
+    bool B2DPolygon::isPrevControlPointUsed(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        return (mpPolygon->areControlPointsUsed() && !mpPolygon->getPrevControlVector(nIndex).equalZero());
+    }
+
+    bool B2DPolygon::isNextControlPointUsed(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        return (mpPolygon->areControlPointsUsed() && !mpPolygon->getNextControlVector(nIndex).equalZero());
+    }
+
+    B2VectorContinuity B2DPolygon::getContinuityInPoint(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(mpPolygon->areControlPointsUsed())
+        {
+            const B2DVector& rPrev(mpPolygon->getPrevControlVector(nIndex));
+            const B2DVector& rNext(mpPolygon->getNextControlVector(nIndex));
+
+            return getContinuity(rPrev, rNext);
+        }
+        else
+        {
+            return CONTINUITY_NONE;
+        }
+    }
+
+    bool B2DPolygon::isBezierSegment(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+
+        if(mpPolygon->areControlPointsUsed())
+        {
+            // Check if the edge exists
+            const bool bNextIndexValidWithoutClose(nIndex + 1 < mpPolygon->count());
+
+            if(bNextIndexValidWithoutClose || mpPolygon->isClosed())
+            {
+                const sal_uInt32 nNextIndex(bNextIndexValidWithoutClose ? nIndex + 1 : 0);
+                return (!mpPolygon->getPrevControlVector(nNextIndex).equalZero()
+                    || !mpPolygon->getNextControlVector(nIndex).equalZero());
+            }
+            else
+            {
+                // no valid edge -> no bezier segment, even when local next
+                // vector may be used
+                return false;
+            }
+        }
+        else
+        {
+            // no control points -> no bezier segment
+            return false;
+        }
+    }
+
+    void B2DPolygon::getBezierSegment(sal_uInt32 nIndex, B2DCubicBezier& rTarget) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
+        const bool bNextIndexValidWithoutClose(nIndex + 1 < mpPolygon->count());
+
+        if(bNextIndexValidWithoutClose || mpPolygon->isClosed())
+        {
+            const sal_uInt32 nNextIndex(bNextIndexValidWithoutClose ? nIndex + 1 : 0);
+            rTarget.setStartPoint(mpPolygon->getPoint(nIndex));
+            rTarget.setEndPoint(mpPolygon->getPoint(nNextIndex));
+
+            if(mpPolygon->areControlPointsUsed())
+            {
+                rTarget.setControlPointA(rTarget.getStartPoint() + mpPolygon->getNextControlVector(nIndex));
+                rTarget.setControlPointB(rTarget.getEndPoint() + mpPolygon->getPrevControlVector(nNextIndex));
+            }
+            else
+            {
+                // no bezier, reset control poins at rTarget
+                rTarget.setControlPointA(rTarget.getStartPoint());
+                rTarget.setControlPointB(rTarget.getEndPoint());
+            }
+        }
+        else
+        {
+            // no valid edge at all, reset rTarget to current point
+            const B2DPoint aPoint(mpPolygon->getPoint(nIndex));
+            rTarget.setStartPoint(aPoint);
+            rTarget.setEndPoint(aPoint);
+            rTarget.setControlPointA(aPoint);
+            rTarget.setControlPointB(aPoint);
+        }
+    }
+
+    B2DPolygon B2DPolygon::getDefaultAdaptiveSubdivision() const
+    {
+        return mpPolygon->getDefaultAdaptiveSubdivision(*this);
+    }
+
+    B2DRange B2DPolygon::getB2DRange() const
+    {
+        return mpPolygon->getB2DRange(*this);
+    }
+
+    void B2DPolygon::insert(sal_uInt32 nIndex, const B2DPolygon& rPoly, sal_uInt32 nIndex2, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex <= mpPolygon->count(), "B2DPolygon Insert outside range (!)");
+
+        if(rPoly.count())
+        {
+            if(!nCount)
+            {
+                nCount = rPoly.count();
+            }
+
+            if(0 == nIndex2 && nCount == rPoly.count())
+            {
+                mpPolygon->insert(nIndex, *rPoly.mpPolygon);
+            }
+            else
+            {
+                OSL_ENSURE(nIndex2 + nCount <= rPoly.mpPolygon->count(), "B2DPolygon Insert outside range (!)");
+                ImplB2DPolygon aTempPoly(*rPoly.mpPolygon, nIndex2, nCount);
+                mpPolygon->insert(nIndex, aTempPoly);
+            }
+        }
+    }
+
+    void B2DPolygon::append(const B2DPolygon& rPoly, sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(rPoly.count())
+        {
+            if(!nCount)
+            {
+                nCount = rPoly.count();
+            }
+
+            if(0 == nIndex && nCount == rPoly.count())
+            {
+                mpPolygon->insert(mpPolygon->count(), *rPoly.mpPolygon);
+            }
+            else
+            {
+                OSL_ENSURE(nIndex + nCount <= rPoly.mpPolygon->count(), "B2DPolygon Append outside range (!)");
+                ImplB2DPolygon aTempPoly(*rPoly.mpPolygon, nIndex, nCount);
+                mpPolygon->insert(mpPolygon->count(), aTempPoly);
+            }
+        }
+    }
+
+    void B2DPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex + nCount <= mpPolygon->count(), "B2DPolygon Remove outside range (!)");
+
+        if(nCount)
+        {
+            mpPolygon->remove(nIndex, nCount);
+        }
+    }
+
+    void B2DPolygon::clear()
+    {
+        mpPolygon = DefaultPolygon::get();
+    }
+
+    bool B2DPolygon::isClosed() const
+    {
+        return mpPolygon->isClosed();
+    }
+
+    void B2DPolygon::setClosed(bool bNew)
+    {
+        if(isClosed() != bNew)
+        {
+            mpPolygon->setClosed(bNew);
+        }
+    }
+
+    void B2DPolygon::flip()
+    {
+        if(count() > 1)
+        {
+            mpPolygon->flip();
+        }
+    }
+
+    bool B2DPolygon::hasDoublePoints() const
+    {
+        return (mpPolygon->count() > 1 && mpPolygon->hasDoublePoints());
+    }
+
+    void B2DPolygon::removeDoublePoints()
+    {
+        if(hasDoublePoints())
+        {
+            mpPolygon->removeDoublePointsAtBeginEnd();
+            mpPolygon->removeDoublePointsWholeTrack();
+        }
+    }
+
+    void B2DPolygon::transform(const B2DHomMatrix& rMatrix)
+    {
+        if(mpPolygon->count() && !rMatrix.isIdentity())
+        {
+            mpPolygon->transform(rMatrix);
+        }
+    }
+
+    const B2DPoint* B2DPolygon::begin() const
+    {
+        return mpPolygon->begin();
+    }
+
+    const B2DPoint* B2DPolygon::end() const
+    {
+        return mpPolygon->end();
+    }
+
+    B2DPoint* B2DPolygon::begin()
+    {
+        return mpPolygon->begin();
+    }
+
+    B2DPoint* B2DPolygon::end()
+    {
+        return mpPolygon->end();
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
new file mode 100644
index 000000000000..6e5c7701e2ec
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -0,0 +1,873 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <basegfx/polygon/b2dpolygoncutandtouch.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <basegfx/tools/rectcliptools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke)
+        {
+            B2DPolyPolygon aRetval;
+
+            if(rCandidate.count())
+            {
+                const B2DRange aCandidateRange(getRange(rCandidate));
+
+                if(bParallelToXAxis && fTools::moreOrEqual(aCandidateRange.getMinY(), fValueOnOtherAxis))
+                {
+                    // completely above and on the clip line. also true for curves.
+                    if(bAboveAxis)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(bParallelToXAxis && fTools::lessOrEqual(aCandidateRange.getMaxY(), fValueOnOtherAxis))
+                {
+                    // completely below and on the clip line. also true for curves.
+                    if(!bAboveAxis)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(!bParallelToXAxis && fTools::moreOrEqual(aCandidateRange.getMinX(), fValueOnOtherAxis))
+                {
+                    // completely right of and on the clip line. also true for curves.
+                    if(bAboveAxis)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(!bParallelToXAxis && fTools::lessOrEqual(aCandidateRange.getMaxX(), fValueOnOtherAxis))
+                {
+                    // completely left of and on the clip line. also true for curves.
+                    if(!bAboveAxis)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else
+                {
+                    // add cuts with axis to polygon, including bezier segments
+                    // Build edge to cut with. Make it a little big longer than needed for
+                    // numerical stability. We want to cut against the edge seen as endless
+                    // ray here, but addPointsAtCuts() will limit itself to the
+                    // edge's range ]0.0 .. 1.0[.
+                    const double fSmallExtension((aCandidateRange.getWidth() + aCandidateRange.getHeight()) * (0.5 * 0.1));
+                    const B2DPoint aStart(
+                        bParallelToXAxis ? aCandidateRange.getMinX() - fSmallExtension : fValueOnOtherAxis,
+                        bParallelToXAxis ? fValueOnOtherAxis : aCandidateRange.getMinY() - fSmallExtension);
+                    const B2DPoint aEnd(
+                        bParallelToXAxis ? aCandidateRange.getMaxX() + fSmallExtension : fValueOnOtherAxis,
+                        bParallelToXAxis ? fValueOnOtherAxis : aCandidateRange.getMaxY() + fSmallExtension);
+                    const B2DPolygon aCandidate(addPointsAtCuts(rCandidate, aStart, aEnd));
+                    const sal_uInt32 nPointCount(aCandidate.count());
+                    const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                    B2DCubicBezier aEdge;
+                    B2DPolygon aRun;
+
+                    for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                    {
+                        aCandidate.getBezierSegment(a, aEdge);
+                        const B2DPoint aTestPoint(aEdge.interpolatePoint(0.5));
+                        const bool bInside(bParallelToXAxis ?
+                            fTools::moreOrEqual(aTestPoint.getY(), fValueOnOtherAxis) == bAboveAxis :
+                            fTools::moreOrEqual(aTestPoint.getX(), fValueOnOtherAxis) == bAboveAxis);
+
+                        if(bInside)
+                        {
+                            if(!aRun.count() || !aRun.getB2DPoint(aRun.count() - 1).equal(aEdge.getStartPoint()))
+                            {
+                                aRun.append(aEdge.getStartPoint());
+                            }
+
+                            if(aEdge.isBezier())
+                            {
+                                aRun.appendBezierSegment(aEdge.getControlPointA(), aEdge.getControlPointB(), aEdge.getEndPoint());
+                            }
+                            else
+                            {
+                                aRun.append(aEdge.getEndPoint());
+                            }
+                        }
+                        else
+                        {
+                            if(bStroke && aRun.count())
+                            {
+                                aRetval.append(aRun);
+                                aRun.clear();
+                            }
+                        }
+                    }
+
+                    if(aRun.count())
+                    {
+                        if(bStroke)
+                        {
+                            // try to merge this last and first polygon; they may have been
+                            // the former polygon's start/end point
+                            if(aRetval.count())
+                            {
+                                const B2DPolygon aStartPolygon(aRetval.getB2DPolygon(0));
+
+                                if(aStartPolygon.count() && aStartPolygon.getB2DPoint(0).equal(aRun.getB2DPoint(aRun.count() - 1)))
+                                {
+                                    // append start polygon to aRun, remove from result set
+                                    aRun.append(aStartPolygon); aRun.removeDoublePoints();
+                                    aRetval.remove(0);
+                                }
+                            }
+
+                            aRetval.append(aRun);
+                        }
+                        else
+                        {
+                            // set closed flag and correct last point (which is added double now).
+                            closeWithGeometryChange(aRun);
+                            aRetval.append(aRun);
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon clipPolyPolygonOnParallelAxis(const B2DPolyPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                const B2DPolyPolygon aClippedPolyPolygon(clipPolygonOnParallelAxis(rCandidate.getB2DPolygon(a), bParallelToXAxis, bAboveAxis, fValueOnOtherAxis, bStroke));
+
+                if(aClippedPolyPolygon.count())
+                {
+                    aRetval.append(aClippedPolyPolygon);
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke)
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            if(!nCount)
+            {
+                // source is empty
+                return aRetval;
+            }
+
+            if(rRange.isEmpty())
+            {
+                if(bInside)
+                {
+                    // nothing is inside an empty range
+                    return aRetval;
+                }
+                else
+                {
+                    // everything is outside an empty range
+                    return B2DPolyPolygon(rCandidate);
+                }
+            }
+
+            const B2DRange aCandidateRange(getRange(rCandidate));
+
+            if(rRange.isInside(aCandidateRange))
+            {
+                  // candidate is completely inside given range
+                if(bInside)
+                {
+                    // nothing to do
+                    return B2DPolyPolygon(rCandidate);
+                }
+                else
+                {
+                    // nothing is outside, then
+                    return aRetval;
+                }
+            }
+
+            if(!bInside)
+            {
+                // cutting off the outer parts of filled polygons at parallell
+                // lines to the axes is only possible for the inner part, not for
+                // the outer part which means cutting a hole into the original polygon.
+                // This is because the inner part is a logical AND-operation of
+                // the four implied half-planes, but the outer part is not.
+                // It is possible for strokes, but with creating unnecessary extra
+                // cuts, so using clipPolygonOnPolyPolygon is better there, too.
+                // This needs to be done with the topology knowlegde and is unfurtunately
+                // more expensive, too.
+                const B2DPolygon aClip(createPolygonFromRect(rRange));
+
+                return clipPolygonOnPolyPolygon(rCandidate, B2DPolyPolygon(aClip), bInside, bStroke);
+            }
+
+            // clip against the four axes of the range
+            // against X-Axis, lower value
+            aRetval = clipPolygonOnParallelAxis(rCandidate, true, bInside, rRange.getMinY(), bStroke);
+
+            if(aRetval.count())
+            {
+                // against Y-Axis, lower value
+                if(1L == aRetval.count())
+                {
+                    aRetval = clipPolygonOnParallelAxis(aRetval.getB2DPolygon(0L), false, bInside, rRange.getMinX(), bStroke);
+                }
+                else
+                {
+                    aRetval = clipPolyPolygonOnParallelAxis(aRetval, false, bInside, rRange.getMinX(), bStroke);
+                }
+
+                if(aRetval.count())
+                {
+                    // against X-Axis, higher value
+                    if(1L == aRetval.count())
+                    {
+                        aRetval = clipPolygonOnParallelAxis(aRetval.getB2DPolygon(0L), true, !bInside, rRange.getMaxY(), bStroke);
+                    }
+                    else
+                    {
+                        aRetval = clipPolyPolygonOnParallelAxis(aRetval, true, !bInside, rRange.getMaxY(), bStroke);
+                    }
+
+                    if(aRetval.count())
+                    {
+                        // against Y-Axis, higher value
+                        if(1L == aRetval.count())
+                        {
+                            aRetval = clipPolygonOnParallelAxis(aRetval.getB2DPolygon(0L), false, !bInside, rRange.getMaxX(), bStroke);
+                        }
+                        else
+                        {
+                            aRetval = clipPolyPolygonOnParallelAxis(aRetval, false, !bInside, rRange.getMaxX(), bStroke);
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            if(!nPolygonCount)
+            {
+                // source is empty
+                return aRetval;
+            }
+
+            if(rRange.isEmpty())
+            {
+                if(bInside)
+                {
+                    // nothing is inside an empty range
+                    return aRetval;
+                }
+                else
+                {
+                    // everything is outside an empty range
+                    return rCandidate;
+                }
+            }
+
+            if(bInside)
+            {
+                for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+                {
+                    const B2DPolyPolygon aClippedPolyPolygon(clipPolygonOnRange(rCandidate.getB2DPolygon(a), rRange, bInside, bStroke));
+
+                    if(aClippedPolyPolygon.count())
+                    {
+                        aRetval.append(aClippedPolyPolygon);
+                    }
+                }
+            }
+            else
+            {
+                // for details, see comment in clipPolygonOnRange for the "cutting off
+                // the outer parts of filled polygons at parallell lines" explanations
+                const B2DPolygon aClip(createPolygonFromRect(rRange));
+
+                return clipPolyPolygonOnPolyPolygon(rCandidate, B2DPolyPolygon(aClip), bInside, bStroke);
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke)
+        {
+            B2DPolyPolygon aRetval;
+
+            if(rPointA.equal(rPointB))
+            {
+                // edge has no length, return polygon
+                aRetval.append(rCandidate);
+            }
+            else if(rCandidate.count())
+            {
+                const B2DVector aEdge(rPointB - rPointA);
+                B2DPolygon aCandidate(rCandidate);
+
+                // translate and rotate polygon so that given edge is on x axis
+                B2DHomMatrix aMatrixTransform(basegfx::tools::createTranslateB2DHomMatrix(-rPointA.getX(), -rPointA.getY()));
+                aMatrixTransform.rotate(-atan2(aEdge.getY(), aEdge.getX()));
+                aCandidate.transform(aMatrixTransform);
+
+                // call clip method on X-Axis
+                aRetval = clipPolygonOnParallelAxis(aCandidate, true, bAbove, 0.0, bStroke);
+
+                if(aRetval.count())
+                {
+                    // if there is a result, it needs to be transformed back
+                    aMatrixTransform.invert();
+                    aRetval.transform(aMatrixTransform);
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke)
+        {
+            B2DPolyPolygon aRetval;
+
+            if(rPointA.equal(rPointB))
+            {
+                // edge has no length, return polygon
+                aRetval = rCandidate;
+            }
+            else if(rCandidate.count())
+            {
+                const B2DVector aEdge(rPointB - rPointA);
+                B2DPolyPolygon aCandidate(rCandidate);
+
+                // translate and rotate polygon so that given edge is on x axis
+                B2DHomMatrix aMatrixTransform(basegfx::tools::createTranslateB2DHomMatrix(-rPointA.getX(), -rPointA.getY()));
+                aMatrixTransform.rotate(-atan2(aEdge.getY(), aEdge.getX()));
+                aCandidate.transform(aMatrixTransform);
+
+                // call clip method on X-Axis
+                aRetval = clipPolyPolygonOnParallelAxis(aCandidate, true, bAbove, 0.0, bStroke);
+
+                if(aRetval.count())
+                {
+                    // if there is a result, it needs to be transformed back
+                    aMatrixTransform.invert();
+                    aRetval.transform(aMatrixTransform);
+                }
+            }
+
+            return aRetval;
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke)
+        {
+            B2DPolyPolygon aRetval;
+
+            if(rCandidate.count() && rClip.count())
+            {
+                if(bStroke)
+                {
+                    // line clipping, create line snippets by first adding all cut points and
+                    // then marching along the edges and detecting if they are inside or outside
+                    // the clip polygon
+                    for(sal_uInt32 a(0); a < rCandidate.count(); a++)
+                    {
+                        // add cuts with clip to polygon, including bezier segments
+                        const B2DPolygon aCandidate(addPointsAtCuts(rCandidate.getB2DPolygon(a), rClip));
+                        const sal_uInt32 nPointCount(aCandidate.count());
+                        const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                        B2DCubicBezier aEdge;
+                        B2DPolygon aRun;
+
+                        for(sal_uInt32 b(0); b < nEdgeCount; b++)
+                        {
+                            aCandidate.getBezierSegment(b, aEdge);
+                            const B2DPoint aTestPoint(aEdge.interpolatePoint(0.5));
+                            const bool bIsInside(tools::isInside(rClip, aTestPoint) == bInside);
+
+                            if(bIsInside)
+                            {
+                                if(!aRun.count())
+                                {
+                                    aRun.append(aEdge.getStartPoint());
+                                }
+
+                                if(aEdge.isBezier())
+                                {
+                                    aRun.appendBezierSegment(aEdge.getControlPointA(), aEdge.getControlPointB(), aEdge.getEndPoint());
+                                }
+                                else
+                                {
+                                    aRun.append(aEdge.getEndPoint());
+                                }
+                            }
+                            else
+                            {
+                                if(aRun.count())
+                                {
+                                    aRetval.append(aRun);
+                                    aRun.clear();
+                                }
+                            }
+                        }
+
+                        if(aRun.count())
+                        {
+                            // try to merge this last and first polygon; they may have been
+                            // the former polygon's start/end point
+                            if(aRetval.count())
+                            {
+                                const B2DPolygon aStartPolygon(aRetval.getB2DPolygon(0));
+
+                                if(aStartPolygon.count() && aStartPolygon.getB2DPoint(0).equal(aRun.getB2DPoint(aRun.count() - 1)))
+                                {
+                                    // append start polygon to aRun, remove from result set
+                                    aRun.append(aStartPolygon); aRun.removeDoublePoints();
+                                    aRetval.remove(0);
+                                }
+                            }
+
+                            aRetval.append(aRun);
+                        }
+                    }
+                }
+                else
+                {
+                    // area clipping
+                    B2DPolyPolygon aMergePolyPolygonA(rClip);
+
+                    // First solve all polygon-self and polygon-polygon intersections.
+                    // Also get rid of some not-needed polygons (neutral, no area -> when
+                    // no intersections, these are tubes).
+                    // Now it is possible to correct the orientations in the cut-free
+                    // polygons to values corresponding to painting the PolyPolygon with
+                    // a XOR-WindingRule.
+                    aMergePolyPolygonA = solveCrossovers(aMergePolyPolygonA);
+                    aMergePolyPolygonA = stripNeutralPolygons(aMergePolyPolygonA);
+                    aMergePolyPolygonA = correctOrientations(aMergePolyPolygonA);
+
+                    if(!bInside)
+                    {
+                        // if we want to get the outside of the clip polygon, make
+                        // it a 'Hole' in topological sense
+                        aMergePolyPolygonA.flip();
+                    }
+
+                    B2DPolyPolygon aMergePolyPolygonB(rCandidate);
+
+                    // prepare 2nd source polygon in same way
+                    aMergePolyPolygonB = solveCrossovers(aMergePolyPolygonB);
+                    aMergePolyPolygonB = stripNeutralPolygons(aMergePolyPolygonB);
+                    aMergePolyPolygonB = correctOrientations(aMergePolyPolygonB);
+
+                    // to clip against each other, concatenate and solve all
+                    // polygon-polygon crossovers. polygon-self do not need to
+                    // be solved again, they were solved in the preparation.
+                    aRetval.append(aMergePolyPolygonA);
+                    aRetval.append(aMergePolyPolygonB);
+                    aRetval = solveCrossovers(aRetval);
+
+                    // now remove neutral polygons (closed, but no area). In a last
+                    // step throw away all polygons which have a depth of less than 1
+                    // which means there was no logical AND at their position. For the
+                    // not-inside solution, the clip was flipped to define it as 'Hole',
+                    // so the removal rule is different here; remove all with a depth
+                    // of less than 0 (aka holes).
+                    aRetval = stripNeutralPolygons(aRetval);
+                    aRetval = stripDispensablePolygons(aRetval, bInside);
+                }
+            }
+
+            return aRetval;
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke)
+        {
+            B2DPolyPolygon aRetval;
+
+            if(rCandidate.count() && rClip.count())
+            {
+                aRetval = clipPolyPolygonOnPolyPolygon(B2DPolyPolygon(rCandidate), rClip, bInside, bStroke);
+            }
+
+            return aRetval;
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        /*
+        * let a plane be defined as
+        *
+        *     v.n+d=0
+        *
+        * and a ray be defined as
+        *
+        *     a+(b-a)*t=0
+        *
+        * substitute and rearranging yields
+        *
+        *     t = -(a.n+d)/(n.(b-a))
+        *
+        * if the denominator is zero, the line is either
+        * contained in the plane or parallel to the plane.
+        * in either case, there is no intersection.
+        * if numerator and denominator are both zero, the
+        * ray is contained in the plane.
+        *
+        */
+        struct scissor_plane {
+            double nx,ny;           // plane normal
+            double d;               // [-] minimum distance from origin
+            sal_uInt32 clipmask;    // clipping mask, e.g. 1000 1000
+        };
+
+        /*
+        *
+        * polygon clipping rules  (straight out of Foley and Van Dam)
+        * ===========================================================
+        * current   |next       |emit
+        * ____________________________________
+        * inside    |inside     |next
+        * inside    |outside    |intersect with clip plane
+        * outside   |outside    |nothing
+        * outside   |inside     |intersect with clip plane follwed by next
+        *
+        */
+        sal_uInt32 scissorLineSegment( ::basegfx::B2DPoint           *in_vertex,    // input buffer
+                                       sal_uInt32                     in_count,     // number of verts in input buffer
+                                       ::basegfx::B2DPoint           *out_vertex,   // output buffer
+                                       scissor_plane                 *pPlane,       // scissoring plane
+                                       const ::basegfx::B2DRectangle &rR )          // clipping rectangle
+        {
+            ::basegfx::B2DPoint *curr;
+            ::basegfx::B2DPoint *next;
+
+            sal_uInt32 out_count=0;
+
+            // process all the verts
+            for(sal_uInt32 i=0; i<in_count; i++) {
+
+                // vertices are relative to the coordinate
+                // system defined by the rectangle.
+                curr = &in_vertex[i];
+                next = &in_vertex[(i+1)%in_count];
+
+                // perform clipping judgement & mask against current plane.
+                sal_uInt32 clip = pPlane->clipmask & ((getCohenSutherlandClipFlags(*curr,rR)<<4)|getCohenSutherlandClipFlags(*next,rR));
+
+                if(clip==0) { // both verts are inside
+                    out_vertex[out_count++] = *next;
+                }
+                else if((clip&0x0f) && (clip&0xf0)) { // both verts are outside
+                }
+                else if((clip&0x0f) && (clip&0xf0)==0) { // curr is inside, next is outside
+
+                    // direction vector from 'current' to 'next', *not* normalized
+                    // to bring 't' into the [0<=x<=1] intervall.
+                    ::basegfx::B2DPoint dir((*next)-(*curr));
+
+                    double denominator = ( pPlane->nx*dir.getX() +
+                                        pPlane->ny*dir.getY() );
+                    double numerator = ( pPlane->nx*curr->getX() +
+                                        pPlane->ny*curr->getY() +
+                                        pPlane->d );
+                    double t = -numerator/denominator;
+
+                    // calculate the actual point of intersection
+                    ::basegfx::B2DPoint intersection( curr->getX()+t*dir.getX(),
+                                                    curr->getY()+t*dir.getY() );
+
+                    out_vertex[out_count++] = intersection;
+                }
+                else if((clip&0x0f)==0 && (clip&0xf0)) { // curr is outside, next is inside
+
+                    // direction vector from 'current' to 'next', *not* normalized
+                    // to bring 't' into the [0<=x<=1] intervall.
+                    ::basegfx::B2DPoint dir((*next)-(*curr));
+
+                    double denominator = ( pPlane->nx*dir.getX() +
+                                        pPlane->ny*dir.getY() );
+                    double numerator = ( pPlane->nx*curr->getX() +
+                                        pPlane->ny*curr->getY() +
+                                        pPlane->d );
+                    double t = -numerator/denominator;
+
+                    // calculate the actual point of intersection
+                    ::basegfx::B2DPoint intersection( curr->getX()+t*dir.getX(),
+                                                    curr->getY()+t*dir.getY() );
+
+                    out_vertex[out_count++] = intersection;
+                    out_vertex[out_count++] = *next;
+                }
+            }
+
+            return out_count;
+        }
+
+        B2DPolygon clipTriangleListOnRange( const B2DPolygon& rCandidate,
+                                            const B2DRange&   rRange )
+        {
+            B2DPolygon aResult;
+
+            if( !(rCandidate.count()%3) )
+            {
+                const int scissor_plane_count = 4;
+
+                scissor_plane sp[scissor_plane_count];
+
+                sp[0].nx = +1.0;
+                sp[0].ny = +0.0;
+                sp[0].d = -(rRange.getMinX());
+                sp[0].clipmask = (RectClipFlags::LEFT << 4) | RectClipFlags::LEFT; // 0001 0001
+                sp[1].nx = -1.0;
+                sp[1].ny = +0.0;
+                sp[1].d = +(rRange.getMaxX());
+                sp[1].clipmask = (RectClipFlags::RIGHT << 4) | RectClipFlags::RIGHT; // 0010 0010
+                sp[2].nx = +0.0;
+                sp[2].ny = +1.0;
+                sp[2].d = -(rRange.getMinY());
+                sp[2].clipmask = (RectClipFlags::TOP << 4) | RectClipFlags::TOP; // 0100 0100
+                sp[3].nx = +0.0;
+                sp[3].ny = -1.0;
+                sp[3].d = +(rRange.getMaxY());
+                sp[3].clipmask = (RectClipFlags::BOTTOM << 4) | RectClipFlags::BOTTOM; // 1000 1000
+
+                // retrieve the number of vertices of the triangulated polygon
+                const sal_uInt32 nVertexCount = rCandidate.count();
+
+                if(nVertexCount)
+                {
+                    ////////////////////////////////////////////////////////////////////////
+                    ////////////////////////////////////////////////////////////////////////
+                    ////////////////////////////////////////////////////////////////////////
+                    //
+                    // Upper bound for the maximal number of vertices when intersecting an
+                    // axis-aligned rectangle with a triangle in E2
+                    //
+                    // The rectangle and the triangle are in general position, and have 4 and 3
+                    // vertices, respectively.
+                    //
+                    //   Lemma: Since the rectangle is a convex polygon ( see
+                    //   http://mathworld.wolfram.com/ConvexPolygon.html for a definition), and
+                    //   has no holes, it follows that any straight line will intersect the
+                    //   rectangle's border line at utmost two times (with the usual
+                    //   tie-breaking rule, if the intersection exactly hits an already existing
+                    //   rectangle vertex, that this intersection is only attributed to one of
+                    //   the adjoining edges). Thus, having a rectangle intersected with
+                    //   a half-plane (one side of a straight line denotes 'inside', the
+                    //   other 'outside') will at utmost add _one_  vertex to the resulting
+                    //   intersection polygon (adding two intersection vertices, and removing at
+                    //   least one rectangle vertex):
+                    //
+                    //         *
+                    //     +--+-----------------+
+                    //     | *                  |
+                    //     |*                   |
+                    //     +                    |
+                    //    *|                    |
+                    //   * |                    |
+                    //     +--------------------+
+                    //
+                    //   Proof: If the straight line intersects the rectangle two
+                    //   times, it does so for distinct edges, i.e. the intersection has
+                    //   minimally one of the rectangle's vertices on either side of the straight
+                    //   line (but maybe more). Thus, the intersection with a half-plane has
+                    //   minimally _one_ rectangle vertex removed from the resulting clip
+                    //   polygon, and therefore, a clip against a half-plane has the net effect
+                    //   of adding at utmost _one_ vertex to the resulting clip polygon.
+                    //
+                    // Theorem: The intersection of a rectangle and a triangle results in a
+                    // polygon with at utmost 7 vertices.
+                    //
+                    // Proof: The inside of the triangle can be described as the consecutive
+                    // intersection with three half-planes. Together with the lemma above, this
+                    // results in at utmost 3 additional vertices added to the already existing 4
+                    // rectangle vertices.
+                    //
+                    // This upper bound is attained with the following example configuration:
+                    //
+                    //                               *
+                    //                             ***
+                    //                           ** *
+                    //                         **  *
+                    //                       **   *
+                    //                     **    *
+                    //                   **     *
+                    //                 **      *
+                    //               **       *
+                    //             **        *
+                    //           **         *
+                    //     ----*2--------3 *
+                    //     | **          |*
+                    //     1*            4
+                    //   **|            *|
+                    // **  |           * |
+                    //   **|          *  |
+                    //     7*        *   |
+                    //     --*6-----5-----
+                    //         **  *
+                    //           **
+                    //
+                    // As we need to scissor all triangles against the
+                    // output rectangle we employ an output buffer for the
+                    // resulting vertices.  the question is how large this
+                    // buffer needs to be compared to the number of
+                    // incoming vertices.  this buffer needs to hold at
+                    // most the number of original vertices times '7'. see
+                    // figure above for an example.  scissoring triangles
+                    // with the cohen-sutherland line clipping algorithm
+                    // as implemented here will result in a triangle fan
+                    // which will be rendered as separate triangles to
+                    // avoid pipeline stalls for each scissored
+                    // triangle. creating separate triangles from a
+                    // triangle fan produces (n-2)*3 vertices where n is
+                    // the number of vertices of the original triangle
+                    // fan.  for the maximum number of 7 vertices of
+                    // resulting triangle fans we therefore need 15 times
+                    // the number of original vertices.
+                    //
+                    ////////////////////////////////////////////////////////////////////////
+                    ////////////////////////////////////////////////////////////////////////
+                    ////////////////////////////////////////////////////////////////////////
+
+                    //const size_t nBufferSize = sizeof(vertex)*(nVertexCount*16);
+                    //vertex *pVertices = (vertex*)alloca(nBufferSize);
+                    //sal_uInt32 nNumOutput = 0;
+
+                    // we need to clip this triangle against the output rectangle
+                    // to ensure that the resulting texture coordinates are in
+                    // the valid range from [0<=st<=1]. under normal circustances
+                    // we could use the BORDERCOLOR renderstate but some cards
+                    // seem to ignore this feature.
+                    ::basegfx::B2DPoint stack[3];
+                    unsigned int clipflag = 0;
+
+                    for(sal_uInt32 nIndex=0; nIndex<nVertexCount; ++nIndex)
+                    {
+                        // rotate stack
+                        stack[0] = stack[1];
+                        stack[1] = stack[2];
+                        stack[2] = rCandidate.getB2DPoint(nIndex);
+
+                        // clipping judgement
+                        clipflag |= !(rRange.isInside(stack[2]));
+
+                        if(nIndex > 1)
+                        {
+                            // consume vertices until a single seperate triangle has been visited.
+                            if(!((nIndex+1)%3))
+                            {
+                                // if any of the last three vertices was outside
+                                // we need to scissor against the destination rectangle
+                                if(clipflag & 7)
+                                {
+                                    ::basegfx::B2DPoint buf0[16];
+                                    ::basegfx::B2DPoint buf1[16];
+
+                                    sal_uInt32 vertex_count = 3;
+
+                                    // clip against all 4 planes passing the result of
+                                    // each plane as the input to the next using a double buffer
+                                    vertex_count = scissorLineSegment(stack,vertex_count,buf1,&sp[0],rRange);
+                                    vertex_count = scissorLineSegment(buf1,vertex_count,buf0,&sp[1],rRange);
+                                    vertex_count = scissorLineSegment(buf0,vertex_count,buf1,&sp[2],rRange);
+                                    vertex_count = scissorLineSegment(buf1,vertex_count,buf0,&sp[3],rRange);
+
+                                    if(vertex_count >= 3)
+                                    {
+                                        // convert triangle fan back to triangle list.
+                                        ::basegfx::B2DPoint v0(buf0[0]);
+                                        ::basegfx::B2DPoint v1(buf0[1]);
+                                        for(sal_uInt32 i=2; i<vertex_count; ++i)
+                                        {
+                                            ::basegfx::B2DPoint v2(buf0[i]);
+                                            aResult.append(v0);
+                                            aResult.append(v1);
+                                            aResult.append(v2);
+                                            v1 = v2;
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    // the last triangle has not been altered, simply copy to result
+                                    for(sal_uInt32 i=0; i<3; ++i)
+                                        aResult.append(stack[i]);
+                                }
+                            }
+                        }
+
+                        clipflag <<= 1;
+                    }
+                }
+            }
+
+            return aResult;
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+// eof
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
new file mode 100644
index 000000000000..11955ceb22f9
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -0,0 +1,1299 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b2dpolygoncutandtouch.hxx>
+#include <osl/diagnose.h>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+
+#include <vector>
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+// defines
+
+#define SUBDIVIDE_FOR_CUT_TEST_COUNT        (50)
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+
+        class temporaryPoint
+        {
+            B2DPoint                            maPoint;        // the new point
+            sal_uInt32                          mnIndex;        // index after which to insert
+            double                              mfCut;          // parametric cut description [0.0 .. 1.0]
+
+        public:
+            temporaryPoint(const B2DPoint& rNewPoint, sal_uInt32 nIndex, double fCut)
+            :   maPoint(rNewPoint),
+                mnIndex(nIndex),
+                mfCut(fCut)
+            {
+            }
+
+            bool operator<(const temporaryPoint& rComp) const
+            {
+                if(mnIndex == rComp.mnIndex)
+                {
+                    return (mfCut < rComp.mfCut);
+                }
+
+                return (mnIndex < rComp.mnIndex);
+            }
+
+            const B2DPoint& getPoint() const { return maPoint; }
+            sal_uInt32 getIndex() const { return mnIndex; }
+            double getCut() const { return mfCut; }
+        };
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        typedef ::std::vector< temporaryPoint > temporaryPointVector;
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        class temporaryPolygonData
+        {
+            B2DPolygon                              maPolygon;
+            B2DRange                                maRange;
+            temporaryPointVector                    maPoints;
+
+        public:
+            const B2DPolygon& getPolygon() const { return maPolygon; }
+            void setPolygon(const B2DPolygon& rNew) { maPolygon = rNew; maRange = tools::getRange(maPolygon); }
+            const B2DRange& getRange() const { return maRange; }
+            temporaryPointVector& getTemporaryPointVector() { return maPoints; }
+        };
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        B2DPolygon mergeTemporaryPointsAndPolygon(const B2DPolygon& rCandidate, temporaryPointVector& rTempPoints)
+        {
+            // #i76891# mergeTemporaryPointsAndPolygon redesigned to be able to correctly handle
+            // single edges with/without control points
+            // #i101491# added counter for non-changing element count
+            const sal_uInt32 nTempPointCount(rTempPoints.size());
+
+            if(nTempPointCount)
+            {
+                B2DPolygon aRetval;
+                const sal_uInt32 nCount(rCandidate.count());
+
+                if(nCount)
+                {
+                    // sort temp points to assure increasing fCut values and increasing indices
+                    ::std::sort(rTempPoints.begin(), rTempPoints.end());
+
+                    // prepare loop
+                    B2DCubicBezier aEdge;
+                    sal_uInt32 nNewInd(0L);
+
+                    // add start point
+                    aRetval.append(rCandidate.getB2DPoint(0));
+
+                    for(sal_uInt32 a(0L); a < nCount; a++)
+                    {
+                        // get edge
+                        rCandidate.getBezierSegment(a, aEdge);
+
+                        if(aEdge.isBezier())
+                        {
+                            // control vectors involved for this edge
+                            double fLeftStart(0.0);
+
+                            // now add all points targeted to be at this index
+                            while(nNewInd < nTempPointCount && rTempPoints[nNewInd].getIndex() == a)
+                            {
+                                const temporaryPoint& rTempPoint = rTempPoints[nNewInd++];
+
+                                // split curve segment. Splits need to come sorted and need to be < 1.0. Also,
+                                // since original segment is consumed from left to right, the cut values need
+                                // to be scaled to the remaining part
+                                B2DCubicBezier aLeftPart;
+                                const double fRelativeSplitPoint((rTempPoint.getCut() - fLeftStart) / (1.0 - fLeftStart));
+                                aEdge.split(fRelativeSplitPoint, &aLeftPart, &aEdge);
+                                fLeftStart = rTempPoint.getCut();
+
+                                // add left bow
+                                aRetval.appendBezierSegment(aLeftPart.getControlPointA(), aLeftPart.getControlPointB(), rTempPoint.getPoint());
+                            }
+
+                            // add remaining bow
+                            aRetval.appendBezierSegment(aEdge.getControlPointA(), aEdge.getControlPointB(), aEdge.getEndPoint());
+                        }
+                        else
+                        {
+                            // add all points targeted to be at this index
+                            while(nNewInd < nTempPointCount && rTempPoints[nNewInd].getIndex() == a)
+                            {
+                                const temporaryPoint& rTempPoint = rTempPoints[nNewInd++];
+                                const B2DPoint aNewPoint(rTempPoint.getPoint());
+
+                                // do not add points double
+                                if(!aRetval.getB2DPoint(aRetval.count() - 1L).equal(aNewPoint))
+                                {
+                                    aRetval.append(aNewPoint);
+                                }
+                            }
+
+                            // add edge end point
+                            aRetval.append(aEdge.getEndPoint());
+                        }
+                    }
+                }
+
+                if(rCandidate.isClosed())
+                {
+                    // set closed flag and correct last point (which is added double now).
+                    tools::closeWithGeometryChange(aRetval);
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void adaptAndTransferCutsWithBezierSegment(
+            const temporaryPointVector& rPointVector, const B2DPolygon& rPolygon,
+            sal_uInt32 nInd, temporaryPointVector& rTempPoints)
+        {
+            // assuming that the subdivision to create rPolygon used aequidistant pieces
+            // (as in adaptiveSubdivideByCount) it is now possible to calculate back the
+            // cut positions in the polygon to relative cut positions on the original bezier
+            // segment.
+            const sal_uInt32 nTempPointCount(rPointVector.size());
+            const sal_uInt32 nEdgeCount(rPolygon.count() ? rPolygon.count() - 1L : 0L);
+
+            if(nTempPointCount && nEdgeCount)
+            {
+                for(sal_uInt32 a(0L); a < nTempPointCount; a++)
+                {
+                    const temporaryPoint& rTempPoint = rPointVector[a];
+                    const double fCutPosInPolygon((double)rTempPoint.getIndex() + rTempPoint.getCut());
+                    const double fRelativeCutPos(fCutPosInPolygon / (double)nEdgeCount);
+                    rTempPoints.push_back(temporaryPoint(rTempPoint.getPoint(), nInd, fRelativeCutPos));
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+        // predefines for calls to this methods before method implementation
+
+        void findCuts(const B2DPolygon& rCandidate, temporaryPointVector& rTempPoints);
+        void findTouches(const B2DPolygon& rEdgePolygon, const B2DPolygon& rPointPolygon, temporaryPointVector& rTempPoints);
+        void findCuts(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB);
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findEdgeCutsTwoEdges(
+            const B2DPoint& rCurrA, const B2DPoint& rNextA,
+            const B2DPoint& rCurrB, const B2DPoint& rNextB,
+            sal_uInt32 nIndA, sal_uInt32 nIndB,
+            temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
+        {
+            // no null length edges
+            if(!(rCurrA.equal(rNextA) || rCurrB.equal(rNextB)))
+            {
+                // no common start/end points, this can be no cuts
+                if(!(rCurrB.equal(rCurrA) || rCurrB.equal(rNextA) || rNextB.equal(rCurrA) || rNextB.equal(rNextA)))
+                {
+                    const B2DVector aVecA(rNextA - rCurrA);
+                    const B2DVector aVecB(rNextB - rCurrB);
+                    double fCut(aVecA.cross(aVecB));
+
+                    if(!fTools::equalZero(fCut))
+                    {
+                        const double fZero(0.0);
+                        const double fOne(1.0);
+                        fCut = (aVecB.getY() * (rCurrB.getX() - rCurrA.getX()) + aVecB.getX() * (rCurrA.getY() - rCurrB.getY())) / fCut;
+
+                        if(fTools::more(fCut, fZero) && fTools::less(fCut, fOne))
+                        {
+                            // it's a candidate, but also need to test parameter value of cut on line 2
+                            double fCut2;
+
+                            // choose the more precise version
+                            if(fabs(aVecB.getX()) > fabs(aVecB.getY()))
+                            {
+                                fCut2 = (rCurrA.getX() + (fCut * aVecA.getX()) - rCurrB.getX()) / aVecB.getX();
+                            }
+                            else
+                            {
+                                fCut2 = (rCurrA.getY() + (fCut * aVecA.getY()) - rCurrB.getY()) / aVecB.getY();
+                            }
+
+                            if(fTools::more(fCut2, fZero) && fTools::less(fCut2, fOne))
+                            {
+                                // cut is in range, add point. Two edges can have only one cut, but
+                                // add a cut point to each list. The lists may be the same for
+                                // self intersections.
+                                const B2DPoint aCutPoint(interpolate(rCurrA, rNextA, fCut));
+                                rTempPointsA.push_back(temporaryPoint(aCutPoint, nIndA, fCut));
+                                rTempPointsB.push_back(temporaryPoint(aCutPoint, nIndB, fCut2));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findCutsAndTouchesAndCommonForBezier(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
+        {
+            // #i76891#
+            // This new method is necessary since in findEdgeCutsBezierAndEdge and in findEdgeCutsTwoBeziers
+            // it is not sufficient to use findCuts() recursively. This will indeed find the cuts between the
+            // segments of the two temporarily adaptive subdivided bezier segments, but not the touches or
+            // equal points of them.
+            // It would be possible to find the toches using findTouches(), but at last with commpn points
+            // the adding of cut points (temporary points) would fail. But for these temporarily adaptive
+            // subdivided bezier segments, common points may be not very likely, but the bug shows that it
+            // happens.
+            // Touch points are a little bit more likely than common points. All in all it is best to use
+            // a specialized method here which can profit from knowing that it is working on a special
+            // family of B2DPolygons: no curve segments included and not closed.
+            OSL_ENSURE(!rCandidateA.areControlPointsUsed() && !rCandidateB.areControlPointsUsed(), "findCutsAndTouchesAndCommonForBezier only works with subdivided polygons (!)");
+            OSL_ENSURE(!rCandidateA.isClosed() && !rCandidateB.isClosed(), "findCutsAndTouchesAndCommonForBezier only works with opened polygons (!)");
+            const sal_uInt32 nPointCountA(rCandidateA.count());
+            const sal_uInt32 nPointCountB(rCandidateB.count());
+
+            if(nPointCountA > 1 && nPointCountB > 1)
+            {
+                const sal_uInt32 nEdgeCountA(nPointCountA - 1);
+                const sal_uInt32 nEdgeCountB(nPointCountB - 1);
+                B2DPoint aCurrA(rCandidateA.getB2DPoint(0L));
+
+                for(sal_uInt32 a(0L); a < nEdgeCountA; a++)
+                {
+                    const B2DPoint aNextA(rCandidateA.getB2DPoint(a + 1L));
+                    const B2DRange aRangeA(aCurrA, aNextA);
+                    B2DPoint aCurrB(rCandidateB.getB2DPoint(0L));
+
+                    for(sal_uInt32 b(0L); b < nEdgeCountB; b++)
+                    {
+                        const B2DPoint aNextB(rCandidateB.getB2DPoint(b + 1L));
+                        const B2DRange aRangeB(aCurrB, aNextB);
+
+                        if(aRangeA.overlaps(aRangeB))
+                        {
+                            // no null length edges
+                            if(!(aCurrA.equal(aNextA) || aCurrB.equal(aNextB)))
+                            {
+                                const B2DVector aVecA(aNextA - aCurrA);
+                                const B2DVector aVecB(aNextB - aCurrB);
+                                double fCutA(aVecA.cross(aVecB));
+
+                                if(!fTools::equalZero(fCutA))
+                                {
+                                    const double fZero(0.0);
+                                    const double fOne(1.0);
+                                    fCutA = (aVecB.getY() * (aCurrB.getX() - aCurrA.getX()) + aVecB.getX() * (aCurrA.getY() - aCurrB.getY())) / fCutA;
+
+                                    // use range [0.0 .. 1.0[, thus in the loop, all direct aCurrA cuts will be registered
+                                    // as 0.0 cut. The 1.0 cut will be registered in the next loop step
+                                    if(fTools::moreOrEqual(fCutA, fZero) && fTools::less(fCutA, fOne))
+                                    {
+                                        // it's a candidate, but also need to test parameter value of cut on line 2
+                                        double fCutB;
+
+                                        // choose the more precise version
+                                        if(fabs(aVecB.getX()) > fabs(aVecB.getY()))
+                                        {
+                                            fCutB = (aCurrA.getX() + (fCutA * aVecA.getX()) - aCurrB.getX()) / aVecB.getX();
+                                        }
+                                        else
+                                        {
+                                            fCutB = (aCurrA.getY() + (fCutA * aVecA.getY()) - aCurrB.getY()) / aVecB.getY();
+                                        }
+
+                                        // use range [0.0 .. 1.0[, thus in the loop, all direct aCurrA cuts will be registered
+                                        // as 0.0 cut. The 1.0 cut will be registered in the next loop step
+                                        if(fTools::moreOrEqual(fCutB, fZero) && fTools::less(fCutB, fOne))
+                                        {
+                                            // cut is in both ranges. Add points for A and B
+                                            if(fTools::equalZero(fCutA))
+                                            {
+                                                // ignore for start point in first edge; this is handled
+                                                // by outer methods and would just produce a double point
+                                                if(a)
+                                                {
+                                                    rTempPointsA.push_back(temporaryPoint(aCurrA, a, 0.0));
+                                                }
+                                            }
+                                            else
+                                            {
+                                                const B2DPoint aCutPoint(interpolate(aCurrA, aNextA, fCutA));
+                                                rTempPointsA.push_back(temporaryPoint(aCutPoint, a, fCutA));
+                                            }
+
+                                            if(fTools::equalZero(fCutB))
+                                            {
+                                                // ignore for start point in first edge; this is handled
+                                                // by outer methods and would just produce a double point
+                                                if(b)
+                                                {
+                                                    rTempPointsB.push_back(temporaryPoint(aCurrB, b, 0.0));
+                                                }
+                                            }
+                                            else
+                                            {
+                                                const B2DPoint aCutPoint(interpolate(aCurrB, aNextB, fCutB));
+                                                rTempPointsB.push_back(temporaryPoint(aCutPoint, b, fCutB));
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        // prepare next step
+                        aCurrB = aNextB;
+                    }
+
+                    // prepare next step
+                    aCurrA = aNextA;
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findEdgeCutsBezierAndEdge(
+            const B2DCubicBezier& rCubicA,
+            const B2DPoint& rCurrB, const B2DPoint& rNextB,
+            sal_uInt32 nIndA, sal_uInt32 nIndB,
+            temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
+        {
+            // find all cuts between given bezier segment and edge. Add an entry to the tempPoints
+            // for each common point with the cut value describing the relative position on given
+            // bezier segment and edge.
+            B2DPolygon aTempPolygonA;
+            B2DPolygon aTempPolygonEdge;
+            temporaryPointVector aTempPointVectorA;
+            temporaryPointVector aTempPointVectorEdge;
+
+            // create subdivided polygons and find cuts between them
+            // Keep adaptiveSubdivideByCount due to needed quality
+            aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygonA.append(rCubicA.getStartPoint());
+            rCubicA.adaptiveSubdivideByCount(aTempPolygonA, SUBDIVIDE_FOR_CUT_TEST_COUNT);
+            aTempPolygonEdge.append(rCurrB);
+            aTempPolygonEdge.append(rNextB);
+
+            // #i76891# using findCuts recursively is not sufficient here
+            findCutsAndTouchesAndCommonForBezier(aTempPolygonA, aTempPolygonEdge, aTempPointVectorA, aTempPointVectorEdge);
+
+            if(aTempPointVectorA.size())
+            {
+                // adapt tempVector entries to segment
+                adaptAndTransferCutsWithBezierSegment(aTempPointVectorA, aTempPolygonA, nIndA, rTempPointsA);
+            }
+
+            // append remapped tempVector entries for edge to tempPoints for edge
+            for(sal_uInt32 a(0L); a < aTempPointVectorEdge.size(); a++)
+            {
+                const temporaryPoint& rTempPoint = aTempPointVectorEdge[a];
+                rTempPointsB.push_back(temporaryPoint(rTempPoint.getPoint(), nIndB, rTempPoint.getCut()));
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findEdgeCutsTwoBeziers(
+            const B2DCubicBezier& rCubicA,
+            const B2DCubicBezier& rCubicB,
+            sal_uInt32 nIndA, sal_uInt32 nIndB,
+            temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
+        {
+            // find all cuts between the two given bezier segments. Add an entry to the tempPoints
+            // for each common point with the cut value describing the relative position on given
+            // bezier segments.
+            B2DPolygon aTempPolygonA;
+            B2DPolygon aTempPolygonB;
+            temporaryPointVector aTempPointVectorA;
+            temporaryPointVector aTempPointVectorB;
+
+            // create subdivided polygons and find cuts between them
+            // Keep adaptiveSubdivideByCount due to needed quality
+            aTempPolygonA.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygonA.append(rCubicA.getStartPoint());
+            rCubicA.adaptiveSubdivideByCount(aTempPolygonA, SUBDIVIDE_FOR_CUT_TEST_COUNT);
+            aTempPolygonB.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygonB.append(rCubicB.getStartPoint());
+            rCubicB.adaptiveSubdivideByCount(aTempPolygonB, SUBDIVIDE_FOR_CUT_TEST_COUNT);
+
+            // #i76891# using findCuts recursively is not sufficient here
+            findCutsAndTouchesAndCommonForBezier(aTempPolygonA, aTempPolygonB, aTempPointVectorA, aTempPointVectorB);
+
+            if(aTempPointVectorA.size())
+            {
+                // adapt tempVector entries to segment
+                adaptAndTransferCutsWithBezierSegment(aTempPointVectorA, aTempPolygonA, nIndA, rTempPointsA);
+            }
+
+            if(aTempPointVectorB.size())
+            {
+                // adapt tempVector entries to segment
+                adaptAndTransferCutsWithBezierSegment(aTempPointVectorB, aTempPolygonB, nIndB, rTempPointsB);
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findEdgeCutsOneBezier(
+            const B2DCubicBezier& rCubicA,
+            sal_uInt32 nInd, temporaryPointVector& rTempPoints)
+        {
+            // avoid expensive part of this method if possible
+            // TODO: use hasAnyExtremum() method instead when it becomes available
+            double fDummy;
+            const bool bHasAnyExtremum = rCubicA.getMinimumExtremumPosition( fDummy );
+            if( !bHasAnyExtremum )
+                return;
+
+            // find all self-intersections on the given bezier segment. Add an entry to the tempPoints
+            // for each self intersection point with the cut value describing the relative position on given
+            // bezier segment.
+            B2DPolygon aTempPolygon;
+            temporaryPointVector aTempPointVector;
+
+            // create subdivided polygon and find cuts on it
+            // Keep adaptiveSubdivideByCount due to needed quality
+            aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygon.append(rCubicA.getStartPoint());
+            rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
+            findCuts(aTempPolygon, aTempPointVector);
+
+            if(aTempPointVector.size())
+            {
+                // adapt tempVector entries to segment
+                adaptAndTransferCutsWithBezierSegment(aTempPointVector, aTempPolygon, nInd, rTempPoints);
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findCuts(const B2DPolygon& rCandidate, temporaryPointVector& rTempPoints)
+        {
+            // find out if there are edges with intersections (self-cuts). If yes, add
+            // entries to rTempPoints accordingly
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount)
+            {
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+
+                if(nEdgeCount)
+                {
+                    const bool bCurvesInvolved(rCandidate.areControlPointsUsed());
+
+                    if(bCurvesInvolved)
+                    {
+                        B2DCubicBezier aCubicA;
+                        B2DCubicBezier aCubicB;
+
+                        for(sal_uInt32 a(0L); a < nEdgeCount - 1L; a++)
+                        {
+                            rCandidate.getBezierSegment(a, aCubicA);
+                            aCubicA.testAndSolveTrivialBezier();
+                            const bool bEdgeAIsCurve(aCubicA.isBezier());
+                            const B2DRange aRangeA(aCubicA.getRange());
+
+                            if(bEdgeAIsCurve)
+                            {
+                                // curved segments may have self-intersections, do not forget those (!)
+                                findEdgeCutsOneBezier(aCubicA, a, rTempPoints);
+                            }
+
+                            for(sal_uInt32 b(a + 1L); b < nEdgeCount; b++)
+                            {
+                                rCandidate.getBezierSegment(b, aCubicB);
+                                aCubicB.testAndSolveTrivialBezier();
+                                const bool bEdgeBIsCurve(aCubicB.isBezier());
+                                const B2DRange aRangeB(aCubicB.getRange());
+
+                                // only overlapping segments need to be tested
+                                // consecutive segments touch of course
+                                bool bOverlap = false;
+                                if( b > a+1)
+                                    bOverlap = aRangeA.overlaps(aRangeB);
+                                else
+                                    bOverlap = aRangeA.overlapsMore(aRangeB);
+                                if( bOverlap)
+                                {
+                                    if(bEdgeAIsCurve && bEdgeBIsCurve)
+                                    {
+                                        // test for bezier-bezier cuts
+                                        findEdgeCutsTwoBeziers(aCubicA, aCubicB, a, b, rTempPoints, rTempPoints);
+                                    }
+                                    else if(bEdgeAIsCurve)
+                                    {
+                                        // test for bezier-edge cuts
+                                        findEdgeCutsBezierAndEdge(aCubicA, aCubicB.getStartPoint(), aCubicB.getEndPoint(), a, b, rTempPoints, rTempPoints);
+                                    }
+                                    else if(bEdgeBIsCurve)
+                                    {
+                                        // test for bezier-edge cuts
+                                        findEdgeCutsBezierAndEdge(aCubicB, aCubicA.getStartPoint(), aCubicA.getEndPoint(), b, a, rTempPoints, rTempPoints);
+                                    }
+                                    else
+                                    {
+                                        // test for simple edge-edge cuts
+                                        findEdgeCutsTwoEdges(aCubicA.getStartPoint(), aCubicA.getEndPoint(), aCubicB.getStartPoint(), aCubicB.getEndPoint(),
+                                            a, b, rTempPoints, rTempPoints);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        B2DPoint aCurrA(rCandidate.getB2DPoint(0L));
+
+                        for(sal_uInt32 a(0L); a < nEdgeCount - 1L; a++)
+                        {
+                            const B2DPoint aNextA(rCandidate.getB2DPoint(a + 1L == nPointCount ? 0L : a + 1L));
+                            const B2DRange aRangeA(aCurrA, aNextA);
+                            B2DPoint aCurrB(rCandidate.getB2DPoint(a + 1L));
+
+                            for(sal_uInt32 b(a + 1L); b < nEdgeCount; b++)
+                            {
+                                const B2DPoint aNextB(rCandidate.getB2DPoint(b + 1L == nPointCount ? 0L : b + 1L));
+                                const B2DRange aRangeB(aCurrB, aNextB);
+
+                                // consecutive segments touch of course
+                                bool bOverlap = false;
+                                if( b > a+1)
+                                    bOverlap = aRangeA.overlaps(aRangeB);
+                                else
+                                    bOverlap = aRangeA.overlapsMore(aRangeB);
+                                if( bOverlap)
+                                {
+                                    findEdgeCutsTwoEdges(aCurrA, aNextA, aCurrB, aNextB, a, b, rTempPoints, rTempPoints);
+                                }
+
+                                // prepare next step
+                                aCurrB = aNextB;
+                            }
+
+                            // prepare next step
+                            aCurrA = aNextA;
+                        }
+                    }
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findTouchesOnEdge(
+            const B2DPoint& rCurr, const B2DPoint& rNext, const B2DPolygon& rPointPolygon,
+            sal_uInt32 nInd, temporaryPointVector& rTempPoints)
+        {
+            // find out if points from rPointPolygon are positioned on given edge. If Yes, add
+            // points there to represent touches (which may be enter or leave nodes later).
+            const sal_uInt32 nPointCount(rPointPolygon.count());
+
+            if(nPointCount)
+            {
+                const B2DRange aRange(rCurr, rNext);
+                const B2DVector aEdgeVector(rNext - rCurr);
+                B2DVector aNormalizedEdgeVector(aEdgeVector);
+                aNormalizedEdgeVector.normalize();
+                bool bTestUsingX(fabs(aEdgeVector.getX()) > fabs(aEdgeVector.getY()));
+
+                for(sal_uInt32 a(0L); a < nPointCount; a++)
+                {
+                    const B2DPoint aTestPoint(rPointPolygon.getB2DPoint(a));
+
+                    if(aRange.isInside(aTestPoint))
+                    {
+                        if(!aTestPoint.equal(rCurr) && !aTestPoint.equal(rNext))
+                        {
+                            const B2DVector aTestVector(aTestPoint - rCurr);
+
+                            if(areParallel(aNormalizedEdgeVector, aTestVector))
+                            {
+                                const double fCut((bTestUsingX)
+                                    ? aTestVector.getX() / aEdgeVector.getX()
+                                    : aTestVector.getY() / aEdgeVector.getY());
+                                const double fZero(0.0);
+                                const double fOne(1.0);
+
+                                if(fTools::more(fCut, fZero) && fTools::less(fCut, fOne))
+                                {
+                                    rTempPoints.push_back(temporaryPoint(aTestPoint, nInd, fCut));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findTouchesOnCurve(
+            const B2DCubicBezier& rCubicA, const B2DPolygon& rPointPolygon,
+            sal_uInt32 nInd, temporaryPointVector& rTempPoints)
+        {
+            // find all points from rPointPolygon which touch the given bezier segment. Add an entry
+            // for each touch to the given pointVector. The cut for that entry is the relative position on
+            // the given bezier segment.
+            B2DPolygon aTempPolygon;
+            temporaryPointVector aTempPointVector;
+
+            // create subdivided polygon and find cuts on it
+            // Keep adaptiveSubdivideByCount due to needed quality
+            aTempPolygon.reserve(SUBDIVIDE_FOR_CUT_TEST_COUNT + 8);
+            aTempPolygon.append(rCubicA.getStartPoint());
+            rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
+            findTouches(aTempPolygon, rPointPolygon, aTempPointVector);
+
+            if(aTempPointVector.size())
+            {
+                // adapt tempVector entries to segment
+                adaptAndTransferCutsWithBezierSegment(aTempPointVector, aTempPolygon, nInd, rTempPoints);
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findTouches(const B2DPolygon& rEdgePolygon, const B2DPolygon& rPointPolygon, temporaryPointVector& rTempPoints)
+        {
+            // find out if points from rPointPolygon touch edges from rEdgePolygon. If yes,
+            // add entries to rTempPoints
+            const sal_uInt32 nPointCount(rPointPolygon.count());
+            const sal_uInt32 nEdgePointCount(rEdgePolygon.count());
+
+            if(nPointCount && nEdgePointCount)
+            {
+                const sal_uInt32 nEdgeCount(rEdgePolygon.isClosed() ? nEdgePointCount : nEdgePointCount - 1L);
+                B2DPoint aCurr(rEdgePolygon.getB2DPoint(0));
+
+                for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                {
+                    const sal_uInt32 nNextIndex((a + 1) % nEdgePointCount);
+                    const B2DPoint aNext(rEdgePolygon.getB2DPoint(nNextIndex));
+
+                    if(!aCurr.equal(aNext))
+                    {
+                        bool bHandleAsSimpleEdge(true);
+
+                        if(rEdgePolygon.areControlPointsUsed())
+                        {
+                            const B2DPoint aNextControlPoint(rEdgePolygon.getNextControlPoint(a));
+                            const B2DPoint aPrevControlPoint(rEdgePolygon.getPrevControlPoint(nNextIndex));
+                            const bool bEdgeIsCurve(!aNextControlPoint.equal(aCurr) || !aPrevControlPoint.equal(aNext));
+
+                            if(bEdgeIsCurve)
+                            {
+                                bHandleAsSimpleEdge = false;
+                                const B2DCubicBezier aCubicA(aCurr, aNextControlPoint, aPrevControlPoint, aNext);
+                                findTouchesOnCurve(aCubicA, rPointPolygon, a, rTempPoints);
+                            }
+                        }
+
+                        if(bHandleAsSimpleEdge)
+                        {
+                            findTouchesOnEdge(aCurr, aNext, rPointPolygon, a, rTempPoints);
+                        }
+                    }
+
+                    // next step
+                    aCurr = aNext;
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+
+        void findCuts(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB)
+        {
+            // find out if edges from both polygons cut. If so, add entries to rTempPoints which
+            // should be added to the polygons accordingly
+            const sal_uInt32 nPointCountA(rCandidateA.count());
+            const sal_uInt32 nPointCountB(rCandidateB.count());
+
+            if(nPointCountA && nPointCountB)
+            {
+                const sal_uInt32 nEdgeCountA(rCandidateA.isClosed() ? nPointCountA : nPointCountA - 1L);
+                const sal_uInt32 nEdgeCountB(rCandidateB.isClosed() ? nPointCountB : nPointCountB - 1L);
+
+                if(nEdgeCountA && nEdgeCountB)
+                {
+                    const bool bCurvesInvolved(rCandidateA.areControlPointsUsed() || rCandidateB.areControlPointsUsed());
+
+                    if(bCurvesInvolved)
+                    {
+                        B2DCubicBezier aCubicA;
+                        B2DCubicBezier aCubicB;
+
+                        for(sal_uInt32 a(0L); a < nEdgeCountA; a++)
+                        {
+                            rCandidateA.getBezierSegment(a, aCubicA);
+                            aCubicA.testAndSolveTrivialBezier();
+                            const bool bEdgeAIsCurve(aCubicA.isBezier());
+                            const B2DRange aRangeA(aCubicA.getRange());
+
+                            for(sal_uInt32 b(0L); b < nEdgeCountB; b++)
+                            {
+                                rCandidateB.getBezierSegment(b, aCubicB);
+                                aCubicB.testAndSolveTrivialBezier();
+                                const bool bEdgeBIsCurve(aCubicB.isBezier());
+                                const B2DRange aRangeB(aCubicB.getRange());
+
+                                // consecutive segments touch of course
+                                bool bOverlap = false;
+                                if( b > a+1)
+                                    bOverlap = aRangeA.overlaps(aRangeB);
+                                else
+                                    bOverlap = aRangeA.overlapsMore(aRangeB);
+                                if( bOverlap)
+                                {
+                                    if(bEdgeAIsCurve && bEdgeBIsCurve)
+                                    {
+                                        // test for bezier-bezier cuts
+                                        findEdgeCutsTwoBeziers(aCubicA, aCubicB, a, b, rTempPointsA, rTempPointsB);
+                                    }
+                                    else if(bEdgeAIsCurve)
+                                    {
+                                        // test for bezier-edge cuts
+                                        findEdgeCutsBezierAndEdge(aCubicA, aCubicB.getStartPoint(), aCubicB.getEndPoint(), a, b, rTempPointsA, rTempPointsB);
+                                    }
+                                    else if(bEdgeBIsCurve)
+                                    {
+                                        // test for bezier-edge cuts
+                                        findEdgeCutsBezierAndEdge(aCubicB, aCubicA.getStartPoint(), aCubicA.getEndPoint(), b, a, rTempPointsB, rTempPointsA);
+                                    }
+                                    else
+                                    {
+                                        // test for simple edge-edge cuts
+                                        findEdgeCutsTwoEdges(aCubicA.getStartPoint(), aCubicA.getEndPoint(), aCubicB.getStartPoint(), aCubicB.getEndPoint(),
+                                            a, b, rTempPointsA, rTempPointsB);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        B2DPoint aCurrA(rCandidateA.getB2DPoint(0L));
+
+                        for(sal_uInt32 a(0L); a < nEdgeCountA; a++)
+                        {
+                            const B2DPoint aNextA(rCandidateA.getB2DPoint(a + 1L == nPointCountA ? 0L : a + 1L));
+                            const B2DRange aRangeA(aCurrA, aNextA);
+                            B2DPoint aCurrB(rCandidateB.getB2DPoint(0L));
+
+                            for(sal_uInt32 b(0L); b < nEdgeCountB; b++)
+                            {
+                                const B2DPoint aNextB(rCandidateB.getB2DPoint(b + 1L == nPointCountB ? 0L : b + 1L));
+                                const B2DRange aRangeB(aCurrB, aNextB);
+
+                                // consecutive segments touch of course
+                                bool bOverlap = false;
+                                if( b > a+1)
+                                    bOverlap = aRangeA.overlaps(aRangeB);
+                                else
+                                    bOverlap = aRangeA.overlapsMore(aRangeB);
+                                if( bOverlap)
+                                {
+                                    // test for simple edge-edge cuts
+                                    findEdgeCutsTwoEdges(aCurrA, aNextA, aCurrB, aNextB, a, b, rTempPointsA, rTempPointsB);
+                                }
+
+                                // prepare next step
+                                aCurrB = aNextB;
+                            }
+
+                            // prepare next step
+                            aCurrA = aNextA;
+                        }
+                    }
+                }
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        ////////////////////////////////////////////////////////////////////////////////
+
+        B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate)
+        {
+            if(rCandidate.count())
+            {
+                temporaryPointVector aTempPoints;
+
+                findTouches(rCandidate, rCandidate, aTempPoints);
+                findCuts(rCandidate, aTempPoints);
+
+                return mergeTemporaryPointsAndPolygon(rCandidate, aTempPoints);
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate, bool bSelfIntersections)
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+
+            if(nCount)
+            {
+                B2DPolyPolygon aRetval;
+
+                if(1L == nCount)
+                {
+                    if(bSelfIntersections)
+                    {
+                        // remove self intersections
+                        aRetval.append(addPointsAtCutsAndTouches(rCandidate.getB2DPolygon(0L)));
+                    }
+                    else
+                    {
+                        // copy source
+                        aRetval = rCandidate;
+                    }
+                }
+                else
+                {
+                    // first solve self cuts and self touches for all contained single polygons
+                    temporaryPolygonData *pTempData = new temporaryPolygonData[nCount];
+                    sal_uInt32 a, b;
+
+                    for(a = 0L; a < nCount; a++)
+                    {
+                        if(bSelfIntersections)
+                        {
+                            // use polygons with solved self intersections
+                            pTempData[a].setPolygon(addPointsAtCutsAndTouches(rCandidate.getB2DPolygon(a)));
+                        }
+                        else
+                        {
+                            // copy given polygons
+                            pTempData[a].setPolygon(rCandidate.getB2DPolygon(a));
+                        }
+                    }
+
+                    // now cuts and touches between the polygons
+                    for(a = 0L; a < nCount; a++)
+                    {
+                        for(b = 0L; b < nCount; b++)
+                        {
+                            if(a != b)
+                            {
+                                // look for touches, compare each edge polygon to all other points
+                                if(pTempData[a].getRange().overlaps(pTempData[b].getRange()))
+                                {
+                                    findTouches(pTempData[a].getPolygon(), pTempData[b].getPolygon(), pTempData[a].getTemporaryPointVector());
+                                }
+                            }
+
+                            if(a < b)
+                            {
+                                // look for cuts, compare each edge polygon to following ones
+                                if(pTempData[a].getRange().overlaps(pTempData[b].getRange()))
+                                {
+                                    findCuts(pTempData[a].getPolygon(), pTempData[b].getPolygon(), pTempData[a].getTemporaryPointVector(), pTempData[b].getTemporaryPointVector());
+                                }
+                            }
+                        }
+                    }
+
+                    // consolidate the result
+                    for(a = 0L; a < nCount; a++)
+                    {
+                        aRetval.append(mergeTemporaryPointsAndPolygon(pTempData[a].getPolygon(), pTempData[a].getTemporaryPointVector()));
+                    }
+
+                    delete[] pTempData;
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        B2DPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolygon& rCandidate)
+        {
+            if(rCandidate.count())
+            {
+                temporaryPointVector aTempPoints;
+                temporaryPointVector aTempPointsUnused;
+
+                for(sal_uInt32 a(0L); a < rMask.count(); a++)
+                {
+                    const B2DPolygon aPartMask(rMask.getB2DPolygon(a));
+
+                    findTouches(rCandidate, aPartMask, aTempPoints);
+                    findCuts(rCandidate, aPartMask, aTempPoints, aTempPointsUnused);
+                }
+
+                return mergeTemporaryPointsAndPolygon(rCandidate, aTempPoints);
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rMask, const B2DPolyPolygon& rCandidate)
+        {
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(addPointsAtCutsAndTouches(rMask, rCandidate.getB2DPolygon(a)));
+            }
+
+            return aRetval;
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd)
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+
+            if(nCount && !rStart.equal(rEnd))
+            {
+                const B2DRange aPolygonRange(rCandidate.getB2DRange());
+                const B2DRange aEdgeRange(rStart, rEnd);
+
+                if(aPolygonRange.overlaps(aEdgeRange))
+                {
+                    const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nCount : nCount - 1);
+                    temporaryPointVector aTempPoints;
+                    temporaryPointVector aUnusedTempPoints;
+                    B2DCubicBezier aCubic;
+
+                    for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                    {
+                        rCandidate.getBezierSegment(a, aCubic);
+                        B2DRange aCubicRange(aCubic.getStartPoint(), aCubic.getEndPoint());
+
+                        if(aCubic.isBezier())
+                        {
+                            aCubicRange.expand(aCubic.getControlPointA());
+                            aCubicRange.expand(aCubic.getControlPointB());
+
+                            if(aCubicRange.overlaps(aEdgeRange))
+                            {
+                                findEdgeCutsBezierAndEdge(aCubic, rStart, rEnd, a, 0, aTempPoints, aUnusedTempPoints);
+                            }
+                        }
+                        else
+                        {
+                            if(aCubicRange.overlaps(aEdgeRange))
+                            {
+                                findEdgeCutsTwoEdges(aCubic.getStartPoint(), aCubic.getEndPoint(), rStart, rEnd, a, 0, aTempPoints, aUnusedTempPoints);
+                            }
+                        }
+                    }
+
+                    return mergeTemporaryPointsAndPolygon(rCandidate, aTempPoints);
+                }
+            }
+
+            return rCandidate;
+        }
+
+        B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd)
+        {
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0); a < rCandidate.count(); a++)
+            {
+                aRetval.append(addPointsAtCuts(rCandidate.getB2DPolygon(a), rStart, rEnd));
+            }
+
+            return aRetval;
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+        B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rPolyMask)
+        {
+            const sal_uInt32 nCountA(rCandidate.count());
+            const sal_uInt32 nCountM(rPolyMask.count());
+
+            if(nCountA && nCountM)
+            {
+                const B2DRange aRangeA(rCandidate.getB2DRange());
+                const B2DRange aRangeM(rPolyMask.getB2DRange());
+
+                if(aRangeA.overlaps(aRangeM))
+                {
+                    const sal_uInt32 nEdgeCountA(rCandidate.isClosed() ? nCountA : nCountA - 1);
+                    temporaryPointVector aTempPointsA;
+                    temporaryPointVector aUnusedTempPointsB;
+
+                    for(sal_uInt32 m(0); m < nCountM; m++)
+                    {
+                        const B2DPolygon aMask(rPolyMask.getB2DPolygon(m));
+                        const sal_uInt32 nCountB(aMask.count());
+
+                        if(nCountB)
+                        {
+                            B2DCubicBezier aCubicA;
+                            B2DCubicBezier aCubicB;
+
+                            for(sal_uInt32 a(0); a < nEdgeCountA; a++)
+                            {
+                                rCandidate.getBezierSegment(a, aCubicA);
+                                const bool bCubicAIsCurve(aCubicA.isBezier());
+                                B2DRange aCubicRangeA(aCubicA.getStartPoint(), aCubicA.getEndPoint());
+
+                                if(bCubicAIsCurve)
+                                {
+                                    aCubicRangeA.expand(aCubicA.getControlPointA());
+                                    aCubicRangeA.expand(aCubicA.getControlPointB());
+                                }
+
+                                for(sal_uInt32 b(0); b < nCountB; b++)
+                                {
+                                    aMask.getBezierSegment(b, aCubicB);
+                                    const bool bCubicBIsCurve(aCubicB.isBezier());
+                                    B2DRange aCubicRangeB(aCubicB.getStartPoint(), aCubicB.getEndPoint());
+
+                                    if(bCubicBIsCurve)
+                                    {
+                                        aCubicRangeB.expand(aCubicB.getControlPointA());
+                                        aCubicRangeB.expand(aCubicB.getControlPointB());
+                                    }
+
+                                    if(aCubicRangeA.overlaps(aCubicRangeB))
+                                    {
+                                        if(bCubicAIsCurve && bCubicBIsCurve)
+                                        {
+                                            findEdgeCutsTwoBeziers(aCubicA, aCubicB, a, b, aTempPointsA, aUnusedTempPointsB);
+                                        }
+                                        else if(bCubicAIsCurve)
+                                        {
+                                            findEdgeCutsBezierAndEdge(aCubicA, aCubicB.getStartPoint(), aCubicB.getEndPoint(), a, b, aTempPointsA, aUnusedTempPointsB);
+                                        }
+                                        else if(bCubicBIsCurve)
+                                        {
+                                            findEdgeCutsBezierAndEdge(aCubicB, aCubicA.getStartPoint(), aCubicA.getEndPoint(), b, a, aUnusedTempPointsB, aTempPointsA);
+                                        }
+                                        else
+                                        {
+                                            findEdgeCutsTwoEdges(aCubicA.getStartPoint(), aCubicA.getEndPoint(), aCubicB.getStartPoint(), aCubicB.getEndPoint(), a, b, aTempPointsA, aUnusedTempPointsB);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    return mergeTemporaryPointsAndPolygon(rCandidate, aTempPointsA);
+                }
+            }
+
+            return rCandidate;
+        }
+
+        B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rMask)
+        {
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0); a < rCandidate.count(); a++)
+            {
+                aRetval.append(addPointsAtCuts(rCandidate.getB2DPolygon(a), rMask));
+            }
+
+            return aRetval;
+        }
+
+        B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate)
+        {
+            if(rCandidate.count())
+            {
+                temporaryPointVector aTempPoints;
+
+                findCuts(rCandidate, aTempPoints);
+
+                return mergeTemporaryPointsAndPolygon(rCandidate, aTempPoints);
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, bool bSelfIntersections)
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+
+            if(nCount)
+            {
+                B2DPolyPolygon aRetval;
+
+                if(1 == nCount)
+                {
+                    if(bSelfIntersections)
+                    {
+                        // remove self intersections
+                        aRetval.append(addPointsAtCuts(rCandidate.getB2DPolygon(0)));
+                    }
+                    else
+                    {
+                        // copy source
+                        aRetval = rCandidate;
+                    }
+                }
+                else
+                {
+                    // first solve self cuts for all contained single polygons
+                    temporaryPolygonData *pTempData = new temporaryPolygonData[nCount];
+                    sal_uInt32 a, b;
+
+                    for(a = 0; a < nCount; a++)
+                    {
+                        if(bSelfIntersections)
+                        {
+                            // use polygons with solved self intersections
+                            pTempData[a].setPolygon(addPointsAtCuts(rCandidate.getB2DPolygon(a)));
+                        }
+                        else
+                        {
+                            // copy given polygons
+                            pTempData[a].setPolygon(rCandidate.getB2DPolygon(a));
+                        }
+                    }
+
+                    // now cuts and touches between the polygons
+                    for(a = 0; a < nCount; a++)
+                    {
+                        for(b = 0; b < nCount; b++)
+                        {
+                            if(a < b)
+                            {
+                                // look for cuts, compare each edge polygon to following ones
+                                if(pTempData[a].getRange().overlaps(pTempData[b].getRange()))
+                                {
+                                    findCuts(pTempData[a].getPolygon(), pTempData[b].getPolygon(), pTempData[a].getTemporaryPointVector(), pTempData[b].getTemporaryPointVector());
+                                }
+                            }
+                        }
+                    }
+
+                    // consolidate the result
+                    for(a = 0L; a < nCount; a++)
+                    {
+                        aRetval.append(mergeTemporaryPointsAndPolygon(pTempData[a].getPolygon(), pTempData[a].getTemporaryPointVector()));
+                    }
+
+                    delete[] pTempData;
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        ////////////////////////////////////////////////////////////////////////////////
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
new file mode 100644
index 000000000000..e9db491ecd48
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -0,0 +1,3613 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <osl/diagnose.h>
+#include <rtl/math.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/curve/b2dbeziertools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <osl/mutex.hxx>
+
+#include <numeric>
+#include <limits>
+
+// #i37443#
+#define ANGLE_BOUND_START_VALUE     (2.25)
+#define ANGLE_BOUND_MINIMUM_VALUE   (0.1)
+#define COUNT_SUBDIVIDE_DEFAULT     (4L)
+#ifdef DBG_UTIL
+static double fAngleBoundStartValue = ANGLE_BOUND_START_VALUE;
+#endif
+#define STEPSPERQUARTER     (3)
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        void openWithGeometryChange(B2DPolygon& rCandidate)
+        {
+            if(rCandidate.isClosed())
+            {
+                if(rCandidate.count())
+                {
+                    rCandidate.append(rCandidate.getB2DPoint(0));
+
+                    if(rCandidate.areControlPointsUsed() && rCandidate.isPrevControlPointUsed(0))
+                    {
+                        rCandidate.setPrevControlPoint(rCandidate.count() - 1, rCandidate.getPrevControlPoint(0));
+                        rCandidate.resetPrevControlPoint(0);
+                    }
+                }
+
+                rCandidate.setClosed(false);
+            }
+        }
+
+        void closeWithGeometryChange(B2DPolygon& rCandidate)
+        {
+            if(!rCandidate.isClosed())
+            {
+                while(rCandidate.count() > 1 && rCandidate.getB2DPoint(0) == rCandidate.getB2DPoint(rCandidate.count() - 1))
+                {
+                    if(rCandidate.areControlPointsUsed() && rCandidate.isPrevControlPointUsed(rCandidate.count() - 1))
+                    {
+                        rCandidate.setPrevControlPoint(0, rCandidate.getPrevControlPoint(rCandidate.count() - 1));
+                    }
+
+                    rCandidate.remove(rCandidate.count() - 1);
+                }
+
+                rCandidate.setClosed(true);
+            }
+        }
+
+        void checkClosed(B2DPolygon& rCandidate)
+        {
+            // #i80172# Removed unnecessary assertion
+            // OSL_ENSURE(!rCandidate.isClosed(), "checkClosed: already closed (!)");
+
+            if(rCandidate.count() > 1 && rCandidate.getB2DPoint(0) == rCandidate.getB2DPoint(rCandidate.count() - 1))
+            {
+                closeWithGeometryChange(rCandidate);
+            }
+        }
+
+        // Get successor and predecessor indices. Returning the same index means there
+        // is none. Same for successor.
+        sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "getIndexOfPredecessor: Access to polygon out of range (!)");
+
+            if(nIndex)
+            {
+                return nIndex - 1L;
+            }
+            else if(rCandidate.count())
+            {
+                return rCandidate.count() - 1L;
+            }
+            else
+            {
+                return nIndex;
+            }
+        }
+
+        sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B2DPolygon& rCandidate)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "getIndexOfPredecessor: Access to polygon out of range (!)");
+
+            if(nIndex + 1L < rCandidate.count())
+            {
+                return nIndex + 1L;
+            }
+            else if(nIndex + 1L == rCandidate.count())
+            {
+                return 0L;
+            }
+            else
+            {
+                return nIndex;
+            }
+        }
+
+        B2VectorOrientation getOrientation(const B2DPolygon& rCandidate)
+        {
+            B2VectorOrientation eRetval(ORIENTATION_NEUTRAL);
+
+            if(rCandidate.count() > 2L || rCandidate.areControlPointsUsed())
+            {
+                const double fSignedArea(getSignedArea(rCandidate));
+
+                if(fTools::equalZero(fSignedArea))
+                {
+                    // ORIENTATION_NEUTRAL, already set
+                }
+                if(fSignedArea > 0.0)
+                {
+                    eRetval = ORIENTATION_POSITIVE;
+                }
+                else if(fSignedArea < 0.0)
+                {
+                    eRetval = ORIENTATION_NEGATIVE;
+                }
+            }
+
+            return eRetval;
+        }
+
+        B2VectorContinuity getContinuityInPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndex)
+        {
+            return rCandidate.getContinuityInPoint(nIndex);
+        }
+
+        B2DPolygon adaptiveSubdivideByDistance(const B2DPolygon& rCandidate, double fDistanceBound)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nPointCount(rCandidate.count());
+                B2DPolygon aRetval;
+
+                if(nPointCount)
+                {
+                    // prepare edge-oriented loop
+                    const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                    B2DCubicBezier aBezier;
+                    aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+
+                    // perf: try to avoid too many realloctions by guessing the result's pointcount
+                    aRetval.reserve(nPointCount*4);
+
+                    // add start point (always)
+                    aRetval.append(aBezier.getStartPoint());
+
+                    for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                    {
+                        // get next and control points
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        aBezier.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+                        aBezier.setControlPointA(rCandidate.getNextControlPoint(a));
+                        aBezier.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                        aBezier.testAndSolveTrivialBezier();
+
+                        if(aBezier.isBezier())
+                        {
+                            // add curved edge and generate DistanceBound
+                            double fBound(0.0);
+
+                            if(0.0 == fDistanceBound)
+                            {
+                                // If not set, use B2DCubicBezier functionality to guess a rough value
+                                const double fRoughLength((aBezier.getEdgeLength() + aBezier.getControlPolygonLength()) / 2.0);
+
+                                // take 1/100th of the rough curve length
+                                fBound = fRoughLength * 0.01;
+                            }
+                            else
+                            {
+                                // use given bound value
+                                fBound = fDistanceBound;
+                            }
+
+                            // make sure bound value is not too small. The base units are 1/100th mm, thus
+                            // just make sure it's not smaller then 1/100th of that
+                            if(fBound < 0.01)
+                            {
+                                fBound = 0.01;
+                            }
+
+                            // call adaptive subdivide which adds edges to aRetval accordingly
+                            aBezier.adaptiveSubdivideByDistance(aRetval, fBound);
+                        }
+                        else
+                        {
+                            // add non-curved edge
+                            aRetval.append(aBezier.getEndPoint());
+                        }
+
+                        // prepare next step
+                        aBezier.setStartPoint(aBezier.getEndPoint());
+                    }
+
+                    if(rCandidate.isClosed())
+                    {
+                        // set closed flag and correct last point (which is added double now).
+                        closeWithGeometryChange(aRetval);
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolygon adaptiveSubdivideByAngle(const B2DPolygon& rCandidate, double fAngleBound)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nPointCount(rCandidate.count());
+                B2DPolygon aRetval;
+
+                if(nPointCount)
+                {
+                    // prepare edge-oriented loop
+                    const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                    B2DCubicBezier aBezier;
+                    aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+
+                    // perf: try to avoid too many realloctions by guessing the result's pointcount
+                    aRetval.reserve(nPointCount*4);
+
+                    // add start point (always)
+                    aRetval.append(aBezier.getStartPoint());
+
+                    // #i37443# prepare convenient AngleBound if none was given
+                    if(0.0 == fAngleBound)
+                    {
+#ifdef DBG_UTIL
+                        fAngleBound = fAngleBoundStartValue;
+#else
+                        fAngleBound = ANGLE_BOUND_START_VALUE;
+#endif
+                    }
+                    else if(fTools::less(fAngleBound, ANGLE_BOUND_MINIMUM_VALUE))
+                    {
+                        fAngleBound = 0.1;
+                    }
+
+                    for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                    {
+                        // get next and control points
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        aBezier.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+                        aBezier.setControlPointA(rCandidate.getNextControlPoint(a));
+                        aBezier.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                        aBezier.testAndSolveTrivialBezier();
+
+                        if(aBezier.isBezier())
+                        {
+                            // call adaptive subdivide
+                            aBezier.adaptiveSubdivideByAngle(aRetval, fAngleBound, true);
+                        }
+                        else
+                        {
+                            // add non-curved edge
+                            aRetval.append(aBezier.getEndPoint());
+                        }
+
+                        // prepare next step
+                        aBezier.setStartPoint(aBezier.getEndPoint());
+                    }
+
+                    if(rCandidate.isClosed())
+                    {
+                        // set closed flag and correct last point (which is added double now).
+                        closeWithGeometryChange(aRetval);
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolygon adaptiveSubdivideByCount(const B2DPolygon& rCandidate, sal_uInt32 nCount)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nPointCount(rCandidate.count());
+                B2DPolygon aRetval;
+
+                if(nPointCount)
+                {
+                    // prepare edge-oriented loop
+                    const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                    B2DCubicBezier aBezier;
+                    aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+
+                    // perf: try to avoid too many realloctions by guessing the result's pointcount
+                    aRetval.reserve(nPointCount*4);
+
+                    // add start point (always)
+                    aRetval.append(aBezier.getStartPoint());
+
+                    // #i37443# prepare convenient count if none was given
+                    if(0L == nCount)
+                    {
+                        nCount = COUNT_SUBDIVIDE_DEFAULT;
+                    }
+
+                    for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                    {
+                        // get next and control points
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        aBezier.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+                        aBezier.setControlPointA(rCandidate.getNextControlPoint(a));
+                        aBezier.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                        aBezier.testAndSolveTrivialBezier();
+
+                        if(aBezier.isBezier())
+                        {
+                            // call adaptive subdivide
+                            aBezier.adaptiveSubdivideByCount(aRetval, nCount);
+                        }
+                        else
+                        {
+                            // add non-curved edge
+                            aRetval.append(aBezier.getEndPoint());
+                        }
+
+                        // prepare next step
+                        aBezier.setStartPoint(aBezier.getEndPoint());
+                    }
+
+                    if(rCandidate.isClosed())
+                    {
+                        // set closed flag and correct last point (which is added double now).
+                        closeWithGeometryChange(aRetval);
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        bool isInside(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder)
+        {
+            const B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? rCandidate.getDefaultAdaptiveSubdivision() : rCandidate);
+
+            if(bWithBorder && isPointOnPolygon(aCandidate, rPoint, true))
+            {
+                return true;
+            }
+            else
+            {
+                bool bRetval(false);
+                const sal_uInt32 nPointCount(aCandidate.count());
+
+                if(nPointCount)
+                {
+                    B2DPoint aCurrentPoint(aCandidate.getB2DPoint(nPointCount - 1L));
+
+                    for(sal_uInt32 a(0L); a < nPointCount; a++)
+                    {
+                        const B2DPoint aPreviousPoint(aCurrentPoint);
+                        aCurrentPoint = aCandidate.getB2DPoint(a);
+
+                        // cross-over in Y?
+                        const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
+                        const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
+
+                        if(bCompYA != bCompYB)
+                        {
+                            // cross-over in X?
+                            const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
+                            const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
+
+                            if(bCompXA == bCompXB)
+                            {
+                                if(bCompXA)
+                                {
+                                    bRetval = !bRetval;
+                                }
+                            }
+                            else
+                            {
+                                const double fCompare(
+                                    aCurrentPoint.getX() - (aCurrentPoint.getY() - rPoint.getY()) *
+                                    (aPreviousPoint.getX() - aCurrentPoint.getX()) /
+                                    (aPreviousPoint.getY() - aCurrentPoint.getY()));
+
+                                if(fTools::more(fCompare, rPoint.getX()))
+                                {
+                                    bRetval = !bRetval;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                return bRetval;
+            }
+        }
+
+        bool isInside(const B2DPolygon& rCandidate, const B2DPolygon& rPolygon, bool bWithBorder)
+        {
+            const B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? rCandidate.getDefaultAdaptiveSubdivision() : rCandidate);
+            const B2DPolygon aPolygon(rPolygon.areControlPointsUsed() ? rPolygon.getDefaultAdaptiveSubdivision() : rPolygon);
+            const sal_uInt32 nPointCount(aPolygon.count());
+
+            for(sal_uInt32 a(0L); a < nPointCount; a++)
+            {
+                const B2DPoint aTestPoint(aPolygon.getB2DPoint(a));
+
+                if(!isInside(aCandidate, aTestPoint, bWithBorder))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        B2DRange getRangeWithControlPoints(const B2DPolygon& rCandidate)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+            B2DRange aRetval;
+
+            if(nPointCount)
+            {
+                const bool bControlPointsUsed(rCandidate.areControlPointsUsed());
+
+                for(sal_uInt32 a(0); a < nPointCount; a++)
+                {
+                    aRetval.expand(rCandidate.getB2DPoint(a));
+
+                    if(bControlPointsUsed)
+                    {
+                        aRetval.expand(rCandidate.getNextControlPoint(a));
+                        aRetval.expand(rCandidate.getPrevControlPoint(a));
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DRange getRange(const B2DPolygon& rCandidate)
+        {
+            // changed to use internally buffered version at B2DPolygon
+            return rCandidate.getB2DRange();
+        }
+
+        double getSignedArea(const B2DPolygon& rCandidate)
+        {
+            const B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? rCandidate.getDefaultAdaptiveSubdivision() : rCandidate);
+            double fRetval(0.0);
+            const sal_uInt32 nPointCount(aCandidate.count());
+
+            if(nPointCount > 2)
+            {
+                for(sal_uInt32 a(0L); a < nPointCount; a++)
+                {
+                    const B2DPoint aPreviousPoint(aCandidate.getB2DPoint((!a) ? nPointCount - 1L : a - 1L));
+                    const B2DPoint aCurrentPoint(aCandidate.getB2DPoint(a));
+
+                    fRetval += aPreviousPoint.getX() * aCurrentPoint.getY();
+                    fRetval -= aPreviousPoint.getY() * aCurrentPoint.getX();
+                }
+
+                fRetval /= 2.0;
+
+                // correct to zero if small enough. Also test the quadratic
+                // of the result since the precision is near quadratic due to
+                // the algorithm
+                if(fTools::equalZero(fRetval) || fTools::equalZero(fRetval * fRetval))
+                {
+                    fRetval = 0.0;
+                }
+            }
+
+            return fRetval;
+        }
+
+        double getArea(const B2DPolygon& rCandidate)
+        {
+            double fRetval(0.0);
+
+            if(rCandidate.count() > 2 || rCandidate.areControlPointsUsed())
+            {
+                fRetval = getSignedArea(rCandidate);
+                const double fZero(0.0);
+
+                if(fTools::less(fRetval, fZero))
+                {
+                    fRetval = -fRetval;
+                }
+            }
+
+            return fRetval;
+        }
+
+        double getEdgeLength(const B2DPolygon& rCandidate, sal_uInt32 nIndex)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+            OSL_ENSURE(nIndex < nPointCount, "getEdgeLength: Access to polygon out of range (!)");
+            double fRetval(0.0);
+
+            if(nPointCount)
+            {
+                const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
+
+                if(rCandidate.areControlPointsUsed())
+                {
+                    B2DCubicBezier aEdge;
+
+                    aEdge.setStartPoint(rCandidate.getB2DPoint(nIndex));
+                    aEdge.setControlPointA(rCandidate.getNextControlPoint(nIndex));
+                    aEdge.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                    aEdge.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+
+                    fRetval = aEdge.getLength();
+                }
+                else
+                {
+                    const B2DPoint aCurrent(rCandidate.getB2DPoint(nIndex));
+                    const B2DPoint aNext(rCandidate.getB2DPoint(nNextIndex));
+
+                    fRetval = B2DVector(aNext - aCurrent).getLength();
+                }
+            }
+
+            return fRetval;
+        }
+
+        double getLength(const B2DPolygon& rCandidate)
+        {
+            double fRetval(0.0);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount)
+            {
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+
+                if(rCandidate.areControlPointsUsed())
+                {
+                    B2DCubicBezier aEdge;
+                    aEdge.setStartPoint(rCandidate.getB2DPoint(0));
+
+                    for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                    {
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        aEdge.setControlPointA(rCandidate.getNextControlPoint(a));
+                        aEdge.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                        aEdge.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+
+                        fRetval += aEdge.getLength();
+                        aEdge.setStartPoint(aEdge.getEndPoint());
+                    }
+                }
+                else
+                {
+                    B2DPoint aCurrent(rCandidate.getB2DPoint(0));
+
+                    for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                    {
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        const B2DPoint aNext(rCandidate.getB2DPoint(nNextIndex));
+
+                        fRetval += B2DVector(aNext - aCurrent).getLength();
+                        aCurrent = aNext;
+                    }
+                }
+            }
+
+            return fRetval;
+        }
+
+        B2DPoint getPositionAbsolute(const B2DPolygon& rCandidate, double fDistance, double fLength)
+        {
+            B2DPoint aRetval;
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if( 1L == nPointCount )
+            {
+                // only one point (i.e. no edge) - simply take that point
+                aRetval = rCandidate.getB2DPoint(0);
+            }
+            else if(nPointCount > 1L)
+            {
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                sal_uInt32 nIndex(0L);
+                bool bIndexDone(false);
+
+                // get length if not given
+                if(fTools::equalZero(fLength))
+                {
+                    fLength = getLength(rCandidate);
+                }
+
+                if(fTools::less(fDistance, 0.0))
+                {
+                    // handle fDistance < 0.0
+                    if(rCandidate.isClosed())
+                    {
+                        // if fDistance < 0.0 increment with multiple of fLength
+                        sal_uInt32 nCount(sal_uInt32(-fDistance / fLength));
+                        fDistance += double(nCount + 1L) * fLength;
+                    }
+                    else
+                    {
+                        // crop to polygon start
+                        fDistance = 0.0;
+                        bIndexDone = true;
+                    }
+                }
+                else if(fTools::moreOrEqual(fDistance, fLength))
+                {
+                    // handle fDistance >= fLength
+                    if(rCandidate.isClosed())
+                    {
+                        // if fDistance >= fLength decrement with multiple of fLength
+                        sal_uInt32 nCount(sal_uInt32(fDistance / fLength));
+                        fDistance -= (double)(nCount) * fLength;
+                    }
+                    else
+                    {
+                        // crop to polygon end
+                        fDistance = 0.0;
+                        nIndex = nEdgeCount;
+                        bIndexDone = true;
+                    }
+                }
+
+                // look for correct index. fDistance is now [0.0 .. fLength[
+                double fEdgeLength(getEdgeLength(rCandidate, nIndex));
+
+                while(!bIndexDone)
+                {
+                    // edge found must be on the half-open range
+                    // [0,fEdgeLength).
+                    // Note that in theory, we cannot move beyond
+                    // the last polygon point, since fDistance>=fLength
+                    // is checked above. Unfortunately, with floating-
+                    // point calculations, this case might happen.
+                    // Handled by nIndex check below
+                    if(nIndex < nEdgeCount && fTools::moreOrEqual(fDistance, fEdgeLength))
+                    {
+                        // go to next edge
+                        fDistance -= fEdgeLength;
+                        fEdgeLength = getEdgeLength(rCandidate, ++nIndex);
+                    }
+                    else
+                    {
+                        // it's on this edge, stop
+                        bIndexDone = true;
+                    }
+                }
+
+                // get the point using nIndex
+                aRetval = rCandidate.getB2DPoint(nIndex);
+
+                // if fDistance != 0.0, move that length on the edge. The edge
+                // length is in fEdgeLength.
+                if(!fTools::equalZero(fDistance))
+                {
+                    if(fTools::moreOrEqual(fDistance, fEdgeLength))
+                    {
+                        // end point of choosen edge
+                        const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
+                        aRetval = rCandidate.getB2DPoint(nNextIndex);
+                    }
+                    else if(fTools::equalZero(fDistance))
+                    {
+                        // start point of choosen edge
+                        aRetval = aRetval;
+                    }
+                    else
+                    {
+                        // inside edge
+                        const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
+                        const B2DPoint aNextPoint(rCandidate.getB2DPoint(nNextIndex));
+                        bool bDone(false);
+
+                        // add calculated average value to the return value
+                        if(rCandidate.areControlPointsUsed())
+                        {
+                            // get as bezier segment
+                            const B2DCubicBezier aBezierSegment(
+                                aRetval, rCandidate.getNextControlPoint(nIndex),
+                                rCandidate.getPrevControlPoint(nNextIndex), aNextPoint);
+
+                            if(aBezierSegment.isBezier())
+                            {
+                                // use B2DCubicBezierHelper to bridge the non-linear gap between
+                                // length and bezier distances
+                                const B2DCubicBezierHelper aBezierSegmentHelper(aBezierSegment);
+                                const double fBezierDistance(aBezierSegmentHelper.distanceToRelative(fDistance));
+
+                                aRetval = aBezierSegment.interpolatePoint(fBezierDistance);
+                                bDone = true;
+                            }
+                        }
+
+                        if(!bDone)
+                        {
+                            const double fRelativeInEdge(fDistance / fEdgeLength);
+                            aRetval = interpolate(aRetval, aNextPoint, fRelativeInEdge);
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPoint getPositionRelative(const B2DPolygon& rCandidate, double fDistance, double fLength)
+        {
+            // get length if not given
+            if(fTools::equalZero(fLength))
+            {
+                fLength = getLength(rCandidate);
+            }
+
+            // multiply fDistance with real length to get absolute position and
+            // use getPositionAbsolute
+            return getPositionAbsolute(rCandidate, fDistance * fLength, fLength);
+        }
+
+        B2DPolygon getSnippetAbsolute(const B2DPolygon& rCandidate, double fFrom, double fTo, double fLength)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount)
+            {
+                // get length if not given
+                if(fTools::equalZero(fLength))
+                {
+                    fLength = getLength(rCandidate);
+                }
+
+                // test and correct fFrom
+                if(fTools::less(fFrom, 0.0))
+                {
+                    fFrom = 0.0;
+                }
+
+                // test and correct fTo
+                if(fTools::more(fTo, fLength))
+                {
+                    fTo = fLength;
+                }
+
+                // test and correct relationship of fFrom, fTo
+                if(fTools::more(fFrom, fTo))
+                {
+                    fFrom = fTo = (fFrom + fTo) / 2.0;
+                }
+
+                if(fTools::equalZero(fFrom) && fTools::equal(fTo, fLength))
+                {
+                    // no change, result is the whole polygon
+                    return rCandidate;
+                }
+                else
+                {
+                    B2DPolygon aRetval;
+                    const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                    double fPositionOfStart(0.0);
+                    bool bStartDone(false);
+                    bool bEndDone(false);
+
+                    for(sal_uInt32 a(0L); !(bStartDone && bEndDone) && a < nEdgeCount; a++)
+                    {
+                        const double fEdgeLength(getEdgeLength(rCandidate, a));
+
+                        if(!bStartDone)
+                        {
+                            if(fTools::equalZero(fFrom))
+                            {
+                                aRetval.append(rCandidate.getB2DPoint(a));
+
+                                if(rCandidate.areControlPointsUsed())
+                                {
+                                    aRetval.setNextControlPoint(aRetval.count() - 1, rCandidate.getNextControlPoint(a));
+                                }
+
+                                bStartDone = true;
+                            }
+                            else if(fTools::moreOrEqual(fFrom, fPositionOfStart) && fTools::less(fFrom, fPositionOfStart + fEdgeLength))
+                            {
+                                // calculate and add start point
+                                if(fTools::equalZero(fEdgeLength))
+                                {
+                                    aRetval.append(rCandidate.getB2DPoint(a));
+
+                                    if(rCandidate.areControlPointsUsed())
+                                    {
+                                        aRetval.setNextControlPoint(aRetval.count() - 1, rCandidate.getNextControlPoint(a));
+                                    }
+                                }
+                                else
+                                {
+                                    const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                                    const B2DPoint aStart(rCandidate.getB2DPoint(a));
+                                    const B2DPoint aEnd(rCandidate.getB2DPoint(nNextIndex));
+                                    bool bDone(false);
+
+                                    if(rCandidate.areControlPointsUsed())
+                                    {
+                                        const B2DCubicBezier aBezierSegment(
+                                            aStart, rCandidate.getNextControlPoint(a),
+                                            rCandidate.getPrevControlPoint(nNextIndex), aEnd);
+
+                                        if(aBezierSegment.isBezier())
+                                        {
+                                            // use B2DCubicBezierHelper to bridge the non-linear gap between
+                                            // length and bezier distances
+                                            const B2DCubicBezierHelper aBezierSegmentHelper(aBezierSegment);
+                                            const double fBezierDistance(aBezierSegmentHelper.distanceToRelative(fFrom - fPositionOfStart));
+                                            B2DCubicBezier aRight;
+
+                                            aBezierSegment.split(fBezierDistance, 0, &aRight);
+                                            aRetval.append(aRight.getStartPoint());
+                                            aRetval.setNextControlPoint(aRetval.count() - 1, aRight.getControlPointA());
+                                            bDone = true;
+                                        }
+                                    }
+
+                                    if(!bDone)
+                                    {
+                                        const double fRelValue((fFrom - fPositionOfStart) / fEdgeLength);
+                                        aRetval.append(interpolate(aStart, aEnd, fRelValue));
+                                    }
+                                }
+
+                                bStartDone = true;
+
+                                // if same point, end is done, too.
+                                if(fFrom == fTo)
+                                {
+                                    bEndDone = true;
+                                }
+                            }
+                        }
+
+                        if(!bEndDone && fTools::moreOrEqual(fTo, fPositionOfStart) && fTools::less(fTo, fPositionOfStart + fEdgeLength))
+                        {
+                            // calculate and add end point
+                            if(fTools::equalZero(fEdgeLength))
+                            {
+                                const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                                aRetval.append(rCandidate.getB2DPoint(nNextIndex));
+
+                                if(rCandidate.areControlPointsUsed())
+                                {
+                                    aRetval.setPrevControlPoint(aRetval.count() - 1, rCandidate.getPrevControlPoint(nNextIndex));
+                                }
+                            }
+                            else
+                            {
+                                const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                                const B2DPoint aStart(rCandidate.getB2DPoint(a));
+                                const B2DPoint aEnd(rCandidate.getB2DPoint(nNextIndex));
+                                bool bDone(false);
+
+                                if(rCandidate.areControlPointsUsed())
+                                {
+                                    const B2DCubicBezier aBezierSegment(
+                                        aStart, rCandidate.getNextControlPoint(a),
+                                        rCandidate.getPrevControlPoint(nNextIndex), aEnd);
+
+                                    if(aBezierSegment.isBezier())
+                                    {
+                                        // use B2DCubicBezierHelper to bridge the non-linear gap between
+                                        // length and bezier distances
+                                        const B2DCubicBezierHelper aBezierSegmentHelper(aBezierSegment);
+                                        const double fBezierDistance(aBezierSegmentHelper.distanceToRelative(fTo - fPositionOfStart));
+                                        B2DCubicBezier aLeft;
+
+                                        aBezierSegment.split(fBezierDistance, &aLeft, 0);
+                                        aRetval.append(aLeft.getEndPoint());
+                                        aRetval.setPrevControlPoint(aRetval.count() - 1, aLeft.getControlPointB());
+                                        bDone = true;
+                                    }
+                                }
+
+                                if(!bDone)
+                                {
+                                    const double fRelValue((fTo - fPositionOfStart) / fEdgeLength);
+                                    aRetval.append(interpolate(aStart, aEnd, fRelValue));
+                                }
+                            }
+
+                            bEndDone = true;
+                        }
+
+                        if(!bEndDone)
+                        {
+                            if(bStartDone)
+                            {
+                                // add segments end point
+                                const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                                aRetval.append(rCandidate.getB2DPoint(nNextIndex));
+
+                                if(rCandidate.areControlPointsUsed())
+                                {
+                                    aRetval.setPrevControlPoint(aRetval.count() - 1, rCandidate.getPrevControlPoint(nNextIndex));
+                                    aRetval.setNextControlPoint(aRetval.count() - 1, rCandidate.getNextControlPoint(nNextIndex));
+                                }
+                            }
+
+                            // increment fPositionOfStart
+                            fPositionOfStart += fEdgeLength;
+                        }
+                    }
+                    return aRetval;
+                }
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolygon getSnippetRelative(const B2DPolygon& rCandidate, double fFrom, double fTo, double fLength)
+        {
+            // get length if not given
+            if(fTools::equalZero(fLength))
+            {
+                fLength = getLength(rCandidate);
+            }
+
+            // multiply distances with real length to get absolute position and
+            // use getSnippetAbsolute
+            return getSnippetAbsolute(rCandidate, fFrom * fLength, fTo * fLength, fLength);
+        }
+
+        CutFlagValue findCut(
+            const B2DPolygon& rCandidate,
+            sal_uInt32 nIndex1, sal_uInt32 nIndex2,
+            CutFlagValue aCutFlags,
+            double* pCut1, double* pCut2)
+        {
+            CutFlagValue aRetval(CUTFLAG_NONE);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nIndex1 < nPointCount && nIndex2 < nPointCount && nIndex1 != nIndex2)
+            {
+                sal_uInt32 nEnd1(getIndexOfSuccessor(nIndex1, rCandidate));
+                sal_uInt32 nEnd2(getIndexOfSuccessor(nIndex2, rCandidate));
+
+                const B2DPoint aStart1(rCandidate.getB2DPoint(nIndex1));
+                const B2DPoint aEnd1(rCandidate.getB2DPoint(nEnd1));
+                const B2DVector aVector1(aEnd1 - aStart1);
+
+                const B2DPoint aStart2(rCandidate.getB2DPoint(nIndex2));
+                const B2DPoint aEnd2(rCandidate.getB2DPoint(nEnd2));
+                const B2DVector aVector2(aEnd2 - aStart2);
+
+                aRetval = findCut(
+                    aStart1, aVector1, aStart2, aVector2,
+                    aCutFlags, pCut1, pCut2);
+            }
+
+            return aRetval;
+        }
+
+        CutFlagValue findCut(
+            const B2DPolygon& rCandidate1, sal_uInt32 nIndex1,
+            const B2DPolygon& rCandidate2, sal_uInt32 nIndex2,
+            CutFlagValue aCutFlags,
+            double* pCut1, double* pCut2)
+        {
+            CutFlagValue aRetval(CUTFLAG_NONE);
+            const sal_uInt32 nPointCount1(rCandidate1.count());
+            const sal_uInt32 nPointCount2(rCandidate2.count());
+
+            if(nIndex1 < nPointCount1 && nIndex2 < nPointCount2)
+            {
+                sal_uInt32 nEnd1(getIndexOfSuccessor(nIndex1, rCandidate1));
+                sal_uInt32 nEnd2(getIndexOfSuccessor(nIndex2, rCandidate2));
+
+                const B2DPoint aStart1(rCandidate1.getB2DPoint(nIndex1));
+                const B2DPoint aEnd1(rCandidate1.getB2DPoint(nEnd1));
+                const B2DVector aVector1(aEnd1 - aStart1);
+
+                const B2DPoint aStart2(rCandidate2.getB2DPoint(nIndex2));
+                const B2DPoint aEnd2(rCandidate2.getB2DPoint(nEnd2));
+                const B2DVector aVector2(aEnd2 - aStart2);
+
+                aRetval = findCut(
+                    aStart1, aVector1, aStart2, aVector2,
+                    aCutFlags, pCut1, pCut2);
+            }
+
+            return aRetval;
+        }
+
+        CutFlagValue findCut(
+            const B2DPoint& rEdge1Start, const B2DVector& rEdge1Delta,
+            const B2DPoint& rEdge2Start, const B2DVector& rEdge2Delta,
+            CutFlagValue aCutFlags,
+            double* pCut1, double* pCut2)
+        {
+            CutFlagValue aRetval(CUTFLAG_NONE);
+            double fCut1(0.0);
+            double fCut2(0.0);
+            bool bFinished(!((bool)(aCutFlags & CUTFLAG_ALL)));
+
+            // test for same points?
+            if(!bFinished
+                && (aCutFlags & (CUTFLAG_START1|CUTFLAG_END1))
+                && (aCutFlags & (CUTFLAG_START2|CUTFLAG_END2)))
+            {
+                // same startpoint?
+                if(!bFinished && (aCutFlags & (CUTFLAG_START1|CUTFLAG_START2)) == (CUTFLAG_START1|CUTFLAG_START2))
+                {
+                    if(rEdge1Start.equal(rEdge2Start))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_START1|CUTFLAG_START2);
+                    }
+                }
+
+                // same endpoint?
+                if(!bFinished && (aCutFlags & (CUTFLAG_END1|CUTFLAG_END2)) == (CUTFLAG_END1|CUTFLAG_END2))
+                {
+                    const B2DPoint aEnd1(rEdge1Start + rEdge1Delta);
+                    const B2DPoint aEnd2(rEdge2Start + rEdge2Delta);
+
+                    if(aEnd1.equal(aEnd2))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_END1|CUTFLAG_END2);
+                        fCut1 = fCut2 = 1.0;
+                    }
+                }
+
+                // startpoint1 == endpoint2?
+                if(!bFinished && (aCutFlags & (CUTFLAG_START1|CUTFLAG_END2)) == (CUTFLAG_START1|CUTFLAG_END2))
+                {
+                    const B2DPoint aEnd2(rEdge2Start + rEdge2Delta);
+
+                    if(rEdge1Start.equal(aEnd2))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_START1|CUTFLAG_END2);
+                        fCut1 = 0.0;
+                        fCut2 = 1.0;
+                    }
+                }
+
+                // startpoint2 == endpoint1?
+                if(!bFinished&& (aCutFlags & (CUTFLAG_START2|CUTFLAG_END1)) == (CUTFLAG_START2|CUTFLAG_END1))
+                {
+                    const B2DPoint aEnd1(rEdge1Start + rEdge1Delta);
+
+                    if(rEdge2Start.equal(aEnd1))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_START2|CUTFLAG_END1);
+                        fCut1 = 1.0;
+                        fCut2 = 0.0;
+                    }
+                }
+            }
+
+            if(!bFinished && (aCutFlags & CUTFLAG_LINE))
+            {
+                if(!bFinished && (aCutFlags & CUTFLAG_START1))
+                {
+                    // start1 on line 2 ?
+                    if(isPointOnEdge(rEdge1Start, rEdge2Start, rEdge2Delta, &fCut2))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_LINE|CUTFLAG_START1);
+                    }
+                }
+
+                if(!bFinished && (aCutFlags & CUTFLAG_START2))
+                {
+                    // start2 on line 1 ?
+                    if(isPointOnEdge(rEdge2Start, rEdge1Start, rEdge1Delta, &fCut1))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_LINE|CUTFLAG_START2);
+                    }
+                }
+
+                if(!bFinished && (aCutFlags & CUTFLAG_END1))
+                {
+                    // end1 on line 2 ?
+                    const B2DPoint aEnd1(rEdge1Start + rEdge1Delta);
+
+                    if(isPointOnEdge(aEnd1, rEdge2Start, rEdge2Delta, &fCut2))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_LINE|CUTFLAG_END1);
+                    }
+                }
+
+                if(!bFinished && (aCutFlags & CUTFLAG_END2))
+                {
+                    // end2 on line 1 ?
+                    const B2DPoint aEnd2(rEdge2Start + rEdge2Delta);
+
+                    if(isPointOnEdge(aEnd2, rEdge1Start, rEdge1Delta, &fCut1))
+                    {
+                        bFinished = true;
+                        aRetval = (CUTFLAG_LINE|CUTFLAG_END2);
+                    }
+                }
+
+                if(!bFinished)
+                {
+                    // cut in line1, line2 ?
+                    fCut1 = (rEdge1Delta.getX() * rEdge2Delta.getY()) - (rEdge1Delta.getY() * rEdge2Delta.getX());
+
+                    if(!fTools::equalZero(fCut1))
+                    {
+                        fCut1 = (rEdge2Delta.getY() * (rEdge2Start.getX() - rEdge1Start.getX())
+                            + rEdge2Delta.getX() * (rEdge1Start.getY() - rEdge2Start.getY())) / fCut1;
+
+                        const double fZero(0.0);
+                        const double fOne(1.0);
+
+                        // inside parameter range edge1 AND fCut2 is calcable
+                        if(fTools::more(fCut1, fZero) && fTools::less(fCut1, fOne)
+                            && (!fTools::equalZero(rEdge2Delta.getX()) || !fTools::equalZero(rEdge2Delta.getY())))
+                        {
+                            // take the mopre precise calculation of the two possible
+                            if(fabs(rEdge2Delta.getX()) > fabs(rEdge2Delta.getY()))
+                            {
+                                fCut2 = (rEdge1Start.getX() + fCut1
+                                    * rEdge1Delta.getX() - rEdge2Start.getX()) / rEdge2Delta.getX();
+                            }
+                            else
+                            {
+                                fCut2 = (rEdge1Start.getY() + fCut1
+                                    * rEdge1Delta.getY() - rEdge2Start.getY()) / rEdge2Delta.getY();
+                            }
+
+                            // inside parameter range edge2, too
+                            if(fTools::more(fCut2, fZero) && fTools::less(fCut2, fOne))
+                            {
+                                bFinished = true;
+                                aRetval = CUTFLAG_LINE;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // copy values if wanted
+            if(pCut1)
+            {
+                *pCut1 = fCut1;
+            }
+
+            if(pCut2)
+            {
+                *pCut2 = fCut2;
+            }
+
+            return aRetval;
+        }
+
+        bool isPointOnEdge(
+            const B2DPoint& rPoint,
+            const B2DPoint& rEdgeStart,
+            const B2DVector& rEdgeDelta,
+            double* pCut)
+        {
+            bool bDeltaXIsZero(fTools::equalZero(rEdgeDelta.getX()));
+            bool bDeltaYIsZero(fTools::equalZero(rEdgeDelta.getY()));
+            const double fZero(0.0);
+            const double fOne(1.0);
+
+            if(bDeltaXIsZero && bDeltaYIsZero)
+            {
+                // no line, just a point
+                return false;
+            }
+            else if(bDeltaXIsZero)
+            {
+                // vertical line
+                if(fTools::equal(rPoint.getX(), rEdgeStart.getX()))
+                {
+                    double fValue = (rPoint.getY() - rEdgeStart.getY()) / rEdgeDelta.getY();
+
+                    if(fTools::more(fValue, fZero) && fTools::less(fValue, fOne))
+                    {
+                        if(pCut)
+                        {
+                            *pCut = fValue;
+                        }
+
+                        return true;
+                    }
+                }
+            }
+            else if(bDeltaYIsZero)
+            {
+                // horizontal line
+                if(fTools::equal(rPoint.getY(), rEdgeStart.getY()))
+                {
+                    double fValue = (rPoint.getX() - rEdgeStart.getX()) / rEdgeDelta.getX();
+
+                    if(fTools::more(fValue, fZero) && fTools::less(fValue, fOne))
+                    {
+                        if(pCut)
+                        {
+                            *pCut = fValue;
+                        }
+
+                        return true;
+                    }
+                }
+            }
+            else
+            {
+                // any angle line
+                double fTOne = (rPoint.getX() - rEdgeStart.getX()) / rEdgeDelta.getX();
+                double fTTwo = (rPoint.getY() - rEdgeStart.getY()) / rEdgeDelta.getY();
+
+                if(fTools::equal(fTOne, fTTwo))
+                {
+                    // same parameter representation, point is on line. Take
+                    // middle value for better results
+                    double fValue = (fTOne + fTTwo) / 2.0;
+
+                    if(fTools::more(fValue, fZero) && fTools::less(fValue, fOne))
+                    {
+                        // point is inside line bounds, too
+                        if(pCut)
+                        {
+                            *pCut = fValue;
+                        }
+
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        void applyLineDashing(const B2DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fDotDashLength)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+            const sal_uInt32 nDotDashCount(rDotDashArray.size());
+
+            if(fTools::lessOrEqual(fDotDashLength, 0.0))
+            {
+                fDotDashLength = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
+            }
+
+            if(fTools::more(fDotDashLength, 0.0) && (pLineTarget || pGapTarget) && nPointCount)
+            {
+                // clear targets
+                if(pLineTarget)
+                {
+                    pLineTarget->clear();
+                }
+
+                if(pGapTarget)
+                {
+                    pGapTarget->clear();
+                }
+
+                // prepare current edge's start
+                B2DCubicBezier aCurrentEdge;
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                aCurrentEdge.setStartPoint(rCandidate.getB2DPoint(0));
+
+                // prepare DotDashArray iteration and the line/gap switching bool
+                sal_uInt32 nDotDashIndex(0);
+                bool bIsLine(true);
+                double fDotDashMovingLength(rDotDashArray[0]);
+                B2DPolygon aSnippet;
+
+                // iterate over all edges
+                for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                {
+                    // update current edge (fill in C1, C2 and end point)
+                    double fLastDotDashMovingLength(0.0);
+                    const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                    aCurrentEdge.setControlPointA(rCandidate.getNextControlPoint(a));
+                    aCurrentEdge.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                    aCurrentEdge.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+
+                    // check if we have a trivial bezier segment -> possible fallback to edge
+                    aCurrentEdge.testAndSolveTrivialBezier();
+
+                    if(aCurrentEdge.isBezier())
+                    {
+                        // bezier segment
+                        const B2DCubicBezierHelper aCubicBezierHelper(aCurrentEdge);
+                        const double fEdgeLength(aCubicBezierHelper.getLength());
+
+                        if(!fTools::equalZero(fEdgeLength))
+                        {
+                            while(fTools::less(fDotDashMovingLength, fEdgeLength))
+                            {
+                                // new split is inside edge, create and append snippet [fLastDotDashMovingLength, fDotDashMovingLength]
+                                const bool bHandleLine(bIsLine && pLineTarget);
+                                const bool bHandleGap(!bIsLine && pGapTarget);
+
+                                if(bHandleLine || bHandleGap)
+                                {
+                                    const double fBezierSplitStart(aCubicBezierHelper.distanceToRelative(fLastDotDashMovingLength));
+                                    const double fBezierSplitEnd(aCubicBezierHelper.distanceToRelative(fDotDashMovingLength));
+                                    B2DCubicBezier aBezierSnippet(aCurrentEdge.snippet(fBezierSplitStart, fBezierSplitEnd));
+
+                                    if(!aSnippet.count())
+                                    {
+                                        aSnippet.append(aBezierSnippet.getStartPoint());
+                                    }
+
+                                    aSnippet.appendBezierSegment(aBezierSnippet.getControlPointA(), aBezierSnippet.getControlPointB(), aBezierSnippet.getEndPoint());
+
+                                    if(bHandleLine)
+                                    {
+                                        pLineTarget->append(aSnippet);
+                                    }
+                                    else
+                                    {
+                                        pGapTarget->append(aSnippet);
+                                    }
+
+                                    aSnippet.clear();
+                                }
+
+                                // prepare next DotDashArray step and flip line/gap flag
+                                fLastDotDashMovingLength = fDotDashMovingLength;
+                                fDotDashMovingLength += rDotDashArray[(++nDotDashIndex) % nDotDashCount];
+                                bIsLine = !bIsLine;
+                            }
+
+                            // append closing snippet [fLastDotDashMovingLength, fEdgeLength]
+                            const bool bHandleLine(bIsLine && pLineTarget);
+                            const bool bHandleGap(!bIsLine && pGapTarget);
+
+                            if(bHandleLine || bHandleGap)
+                            {
+                                B2DCubicBezier aRight;
+                                const double fBezierSplit(aCubicBezierHelper.distanceToRelative(fLastDotDashMovingLength));
+
+                                aCurrentEdge.split(fBezierSplit, 0, &aRight);
+
+                                if(!aSnippet.count())
+                                {
+                                    aSnippet.append(aRight.getStartPoint());
+                                }
+
+                                aSnippet.appendBezierSegment(aRight.getControlPointA(), aRight.getControlPointB(), aRight.getEndPoint());
+                            }
+
+                            // prepare move to next edge
+                            fDotDashMovingLength -= fEdgeLength;
+                        }
+                    }
+                    else
+                    {
+                        // simple edge
+                        const double fEdgeLength(aCurrentEdge.getEdgeLength());
+
+                        if(!fTools::equalZero(fEdgeLength))
+                        {
+                            while(fTools::less(fDotDashMovingLength, fEdgeLength))
+                            {
+                                // new split is inside edge, create and append snippet [fLastDotDashMovingLength, fDotDashMovingLength]
+                                const bool bHandleLine(bIsLine && pLineTarget);
+                                const bool bHandleGap(!bIsLine && pGapTarget);
+
+                                if(bHandleLine || bHandleGap)
+                                {
+                                    if(!aSnippet.count())
+                                    {
+                                        aSnippet.append(interpolate(aCurrentEdge.getStartPoint(), aCurrentEdge.getEndPoint(), fLastDotDashMovingLength / fEdgeLength));
+                                    }
+
+                                    aSnippet.append(interpolate(aCurrentEdge.getStartPoint(), aCurrentEdge.getEndPoint(), fDotDashMovingLength / fEdgeLength));
+
+                                    if(bHandleLine)
+                                    {
+                                        pLineTarget->append(aSnippet);
+                                    }
+                                    else
+                                    {
+                                        pGapTarget->append(aSnippet);
+                                    }
+
+                                    aSnippet.clear();
+                                }
+
+                                // prepare next DotDashArray step and flip line/gap flag
+                                fLastDotDashMovingLength = fDotDashMovingLength;
+                                fDotDashMovingLength += rDotDashArray[(++nDotDashIndex) % nDotDashCount];
+                                bIsLine = !bIsLine;
+                            }
+
+                            // append snippet [fLastDotDashMovingLength, fEdgeLength]
+                            const bool bHandleLine(bIsLine && pLineTarget);
+                            const bool bHandleGap(!bIsLine && pGapTarget);
+
+                            if(bHandleLine || bHandleGap)
+                            {
+                                if(!aSnippet.count())
+                                {
+                                    aSnippet.append(interpolate(aCurrentEdge.getStartPoint(), aCurrentEdge.getEndPoint(), fLastDotDashMovingLength / fEdgeLength));
+                                }
+
+                                aSnippet.append(aCurrentEdge.getEndPoint());
+                            }
+
+                            // prepare move to next edge
+                            fDotDashMovingLength -= fEdgeLength;
+                        }
+                    }
+
+                    // prepare next edge step (end point gets new start point)
+                    aCurrentEdge.setStartPoint(aCurrentEdge.getEndPoint());
+                }
+
+                // append last intermediate results (if exists)
+                if(aSnippet.count())
+                {
+                    if(bIsLine && pLineTarget)
+                    {
+                        pLineTarget->append(aSnippet);
+                    }
+                    else if(!bIsLine && pGapTarget)
+                    {
+                        pGapTarget->append(aSnippet);
+                    }
+                }
+
+                // check if start and end polygon may be merged
+                if(pLineTarget)
+                {
+                    const sal_uInt32 nCount(pLineTarget->count());
+
+                    if(nCount > 1)
+                    {
+                        // these polygons were created above, there exists none with less than two points,
+                        // thus dircet point access below is allowed
+                        const B2DPolygon aFirst(pLineTarget->getB2DPolygon(0));
+                        B2DPolygon aLast(pLineTarget->getB2DPolygon(nCount - 1));
+
+                        if(aFirst.getB2DPoint(0).equal(aLast.getB2DPoint(aLast.count() - 1)))
+                        {
+                            // start of first and end of last are the same -> merge them
+                            aLast.append(aFirst);
+                            aLast.removeDoublePoints();
+                            pLineTarget->setB2DPolygon(0, aLast);
+                            pLineTarget->remove(nCount - 1);
+                        }
+                    }
+                }
+
+                if(pGapTarget)
+                {
+                    const sal_uInt32 nCount(pGapTarget->count());
+
+                    if(nCount > 1)
+                    {
+                        // these polygons were created above, there exists none with less than two points,
+                        // thus dircet point access below is allowed
+                        const B2DPolygon aFirst(pGapTarget->getB2DPolygon(0));
+                        B2DPolygon aLast(pGapTarget->getB2DPolygon(nCount - 1));
+
+                        if(aFirst.getB2DPoint(0).equal(aLast.getB2DPoint(aLast.count() - 1)))
+                        {
+                            // start of first and end of last are the same -> merge them
+                            aLast.append(aFirst);
+                            aLast.removeDoublePoints();
+                            pGapTarget->setB2DPolygon(0, aLast);
+                            pGapTarget->remove(nCount - 1);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // parameters make no sense, just add source to targets
+                if(pLineTarget)
+                {
+                    pLineTarget->append(rCandidate);
+                }
+
+                if(pGapTarget)
+                {
+                    pGapTarget->append(rCandidate);
+                }
+            }
+        }
+
+        // test if point is inside epsilon-range around an edge defined
+        // by the two given points. Can be used for HitTesting. The epsilon-range
+        // is defined to be the rectangle centered to the given edge, using height
+        // 2 x fDistance, and the circle around both points with radius fDistance.
+        bool isInEpsilonRange(const B2DPoint& rEdgeStart, const B2DPoint& rEdgeEnd, const B2DPoint& rTestPosition, double fDistance)
+        {
+            // build edge vector
+            const B2DVector aEdge(rEdgeEnd - rEdgeStart);
+            bool bDoDistanceTestStart(false);
+            bool bDoDistanceTestEnd(false);
+
+            if(aEdge.equalZero())
+            {
+                // no edge, just a point. Do one of the distance tests.
+                bDoDistanceTestStart = true;
+            }
+            else
+            {
+                // edge has a length. Create perpendicular vector.
+                const B2DVector aPerpend(getPerpendicular(aEdge));
+                double fCut(
+                    (aPerpend.getY() * (rTestPosition.getX() - rEdgeStart.getX())
+                    + aPerpend.getX() * (rEdgeStart.getY() - rTestPosition.getY())) /
+                    (aEdge.getX() * aEdge.getX() + aEdge.getY() * aEdge.getY()));
+                const double fZero(0.0);
+                const double fOne(1.0);
+
+                if(fTools::less(fCut, fZero))
+                {
+                    // left of rEdgeStart
+                    bDoDistanceTestStart = true;
+                }
+                else if(fTools::more(fCut, fOne))
+                {
+                    // right of rEdgeEnd
+                    bDoDistanceTestEnd = true;
+                }
+                else
+                {
+                    // inside line [0.0 .. 1.0]
+                    const B2DPoint aCutPoint(interpolate(rEdgeStart, rEdgeEnd, fCut));
+                    const B2DVector aDelta(rTestPosition - aCutPoint);
+                    const double fDistanceSquare(aDelta.scalar(aDelta));
+
+                    if(fDistanceSquare <= fDistance * fDistance)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            if(bDoDistanceTestStart)
+            {
+                const B2DVector aDelta(rTestPosition - rEdgeStart);
+                const double fDistanceSquare(aDelta.scalar(aDelta));
+
+                if(fDistanceSquare <= fDistance * fDistance)
+                {
+                    return true;
+                }
+            }
+            else if(bDoDistanceTestEnd)
+            {
+                const B2DVector aDelta(rTestPosition - rEdgeEnd);
+                const double fDistanceSquare(aDelta.scalar(aDelta));
+
+                if(fDistanceSquare <= fDistance * fDistance)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        // test if point is inside epsilon-range around the given Polygon. Can be used
+        // for HitTesting. The epsilon-range is defined to be the tube around the polygon
+        // with distance fDistance and rounded edges (start and end point).
+        bool isInEpsilonRange(const B2DPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance)
+        {
+            // force to non-bezier polygon
+            const B2DPolygon aCandidate(rCandidate.getDefaultAdaptiveSubdivision());
+            const sal_uInt32 nPointCount(aCandidate.count());
+
+            if(nPointCount)
+            {
+                const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                B2DPoint aCurrent(aCandidate.getB2DPoint(0));
+
+                if(nEdgeCount)
+                {
+                    // edges
+                    for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                    {
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        const B2DPoint aNext(aCandidate.getB2DPoint(nNextIndex));
+
+                        if(isInEpsilonRange(aCurrent, aNext, rTestPosition, fDistance))
+                        {
+                            return true;
+                        }
+
+                        // prepare next step
+                        aCurrent = aNext;
+                    }
+                }
+                else
+                {
+                    // no edges, but points -> not closed. Check single point. Just
+                    // use isInEpsilonRange with twice the same point, it handles those well
+                    if(isInEpsilonRange(aCurrent, aCurrent, rTestPosition, fDistance))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadius )
+        {
+            const double fZero(0.0);
+            const double fOne(1.0);
+
+            if(fTools::lessOrEqual(fRadius, fZero))
+            {
+                // no radius, use rectangle
+                return createPolygonFromRect( rRect );
+            }
+            else if(fTools::moreOrEqual(fRadius, fOne))
+            {
+                // full radius, use ellipse
+                const B2DPoint aCenter(rRect.getCenter());
+                const double fRadiusX(rRect.getWidth() / 2.0);
+                const double fRadiusY(rRect.getHeight() / 2.0);
+
+                return createPolygonFromEllipse( aCenter, fRadiusX, fRadiusY );
+            }
+            else
+            {
+                // create rectangle with two radii between ]0.0 .. 1.0[
+                return createPolygonFromRect( rRect, fRadius, fRadius );
+            }
+        }
+
+        B2DPolygon createPolygonFromRect( const B2DRectangle& rRect, double fRadiusX, double fRadiusY )
+        {
+            const double fZero(0.0);
+            const double fOne(1.0);
+
+            // crop to useful values
+            if(fTools::less(fRadiusX, fZero))
+            {
+                fRadiusX = fZero;
+            }
+            else if(fTools::more(fRadiusX, fOne))
+            {
+                fRadiusX = fOne;
+            }
+
+            if(fTools::less(fRadiusY, fZero))
+            {
+                fRadiusY = fZero;
+            }
+            else if(fTools::more(fRadiusY, fOne))
+            {
+                fRadiusY = fOne;
+            }
+
+            if(fZero == fRadiusX || fZero == fRadiusY)
+            {
+                B2DPolygon aRetval;
+
+                // at least in one direction no radius, use rectangle.
+                // Do not use createPolygonFromRect() here since original
+                // creator (historical reasons) still creates a start point at the
+                // bottom center, so do the same here to get the same line patterns.
+                // Due to this the order of points is different, too.
+                const B2DPoint aBottomCenter(rRect.getCenter().getX(), rRect.getMaxY());
+                aRetval.append(aBottomCenter);
+
+                aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMaxY() ) );
+                aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMinY() ) );
+                aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMinY() ) );
+                aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMaxY() ) );
+
+                // close
+                aRetval.setClosed( true );
+
+                return aRetval;
+            }
+            else if(fOne == fRadiusX && fOne == fRadiusY)
+            {
+                // in both directions full radius, use ellipse
+                const B2DPoint aCenter(rRect.getCenter());
+                const double fRectRadiusX(rRect.getWidth() / 2.0);
+                const double fRectRadiusY(rRect.getHeight() / 2.0);
+
+                return createPolygonFromEllipse( aCenter, fRectRadiusX, fRectRadiusY );
+            }
+            else
+            {
+                B2DPolygon aRetval;
+                const double fBowX((rRect.getWidth() / 2.0) * fRadiusX);
+                const double fBowY((rRect.getHeight() / 2.0) * fRadiusY);
+                const double fKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
+
+                // create start point at bottom center
+                if(fOne != fRadiusX)
+                {
+                    const B2DPoint aBottomCenter(rRect.getCenter().getX(), rRect.getMaxY());
+                    aRetval.append(aBottomCenter);
+                }
+
+                // create first bow
+                {
+                    const B2DPoint aBottomRight(rRect.getMaxX(), rRect.getMaxY());
+                    const B2DPoint aStart(aBottomRight + B2DPoint(-fBowX, 0.0));
+                    const B2DPoint aStop(aBottomRight + B2DPoint(0.0, -fBowY));
+                    aRetval.append(aStart);
+                    aRetval.appendBezierSegment(interpolate(aStart, aBottomRight, fKappa), interpolate(aStop, aBottomRight, fKappa), aStop);
+                }
+
+                // create second bow
+                {
+                    const B2DPoint aTopRight(rRect.getMaxX(), rRect.getMinY());
+                    const B2DPoint aStart(aTopRight + B2DPoint(0.0, fBowY));
+                    const B2DPoint aStop(aTopRight + B2DPoint(-fBowX, 0.0));
+                    aRetval.append(aStart);
+                    aRetval.appendBezierSegment(interpolate(aStart, aTopRight, fKappa), interpolate(aStop, aTopRight, fKappa), aStop);
+                }
+
+                // create third bow
+                {
+                    const B2DPoint aTopLeft(rRect.getMinX(), rRect.getMinY());
+                    const B2DPoint aStart(aTopLeft + B2DPoint(fBowX, 0.0));
+                    const B2DPoint aStop(aTopLeft + B2DPoint(0.0, fBowY));
+                    aRetval.append(aStart);
+                    aRetval.appendBezierSegment(interpolate(aStart, aTopLeft, fKappa), interpolate(aStop, aTopLeft, fKappa), aStop);
+                }
+
+                // create forth bow
+                {
+                    const B2DPoint aBottomLeft(rRect.getMinX(), rRect.getMaxY());
+                    const B2DPoint aStart(aBottomLeft + B2DPoint(0.0, -fBowY));
+                    const B2DPoint aStop(aBottomLeft + B2DPoint(fBowX, 0.0));
+                    aRetval.append(aStart);
+                    aRetval.appendBezierSegment(interpolate(aStart, aBottomLeft, fKappa), interpolate(aStop, aBottomLeft, fKappa), aStop);
+                }
+
+                // close
+                aRetval.setClosed( true );
+
+                // remove double created points if there are extreme radii envolved
+                if(fOne == fRadiusX || fOne == fRadiusY)
+                {
+                    aRetval.removeDoublePoints();
+                }
+
+                return aRetval;
+            }
+        }
+
+        B2DPolygon createPolygonFromRect( const B2DRectangle& rRect )
+        {
+            B2DPolygon aRetval;
+
+            aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMinY() ) );
+            aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMinY() ) );
+            aRetval.append( B2DPoint( rRect.getMaxX(), rRect.getMaxY() ) );
+            aRetval.append( B2DPoint( rRect.getMinX(), rRect.getMaxY() ) );
+
+            // close
+            aRetval.setClosed( true );
+
+            return aRetval;
+        }
+
+        B2DPolygon createUnitPolygon()
+        {
+            static B2DPolygon aRetval;
+
+            if(!aRetval.count())
+            {
+                aRetval.append( B2DPoint( 0.0, 0.0 ) );
+                aRetval.append( B2DPoint( 1.0, 0.0 ) );
+                aRetval.append( B2DPoint( 1.0, 1.0 ) );
+                aRetval.append( B2DPoint( 0.0, 1.0 ) );
+
+                // close
+                aRetval.setClosed( true );
+            }
+
+            return aRetval;
+        }
+
+        B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius )
+        {
+            return createPolygonFromEllipse( rCenter, fRadius, fRadius );
+        }
+
+        B2DPolygon impCreateUnitCircle(sal_uInt32 nStartQuadrant)
+        {
+            B2DPolygon aUnitCircle;
+            const double fKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
+            const double fScaledKappa(fKappa * (1.0 / STEPSPERQUARTER));
+            const B2DHomMatrix aRotateMatrix(createRotateB2DHomMatrix(F_PI2 / STEPSPERQUARTER));
+
+            B2DPoint aPoint(1.0, 0.0);
+            B2DPoint aForward(1.0, fScaledKappa);
+            B2DPoint aBackward(1.0, -fScaledKappa);
+
+            if(0 != nStartQuadrant)
+            {
+                const B2DHomMatrix aQuadrantMatrix(createRotateB2DHomMatrix(F_PI2 * (nStartQuadrant % 4)));
+                aPoint *= aQuadrantMatrix;
+                aBackward *= aQuadrantMatrix;
+                aForward *= aQuadrantMatrix;
+            }
+
+            aUnitCircle.append(aPoint);
+
+            for(sal_uInt32 a(0); a < STEPSPERQUARTER * 4; a++)
+            {
+                aPoint *= aRotateMatrix;
+                aBackward *= aRotateMatrix;
+                aUnitCircle.appendBezierSegment(aForward, aBackward, aPoint);
+                aForward *= aRotateMatrix;
+            }
+
+            aUnitCircle.setClosed(true);
+            aUnitCircle.removeDoublePoints();
+
+            return aUnitCircle;
+        }
+
+        B2DPolygon createPolygonFromUnitCircle(sal_uInt32 nStartQuadrant)
+        {
+            switch(nStartQuadrant % 4)
+            {
+                case 1 :
+                {
+                    static B2DPolygon aUnitCircleStartQuadrantOne;
+
+                    if(!aUnitCircleStartQuadrantOne.count())
+                    {
+                        ::osl::Mutex m_mutex;
+                        aUnitCircleStartQuadrantOne = impCreateUnitCircle(1);
+                    }
+
+                    return aUnitCircleStartQuadrantOne;
+                }
+                case 2 :
+                {
+                    static B2DPolygon aUnitCircleStartQuadrantTwo;
+
+                    if(!aUnitCircleStartQuadrantTwo.count())
+                    {
+                        ::osl::Mutex m_mutex;
+                        aUnitCircleStartQuadrantTwo = impCreateUnitCircle(2);
+                    }
+
+                    return aUnitCircleStartQuadrantTwo;
+                }
+                case 3 :
+                {
+                    static B2DPolygon aUnitCircleStartQuadrantThree;
+
+                    if(!aUnitCircleStartQuadrantThree.count())
+                    {
+                        ::osl::Mutex m_mutex;
+                        aUnitCircleStartQuadrantThree = impCreateUnitCircle(3);
+                    }
+
+                    return aUnitCircleStartQuadrantThree;
+                }
+                default : // case 0 :
+                {
+                    static B2DPolygon aUnitCircleStartQuadrantZero;
+
+                    if(!aUnitCircleStartQuadrantZero.count())
+                    {
+                        ::osl::Mutex m_mutex;
+                        aUnitCircleStartQuadrantZero = impCreateUnitCircle(0);
+                    }
+
+                    return aUnitCircleStartQuadrantZero;
+                }
+            }
+        }
+
+        B2DPolygon createPolygonFromEllipse( const B2DPoint& rCenter, double fRadiusX, double fRadiusY )
+        {
+            B2DPolygon aRetval(createPolygonFromUnitCircle());
+            const B2DHomMatrix aMatrix(createScaleTranslateB2DHomMatrix(fRadiusX, fRadiusY, rCenter.getX(), rCenter.getY()));
+
+            aRetval.transform(aMatrix);
+
+            return aRetval;
+        }
+
+        B2DPolygon createPolygonFromUnitEllipseSegment( double fStart, double fEnd )
+        {
+            B2DPolygon aRetval;
+
+            // truncate fStart, fEnd to a range of [0.0 .. F_2PI[ where F_2PI
+            // falls back to 0.0 to ensure a unique definition
+            if(fTools::less(fStart, 0.0))
+            {
+                fStart = 0.0;
+            }
+
+            if(fTools::moreOrEqual(fStart, F_2PI))
+            {
+                fStart = 0.0;
+            }
+
+            if(fTools::less(fEnd, 0.0))
+            {
+                fEnd = 0.0;
+            }
+
+            if(fTools::moreOrEqual(fEnd, F_2PI))
+            {
+                fEnd = 0.0;
+            }
+
+            if(fTools::equal(fStart, fEnd))
+            {
+                // same start and end angle, add single point
+                aRetval.append(B2DPoint(cos(fStart), sin(fStart)));
+            }
+            else
+            {
+                const sal_uInt32 nSegments(STEPSPERQUARTER * 4);
+                const double fAnglePerSegment(F_PI2 / STEPSPERQUARTER);
+                const sal_uInt32 nStartSegment(sal_uInt32(fStart / fAnglePerSegment) % nSegments);
+                const sal_uInt32 nEndSegment(sal_uInt32(fEnd / fAnglePerSegment) % nSegments);
+                const double fKappa((M_SQRT2 - 1.0) * 4.0 / 3.0);
+                const double fScaledKappa(fKappa * (1.0 / STEPSPERQUARTER));
+
+                B2DPoint aSegStart(cos(fStart), sin(fStart));
+                aRetval.append(aSegStart);
+
+                if(nStartSegment == nEndSegment && fTools::more(fEnd, fStart))
+                {
+                    // start and end in one sector and in the right order, create in one segment
+                    const B2DPoint aSegEnd(cos(fEnd), sin(fEnd));
+                    const double fFactor(fScaledKappa * ((fEnd - fStart) / fAnglePerSegment));
+
+                    aRetval.appendBezierSegment(
+                        aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
+                        aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
+                        aSegEnd);
+                }
+                else
+                {
+                    double fSegEndRad((nStartSegment + 1) * fAnglePerSegment);
+                    double fFactor(fScaledKappa * ((fSegEndRad - fStart) / fAnglePerSegment));
+                    B2DPoint aSegEnd(cos(fSegEndRad), sin(fSegEndRad));
+
+                    aRetval.appendBezierSegment(
+                        aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
+                        aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
+                        aSegEnd);
+
+                    sal_uInt32 nSegment((nStartSegment + 1) % nSegments);
+                    aSegStart = aSegEnd;
+
+                    while(nSegment != nEndSegment)
+                    {
+                        // No end in this sector, add full sector.
+                        fSegEndRad = (nSegment + 1) * fAnglePerSegment;
+                        aSegEnd = B2DPoint(cos(fSegEndRad), sin(fSegEndRad));
+
+                        aRetval.appendBezierSegment(
+                            aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fScaledKappa),
+                            aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fScaledKappa),
+                            aSegEnd);
+
+                        nSegment = (nSegment + 1) % nSegments;
+                        aSegStart = aSegEnd;
+                    }
+
+                    // End in this sector
+                    const double fSegStartRad(nSegment * fAnglePerSegment);
+                    fFactor = fScaledKappa * ((fEnd - fSegStartRad) / fAnglePerSegment);
+                    aSegEnd = B2DPoint(cos(fEnd), sin(fEnd));
+
+                    aRetval.appendBezierSegment(
+                        aSegStart + (B2DPoint(-aSegStart.getY(), aSegStart.getX()) * fFactor),
+                        aSegEnd - (B2DPoint(-aSegEnd.getY(), aSegEnd.getX()) * fFactor),
+                        aSegEnd);
+                }
+            }
+
+            // remove double points between segments created by segmented creation
+            aRetval.removeDoublePoints();
+
+            return aRetval;
+        }
+
+        B2DPolygon createPolygonFromEllipseSegment( const B2DPoint& rCenter, double fRadiusX, double fRadiusY, double fStart, double fEnd )
+        {
+            B2DPolygon aRetval(createPolygonFromUnitEllipseSegment(fStart, fEnd));
+            const B2DHomMatrix aMatrix(createScaleTranslateB2DHomMatrix(fRadiusX, fRadiusY, rCenter.getX(), rCenter.getY()));
+
+            aRetval.transform(aMatrix);
+
+            return aRetval;
+        }
+
+        bool hasNeutralPoints(const B2DPolygon& rCandidate)
+        {
+            OSL_ENSURE(!rCandidate.areControlPointsUsed(), "hasNeutralPoints: ATM works not for curves (!)");
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 2L)
+            {
+                B2DPoint aPrevPoint(rCandidate.getB2DPoint(nPointCount - 1L));
+                B2DPoint aCurrPoint(rCandidate.getB2DPoint(0L));
+
+                for(sal_uInt32 a(0L); a < nPointCount; a++)
+                {
+                    const B2DPoint aNextPoint(rCandidate.getB2DPoint((a + 1) % nPointCount));
+                    const B2DVector aPrevVec(aPrevPoint - aCurrPoint);
+                    const B2DVector aNextVec(aNextPoint - aCurrPoint);
+                    const B2VectorOrientation aOrientation(getOrientation(aNextVec, aPrevVec));
+
+                    if(ORIENTATION_NEUTRAL == aOrientation)
+                    {
+                        // current has neutral orientation
+                        return true;
+                    }
+                    else
+                    {
+                        // prepare next
+                        aPrevPoint = aCurrPoint;
+                        aCurrPoint = aNextPoint;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        B2DPolygon removeNeutralPoints(const B2DPolygon& rCandidate)
+        {
+            if(hasNeutralPoints(rCandidate))
+            {
+                const sal_uInt32 nPointCount(rCandidate.count());
+                B2DPolygon aRetval;
+                B2DPoint aPrevPoint(rCandidate.getB2DPoint(nPointCount - 1L));
+                B2DPoint aCurrPoint(rCandidate.getB2DPoint(0L));
+
+                for(sal_uInt32 a(0L); a < nPointCount; a++)
+                {
+                    const B2DPoint aNextPoint(rCandidate.getB2DPoint((a + 1) % nPointCount));
+                    const B2DVector aPrevVec(aPrevPoint - aCurrPoint);
+                    const B2DVector aNextVec(aNextPoint - aCurrPoint);
+                    const B2VectorOrientation aOrientation(getOrientation(aNextVec, aPrevVec));
+
+                    if(ORIENTATION_NEUTRAL == aOrientation)
+                    {
+                        // current has neutral orientation, leave it out and prepare next
+                        aCurrPoint = aNextPoint;
+                    }
+                    else
+                    {
+                        // add current point
+                        aRetval.append(aCurrPoint);
+
+                        // prepare next
+                        aPrevPoint = aCurrPoint;
+                        aCurrPoint = aNextPoint;
+                    }
+                }
+
+                while(aRetval.count() && ORIENTATION_NEUTRAL == getOrientationForIndex(aRetval, 0L))
+                {
+                    aRetval.remove(0L);
+                }
+
+                // copy closed state
+                aRetval.setClosed(rCandidate.isClosed());
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        bool isConvex(const B2DPolygon& rCandidate)
+        {
+            OSL_ENSURE(!rCandidate.areControlPointsUsed(), "isConvex: ATM works not for curves (!)");
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 2L)
+            {
+                const B2DPoint aPrevPoint(rCandidate.getB2DPoint(nPointCount - 1L));
+                B2DPoint aCurrPoint(rCandidate.getB2DPoint(0L));
+                B2DVector aCurrVec(aPrevPoint - aCurrPoint);
+                B2VectorOrientation aOrientation(ORIENTATION_NEUTRAL);
+
+                for(sal_uInt32 a(0L); a < nPointCount; a++)
+                {
+                    const B2DPoint aNextPoint(rCandidate.getB2DPoint((a + 1) % nPointCount));
+                    const B2DVector aNextVec(aNextPoint - aCurrPoint);
+                    const B2VectorOrientation aCurrentOrientation(getOrientation(aNextVec, aCurrVec));
+
+                    if(ORIENTATION_NEUTRAL == aOrientation)
+                    {
+                        // set start value, maybe neutral again
+                        aOrientation = aCurrentOrientation;
+                    }
+                    else
+                    {
+                        if(ORIENTATION_NEUTRAL != aCurrentOrientation && aCurrentOrientation != aOrientation)
+                        {
+                            // different orientations found, that's it
+                            return false;
+                        }
+                    }
+
+                    // prepare next
+                    aCurrPoint = aNextPoint;
+                    aCurrVec = -aNextVec;
+                }
+            }
+
+            return true;
+        }
+
+        B2VectorOrientation getOrientationForIndex(const B2DPolygon& rCandidate, sal_uInt32 nIndex)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "getOrientationForIndex: index out of range (!)");
+            const B2DPoint aPrev(rCandidate.getB2DPoint(getIndexOfPredecessor(nIndex, rCandidate)));
+            const B2DPoint aCurr(rCandidate.getB2DPoint(nIndex));
+            const B2DPoint aNext(rCandidate.getB2DPoint(getIndexOfSuccessor(nIndex, rCandidate)));
+            const B2DVector aBack(aPrev - aCurr);
+            const B2DVector aForw(aNext - aCurr);
+
+            return getOrientation(aForw, aBack);
+        }
+
+        bool isPointOnLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidate, bool bWithPoints)
+        {
+            if(rCandidate.equal(rStart) || rCandidate.equal(rEnd))
+            {
+                // candidate is in epsilon around start or end -> inside
+                return bWithPoints;
+            }
+            else if(rStart.equal(rEnd))
+            {
+                // start and end are equal, but candidate is outside their epsilon -> outside
+                return false;
+            }
+            else
+            {
+                const B2DVector aEdgeVector(rEnd - rStart);
+                const B2DVector aTestVector(rCandidate - rStart);
+
+                if(areParallel(aEdgeVector, aTestVector))
+                {
+                    const double fZero(0.0);
+                    const double fOne(1.0);
+                    const double fParamTestOnCurr(fabs(aEdgeVector.getX()) > fabs(aEdgeVector.getY())
+                        ? aTestVector.getX() / aEdgeVector.getX()
+                        : aTestVector.getY() / aEdgeVector.getY());
+
+                    if(fTools::more(fParamTestOnCurr, fZero) && fTools::less(fParamTestOnCurr, fOne))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        bool isPointOnPolygon(const B2DPolygon& rCandidate, const B2DPoint& rPoint, bool bWithPoints)
+        {
+            const B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? rCandidate.getDefaultAdaptiveSubdivision() : rCandidate);
+            const sal_uInt32 nPointCount(aCandidate.count());
+
+            if(nPointCount > 1L)
+            {
+                const sal_uInt32 nLoopCount(aCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                B2DPoint aCurrentPoint(aCandidate.getB2DPoint(0L));
+
+                for(sal_uInt32 a(0L); a < nLoopCount; a++)
+                {
+                    const B2DPoint aNextPoint(aCandidate.getB2DPoint((a + 1L) % nPointCount));
+
+                    if(isPointOnLine(aCurrentPoint, aNextPoint, rPoint, bWithPoints))
+                    {
+                        return true;
+                    }
+
+                    aCurrentPoint = aNextPoint;
+                }
+            }
+            else if(nPointCount && bWithPoints)
+            {
+                return rPoint.equal(aCandidate.getB2DPoint(0L));
+            }
+
+            return false;
+        }
+
+        bool isPointInTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC, const B2DPoint& rCandidate, bool bWithBorder)
+        {
+            if(arePointsOnSameSideOfLine(rA, rB, rC, rCandidate, bWithBorder))
+            {
+                if(arePointsOnSameSideOfLine(rB, rC, rA, rCandidate, bWithBorder))
+                {
+                    if(arePointsOnSameSideOfLine(rC, rA, rB, rCandidate, bWithBorder))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        bool arePointsOnSameSideOfLine(const B2DPoint& rStart, const B2DPoint& rEnd, const B2DPoint& rCandidateA, const B2DPoint& rCandidateB, bool bWithLine)
+        {
+            const B2DVector aLineVector(rEnd - rStart);
+            const B2DVector aVectorToA(rEnd - rCandidateA);
+            const double fCrossA(aLineVector.cross(aVectorToA));
+
+            if(fTools::equalZero(fCrossA))
+            {
+                // one point on the line
+                return bWithLine;
+            }
+
+            const B2DVector aVectorToB(rEnd - rCandidateB);
+            const double fCrossB(aLineVector.cross(aVectorToB));
+
+            if(fTools::equalZero(fCrossB))
+            {
+                // one point on the line
+                return bWithLine;
+            }
+
+            // return true if they both have the same sign
+            return ((fCrossA > 0.0) == (fCrossB > 0.0));
+        }
+
+        void addTriangleFan(const B2DPolygon& rCandidate, B2DPolygon& rTarget)
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+
+            if(nCount > 2L)
+            {
+                const B2DPoint aStart(rCandidate.getB2DPoint(0L));
+                B2DPoint aLast(rCandidate.getB2DPoint(1L));
+
+                for(sal_uInt32 a(2L); a < nCount; a++)
+                {
+                    const B2DPoint aCurrent(rCandidate.getB2DPoint(a));
+                    rTarget.append(aStart);
+                    rTarget.append(aLast);
+                    rTarget.append(aCurrent);
+
+                    // prepare next
+                    aLast = aCurrent;
+                }
+            }
+        }
+
+        namespace
+        {
+            /// return 0 for input of 0, -1 for negative and 1 for positive input
+            inline int lcl_sgn( const double n )
+            {
+                return n == 0.0 ? 0 : 1 - 2*::rtl::math::isSignBitSet(n);
+            }
+        }
+
+        bool isRectangle( const B2DPolygon& rPoly )
+        {
+            // polygon must be closed to resemble a rect, and contain
+            // at least four points.
+            if( !rPoly.isClosed() ||
+                rPoly.count() < 4 ||
+                rPoly.areControlPointsUsed() )
+            {
+                return false;
+            }
+
+            // number of 90 degree turns the polygon has taken
+            int nNumTurns(0);
+
+            int  nVerticalEdgeType=0;
+            int  nHorizontalEdgeType=0;
+            bool bNullVertex(true);
+            bool bCWPolygon(false);  // when true, polygon is CW
+                                     // oriented, when false, CCW
+            bool bOrientationSet(false); // when false, polygon
+                                         // orientation has not yet
+                                         // been determined.
+
+            // scan all _edges_ (which involves coming back to point 0
+            // for the last edge - thus the modulo operation below)
+            const sal_Int32 nCount( rPoly.count() );
+            for( sal_Int32 i=0; i<nCount; ++i )
+            {
+                const B2DPoint& rPoint0( rPoly.getB2DPoint(i % nCount) );
+                const B2DPoint& rPoint1( rPoly.getB2DPoint((i+1) % nCount) );
+
+                // is 0 for zero direction vector, 1 for south edge and -1
+                // for north edge (standard screen coordinate system)
+                int nCurrVerticalEdgeType( lcl_sgn( rPoint1.getY() - rPoint0.getY() ) );
+
+                // is 0 for zero direction vector, 1 for east edge and -1
+                // for west edge (standard screen coordinate system)
+                int nCurrHorizontalEdgeType( lcl_sgn(rPoint1.getX() - rPoint0.getX()) );
+
+                if( nCurrVerticalEdgeType && nCurrHorizontalEdgeType )
+                    return false; // oblique edge - for sure no rect
+
+                const bool bCurrNullVertex( !nCurrVerticalEdgeType && !nCurrHorizontalEdgeType );
+
+                // current vertex is equal to previous - just skip,
+                // until we have a real edge
+                if( bCurrNullVertex )
+                    continue;
+
+                // if previous edge has two identical points, because
+                // no previous edge direction was available, simply
+                // take this first non-null edge as the start
+                // direction. That's what will happen here, if
+                // bNullVertex is false
+                if( !bNullVertex )
+                {
+                    // 2D cross product - is 1 for CW and -1 for CCW turns
+                    const int nCrossProduct( nHorizontalEdgeType*nCurrVerticalEdgeType -
+                                             nVerticalEdgeType*nCurrHorizontalEdgeType );
+
+                    if( !nCrossProduct )
+                        continue; // no change in orientation -
+                                  // collinear edges - just go on
+
+                    // if polygon orientation is not set, we'll
+                    // determine it now
+                    if( !bOrientationSet )
+                    {
+                        bCWPolygon = nCrossProduct == 1;
+                        bOrientationSet = true;
+                    }
+                    else
+                    {
+                        // if current turn orientation is not equal
+                        // initial orientation, this is not a
+                        // rectangle (as rectangles have consistent
+                        // orientation).
+                        if( (nCrossProduct == 1) != bCWPolygon )
+                            return false;
+                    }
+
+                    ++nNumTurns;
+
+                    // More than four 90 degree turns are an
+                    // indication that this must not be a rectangle.
+                    if( nNumTurns > 4 )
+                        return false;
+                }
+
+                // store current state for the next turn
+                nVerticalEdgeType   = nCurrVerticalEdgeType;
+                nHorizontalEdgeType = nCurrHorizontalEdgeType;
+                bNullVertex         = false; // won't reach this line,
+                                             // if bCurrNullVertex is
+                                             // true - see above
+            }
+
+            return true;
+        }
+
+        B3DPolygon createB3DPolygonFromB2DPolygon(const B2DPolygon& rCandidate, double fZCoordinate)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                // call myself recursively with subdivided input
+                const B2DPolygon aCandidate(adaptiveSubdivideByAngle(rCandidate));
+                return createB3DPolygonFromB2DPolygon(aCandidate, fZCoordinate);
+            }
+            else
+            {
+                B3DPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+                {
+                    B2DPoint aPoint(rCandidate.getB2DPoint(a));
+                    aRetval.append(B3DPoint(aPoint.getX(), aPoint.getY(), fZCoordinate));
+                }
+
+                // copy closed state
+                aRetval.setClosed(rCandidate.isClosed());
+
+                return aRetval;
+            }
+        }
+
+        B2DPolygon createB2DPolygonFromB3DPolygon(const B3DPolygon& rCandidate, const B3DHomMatrix& rMat)
+        {
+            B2DPolygon aRetval;
+            const sal_uInt32 nCount(rCandidate.count());
+            const bool bIsIdentity(rMat.isIdentity());
+
+            for(sal_uInt32 a(0L); a < nCount; a++)
+            {
+                B3DPoint aCandidate(rCandidate.getB3DPoint(a));
+
+                if(!bIsIdentity)
+                {
+                    aCandidate *= rMat;
+                }
+
+                aRetval.append(B2DPoint(aCandidate.getX(), aCandidate.getY()));
+            }
+
+            // copy closed state
+            aRetval.setClosed(rCandidate.isClosed());
+
+            return aRetval;
+        }
+
+        double getDistancePointToEndlessRay(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut)
+        {
+            if(rPointA.equal(rPointB))
+            {
+                rCut = 0.0;
+                const B2DVector aVector(rTestPoint - rPointA);
+                return aVector.getLength();
+            }
+            else
+            {
+                // get the relative cut value on line vector (Vector1) for cut with perpendicular through TestPoint
+                const B2DVector aVector1(rPointB - rPointA);
+                const B2DVector aVector2(rTestPoint - rPointA);
+                const double fDividend((aVector2.getX() * aVector1.getX()) + (aVector2.getY() * aVector1.getY()));
+                const double fDivisor((aVector1.getX() * aVector1.getX()) + (aVector1.getY() * aVector1.getY()));
+
+                rCut = fDividend / fDivisor;
+
+                const B2DPoint aCutPoint(rPointA + rCut * aVector1);
+                const B2DVector aVector(rTestPoint - aCutPoint);
+                return aVector.getLength();
+            }
+        }
+
+        double getSmallestDistancePointToEdge(const B2DPoint& rPointA, const B2DPoint& rPointB, const B2DPoint& rTestPoint, double& rCut)
+        {
+            if(rPointA.equal(rPointB))
+            {
+                rCut = 0.0;
+                const B2DVector aVector(rTestPoint - rPointA);
+                return aVector.getLength();
+            }
+            else
+            {
+                // get the relative cut value on line vector (Vector1) for cut with perpendicular through TestPoint
+                const B2DVector aVector1(rPointB - rPointA);
+                const B2DVector aVector2(rTestPoint - rPointA);
+                const double fDividend((aVector2.getX() * aVector1.getX()) + (aVector2.getY() * aVector1.getY()));
+                const double fDivisor((aVector1.getX() * aVector1.getX()) + (aVector1.getY() * aVector1.getY()));
+                const double fCut(fDividend / fDivisor);
+
+                if(fCut < 0.0)
+                {
+                    // not in line range, get distance to PointA
+                    rCut = 0.0;
+                    return aVector2.getLength();
+                }
+                else if(fCut > 1.0)
+                {
+                    // not in line range, get distance to PointB
+                    rCut = 1.0;
+                    const B2DVector aVector(rTestPoint - rPointB);
+                    return aVector.getLength();
+                }
+                else
+                {
+                    // in line range
+                    const B2DPoint aCutPoint(rPointA + fCut * aVector1);
+                    const B2DVector aVector(rTestPoint - aCutPoint);
+                    rCut = fCut;
+                    return aVector.getLength();
+                }
+            }
+        }
+
+        double getSmallestDistancePointToPolygon(const B2DPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rEdgeIndex, double& rCut)
+        {
+            double fRetval(DBL_MAX);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 1L)
+            {
+                const double fZero(0.0);
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                B2DCubicBezier aBezier;
+                aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+
+                for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                {
+                    const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                    aBezier.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+                    double fEdgeDist;
+                    double fNewCut;
+                    bool bEdgeIsCurve(false);
+
+                    if(rCandidate.areControlPointsUsed())
+                    {
+                        aBezier.setControlPointA(rCandidate.getNextControlPoint(a));
+                        aBezier.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                        aBezier.testAndSolveTrivialBezier();
+                        bEdgeIsCurve = aBezier.isBezier();
+                    }
+
+                    if(bEdgeIsCurve)
+                    {
+                        fEdgeDist = aBezier.getSmallestDistancePointToBezierSegment(rTestPoint, fNewCut);
+                    }
+                    else
+                    {
+                        fEdgeDist = getSmallestDistancePointToEdge(aBezier.getStartPoint(), aBezier.getEndPoint(), rTestPoint, fNewCut);
+                    }
+
+                    if(DBL_MAX == fRetval || fEdgeDist < fRetval)
+                    {
+                        fRetval = fEdgeDist;
+                        rEdgeIndex = a;
+                        rCut = fNewCut;
+
+                        if(fTools::equal(fRetval, fZero))
+                        {
+                            // already found zero distance, cannot get better. Ensure numerical zero value and end loop.
+                            fRetval = 0.0;
+                            break;
+                        }
+                    }
+
+                    // prepare next step
+                    aBezier.setStartPoint(aBezier.getEndPoint());
+                }
+
+                if(1.0 == rCut)
+                {
+                    // correct rEdgeIndex when not last point
+                    if(rCandidate.isClosed())
+                    {
+                        rEdgeIndex = getIndexOfSuccessor(rEdgeIndex, rCandidate);
+                        rCut = 0.0;
+                    }
+                    else
+                    {
+                        if(rEdgeIndex != nEdgeCount - 1L)
+                        {
+                            rEdgeIndex++;
+                            rCut = 0.0;
+                        }
+                    }
+                }
+            }
+
+            return fRetval;
+        }
+
+        B2DPoint distort(const B2DPoint& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight)
+        {
+            if(fTools::equalZero(rOriginal.getWidth()) || fTools::equalZero(rOriginal.getHeight()))
+            {
+                return rCandidate;
+            }
+            else
+            {
+                const double fRelativeX((rCandidate.getX() - rOriginal.getMinX()) / rOriginal.getWidth());
+                const double fRelativeY((rCandidate.getY() - rOriginal.getMinY()) / rOriginal.getHeight());
+                const double fOneMinusRelativeX(1.0 - fRelativeX);
+                const double fOneMinusRelativeY(1.0 - fRelativeY);
+                const double fNewX((fOneMinusRelativeY) * ((fOneMinusRelativeX) * rTopLeft.getX() + fRelativeX * rTopRight.getX()) +
+                    fRelativeY * ((fOneMinusRelativeX) * rBottomLeft.getX() + fRelativeX * rBottomRight.getX()));
+                const double fNewY((fOneMinusRelativeX) * ((fOneMinusRelativeY) * rTopLeft.getY() + fRelativeY * rBottomLeft.getY()) +
+                    fRelativeX * ((fOneMinusRelativeY) * rTopRight.getY() + fRelativeY * rBottomRight.getY()));
+
+                return B2DPoint(fNewX, fNewY);
+            }
+        }
+
+        B2DPolygon distort(const B2DPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount && 0.0 != rOriginal.getWidth() && 0.0 != rOriginal.getHeight())
+            {
+                B2DPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < nPointCount; a++)
+                {
+                    aRetval.append(distort(rCandidate.getB2DPoint(a), rOriginal, rTopLeft, rTopRight, rBottomLeft, rBottomRight));
+
+                    if(rCandidate.areControlPointsUsed())
+                    {
+                        if(!rCandidate.getPrevControlPoint(a).equalZero())
+                        {
+                            aRetval.setPrevControlPoint(a, distort(rCandidate.getPrevControlPoint(a), rOriginal, rTopLeft, rTopRight, rBottomLeft, rBottomRight));
+                        }
+
+                        if(!rCandidate.getNextControlPoint(a).equalZero())
+                        {
+                            aRetval.setNextControlPoint(a, distort(rCandidate.getNextControlPoint(a), rOriginal, rTopLeft, rTopRight, rBottomLeft, rBottomRight));
+                        }
+                    }
+                }
+
+                aRetval.setClosed(rCandidate.isClosed());
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolygon rotateAroundPoint(const B2DPolygon& rCandidate, const B2DPoint& rCenter, double fAngle)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+            B2DPolygon aRetval(rCandidate);
+
+            if(nPointCount)
+            {
+                const B2DHomMatrix aMatrix(basegfx::tools::createRotateAroundPoint(rCenter, fAngle));
+
+                aRetval.transform(aMatrix);
+            }
+
+            return aRetval;
+        }
+
+        B2DPolygon expandToCurve(const B2DPolygon& rCandidate)
+        {
+            B2DPolygon aRetval(rCandidate);
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                expandToCurveInPoint(aRetval, a);
+            }
+
+            return aRetval;
+        }
+
+        bool expandToCurveInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "expandToCurveInPoint: Access to polygon out of range (!)");
+            bool bRetval(false);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount)
+            {
+                // predecessor
+                if(!rCandidate.isPrevControlPointUsed(nIndex))
+                {
+                    if(!rCandidate.isClosed() && 0 == nIndex)
+                    {
+                        // do not create previous vector for start point of open polygon
+                    }
+                    else
+                    {
+                        const sal_uInt32 nPrevIndex((nIndex + (nPointCount - 1)) % nPointCount);
+                        rCandidate.setPrevControlPoint(nIndex, interpolate(rCandidate.getB2DPoint(nIndex), rCandidate.getB2DPoint(nPrevIndex), 1.0 / 3.0));
+                        bRetval = true;
+                    }
+                }
+
+                // successor
+                if(!rCandidate.isNextControlPointUsed(nIndex))
+                {
+                    if(!rCandidate.isClosed() && nIndex + 1 == nPointCount)
+                    {
+                        // do not create next vector for end point of open polygon
+                    }
+                    else
+                    {
+                        const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
+                        rCandidate.setNextControlPoint(nIndex, interpolate(rCandidate.getB2DPoint(nIndex), rCandidate.getB2DPoint(nNextIndex), 1.0 / 3.0));
+                        bRetval = true;
+                    }
+                }
+            }
+
+            return bRetval;
+        }
+
+        B2DPolygon setContinuity(const B2DPolygon& rCandidate, B2VectorContinuity eContinuity)
+        {
+            B2DPolygon aRetval(rCandidate);
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                setContinuityInPoint(aRetval, a, eContinuity);
+            }
+
+            return aRetval;
+        }
+
+        bool setContinuityInPoint(B2DPolygon& rCandidate, sal_uInt32 nIndex, B2VectorContinuity eContinuity)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "setContinuityInPoint: Access to polygon out of range (!)");
+            bool bRetval(false);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount)
+            {
+                const B2DPoint aCurrentPoint(rCandidate.getB2DPoint(nIndex));
+
+                switch(eContinuity)
+                {
+                    case CONTINUITY_NONE :
+                    {
+                        if(rCandidate.isPrevControlPointUsed(nIndex))
+                        {
+                            if(!rCandidate.isClosed() && 0 == nIndex)
+                            {
+                                // remove existing previous vector for start point of open polygon
+                                rCandidate.resetPrevControlPoint(nIndex);
+                            }
+                            else
+                            {
+                                const sal_uInt32 nPrevIndex((nIndex + (nPointCount - 1)) % nPointCount);
+                                rCandidate.setPrevControlPoint(nIndex, interpolate(aCurrentPoint, rCandidate.getB2DPoint(nPrevIndex), 1.0 / 3.0));
+                            }
+
+                            bRetval = true;
+                        }
+
+                        if(rCandidate.isNextControlPointUsed(nIndex))
+                        {
+                            if(!rCandidate.isClosed() && nIndex == nPointCount + 1)
+                            {
+                                // remove next vector for end point of open polygon
+                                rCandidate.resetNextControlPoint(nIndex);
+                            }
+                            else
+                            {
+                                const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
+                                rCandidate.setNextControlPoint(nIndex, interpolate(aCurrentPoint, rCandidate.getB2DPoint(nNextIndex), 1.0 / 3.0));
+                            }
+
+                            bRetval = true;
+                        }
+
+                        break;
+                    }
+                    case CONTINUITY_C1 :
+                    {
+                        if(rCandidate.isPrevControlPointUsed(nIndex) && rCandidate.isNextControlPointUsed(nIndex))
+                        {
+                            // lengths both exist since both are used
+                            B2DVector aVectorPrev(rCandidate.getPrevControlPoint(nIndex) - aCurrentPoint);
+                            B2DVector aVectorNext(rCandidate.getNextControlPoint(nIndex) - aCurrentPoint);
+                            const double fLenPrev(aVectorPrev.getLength());
+                            const double fLenNext(aVectorNext.getLength());
+                            aVectorPrev.normalize();
+                            aVectorNext.normalize();
+                            const B2VectorOrientation aOrientation(getOrientation(aVectorPrev, aVectorNext));
+
+                            if(ORIENTATION_NEUTRAL == aOrientation && aVectorPrev.scalar(aVectorNext) < 0.0)
+                            {
+                                // parallel and opposite direction; check length
+                                if(fTools::equal(fLenPrev, fLenNext))
+                                {
+                                    // this would be even C2, but we want C1. Use the lengths of the corresponding edges.
+                                    const sal_uInt32 nPrevIndex((nIndex + (nPointCount - 1)) % nPointCount);
+                                    const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
+                                    const double fLenPrevEdge(B2DVector(rCandidate.getB2DPoint(nPrevIndex) - aCurrentPoint).getLength() * (1.0 / 3.0));
+                                    const double fLenNextEdge(B2DVector(rCandidate.getB2DPoint(nNextIndex) - aCurrentPoint).getLength() * (1.0 / 3.0));
+
+                                    rCandidate.setControlPoints(nIndex,
+                                        aCurrentPoint + (aVectorPrev * fLenPrevEdge),
+                                        aCurrentPoint + (aVectorNext * fLenNextEdge));
+                                    bRetval = true;
+                                }
+                            }
+                            else
+                            {
+                                // not parallel or same direction, set vectors and length
+                                const B2DVector aNormalizedPerpendicular(getNormalizedPerpendicular(aVectorPrev + aVectorNext));
+
+                                if(ORIENTATION_POSITIVE == aOrientation)
+                                {
+                                    rCandidate.setControlPoints(nIndex,
+                                        aCurrentPoint - (aNormalizedPerpendicular * fLenPrev),
+                                        aCurrentPoint + (aNormalizedPerpendicular * fLenNext));
+                                }
+                                else
+                                {
+                                    rCandidate.setControlPoints(nIndex,
+                                        aCurrentPoint + (aNormalizedPerpendicular * fLenPrev),
+                                        aCurrentPoint - (aNormalizedPerpendicular * fLenNext));
+                                }
+
+                                bRetval = true;
+                            }
+                        }
+                        break;
+                    }
+                    case CONTINUITY_C2 :
+                    {
+                        if(rCandidate.isPrevControlPointUsed(nIndex) && rCandidate.isNextControlPointUsed(nIndex))
+                        {
+                            // lengths both exist since both are used
+                            B2DVector aVectorPrev(rCandidate.getPrevControlPoint(nIndex) - aCurrentPoint);
+                            B2DVector aVectorNext(rCandidate.getNextControlPoint(nIndex) - aCurrentPoint);
+                            const double fCommonLength((aVectorPrev.getLength() + aVectorNext.getLength()) / 2.0);
+                            aVectorPrev.normalize();
+                            aVectorNext.normalize();
+                            const B2VectorOrientation aOrientation(getOrientation(aVectorPrev, aVectorNext));
+
+                            if(ORIENTATION_NEUTRAL == aOrientation && aVectorPrev.scalar(aVectorNext) < 0.0)
+                            {
+                                // parallel and opposite direction; set length. Use one direction for better numerical correctness
+                                const B2DVector aScaledDirection(aVectorPrev * fCommonLength);
+
+                                rCandidate.setControlPoints(nIndex,
+                                    aCurrentPoint + aScaledDirection,
+                                    aCurrentPoint - aScaledDirection);
+                            }
+                            else
+                            {
+                                // not parallel or same direction, set vectors and length
+                                const B2DVector aNormalizedPerpendicular(getNormalizedPerpendicular(aVectorPrev + aVectorNext));
+                                const B2DVector aPerpendicular(aNormalizedPerpendicular * fCommonLength);
+
+                                if(ORIENTATION_POSITIVE == aOrientation)
+                                {
+                                    rCandidate.setControlPoints(nIndex,
+                                        aCurrentPoint - aPerpendicular,
+                                        aCurrentPoint + aPerpendicular);
+                                }
+                                else
+                                {
+                                    rCandidate.setControlPoints(nIndex,
+                                        aCurrentPoint + aPerpendicular,
+                                        aCurrentPoint - aPerpendicular);
+                                }
+                            }
+
+                            bRetval = true;
+                        }
+                        break;
+                    }
+                }
+            }
+
+            return bRetval;
+        }
+
+        B2DPolygon growInNormalDirection(const B2DPolygon& rCandidate, double fValue)
+        {
+            if(0.0 != fValue)
+            {
+                if(rCandidate.areControlPointsUsed())
+                {
+                    // call myself recursively with subdivided input
+                    const B2DPolygon aCandidate(adaptiveSubdivideByAngle(rCandidate));
+                    return growInNormalDirection(aCandidate, fValue);
+                }
+                else
+                {
+                    B2DPolygon aRetval;
+                    const sal_uInt32 nPointCount(rCandidate.count());
+
+                    if(nPointCount)
+                    {
+                        B2DPoint aPrev(rCandidate.getB2DPoint(nPointCount - 1L));
+                        B2DPoint aCurrent(rCandidate.getB2DPoint(0L));
+
+                        for(sal_uInt32 a(0L); a < nPointCount; a++)
+                        {
+                            const B2DPoint aNext(rCandidate.getB2DPoint(a + 1L == nPointCount ? 0L : a + 1L));
+                            const B2DVector aBack(aPrev - aCurrent);
+                            const B2DVector aForw(aNext - aCurrent);
+                            const B2DVector aPerpBack(getNormalizedPerpendicular(aBack));
+                            const B2DVector aPerpForw(getNormalizedPerpendicular(aForw));
+                            B2DVector aDirection(aPerpBack - aPerpForw);
+                            aDirection.normalize();
+                            aDirection *= fValue;
+                            aRetval.append(aCurrent + aDirection);
+
+                            // prepare next step
+                            aPrev = aCurrent;
+                            aCurrent = aNext;
+                        }
+                    }
+
+                    // copy closed state
+                    aRetval.setClosed(rCandidate.isClosed());
+
+                    return aRetval;
+                }
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolygon reSegmentPolygon(const B2DPolygon& rCandidate, sal_uInt32 nSegments)
+        {
+            B2DPolygon aRetval;
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount && nSegments)
+            {
+                // get current segment count
+                const sal_uInt32 nSegmentCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+
+                if(nSegmentCount == nSegments)
+                {
+                    aRetval = rCandidate;
+                }
+                else
+                {
+                    const double fLength(getLength(rCandidate));
+                    const sal_uInt32 nLoopCount(rCandidate.isClosed() ? nSegments : nSegments + 1L);
+
+                    for(sal_uInt32 a(0L); a < nLoopCount; a++)
+                    {
+                        const double fRelativePos((double)a / (double)nSegments); // 0.0 .. 1.0
+                        const B2DPoint aNewPoint(getPositionRelative(rCandidate, fRelativePos, fLength));
+                        aRetval.append(aNewPoint);
+                    }
+
+                    // copy closed flag
+                    aRetval.setClosed(rCandidate.isClosed());
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolygon reSegmentPolygonEdges(const B2DPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount < 2 || nSubEdges < 2 || (!bHandleCurvedEdges && !bHandleStraightEdges))
+            {
+                // nothing to do:
+                // - less than two points -> no edge at all
+                // - less than two nSubEdges -> no resegment necessary
+                // - neither bHandleCurvedEdges nor bHandleStraightEdges -> nothing to do
+                return rCandidate;
+            }
+            else
+            {
+                B2DPolygon aRetval;
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                B2DCubicBezier aCurrentEdge;
+
+                // prepare first edge and add start point to target
+                aCurrentEdge.setStartPoint(rCandidate.getB2DPoint(0));
+                aRetval.append(aCurrentEdge.getStartPoint());
+
+                for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                {
+                    // fill edge
+                    const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                    aCurrentEdge.setControlPointA(rCandidate.getNextControlPoint(a));
+                    aCurrentEdge.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                    aCurrentEdge.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+
+                    if(aCurrentEdge.isBezier())
+                    {
+                        if(bHandleCurvedEdges)
+                        {
+                            for(sal_uInt32 b(nSubEdges); b > 1; b--)
+                            {
+                                const double fSplitPoint(1.0 / b);
+                                B2DCubicBezier aLeftPart;
+
+                                aCurrentEdge.split(fSplitPoint, &aLeftPart, &aCurrentEdge);
+                                aRetval.appendBezierSegment(aLeftPart.getControlPointA(), aLeftPart.getControlPointB(), aLeftPart.getEndPoint());
+                            }
+                        }
+
+                        // copy remaining segment to target
+                        aRetval.appendBezierSegment(aCurrentEdge.getControlPointA(), aCurrentEdge.getControlPointB(), aCurrentEdge.getEndPoint());
+                    }
+                    else
+                    {
+                        if(bHandleStraightEdges)
+                        {
+                            for(sal_uInt32 b(nSubEdges); b > 1; b--)
+                            {
+                                const double fSplitPoint(1.0 / b);
+                                const B2DPoint aSplitPoint(interpolate(aCurrentEdge.getStartPoint(), aCurrentEdge.getEndPoint(), fSplitPoint));
+
+                                aRetval.append(aSplitPoint);
+                                aCurrentEdge.setStartPoint(aSplitPoint);
+                            }
+                        }
+
+                        // copy remaining segment to target
+                        aRetval.append(aCurrentEdge.getEndPoint());
+                    }
+
+                    // prepare next step
+                    aCurrentEdge.setStartPoint(aCurrentEdge.getEndPoint());
+                }
+
+                // copy closed flag and return
+                aRetval.setClosed(rCandidate.isClosed());
+                return aRetval;
+            }
+        }
+
+        B2DPolygon interpolate(const B2DPolygon& rOld1, const B2DPolygon& rOld2, double t)
+        {
+            OSL_ENSURE(rOld1.count() == rOld2.count(), "B2DPolygon interpolate: Different geometry (!)");
+
+            if(fTools::lessOrEqual(t, 0.0) || rOld1 == rOld2)
+            {
+                return rOld1;
+            }
+            else if(fTools::moreOrEqual(t, 1.0))
+            {
+                return rOld2;
+            }
+            else
+            {
+                B2DPolygon aRetval;
+                const bool bInterpolateVectors(rOld1.areControlPointsUsed() || rOld2.areControlPointsUsed());
+                aRetval.setClosed(rOld1.isClosed() && rOld2.isClosed());
+
+                for(sal_uInt32 a(0L); a < rOld1.count(); a++)
+                {
+                    aRetval.append(interpolate(rOld1.getB2DPoint(a), rOld2.getB2DPoint(a), t));
+
+                    if(bInterpolateVectors)
+                    {
+                        aRetval.setPrevControlPoint(a, interpolate(rOld1.getPrevControlPoint(a), rOld2.getPrevControlPoint(a), t));
+                        aRetval.setNextControlPoint(a, interpolate(rOld1.getNextControlPoint(a), rOld2.getNextControlPoint(a), t));
+                    }
+                }
+
+                return aRetval;
+            }
+        }
+
+        bool isPolyPolygonEqualRectangle( const B2DPolyPolygon& rPolyPoly,
+                                          const B2DRange&      rRect )
+        {
+            // exclude some cheap cases first
+            if( rPolyPoly.count() != 1 )
+                return false;
+
+            // fill array with rectangle vertices
+            const B2DPoint aPoints[] =
+              {
+                  B2DPoint(rRect.getMinX(),rRect.getMinY()),
+                  B2DPoint(rRect.getMaxX(),rRect.getMinY()),
+                  B2DPoint(rRect.getMaxX(),rRect.getMaxY()),
+                  B2DPoint(rRect.getMinX(),rRect.getMaxY())
+              };
+
+            const B2DPolygon& rPoly( rPolyPoly.getB2DPolygon(0) );
+            const sal_uInt32 nCount( rPoly.count() );
+            const double epsilon = ::std::numeric_limits<double>::epsilon();
+
+            for(unsigned int j=0; j<4; ++j)
+            {
+                const B2DPoint &p1 = aPoints[j];
+                const B2DPoint &p2 = aPoints[(j+1)%4];
+                bool bPointOnBoundary = false;
+                for( sal_uInt32 i=0; i<nCount; ++i )
+                {
+                    const B2DPoint p(rPoly.getB2DPoint(i));
+
+                    //     1 | x0 y0 1 |
+                    // A = - | x1 y1 1 |
+                    //     2 | x2 y2 1 |
+                    double fDoubleArea = p2.getX()*p.getY() -
+                                         p2.getY()*p.getX() -
+                                         p1.getX()*p.getY() +
+                                         p1.getY()*p.getX() +
+                                         p1.getX()*p2.getY() -
+                                         p1.getY()*p2.getX();
+
+                    if(fDoubleArea < epsilon)
+                    {
+                        bPointOnBoundary=true;
+                        break;
+                    }
+                }
+                if(!(bPointOnBoundary))
+                    return false;
+            }
+
+            return true;
+        }
+
+
+        // create simplified version of the original polygon by
+        // replacing segments with spikes/loops and self intersections
+        // by several trivial sub-segments
+        B2DPolygon createSimplifiedPolygon( const B2DPolygon& rCandidate )
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+
+            if(nCount && rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nCount : nCount - 1);
+                B2DPolygon aRetval;
+                B2DCubicBezier aSegment;
+
+                aSegment.setStartPoint(rCandidate.getB2DPoint(0));
+                aRetval.append(aSegment.getStartPoint());
+
+                for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                {
+                    // fill edge
+                    const sal_uInt32 nNextIndex((a + 1) % nCount);
+                    aSegment.setControlPointA(rCandidate.getNextControlPoint(a));
+                    aSegment.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                    aSegment.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+
+                    if(aSegment.isBezier())
+                    {
+                        double fExtremumPos(0.0);
+                        sal_uInt32 nExtremumCounter(4);
+
+                        while(nExtremumCounter-- && aSegment.isBezier() && aSegment.getMinimumExtremumPosition(fExtremumPos))
+                        {
+                            // split off left, now extremum-free part and append
+                            B2DCubicBezier aLeft;
+
+                            aSegment.split(fExtremumPos, &aLeft, &aSegment);
+                            aLeft.testAndSolveTrivialBezier();
+                            aSegment.testAndSolveTrivialBezier();
+
+                            if(aLeft.isBezier())
+                            {
+                                aRetval.appendBezierSegment(aLeft.getControlPointA(), aLeft.getControlPointB(), aLeft.getEndPoint());
+                            }
+                            else
+                            {
+                                aRetval.append(aLeft.getEndPoint());
+                            }
+                        }
+
+                        // append (evtl. reduced) rest of Segment
+                        if(aSegment.isBezier())
+                        {
+                            aRetval.appendBezierSegment(aSegment.getControlPointA(), aSegment.getControlPointB(), aSegment.getEndPoint());
+                        }
+                        else
+                        {
+                            aRetval.append(aSegment.getEndPoint());
+                        }
+                    }
+                    else
+                    {
+                        // simple edge, append end point
+                        aRetval.append(aSegment.getEndPoint());
+                    }
+
+                    // prepare next edge
+                    aSegment.setStartPoint(aSegment.getEndPoint());
+                }
+
+                // copy closed flag and check for double points
+                aRetval.setClosed(rCandidate.isClosed());
+                aRetval.removeDoublePoints();
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        // #i76891#
+        B2DPolygon simplifyCurveSegments(const B2DPolygon& rCandidate)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount && rCandidate.areControlPointsUsed())
+            {
+                // prepare loop
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                B2DPolygon aRetval;
+                B2DCubicBezier aBezier;
+                aBezier.setStartPoint(rCandidate.getB2DPoint(0));
+
+                // try to avoid costly reallocations
+                aRetval.reserve( nEdgeCount+1);
+
+                // add start point
+                aRetval.append(aBezier.getStartPoint());
+
+                for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                {
+                    // get values for edge
+                    const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                    aBezier.setEndPoint(rCandidate.getB2DPoint(nNextIndex));
+                    aBezier.setControlPointA(rCandidate.getNextControlPoint(a));
+                    aBezier.setControlPointB(rCandidate.getPrevControlPoint(nNextIndex));
+                    aBezier.testAndSolveTrivialBezier();
+
+                    // still bezier?
+                    if(aBezier.isBezier())
+                    {
+                        // add edge with control vectors
+                        aRetval.appendBezierSegment(aBezier.getControlPointA(), aBezier.getControlPointB(), aBezier.getEndPoint());
+                    }
+                    else
+                    {
+                        // add edge
+                        aRetval.append(aBezier.getEndPoint());
+                    }
+
+                    // next point
+                    aBezier.setStartPoint(aBezier.getEndPoint());
+                }
+
+                if(rCandidate.isClosed())
+                {
+                    // set closed flag, rescue control point and correct last double point
+                    closeWithGeometryChange(aRetval);
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        // makes the given indexed point the new polygon start point. To do that, the points in the
+        // polygon will be rotated. This is only valid for closed polygons, for non-closed ones
+        // an assertion will be triggered
+        B2DPolygon makeStartPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndexOfNewStatPoint)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 2 && nIndexOfNewStatPoint != 0 && nIndexOfNewStatPoint < nPointCount)
+            {
+                OSL_ENSURE(rCandidate.isClosed(), "makeStartPoint: only valid for closed polygons (!)");
+                B2DPolygon aRetval;
+
+                for(sal_uInt32 a(0); a < nPointCount; a++)
+                {
+                    const sal_uInt32 nSourceIndex((a + nIndexOfNewStatPoint) % nPointCount);
+                    aRetval.append(rCandidate.getB2DPoint(nSourceIndex));
+
+                    if(rCandidate.areControlPointsUsed())
+                    {
+                        aRetval.setPrevControlPoint(a, rCandidate.getPrevControlPoint(nSourceIndex));
+                        aRetval.setNextControlPoint(a, rCandidate.getNextControlPoint(nSourceIndex));
+                    }
+                }
+
+                return aRetval;
+            }
+
+            return rCandidate;
+        }
+
+        B2DPolygon createEdgesOfGivenLength(const B2DPolygon& rCandidate, double fLength, double fStart, double fEnd)
+        {
+            B2DPolygon aRetval;
+
+            if(fLength < 0.0)
+            {
+                fLength = 0.0;
+            }
+
+            if(!fTools::equalZero(fLength))
+            {
+                if(fStart < 0.0)
+                {
+                    fStart = 0.0;
+                }
+
+                if(fEnd < 0.0)
+                {
+                    fEnd = 0.0;
+                }
+
+                if(fEnd < fStart)
+                {
+                    fEnd = fStart;
+                }
+
+                // iterate and consume pieces with fLength. First subdivide to reduce input to line segments
+                const B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? rCandidate.getDefaultAdaptiveSubdivision() : rCandidate);
+                const sal_uInt32 nPointCount(aCandidate.count());
+
+                if(nPointCount > 1)
+                {
+                    const bool bEndActive(!fTools::equalZero(fEnd));
+                    const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount : nPointCount - 1);
+                    B2DPoint aCurrent(aCandidate.getB2DPoint(0));
+                    double fPositionInEdge(fStart);
+                    double fAbsolutePosition(fStart);
+
+                    for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                    {
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        const B2DPoint aNext(aCandidate.getB2DPoint(nNextIndex));
+                        const B2DVector aEdge(aNext - aCurrent);
+                        double fEdgeLength(aEdge.getLength());
+
+                        if(!fTools::equalZero(fEdgeLength))
+                        {
+                            while(fTools::less(fPositionInEdge, fEdgeLength))
+                            {
+                                // move position on edge forward as long as on edge
+                                const double fScalar(fPositionInEdge / fEdgeLength);
+                                aRetval.append(aCurrent + (aEdge * fScalar));
+                                fPositionInEdge += fLength;
+
+                                if(bEndActive)
+                                {
+                                    fAbsolutePosition += fLength;
+
+                                    if(fTools::more(fAbsolutePosition, fEnd))
+                                    {
+                                        break;
+                                    }
+                                }
+                            }
+
+                            // substract length of current edge
+                            fPositionInEdge -= fEdgeLength;
+                        }
+
+                        if(bEndActive && fTools::more(fAbsolutePosition, fEnd))
+                        {
+                            break;
+                        }
+
+                        // prepare next step
+                        aCurrent = aNext;
+                    }
+
+                    // keep closed state
+                    aRetval.setClosed(aCandidate.isClosed());
+                }
+                else
+                {
+                    // source polygon has only one point, return unchanged
+                    aRetval = aCandidate;
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolygon createWaveline(const B2DPolygon& rCandidate, double fWaveWidth, double fWaveHeight)
+        {
+            B2DPolygon aRetval;
+
+            if(fWaveWidth < 0.0)
+            {
+                fWaveWidth = 0.0;
+            }
+
+            if(fWaveHeight < 0.0)
+            {
+                fWaveHeight = 0.0;
+            }
+
+            const bool bHasWidth(!fTools::equalZero(fWaveWidth));
+            const bool bHasHeight(!fTools::equalZero(fWaveHeight));
+
+            if(bHasWidth)
+            {
+                if(bHasHeight)
+                {
+                    // width and height, create waveline. First subdivide to reduce input to line segments
+                    // of WaveWidth. Last segment may be missing. If this turns out to be a problem, it
+                    // may be added here again using the original last point from rCandidate. It may
+                    // also be the case that rCandidate was closed. To simplify things it is handled here
+                    // as if it was opened.
+                    // Result from createEdgesOfGivenLength contains no curved segments, handle as straight
+                    // edges.
+                    const B2DPolygon aEqualLenghEdges(createEdgesOfGivenLength(rCandidate, fWaveWidth));
+                    const sal_uInt32 nPointCount(aEqualLenghEdges.count());
+
+                    if(nPointCount > 1)
+                    {
+                        // iterate over straight edges, add start point
+                        B2DPoint aCurrent(aEqualLenghEdges.getB2DPoint(0));
+                        aRetval.append(aCurrent);
+
+                        for(sal_uInt32 a(0); a < nPointCount - 1; a++)
+                        {
+                            const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                            const B2DPoint aNext(aEqualLenghEdges.getB2DPoint(nNextIndex));
+                            const B2DVector aEdge(aNext - aCurrent);
+                            const B2DVector aPerpendicular(getNormalizedPerpendicular(aEdge));
+                            const B2DVector aControlOffset((aEdge * 0.467308) - (aPerpendicular * fWaveHeight));
+
+                            // add curve segment
+                            aRetval.appendBezierSegment(
+                                aCurrent + aControlOffset,
+                                aNext - aControlOffset,
+                                aNext);
+
+                            // prepare next step
+                            aCurrent = aNext;
+                        }
+                    }
+                }
+                else
+                {
+                    // width but no height -> return original polygon
+                    aRetval = rCandidate;
+                }
+            }
+            else
+            {
+                // no width -> no waveline, stay empty and return
+            }
+
+            return aRetval;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 2D Polygons
+
+        bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, const double& rfSmallValue)
+        {
+            const sal_uInt32 nPointCount(rCandidateA.count());
+
+            if(nPointCount != rCandidateB.count())
+                return false;
+
+            const bool bClosed(rCandidateA.isClosed());
+
+            if(bClosed != rCandidateB.isClosed())
+                return false;
+
+            const bool bAreControlPointsUsed(rCandidateA.areControlPointsUsed());
+
+            if(bAreControlPointsUsed != rCandidateB.areControlPointsUsed())
+                return false;
+
+            for(sal_uInt32 a(0); a < nPointCount; a++)
+            {
+                const B2DPoint aPoint(rCandidateA.getB2DPoint(a));
+
+                if(!aPoint.equal(rCandidateB.getB2DPoint(a), rfSmallValue))
+                    return false;
+
+                if(bAreControlPointsUsed)
+                {
+                    const basegfx::B2DPoint aPrev(rCandidateA.getPrevControlPoint(a));
+
+                    if(!aPrev.equal(rCandidateB.getPrevControlPoint(a), rfSmallValue))
+                        return false;
+
+                    const basegfx::B2DPoint aNext(rCandidateA.getNextControlPoint(a));
+
+                    if(!aNext.equal(rCandidateB.getNextControlPoint(a), rfSmallValue))
+                        return false;
+                }
+            }
+
+            return true;
+        }
+
+        bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB)
+        {
+            const double fSmallValue(fTools::getSmallValue());
+
+            return equal(rCandidateA, rCandidateB, fSmallValue);
+        }
+
+        // snap points of horizontal or vertical edges to discrete values
+        B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon& rCandidate)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 1)
+            {
+                // Start by copying the source polygon to get a writeable copy. The closed state is
+                // copied by aRetval's initialisation, too, so no need to copy it in this method
+                B2DPolygon aRetval(rCandidate);
+
+                // prepare geometry data. Get rounded from original
+                B2ITuple aPrevTuple(basegfx::fround(rCandidate.getB2DPoint(nPointCount - 1)));
+                B2DPoint aCurrPoint(rCandidate.getB2DPoint(0));
+                B2ITuple aCurrTuple(basegfx::fround(aCurrPoint));
+
+                // loop over all points. This will also snap the implicit closing edge
+                // even when not closed, but that's no problem here
+                for(sal_uInt32 a(0); a < nPointCount; a++)
+                {
+                    // get next point. Get rounded from original
+                    const bool bLastRun(a + 1 == nPointCount);
+                    const sal_uInt32 nNextIndex(bLastRun ? 0 : a + 1);
+                    const B2DPoint aNextPoint(rCandidate.getB2DPoint(nNextIndex));
+                    const B2ITuple aNextTuple(basegfx::fround(aNextPoint));
+
+                    // get the states
+                    const bool bPrevVertical(aPrevTuple.getX() == aCurrTuple.getX());
+                    const bool bNextVertical(aNextTuple.getX() == aCurrTuple.getX());
+                    const bool bPrevHorizontal(aPrevTuple.getY() == aCurrTuple.getY());
+                    const bool bNextHorizontal(aNextTuple.getY() == aCurrTuple.getY());
+                    const bool bSnapX(bPrevVertical || bNextVertical);
+                    const bool bSnapY(bPrevHorizontal || bNextHorizontal);
+
+                    if(bSnapX || bSnapY)
+                    {
+                        const B2DPoint aSnappedPoint(
+                            bSnapX ? aCurrTuple.getX() : aCurrPoint.getX(),
+                            bSnapY ? aCurrTuple.getY() : aCurrPoint.getY());
+
+                        aRetval.setB2DPoint(a, aSnappedPoint);
+                    }
+
+                    // prepare next point
+                    if(!bLastRun)
+                    {
+                        aPrevTuple = aCurrTuple;
+                        aCurrPoint = aNextPoint;
+                        aCurrTuple = aNextTuple;
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
new file mode 100644
index 000000000000..83fcc036c996
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -0,0 +1,466 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b2dpolygontriangulator.hxx>
+#include <osl/diagnose.h>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        class EdgeEntry
+        {
+            EdgeEntry*                              mpNext;
+            B2DPoint                                maStart;
+            B2DPoint                                maEnd;
+            double                                  mfAtan2;
+
+        public:
+            EdgeEntry(const B2DPoint& rStart, const B2DPoint& rEnd)
+            :   mpNext(0L),
+                maStart(rStart),
+                maEnd(rEnd),
+                mfAtan2(0.0)
+            {
+                // make sure edge goes down. If horizontal, let it go to the right (left-handed).
+                bool bSwap(false);
+
+                if(::basegfx::fTools::equal(maStart.getY(), maEnd.getY()))
+                {
+                    if(maStart.getX() > maEnd.getX())
+                    {
+                        bSwap = true;
+                    }
+                }
+                else if(maStart.getY() > maEnd.getY())
+                {
+                    bSwap = true;
+                }
+
+                if(bSwap)
+                {
+                    maStart = rEnd;
+                    maEnd = rStart;
+                }
+
+                mfAtan2 = atan2(maEnd.getY() - maStart.getY(), maEnd.getX() - maStart.getX());
+            }
+
+            ~EdgeEntry()
+            {
+            }
+
+            bool operator<(const EdgeEntry& rComp) const
+            {
+                if(::basegfx::fTools::equal(maStart.getY(), rComp.maStart.getY()))
+                {
+                    if(::basegfx::fTools::equal(maStart.getX(), rComp.maStart.getX()))
+                    {
+                        // same in x and y -> same start point. Sort emitting vectors from left to right.
+                        return (mfAtan2 > rComp.mfAtan2);
+                    }
+
+                    return (maStart.getX() < rComp.maStart.getX());
+                }
+
+                return (maStart.getY() < rComp.maStart.getY());
+            }
+
+            bool operator==(const EdgeEntry& rComp) const
+            {
+                return (maStart.equal(rComp.maStart) && maEnd.equal(rComp.maEnd));
+            }
+
+            bool operator!=(const EdgeEntry& rComp) const
+            {
+                return !(*this == rComp);
+            }
+
+            const B2DPoint& getStart() const { return maStart; }
+            const B2DPoint& getEnd() const { return maEnd; }
+
+            EdgeEntry* getNext() const { return mpNext; }
+            void setNext(EdgeEntry* pNext) { mpNext = pNext; }
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        typedef ::std::vector< EdgeEntry > EdgeEntries;
+        typedef ::std::vector< EdgeEntry* > EdgeEntryPointers;
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        class Triangulator
+        {
+            EdgeEntry*                                      mpList;
+            EdgeEntries                                     maStartEntries;
+            EdgeEntryPointers                               maNewEdgeEntries;
+            B2DPolygon                                      maResult;
+
+            void handleClosingEdge(const B2DPoint& rStart, const B2DPoint& rEnd);
+            bool CheckPointInTriangle(EdgeEntry* pEdgeA, EdgeEntry* pEdgeB, const B2DPoint& rTestPoint);
+            void createTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC);
+
+        public:
+            Triangulator(const B2DPolyPolygon& rCandidate);
+            ~Triangulator();
+
+            const B2DPolygon getResult() const { return maResult; }
+        };
+
+        void Triangulator::handleClosingEdge(const B2DPoint& rStart, const B2DPoint& rEnd)
+        {
+            // create an entry, else the comparison might use the wrong edges
+            EdgeEntry aNew(rStart, rEnd);
+            EdgeEntry* pCurr = mpList;
+            EdgeEntry* pPrev = 0L;
+
+            while(pCurr
+                && pCurr->getStart().getY() <= aNew.getStart().getY()
+                && *pCurr != aNew)
+            {
+                pPrev = pCurr;
+                pCurr = pCurr->getNext();
+            }
+
+            if(pCurr && *pCurr == aNew)
+            {
+                // found closing edge, remove
+                if(pPrev)
+                {
+                    pPrev->setNext(pCurr->getNext());
+                }
+                else
+                {
+                    mpList = pCurr->getNext();
+                }
+            }
+            else
+            {
+                // insert closing edge
+                EdgeEntry* pNew = new EdgeEntry(aNew);
+                maNewEdgeEntries.push_back(pNew);
+                pCurr = mpList;
+                pPrev = 0L;
+
+                while(pCurr && *pCurr < *pNew)
+                {
+                    pPrev = pCurr;
+                    pCurr = pCurr->getNext();
+                }
+
+                if(pPrev)
+                {
+                    pNew->setNext(pPrev->getNext());
+                    pPrev->setNext(pNew);
+                }
+                else
+                {
+                    pNew->setNext(mpList);
+                    mpList = pNew;
+                }
+            }
+        }
+
+        bool Triangulator::CheckPointInTriangle(EdgeEntry* pEdgeA, EdgeEntry* pEdgeB, const B2DPoint& rTestPoint)
+        {
+            // inside triangle or on edge?
+            if(tools::isPointInTriangle(pEdgeA->getStart(), pEdgeA->getEnd(), pEdgeB->getEnd(), rTestPoint, true))
+            {
+                // but not on point
+                if(!rTestPoint.equal(pEdgeA->getEnd()) && !rTestPoint.equal(pEdgeB->getEnd()))
+                {
+                    // found point in triangle -> split triangle inserting two edges
+                    EdgeEntry* pStart = new EdgeEntry(pEdgeA->getStart(), rTestPoint);
+                    EdgeEntry* pEnd = new EdgeEntry(*pStart);
+                    maNewEdgeEntries.push_back(pStart);
+                    maNewEdgeEntries.push_back(pEnd);
+
+                    pStart->setNext(pEnd);
+                    pEnd->setNext(pEdgeA->getNext());
+                    pEdgeA->setNext(pStart);
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        void Triangulator::createTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC)
+        {
+            maResult.append(rA);
+            maResult.append(rB);
+            maResult.append(rC);
+        }
+
+        // consume as long as there are edges
+        Triangulator::Triangulator(const B2DPolyPolygon& rCandidate)
+        :   mpList(0L)
+        {
+            // add all available edges to the single linked local list which will be sorted
+            // by Y,X,atan2 when adding nodes
+            if(rCandidate.count())
+            {
+                for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+                {
+                    const B2DPolygon aPolygonCandidate(rCandidate.getB2DPolygon(a));
+                    const sal_uInt32 nCount(aPolygonCandidate.count());
+
+                    if(nCount > 2L)
+                    {
+                        B2DPoint aPrevPnt(aPolygonCandidate.getB2DPoint(nCount - 1L));
+
+                        for(sal_uInt32 b(0L); b < nCount; b++)
+                        {
+                            B2DPoint aNextPnt(aPolygonCandidate.getB2DPoint(b));
+
+                            if( !aPrevPnt.equal(aNextPnt) )
+                            {
+                                maStartEntries.push_back(EdgeEntry(aPrevPnt, aNextPnt));
+                            }
+
+                            aPrevPnt = aNextPnt;
+                        }
+                    }
+                }
+
+                if(maStartEntries.size())
+                {
+                    // sort initial list
+                    ::std::sort(maStartEntries.begin(), maStartEntries.end());
+
+                    // insert to own simply linked list
+                    EdgeEntries::iterator aPos(maStartEntries.begin());
+                    mpList = &(*aPos++);
+                    EdgeEntry* pLast = mpList;
+
+                    while(aPos != maStartEntries.end())
+                    {
+                        EdgeEntry* pEntry = &(*aPos++);
+                        pLast->setNext(pEntry);
+                        pLast = pEntry;
+                    }
+                }
+            }
+
+            while(mpList)
+            {
+                if(mpList->getNext() && mpList->getNext()->getStart().equal(mpList->getStart()))
+                {
+                    // next candidate. There are two edges and start point is equal.
+                    // Length is not zero.
+                    EdgeEntry* pEdgeA = mpList;
+                    EdgeEntry* pEdgeB = pEdgeA->getNext();
+
+                    if( pEdgeA->getEnd().equal(pEdgeB->getEnd()) )
+                    {
+                        // start and end equal -> neutral triangle, delete both
+                        mpList = pEdgeB->getNext();
+                    }
+                    else
+                    {
+                        const B2DVector aLeft(pEdgeA->getEnd() - pEdgeA->getStart());
+                        const B2DVector aRight(pEdgeB->getEnd() - pEdgeA->getStart());
+
+                        if(ORIENTATION_NEUTRAL == getOrientation(aLeft, aRight))
+                        {
+                            // edges are parallel and have different length -> neutral triangle,
+                            // delete both edges and handle closing edge
+                            mpList = pEdgeB->getNext();
+                            handleClosingEdge(pEdgeA->getEnd(), pEdgeB->getEnd());
+                        }
+                        else
+                        {
+                            // not parallel, look for points inside
+                            B2DRange aRange(pEdgeA->getStart(), pEdgeA->getEnd());
+                            aRange.expand(pEdgeB->getEnd());
+                            EdgeEntry* pTestEdge = pEdgeB->getNext();
+                            bool bNoPointInTriangle(true);
+
+                            // look for start point in triangle
+                            while(bNoPointInTriangle && pTestEdge)
+                            {
+                                if(aRange.getMaxY() < pTestEdge->getStart().getY())
+                                {
+                                    // edge is below test range and edges are sorted -> stop looking
+                                    break;
+                                }
+                                else
+                                {
+                                    // do not look for edges with same start point, they are sorted and cannot end inside.
+                                    if(!pTestEdge->getStart().equal(pEdgeA->getStart()))
+                                    {
+                                        if(aRange.isInside(pTestEdge->getStart()))
+                                        {
+                                            bNoPointInTriangle = CheckPointInTriangle(pEdgeA, pEdgeB, pTestEdge->getStart());
+                                        }
+                                    }
+                                }
+
+                                // next candidate
+                                pTestEdge = pTestEdge->getNext();
+                            }
+
+                            if(bNoPointInTriangle)
+                            {
+                                // look for end point in triange
+                                pTestEdge = pEdgeB->getNext();
+
+                                while(bNoPointInTriangle && pTestEdge)
+                                {
+                                    if(aRange.getMaxY() < pTestEdge->getStart().getY())
+                                    {
+                                        // edge is below test range and edges are sorted -> stop looking
+                                        break;
+                                    }
+                                    else
+                                    {
+                                        // do not look for edges with same end point, they are sorted and cannot end inside.
+                                        if(!pTestEdge->getEnd().equal(pEdgeA->getStart()))
+                                        {
+                                            if(aRange.isInside(pTestEdge->getEnd()))
+                                            {
+                                                bNoPointInTriangle = CheckPointInTriangle(pEdgeA, pEdgeB, pTestEdge->getEnd());
+                                            }
+                                        }
+                                    }
+
+                                    // next candidate
+                                    pTestEdge = pTestEdge->getNext();
+                                }
+                            }
+
+                            if(bNoPointInTriangle)
+                            {
+                                // create triangle, remove edges, handle closing edge
+                                mpList = pEdgeB->getNext();
+                                createTriangle(pEdgeA->getStart(), pEdgeB->getEnd(), pEdgeA->getEnd());
+                                handleClosingEdge(pEdgeA->getEnd(), pEdgeB->getEnd());
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // only one entry at start point, delete it
+                    mpList = mpList->getNext();
+                }
+            }
+        }
+
+        Triangulator::~Triangulator()
+        {
+            EdgeEntryPointers::iterator aIter(maNewEdgeEntries.begin());
+
+            while(aIter != maNewEdgeEntries.end())
+            {
+                delete (*aIter++);
+            }
+        }
+
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace triangulator
+    {
+        B2DPolygon triangulate(const B2DPolygon& rCandidate)
+        {
+            B2DPolygon aRetval;
+
+            // subdivide locally (triangulate does not work with beziers), remove double and neutral points
+            B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? tools::adaptiveSubdivideByAngle(rCandidate) : rCandidate);
+            aCandidate.removeDoublePoints();
+            aCandidate = tools::removeNeutralPoints(aCandidate);
+
+            if(2L == aCandidate.count())
+            {
+                // candidate IS a triangle, just append
+                aRetval.append(aCandidate);
+            }
+            else if(aCandidate.count() > 2L)
+            {
+                if(tools::isConvex(aCandidate))
+                {
+                    // polygon is convex, just use a triangle fan
+                    tools::addTriangleFan(aCandidate, aRetval);
+                }
+                else
+                {
+                    // polygon is concave.
+                    const B2DPolyPolygon aCandPolyPoly(aCandidate);
+                    Triangulator aTriangulator(aCandPolyPoly);
+                    aRetval = aTriangulator.getResult();
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolygon triangulate(const B2DPolyPolygon& rCandidate)
+        {
+            B2DPolygon aRetval;
+
+            // subdivide locally (triangulate does not work with beziers)
+            B2DPolyPolygon aCandidate(rCandidate.areControlPointsUsed() ? tools::adaptiveSubdivideByAngle(rCandidate) : rCandidate);
+
+            if(1L == aCandidate.count())
+            {
+                // single polygon -> single polygon triangulation
+                const B2DPolygon aSinglePolygon(aCandidate.getB2DPolygon(0L));
+                aRetval = triangulate(aSinglePolygon);
+            }
+            else
+            {
+                Triangulator aTriangulator(aCandidate);
+                aRetval = aTriangulator.getResult();
+            }
+
+            return aRetval;
+        }
+    } // end of namespace triangulator
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
new file mode 100644
index 000000000000..9b28dffd19af
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -0,0 +1,432 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <rtl/instance.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+
+#include <functional>
+#include <vector>
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ImplB2DPolyPolygon
+{
+    typedef ::std::vector< basegfx::B2DPolygon >    PolygonVector;
+
+    PolygonVector                                   maPolygons;
+
+public:
+    ImplB2DPolyPolygon() : maPolygons()
+    {
+    }
+
+    ImplB2DPolyPolygon(const basegfx::B2DPolygon& rToBeCopied) :
+        maPolygons(1,rToBeCopied)
+    {
+    }
+
+    bool operator==(const ImplB2DPolyPolygon& rPolygonList) const
+    {
+        // same polygon count?
+        if(maPolygons.size() != rPolygonList.maPolygons.size())
+            return false;
+
+        // compare polygon content
+        if(!(maPolygons == rPolygonList.maPolygons))
+            return false;
+
+        return true;
+    }
+
+    const basegfx::B2DPolygon& getB2DPolygon(sal_uInt32 nIndex) const
+    {
+        return maPolygons[nIndex];
+    }
+
+    void setB2DPolygon(sal_uInt32 nIndex, const basegfx::B2DPolygon& rPolygon)
+    {
+        maPolygons[nIndex] = rPolygon;
+    }
+
+    void insert(sal_uInt32 nIndex, const basegfx::B2DPolygon& rPolygon, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rPolygon
+            PolygonVector::iterator aIndex(maPolygons.begin());
+            aIndex += nIndex;
+            maPolygons.insert(aIndex, nCount, rPolygon);
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const basegfx::B2DPolyPolygon& rPolyPolygon)
+    {
+        const sal_uInt32 nCount = rPolyPolygon.count();
+
+        if(nCount)
+        {
+            // add nCount polygons from rPolyPolygon
+            maPolygons.reserve(maPolygons.size() + nCount);
+            PolygonVector::iterator aIndex(maPolygons.begin());
+            aIndex += nIndex;
+
+            for(sal_uInt32 a(0L); a < nCount; a++)
+            {
+                aIndex = maPolygons.insert(aIndex, rPolyPolygon.getB2DPolygon(a));
+                aIndex++;
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // remove polygon data
+            PolygonVector::iterator aStart(maPolygons.begin());
+            aStart += nIndex;
+            const PolygonVector::iterator aEnd(aStart + nCount);
+
+            maPolygons.erase(aStart, aEnd);
+        }
+    }
+
+    sal_uInt32 count() const
+    {
+        return maPolygons.size();
+    }
+
+    void setClosed(bool bNew)
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].setClosed(bNew);
+        }
+    }
+
+    void flip()
+    {
+        std::for_each( maPolygons.begin(),
+                       maPolygons.end(),
+                       std::mem_fun_ref( &basegfx::B2DPolygon::flip ));
+    }
+
+    void removeDoublePoints()
+    {
+        std::for_each( maPolygons.begin(),
+                       maPolygons.end(),
+                       std::mem_fun_ref( &basegfx::B2DPolygon::removeDoublePoints ));
+    }
+
+    void transform(const basegfx::B2DHomMatrix& rMatrix)
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].transform(rMatrix);
+        }
+    }
+
+    void makeUnique()
+    {
+        std::for_each( maPolygons.begin(),
+                       maPolygons.end(),
+                       std::mem_fun_ref( &basegfx::B2DPolygon::makeUnique ));
+    }
+
+    const basegfx::B2DPolygon* begin() const
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return &maPolygons.front();
+    }
+
+    const basegfx::B2DPolygon* end() const
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return (&maPolygons.back())+1;
+    }
+
+    basegfx::B2DPolygon* begin()
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return &maPolygons.front();
+    }
+
+    basegfx::B2DPolygon* end()
+    {
+        if(maPolygons.empty())
+            return 0;
+        else
+            return &(maPolygons.back())+1;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace { struct DefaultPolyPolygon: public rtl::Static<B2DPolyPolygon::ImplType,
+                                                              DefaultPolyPolygon> {}; }
+
+    B2DPolyPolygon::B2DPolyPolygon() :
+        mpPolyPolygon(DefaultPolyPolygon::get())
+    {
+    }
+
+    B2DPolyPolygon::B2DPolyPolygon(const B2DPolyPolygon& rPolyPolygon) :
+        mpPolyPolygon(rPolyPolygon.mpPolyPolygon)
+    {
+    }
+
+    B2DPolyPolygon::B2DPolyPolygon(const B2DPolygon& rPolygon) :
+        mpPolyPolygon( ImplB2DPolyPolygon(rPolygon) )
+    {
+    }
+
+    B2DPolyPolygon::~B2DPolyPolygon()
+    {
+    }
+
+    B2DPolyPolygon& B2DPolyPolygon::operator=(const B2DPolyPolygon& rPolyPolygon)
+    {
+        mpPolyPolygon = rPolyPolygon.mpPolyPolygon;
+        return *this;
+    }
+
+    void B2DPolyPolygon::makeUnique()
+    {
+        mpPolyPolygon.make_unique();
+        mpPolyPolygon->makeUnique();
+    }
+
+    bool B2DPolyPolygon::operator==(const B2DPolyPolygon& rPolyPolygon) const
+    {
+        if(mpPolyPolygon.same_object(rPolyPolygon.mpPolyPolygon))
+            return true;
+
+        return ((*mpPolyPolygon) == (*rPolyPolygon.mpPolyPolygon));
+    }
+
+    bool B2DPolyPolygon::operator!=(const B2DPolyPolygon& rPolyPolygon) const
+    {
+        return !((*this) == rPolyPolygon);
+    }
+
+    sal_uInt32 B2DPolyPolygon::count() const
+    {
+        return mpPolyPolygon->count();
+    }
+
+    B2DPolygon B2DPolyPolygon::getB2DPolygon(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B2DPolyPolygon access outside range (!)");
+
+        return mpPolyPolygon->getB2DPolygon(nIndex);
+    }
+
+    void B2DPolyPolygon::setB2DPolygon(sal_uInt32 nIndex, const B2DPolygon& rPolygon)
+    {
+        OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B2DPolyPolygon access outside range (!)");
+
+        if(getB2DPolygon(nIndex) != rPolygon)
+            mpPolyPolygon->setB2DPolygon(nIndex, rPolygon);
+    }
+
+    bool B2DPolyPolygon::areControlPointsUsed() const
+    {
+        for(sal_uInt32 a(0L); a < mpPolyPolygon->count(); a++)
+        {
+            const B2DPolygon& rPolygon = mpPolyPolygon->getB2DPolygon(a);
+
+            if(rPolygon.areControlPointsUsed())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void B2DPolyPolygon::insert(sal_uInt32 nIndex, const B2DPolygon& rPolygon, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B2DPolyPolygon Insert outside range (!)");
+
+        if(nCount)
+            mpPolyPolygon->insert(nIndex, rPolygon, nCount);
+    }
+
+    void B2DPolyPolygon::append(const B2DPolygon& rPolygon, sal_uInt32 nCount)
+    {
+        if(nCount)
+            mpPolyPolygon->insert(mpPolyPolygon->count(), rPolygon, nCount);
+    }
+
+    B2DPolyPolygon B2DPolyPolygon::getDefaultAdaptiveSubdivision() const
+    {
+        B2DPolyPolygon aRetval;
+
+        for(sal_uInt32 a(0L); a < mpPolyPolygon->count(); a++)
+        {
+            aRetval.append(mpPolyPolygon->getB2DPolygon(a).getDefaultAdaptiveSubdivision());
+        }
+
+        return aRetval;
+    }
+
+    B2DRange B2DPolyPolygon::getB2DRange() const
+    {
+        B2DRange aRetval;
+
+        for(sal_uInt32 a(0L); a < mpPolyPolygon->count(); a++)
+        {
+            aRetval.expand(mpPolyPolygon->getB2DPolygon(a).getB2DRange());
+        }
+
+        return aRetval;
+    }
+
+    void B2DPolyPolygon::insert(sal_uInt32 nIndex, const B2DPolyPolygon& rPolyPolygon)
+    {
+        OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B2DPolyPolygon Insert outside range (!)");
+
+        if(rPolyPolygon.count())
+            mpPolyPolygon->insert(nIndex, rPolyPolygon);
+    }
+
+    void B2DPolyPolygon::append(const B2DPolyPolygon& rPolyPolygon)
+    {
+        if(rPolyPolygon.count())
+            mpPolyPolygon->insert(mpPolyPolygon->count(), rPolyPolygon);
+    }
+
+    void B2DPolyPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex + nCount <= mpPolyPolygon->count(), "B2DPolyPolygon Remove outside range (!)");
+
+        if(nCount)
+            mpPolyPolygon->remove(nIndex, nCount);
+    }
+
+    void B2DPolyPolygon::clear()
+    {
+        mpPolyPolygon = DefaultPolyPolygon::get();
+    }
+
+    bool B2DPolyPolygon::isClosed() const
+    {
+        bool bRetval(true);
+
+        // PolyPOlygon is closed when all contained Polygons are closed or
+        // no Polygon exists.
+        for(sal_uInt32 a(0L); bRetval && a < mpPolyPolygon->count(); a++)
+        {
+            if(!(mpPolyPolygon->getB2DPolygon(a)).isClosed())
+            {
+                bRetval = false;
+            }
+        }
+
+        return bRetval;
+    }
+
+    void B2DPolyPolygon::setClosed(bool bNew)
+    {
+        if(bNew != isClosed())
+            mpPolyPolygon->setClosed(bNew);
+    }
+
+    void B2DPolyPolygon::flip()
+    {
+        if(mpPolyPolygon->count())
+        {
+            mpPolyPolygon->flip();
+        }
+    }
+
+    bool B2DPolyPolygon::hasDoublePoints() const
+    {
+        bool bRetval(false);
+
+        for(sal_uInt32 a(0L); !bRetval && a < mpPolyPolygon->count(); a++)
+        {
+            if((mpPolyPolygon->getB2DPolygon(a)).hasDoublePoints())
+            {
+                bRetval = true;
+            }
+        }
+
+        return bRetval;
+    }
+
+    void B2DPolyPolygon::removeDoublePoints()
+    {
+        if(hasDoublePoints())
+            mpPolyPolygon->removeDoublePoints();
+    }
+
+    void B2DPolyPolygon::transform(const B2DHomMatrix& rMatrix)
+    {
+        if(mpPolyPolygon->count() && !rMatrix.isIdentity())
+        {
+            mpPolyPolygon->transform(rMatrix);
+        }
+    }
+
+    const B2DPolygon* B2DPolyPolygon::begin() const
+    {
+        return mpPolyPolygon->begin();
+    }
+
+    const B2DPolygon* B2DPolyPolygon::end() const
+    {
+        return mpPolyPolygon->end();
+    }
+
+    B2DPolygon* B2DPolyPolygon::begin()
+    {
+        return mpPolyPolygon->begin();
+    }
+
+    B2DPolygon* B2DPolyPolygon::end()
+    {
+        return mpPolyPolygon->end();
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
new file mode 100644
index 000000000000..4f9cf3a75f72
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -0,0 +1,1014 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <osl/diagnose.h>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygoncutandtouch.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/curve/b2dcubicbezier.hxx>
+#include <vector>
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        //////////////////////////////////////////////////////////////////////////////
+
+        struct StripHelper
+        {
+            B2DRange                                maRange;
+            sal_Int32                               mnDepth;
+            B2VectorOrientation                     meOrinetation;
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        struct PN
+        {
+        public:
+            B2DPoint                maPoint;
+            sal_uInt32              mnI;
+            sal_uInt32              mnIP;
+            sal_uInt32              mnIN;
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        struct VN
+        {
+        public:
+            B2DVector               maPrev;
+            B2DVector               maNext;
+
+            // to have the correct curve segments in the crossover checks,
+            // it is necessary to keep the original next vectors, too. Else,
+            // it may happen to use a already switched next vector which
+            // would interpolate the wrong comparison point
+            B2DVector               maOriginalNext;
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        struct SN
+        {
+        public:
+            PN*                     mpPN;
+
+            bool operator<(const SN& rComp) const
+            {
+                if(fTools::equal(mpPN->maPoint.getX(), rComp.mpPN->maPoint.getX()))
+                {
+                    if(fTools::equal(mpPN->maPoint.getY(), rComp.mpPN->maPoint.getY()))
+                    {
+                        return (mpPN->mnI < rComp.mpPN->mnI);
+                    }
+                    else
+                    {
+                        return fTools::less(mpPN->maPoint.getY(), rComp.mpPN->maPoint.getY());
+                    }
+                }
+                else
+                {
+                    return fTools::less(mpPN->maPoint.getX(), rComp.mpPN->maPoint.getX());
+                }
+            }
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        typedef ::std::vector< PN > PNV;
+        typedef ::std::vector< VN > VNV;
+        typedef ::std::vector< SN > SNV;
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        class solver
+        {
+        private:
+            const B2DPolyPolygon    maOriginal;
+            PNV                     maPNV;
+            VNV                     maVNV;
+            SNV                     maSNV;
+
+            unsigned                mbIsCurve : 1;
+            unsigned                mbChanged : 1;
+
+            void impAddPolygon(const sal_uInt32 aPos, const B2DPolygon& rGeometry)
+            {
+                const sal_uInt32 nCount(rGeometry.count());
+                PN aNewPN;
+                VN aNewVN;
+                SN aNewSN;
+
+                for(sal_uInt32 a(0); a < nCount; a++)
+                {
+                    const B2DPoint aPoint(rGeometry.getB2DPoint(a));
+                    aNewPN.maPoint = aPoint;
+                    aNewPN.mnI = aPos + a;
+                    aNewPN.mnIP = aPos + ((a != 0) ? a - 1 : nCount - 1);
+                    aNewPN.mnIN = aPos + ((a + 1 == nCount) ? 0 : a + 1);
+                    maPNV.push_back(aNewPN);
+
+                    if(mbIsCurve)
+                    {
+                        aNewVN.maPrev = rGeometry.getPrevControlPoint(a) - aPoint;
+                        aNewVN.maNext = rGeometry.getNextControlPoint(a) - aPoint;
+                        aNewVN.maOriginalNext = aNewVN.maNext;
+                        maVNV.push_back(aNewVN);
+                    }
+
+                    aNewSN.mpPN = &maPNV[maPNV.size() - 1];
+                    maSNV.push_back(aNewSN);
+                }
+            }
+
+            bool impLeftOfEdges(const B2DVector& rVecA, const B2DVector& rVecB, const B2DVector& rTest)
+            {
+                // tests if rTest is left of both directed line segments along the line -rVecA, rVecB. Test is
+                // with border.
+                if(rVecA.cross(rVecB) > 0.0)
+                {
+                    // b is left turn seen from a, test if Test is left of both and so inside (left is seeen as inside)
+                    const bool bBoolA(fTools::moreOrEqual(rVecA.cross(rTest), 0.0));
+                    const bool bBoolB(fTools::lessOrEqual(rVecB.cross(rTest), 0.0));
+
+                    return (bBoolA && bBoolB);
+                }
+                else
+                {
+                    // b is right turn seen from a, test if Test is right of both and so outside (left is seeen as inside)
+                    const bool bBoolA(fTools::lessOrEqual(rVecA.cross(rTest), 0.0));
+                    const bool bBoolB(fTools::moreOrEqual(rVecB.cross(rTest), 0.0));
+
+                    return (!(bBoolA && bBoolB));
+                }
+            }
+
+            void impSwitchNext(PN& rPNa, PN& rPNb)
+            {
+                ::std::swap(rPNa.mnIN, rPNb.mnIN);
+
+                if(mbIsCurve)
+                {
+                    VN& rVNa = maVNV[rPNa.mnI];
+                    VN& rVNb = maVNV[rPNb.mnI];
+
+                    ::std::swap(rVNa.maNext, rVNb.maNext);
+                }
+
+                if(!mbChanged)
+                {
+                    mbChanged = true;
+                }
+            }
+
+            B2DCubicBezier createSegment(const PN& rPN, bool bPrev) const
+            {
+                const B2DPoint& rStart(rPN.maPoint);
+                const B2DPoint& rEnd(maPNV[bPrev ? rPN.mnIP : rPN.mnIN].maPoint);
+                const B2DVector& rCPA(bPrev ? maVNV[rPN.mnI].maPrev : maVNV[rPN.mnI].maNext);
+                // Use maOriginalNext, not maNext to create the original (yet unchanged)
+                // curve segment. Otherwise, this segment would NOT ne correct.
+                const B2DVector& rCPB(bPrev ? maVNV[maPNV[rPN.mnIP].mnI].maOriginalNext : maVNV[maPNV[rPN.mnIN].mnI].maPrev);
+
+                return B2DCubicBezier(rStart, rStart + rCPA, rEnd + rCPB, rEnd);
+            }
+
+            void impHandleCommon(PN& rPNa, PN& rPNb)
+            {
+                if(mbIsCurve)
+                {
+                    const B2DCubicBezier aNextA(createSegment(rPNa, false));
+                    const B2DCubicBezier aPrevA(createSegment(rPNa, true));
+
+                    if(aNextA.equal(aPrevA))
+                    {
+                        // deadend on A (identical edge)
+                        return;
+                    }
+
+                    const B2DCubicBezier aNextB(createSegment(rPNb, false));
+                    const B2DCubicBezier aPrevB(createSegment(rPNb, true));
+
+                    if(aNextB.equal(aPrevB))
+                    {
+                        // deadend on B (identical edge)
+                        return;
+                    }
+
+                    if(aPrevA.equal(aPrevB))
+                    {
+                        // common edge in same direction
+                        if(aNextA.equal(aNextB))
+                        {
+                            // common edge in same direction continues
+                            return;
+                        }
+                        else
+                        {
+                            // common edge in same direction leave
+                            // action is done on enter
+                            return;
+                        }
+                    }
+                    else if(aPrevA.equal(aNextB))
+                    {
+                        // common edge in opposite direction
+                        if(aNextA.equal(aPrevB))
+                        {
+                            // common edge in opposite direction continues
+                            return;
+                        }
+                        else
+                        {
+                            // common edge in opposite direction leave
+                            impSwitchNext(rPNa, rPNb);
+                        }
+                    }
+                    else if(aNextA.equal(aNextB))
+                    {
+                        // common edge in same direction enter
+                        // search leave edge
+                        PN* pPNa2 = &maPNV[rPNa.mnIN];
+                        PN* pPNb2 = &maPNV[rPNb.mnIN];
+                        bool bOnEdge(true);
+
+                        do
+                        {
+                            const B2DCubicBezier aNextA2(createSegment(*pPNa2, false));
+                            const B2DCubicBezier aNextB2(createSegment(*pPNb2, false));
+
+                            if(aNextA2.equal(aNextB2))
+                            {
+                                pPNa2 = &maPNV[pPNa2->mnIN];
+                                pPNb2 = &maPNV[pPNb2->mnIN];
+                            }
+                            else
+                            {
+                                bOnEdge = false;
+                            }
+                        }
+                        while(bOnEdge && pPNa2 != &rPNa && pPNa2 != &rPNa);
+
+                        if(bOnEdge)
+                        {
+                            // loop over two identical polygon paths
+                            return;
+                        }
+                        else
+                        {
+                            // enter at rPNa, rPNb; leave at pPNa2, pPNb2. No common edges
+                            // at enter/leave. Check for crossover.
+                            const B2DVector aPrevCA(aPrevA.interpolatePoint(0.5) - aPrevA.getStartPoint());
+                            const B2DVector aNextCA(aNextA.interpolatePoint(0.5) - aNextA.getStartPoint());
+                            const B2DVector aPrevCB(aPrevB.interpolatePoint(0.5) - aPrevB.getStartPoint());
+                            const bool bEnter(impLeftOfEdges(aPrevCA, aNextCA, aPrevCB));
+
+                            const B2DCubicBezier aNextA2(createSegment(*pPNa2, false));
+                            const B2DCubicBezier aPrevA2(createSegment(*pPNa2, true));
+                            const B2DCubicBezier aNextB2(createSegment(*pPNb2, false));
+                            const B2DVector aPrevCA2(aPrevA2.interpolatePoint(0.5) - aPrevA2.getStartPoint());
+                            const B2DVector aNextCA2(aNextA2.interpolatePoint(0.5) - aNextA2.getStartPoint());
+                            const B2DVector aNextCB2(aNextB2.interpolatePoint(0.5) - aNextB2.getStartPoint());
+                            const bool bLeave(impLeftOfEdges(aPrevCA2, aNextCA2, aNextCB2));
+
+                            if(bEnter != bLeave)
+                            {
+                                // crossover
+                                impSwitchNext(rPNa, rPNb);
+                            }
+                        }
+                    }
+                    else if(aNextA.equal(aPrevB))
+                    {
+                        // common edge in opposite direction enter
+                        impSwitchNext(rPNa, rPNb);
+                    }
+                    else
+                    {
+                        // no common edges, check for crossover
+                        const B2DVector aPrevCA(aPrevA.interpolatePoint(0.5) - aPrevA.getStartPoint());
+                        const B2DVector aNextCA(aNextA.interpolatePoint(0.5) - aNextA.getStartPoint());
+                        const B2DVector aPrevCB(aPrevB.interpolatePoint(0.5) - aPrevB.getStartPoint());
+                        const B2DVector aNextCB(aNextB.interpolatePoint(0.5) - aNextB.getStartPoint());
+
+                        const bool bEnter(impLeftOfEdges(aPrevCA, aNextCA, aPrevCB));
+                        const bool bLeave(impLeftOfEdges(aPrevCA, aNextCA, aNextCB));
+
+                        if(bEnter != bLeave)
+                        {
+                            // crossover
+                            impSwitchNext(rPNa, rPNb);
+                        }
+                    }
+                }
+                else
+                {
+                    const B2DPoint& rNextA(maPNV[rPNa.mnIN].maPoint);
+                    const B2DPoint& rPrevA(maPNV[rPNa.mnIP].maPoint);
+
+                    if(rNextA.equal(rPrevA))
+                    {
+                        // deadend on A
+                        return;
+                    }
+
+                    const B2DPoint& rNextB(maPNV[rPNb.mnIN].maPoint);
+                    const B2DPoint& rPrevB(maPNV[rPNb.mnIP].maPoint);
+
+                    if(rNextB.equal(rPrevB))
+                    {
+                        // deadend on B
+                        return;
+                    }
+
+                    if(rPrevA.equal(rPrevB))
+                    {
+                        // common edge in same direction
+                        if(rNextA.equal(rNextB))
+                        {
+                            // common edge in same direction continues
+                            return;
+                        }
+                        else
+                        {
+                            // common edge in same direction leave
+                            // action is done on enter
+                            return;
+                        }
+                    }
+                    else if(rPrevA.equal(rNextB))
+                    {
+                        // common edge in opposite direction
+                        if(rNextA.equal(rPrevB))
+                        {
+                            // common edge in opposite direction continues
+                            return;
+                        }
+                        else
+                        {
+                            // common edge in opposite direction leave
+                            impSwitchNext(rPNa, rPNb);
+                        }
+                    }
+                    else if(rNextA.equal(rNextB))
+                    {
+                        // common edge in same direction enter
+                        // search leave edge
+                        PN* pPNa2 = &maPNV[rPNa.mnIN];
+                        PN* pPNb2 = &maPNV[rPNb.mnIN];
+                        bool bOnEdge(true);
+
+                        do
+                        {
+                            const B2DPoint& rNextA2(maPNV[pPNa2->mnIN].maPoint);
+                            const B2DPoint& rNextB2(maPNV[pPNb2->mnIN].maPoint);
+
+                            if(rNextA2.equal(rNextB2))
+                            {
+                                pPNa2 = &maPNV[pPNa2->mnIN];
+                                pPNb2 = &maPNV[pPNb2->mnIN];
+                            }
+                            else
+                            {
+                                bOnEdge = false;
+                            }
+                        }
+                        while(bOnEdge && pPNa2 != &rPNa && pPNa2 != &rPNa);
+
+                        if(bOnEdge)
+                        {
+                            // loop over two identical polygon paths
+                            return;
+                        }
+                        else
+                        {
+                            // enter at rPNa, rPNb; leave at pPNa2, pPNb2. No common edges
+                            // at enter/leave. Check for crossover.
+                            const B2DPoint& aPointE(rPNa.maPoint);
+                            const B2DVector aPrevAE(rPrevA - aPointE);
+                            const B2DVector aNextAE(rNextA - aPointE);
+                            const B2DVector aPrevBE(rPrevB - aPointE);
+
+                            const B2DPoint& aPointL(pPNa2->maPoint);
+                            const B2DVector aPrevAL(maPNV[pPNa2->mnIP].maPoint - aPointL);
+                            const B2DVector aNextAL(maPNV[pPNa2->mnIN].maPoint - aPointL);
+                            const B2DVector aNextBL(maPNV[pPNb2->mnIN].maPoint - aPointL);
+
+                            const bool bEnter(impLeftOfEdges(aPrevAE, aNextAE, aPrevBE));
+                            const bool bLeave(impLeftOfEdges(aPrevAL, aNextAL, aNextBL));
+
+                            if(bEnter != bLeave)
+                            {
+                                // crossover; switch start or end
+                                impSwitchNext(rPNa, rPNb);
+                            }
+                        }
+                    }
+                    else if(rNextA.equal(rPrevB))
+                    {
+                        // common edge in opposite direction enter
+                        impSwitchNext(rPNa, rPNb);
+                    }
+                    else
+                    {
+                        // no common edges, check for crossover
+                        const B2DPoint& aPoint(rPNa.maPoint);
+                        const B2DVector aPrevA(rPrevA - aPoint);
+                        const B2DVector aNextA(rNextA - aPoint);
+                        const B2DVector aPrevB(rPrevB - aPoint);
+                        const B2DVector aNextB(rNextB - aPoint);
+
+                        const bool bEnter(impLeftOfEdges(aPrevA, aNextA, aPrevB));
+                        const bool bLeave(impLeftOfEdges(aPrevA, aNextA, aNextB));
+
+                        if(bEnter != bLeave)
+                        {
+                            // crossover
+                            impSwitchNext(rPNa, rPNb);
+                        }
+                    }
+                }
+            }
+
+            void impSolve()
+            {
+                // sort by point to identify common nodes
+                ::std::sort(maSNV.begin(), maSNV.end());
+
+                // handle common nodes
+                const sal_uInt32 nNodeCount(maSNV.size());
+
+                for(sal_uInt32 a(0); a < nNodeCount - 1; a++)
+                {
+                    // test a before using it, not after. Also use nPointCount instead of aSortNodes.size()
+                    PN& rPNb = *(maSNV[a].mpPN);
+
+                    for(sal_uInt32 b(a + 1); b < nNodeCount && rPNb.maPoint.equal(maSNV[b].mpPN->maPoint); b++)
+                    {
+                        impHandleCommon(rPNb, *maSNV[b].mpPN);
+                    }
+                }
+            }
+
+        public:
+            solver(const B2DPolygon& rOriginal)
+            :   maOriginal(B2DPolyPolygon(rOriginal)),
+                mbIsCurve(false),
+                mbChanged(false)
+            {
+                const sal_uInt32 nOriginalCount(rOriginal.count());
+
+                if(nOriginalCount)
+                {
+                    B2DPolygon aGeometry(tools::addPointsAtCutsAndTouches(rOriginal));
+                    aGeometry.removeDoublePoints();
+                    aGeometry = tools::simplifyCurveSegments(aGeometry);
+                    mbIsCurve = aGeometry.areControlPointsUsed();
+
+                    const sal_uInt32 nPointCount(aGeometry.count());
+
+                    // If it's not a pezier polygon, at least four points are needed to create
+                    // a self-intersection. If it's a bezier polygon, the minimum point number
+                    // is two, since with a single point You get a curve, but no self-intersection
+                    if(nPointCount > 3 || (nPointCount > 1 && mbIsCurve))
+                    {
+                        // reserve space in point, control and sort vector.
+                        maSNV.reserve(nPointCount);
+                        maPNV.reserve(nPointCount);
+                        maVNV.reserve(mbIsCurve ? nPointCount : 0);
+
+                        // fill data
+                        impAddPolygon(0, aGeometry);
+
+                        // solve common nodes
+                        impSolve();
+                    }
+                }
+            }
+
+            solver(const B2DPolyPolygon& rOriginal)
+            :   maOriginal(rOriginal),
+                mbIsCurve(false),
+                mbChanged(false)
+            {
+                sal_uInt32 nOriginalCount(maOriginal.count());
+
+                if(nOriginalCount)
+                {
+                    B2DPolyPolygon aGeometry(tools::addPointsAtCutsAndTouches(maOriginal, true));
+                    aGeometry.removeDoublePoints();
+                    aGeometry = tools::simplifyCurveSegments(aGeometry);
+                    mbIsCurve = aGeometry.areControlPointsUsed();
+                    nOriginalCount = aGeometry.count();
+
+                    if(nOriginalCount)
+                    {
+                        sal_uInt32 nPointCount(0);
+                        sal_uInt32 a(0);
+
+                        // count points
+                        for(a = 0; a < nOriginalCount; a++)
+                        {
+                            const B2DPolygon aCandidate(aGeometry.getB2DPolygon(a));
+                            const sal_uInt32 nCandCount(aCandidate.count());
+
+                            // If it's not a bezier curve, at least three points would be needed to have a
+                            // topological relevant (not empty) polygon. Since its not known here if trivial
+                            // edges (dead ends) will be kept or sorted out, add non-bezier polygons with
+                            // more than one point.
+                            // For bezier curves, the minimum for defining an area is also one.
+                            if(nCandCount)
+                            {
+                                nPointCount += nCandCount;
+                            }
+                        }
+
+                        if(nPointCount)
+                        {
+                            // reserve space in point, control and sort vector.
+                            maSNV.reserve(nPointCount);
+                            maPNV.reserve(nPointCount);
+                            maVNV.reserve(mbIsCurve ? nPointCount : 0);
+
+                            // fill data
+                            sal_uInt32 nInsertIndex(0);
+
+                            for(a = 0; a < nOriginalCount; a++)
+                            {
+                                const B2DPolygon aCandidate(aGeometry.getB2DPolygon(a));
+                                const sal_uInt32 nCandCount(aCandidate.count());
+
+                                // use same condition as above, the data vector is
+                                // pre-allocated
+                                if(nCandCount)
+                                {
+                                    impAddPolygon(nInsertIndex, aCandidate);
+                                    nInsertIndex += nCandCount;
+                                }
+                            }
+
+                            // solve common nodes
+                            impSolve();
+                        }
+                    }
+                }
+            }
+
+            B2DPolyPolygon getB2DPolyPolygon()
+            {
+                if(mbChanged)
+                {
+                    B2DPolyPolygon aRetval;
+                    const sal_uInt32 nCount(maPNV.size());
+                    sal_uInt32 nCountdown(nCount);
+
+                    for(sal_uInt32 a(0); nCountdown && a < nCount; a++)
+                    {
+                        PN& rPN = maPNV[a];
+
+                        if(SAL_MAX_UINT32 != rPN.mnI)
+                        {
+                            // unused node, start new part polygon
+                            B2DPolygon aNewPart;
+                            PN* pPNCurr = &rPN;
+
+                            do
+                            {
+                                const B2DPoint& rPoint = pPNCurr->maPoint;
+                                aNewPart.append(rPoint);
+
+                                if(mbIsCurve)
+                                {
+                                    const VN& rVNCurr = maVNV[pPNCurr->mnI];
+
+                                    if(!rVNCurr.maPrev.equalZero())
+                                    {
+                                        aNewPart.setPrevControlPoint(aNewPart.count() - 1, rPoint + rVNCurr.maPrev);
+                                    }
+
+                                    if(!rVNCurr.maNext.equalZero())
+                                    {
+                                        aNewPart.setNextControlPoint(aNewPart.count() - 1, rPoint + rVNCurr.maNext);
+                                    }
+                                }
+
+                                pPNCurr->mnI = SAL_MAX_UINT32;
+                                nCountdown--;
+                                pPNCurr = &(maPNV[pPNCurr->mnIN]);
+                            }
+                            while(pPNCurr != &rPN && SAL_MAX_UINT32 != pPNCurr->mnI);
+
+                            // close and add
+                            aNewPart.setClosed(true);
+                            aRetval.append(aNewPart);
+                        }
+                    }
+
+                    return aRetval;
+                }
+                else
+                {
+                    // no change, return original
+                    return maOriginal;
+                }
+            }
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        //////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon solveCrossovers(const B2DPolyPolygon& rCandidate)
+        {
+            if(rCandidate.count() > 1L)
+            {
+                solver aSolver(rCandidate);
+                return aSolver.getB2DPolyPolygon();
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon solveCrossovers(const B2DPolygon& rCandidate)
+        {
+            solver aSolver(rCandidate);
+            return aSolver.getB2DPolyPolygon();
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon stripNeutralPolygons(const B2DPolyPolygon& rCandidate)
+        {
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                if(ORIENTATION_NEUTRAL != tools::getOrientation(aCandidate))
+                {
+                    aRetval.append(aCandidate);
+                }
+            }
+
+            return aRetval;
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon stripDispensablePolygons(const B2DPolyPolygon& rCandidate, bool bKeepAboveZero)
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            if(nCount)
+            {
+                if(nCount == 1L)
+                {
+                    if(!bKeepAboveZero && ORIENTATION_POSITIVE == tools::getOrientation(rCandidate.getB2DPolygon(0L)))
+                    {
+                        aRetval = rCandidate;
+                    }
+                }
+                else
+                {
+                    sal_uInt32 a, b;
+                    ::std::vector< StripHelper > aHelpers;
+                    aHelpers.resize(nCount);
+
+                    for(a = 0L; a < nCount; a++)
+                    {
+                        const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+                        StripHelper* pNewHelper = &(aHelpers[a]);
+                        pNewHelper->maRange = tools::getRange(aCandidate);
+                        pNewHelper->meOrinetation = tools::getOrientation(aCandidate);
+                        pNewHelper->mnDepth = (ORIENTATION_NEGATIVE == pNewHelper->meOrinetation ? -1L : 0L);
+                    }
+
+                    for(a = 0L; a < nCount - 1L; a++)
+                    {
+                        const B2DPolygon aCandA(rCandidate.getB2DPolygon(a));
+                        StripHelper& rHelperA = aHelpers[a];
+
+                        for(b = a + 1L; b < nCount; b++)
+                        {
+                            const B2DPolygon aCandB(rCandidate.getB2DPolygon(b));
+                            StripHelper& rHelperB = aHelpers[b];
+                            const bool bAInB(rHelperB.maRange.isInside(rHelperA.maRange) && tools::isInside(aCandB, aCandA, true));
+                            const bool bBInA(rHelperA.maRange.isInside(rHelperB.maRange) && tools::isInside(aCandA, aCandB, true));
+
+                            if(bAInB && bBInA)
+                            {
+                                // congruent
+                                if(rHelperA.meOrinetation == rHelperB.meOrinetation)
+                                {
+                                    // two polys or two holes. Lower one of them to get one of them out of the way.
+                                    // Since each will be contained in the other one, both will be increased, too.
+                                    // So, for lowering, increase only one of them
+                                    rHelperA.mnDepth++;
+                                }
+                                else
+                                {
+                                    // poly and hole. They neutralize, so get rid of both. Move securely below zero.
+                                    rHelperA.mnDepth = -((sal_Int32)nCount);
+                                    rHelperB.mnDepth = -((sal_Int32)nCount);
+                                }
+                            }
+                            else
+                            {
+                                if(bAInB)
+                                {
+                                    if(ORIENTATION_NEGATIVE == rHelperB.meOrinetation)
+                                    {
+                                        rHelperA.mnDepth--;
+                                    }
+                                    else
+                                    {
+                                        rHelperA.mnDepth++;
+                                    }
+                                }
+                                else if(bBInA)
+                                {
+                                    if(ORIENTATION_NEGATIVE == rHelperA.meOrinetation)
+                                    {
+                                        rHelperB.mnDepth--;
+                                    }
+                                    else
+                                    {
+                                        rHelperB.mnDepth++;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    for(a = 0L; a < nCount; a++)
+                    {
+                        const StripHelper& rHelper = aHelpers[a];
+                        bool bAcceptEntry(bKeepAboveZero ? 1L <= rHelper.mnDepth : 0L == rHelper.mnDepth);
+
+                        if(bAcceptEntry)
+                        {
+                            aRetval.append(rCandidate.getB2DPolygon(a));
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+        B2DPolyPolygon prepareForPolygonOperation(const B2DPolygon& rCandidate)
+        {
+            solver aSolver(rCandidate);
+            B2DPolyPolygon aRetval(stripNeutralPolygons(aSolver.getB2DPolyPolygon()));
+
+            return correctOrientations(aRetval);
+        }
+
+        B2DPolyPolygon prepareForPolygonOperation(const B2DPolyPolygon& rCandidate)
+        {
+            solver aSolver(rCandidate);
+            B2DPolyPolygon aRetval(stripNeutralPolygons(aSolver.getB2DPolyPolygon()));
+
+            return correctOrientations(aRetval);
+        }
+
+        B2DPolyPolygon solvePolygonOperationOr(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB)
+        {
+            if(!rCandidateA.count())
+            {
+                return rCandidateB;
+            }
+            else if(!rCandidateB.count())
+            {
+                return rCandidateA;
+            }
+            else
+            {
+                // concatenate polygons, solve crossovers and throw away all sub-polygons
+                // which have a depth other than 0.
+                B2DPolyPolygon aRetval(rCandidateA);
+
+                aRetval.append(rCandidateB);
+                aRetval = solveCrossovers(aRetval);
+                aRetval = stripNeutralPolygons(aRetval);
+
+                return stripDispensablePolygons(aRetval, false);
+            }
+        }
+
+        B2DPolyPolygon solvePolygonOperationXor(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB)
+        {
+            if(!rCandidateA.count())
+            {
+                return rCandidateB;
+            }
+            else if(!rCandidateB.count())
+            {
+                return rCandidateA;
+            }
+            else
+            {
+                // XOR is pretty simple: By definition it is the simple concatenation of
+                // the single polygons since we imply XOR fill rule. Make it intersection-free
+                // and correct orientations
+                B2DPolyPolygon aRetval(rCandidateA);
+
+                aRetval.append(rCandidateB);
+                aRetval = solveCrossovers(aRetval);
+                aRetval = stripNeutralPolygons(aRetval);
+
+                return correctOrientations(aRetval);
+            }
+        }
+
+        B2DPolyPolygon solvePolygonOperationAnd(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB)
+        {
+            if(!rCandidateA.count())
+            {
+                return B2DPolyPolygon();
+            }
+            else if(!rCandidateB.count())
+            {
+                return B2DPolyPolygon();
+            }
+            else
+            {
+                // concatenate polygons, solve crossovers and throw away all sub-polygons
+                // with a depth of < 1. This means to keep all polygons where at least two
+                // polygons do overlap.
+                B2DPolyPolygon aRetval(rCandidateA);
+
+                aRetval.append(rCandidateB);
+                aRetval = solveCrossovers(aRetval);
+                aRetval = stripNeutralPolygons(aRetval);
+
+                return stripDispensablePolygons(aRetval, true);
+            }
+        }
+
+        B2DPolyPolygon solvePolygonOperationDiff(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB)
+        {
+            if(!rCandidateA.count())
+            {
+                return B2DPolyPolygon();
+            }
+            else if(!rCandidateB.count())
+            {
+                return rCandidateA;
+            }
+            else
+            {
+                // Make B topologically to holes and append to A
+                B2DPolyPolygon aRetval(rCandidateB);
+
+                aRetval.flip();
+                aRetval.append(rCandidateA);
+
+                // solve crossovers and throw away all sub-polygons which have a
+                // depth other than 0.
+                aRetval = basegfx::tools::solveCrossovers(aRetval);
+                aRetval = basegfx::tools::stripNeutralPolygons(aRetval);
+
+                return basegfx::tools::stripDispensablePolygons(aRetval, false);
+            }
+        }
+
+        B2DPolyPolygon mergeToSinglePolyPolygon(const std::vector< basegfx::B2DPolyPolygon >& rInput)
+        {
+            std::vector< basegfx::B2DPolyPolygon > aInput(rInput);
+
+            // first step: prepareForPolygonOperation and simple merge of non-overlapping
+            // PolyPolygons for speedup; this is possible for the wanted OR-operation
+            if(aInput.size())
+            {
+                std::vector< basegfx::B2DPolyPolygon > aResult;
+                aResult.reserve(aInput.size());
+
+                for(sal_uInt32 a(0); a < aInput.size(); a++)
+                {
+                    const basegfx::B2DPolyPolygon aCandidate(prepareForPolygonOperation(aInput[a]));
+
+                    if(aResult.size())
+                    {
+                        const B2DRange aCandidateRange(aCandidate.getB2DRange());
+                        bool bCouldMergeSimple(false);
+
+                        for(sal_uInt32 b(0); !bCouldMergeSimple && b < aResult.size(); b++)
+                        {
+                            basegfx::B2DPolyPolygon aTarget(aResult[b]);
+                            const B2DRange aTargetRange(aTarget.getB2DRange());
+
+                            if(!aCandidateRange.overlaps(aTargetRange))
+                            {
+                                aTarget.append(aCandidate);
+                                aResult[b] = aTarget;
+                                bCouldMergeSimple = true;
+                            }
+                        }
+
+                        if(!bCouldMergeSimple)
+                        {
+                            aResult.push_back(aCandidate);
+                        }
+                    }
+                    else
+                    {
+                        aResult.push_back(aCandidate);
+                    }
+                }
+
+                aInput = aResult;
+            }
+
+            // second step: melt pairwise to a single PolyPolygon
+            while(aInput.size() > 1)
+            {
+                std::vector< basegfx::B2DPolyPolygon > aResult;
+                aResult.reserve((aInput.size() / 2) + 1);
+
+                for(sal_uInt32 a(0); a < aInput.size(); a += 2)
+                {
+                    if(a + 1 < aInput.size())
+                    {
+                        // a pair for processing
+                        aResult.push_back(solvePolygonOperationOr(aInput[a], aInput[a + 1]));
+                    }
+                    else
+                    {
+                        // last single PolyPolygon; copy to target to not lose it
+                        aResult.push_back(aInput[a]);
+                    }
+                }
+
+                aInput = aResult;
+            }
+
+            // third step: get result
+            if(1 == aInput.size())
+            {
+                return aInput[0];
+            }
+
+            return B2DPolyPolygon();
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
new file mode 100644
index 000000000000..b795c04e158e
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
@@ -0,0 +1,702 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/polygon/b2dpolypolygonrasterconverter.hxx>
+
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <boost/mem_fn.hpp>
+
+#include <algorithm>
+
+namespace basegfx
+{
+    class radixSort {
+
+        //! public interface
+        public:
+
+            //! default constructor
+            radixSort( void );
+
+            //! destructor
+            ~radixSort( void );
+
+            bool sort( const float *pInput, sal_uInt32 nNumElements, sal_uInt32 dwStride );
+
+            inline sal_uInt32 *indices( void ) const { return m_indices1; }
+
+        //! private attributes
+        private:
+
+            // current size of index list
+            sal_uInt32 m_current_size;
+
+            // last known size of index list
+            sal_uInt32 m_previous_size;
+
+            // index lists
+            sal_uInt32 *m_indices1;
+            sal_uInt32 *m_indices2;
+
+            sal_uInt32 m_counter[256*4];
+            sal_uInt32 m_offset[256];
+
+        //! private methods
+        private:
+
+            bool resize( sal_uInt32 nNumElements );
+            inline void reset_indices( void );
+            bool prepareCounters( const float *pInput, sal_uInt32 nNumElements, sal_uInt32 dwStride );
+    };
+
+    inline radixSort::radixSort( void ) {
+
+        m_indices1 = NULL;
+        m_indices2 = NULL;
+        m_current_size = 0;
+        m_previous_size = 0;
+
+        reset_indices();
+    }
+
+    inline radixSort::~radixSort( void ) {
+
+        delete [] m_indices2;
+        delete [] m_indices1;
+    }
+
+    bool radixSort::resize( sal_uInt32 nNumElements ) {
+
+        if(nNumElements==m_previous_size)
+            return true;
+
+        if(nNumElements > m_current_size) {
+
+            // release index lists
+            if(m_indices2)
+                delete [] m_indices2;
+            if(m_indices1)
+                delete [] m_indices1;
+
+            // allocate new index lists
+            m_indices1 = new sal_uInt32[nNumElements];
+            m_indices2 = new sal_uInt32[nNumElements];
+
+            // check for out of memory situation
+            if(!m_indices1 || !m_indices2) {
+                delete [] m_indices1;
+                delete [] m_indices2;
+                m_indices1 = NULL;
+                m_indices2 = NULL;
+                m_current_size = 0;
+                return false;
+            }
+
+            m_current_size = nNumElements;
+        }
+
+        m_previous_size = nNumElements;
+
+        // initialize indices
+        reset_indices();
+
+        return true;
+    }
+
+    inline void radixSort::reset_indices( void ) {
+
+        for(sal_uInt32 i=0;i<m_current_size;i++)
+            m_indices1[i] = i;
+    }
+
+    bool radixSort::prepareCounters( const float *pInput, sal_uInt32 nNumElements, sal_uInt32 dwStride ) {
+
+        // clear counters
+        sal_uInt32 *ptr = m_counter;
+        for(int i=0; i<64; ++i)
+        {
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+            *ptr++ = 0;
+        }
+
+        // prepare pointers to relevant memory addresses
+        sal_uInt8 *p = (sal_uInt8*)pInput;
+        sal_uInt8 *pe = p+(nNumElements*dwStride);
+        sal_uInt32 *h0= &m_counter[0];
+        sal_uInt32 *h1= &m_counter[256];
+        sal_uInt32 *h2= &m_counter[512];
+        sal_uInt32 *h3= &m_counter[768];
+
+        sal_uInt32 *Indices = m_indices1;
+        float previous_value = *(float *)(((sal_uInt8 *)pInput)+(m_indices1[0]*dwStride));
+        bool bSorted = true;
+        while(p!=pe) {
+            float value = *(float *)(((sal_uInt8 *)pInput)+((*Indices++)*dwStride));
+            if(value<previous_value)    {
+                bSorted = false;
+                break;
+            }
+            previous_value = value;
+            h0[*p++]++;
+            h1[*p++]++;
+            h2[*p++]++;
+            h3[*p++]++;
+            p += dwStride-4;
+        }
+        if(bSorted)
+            return true;
+        while(p!=pe) {
+            h0[*p++]++;
+            h1[*p++]++;
+            h2[*p++]++;
+            h3[*p++]++;
+            p += dwStride-4;
+        }
+        return false;
+    }
+
+    bool radixSort::sort( const float *pInput, sal_uInt32 nNumElements, sal_uInt32 dwStride ) {
+
+        if(!(pInput))
+            return false;
+        if(!(nNumElements))
+            return false;
+        if(!(resize(nNumElements)))
+            return false;
+
+        // prepare radix counters, return if already sorted
+        if(prepareCounters(pInput,nNumElements,dwStride))
+            return true;
+
+        // count number of negative values
+        sal_uInt32 num_negatives = 0;
+        sal_uInt32 *h3= &m_counter[768];
+        for(sal_uInt32 i=128;i<256;i++)
+            num_negatives += h3[i];
+
+        // perform passes, one for each byte
+        for(sal_uInt32 j=0;j<4;j++) {
+
+            // ignore this pass if all values have the same byte
+            bool bRun = true;
+            sal_uInt32 *current_counter = &m_counter[j<<8];
+            sal_uInt8 unique_value = *(((sal_uInt8*)pInput)+j);
+            if(current_counter[unique_value]==nNumElements)
+                bRun=false;
+
+            // does the incoming byte contain the sign bit?
+            sal_uInt32 i;
+            if(j!=3) {
+                if(bRun) {
+                    m_offset[0] = 0;
+                    for(i=1;i<256;i++)
+                        m_offset[i] = m_offset[i-1] + current_counter[i-1];
+                    sal_uInt8 *InputBytes = (sal_uInt8 *)pInput;
+                    sal_uInt32 *Indices = m_indices1;
+                    sal_uInt32 *IndicesEnd = &m_indices1[nNumElements];
+                    InputBytes += j;
+                    while(Indices!=IndicesEnd) {
+                        sal_uInt32 id = *Indices++;
+                        m_indices2[m_offset[InputBytes[id*dwStride]]++] = id;
+                    }
+                    sal_uInt32 *Tmp = m_indices1;
+                    m_indices1 = m_indices2;
+                    m_indices2 = Tmp;
+                }
+            }
+            else {
+                if(bRun) {
+                    m_offset[0] = num_negatives;
+                    for(i=1;i<128;i++)
+                        m_offset[i] = m_offset[i-1] + current_counter[i-1];
+                    m_offset[255] = 0;
+                    for(i=0;i<127;i++)
+                        m_offset[254-i] = m_offset[255-i] + current_counter[255-i];
+                    for(i=128;i<256;i++)
+                        m_offset[i] += current_counter[i];
+                    for(i=0;i<nNumElements;i++) {
+                        sal_uInt32 Radix = (*(sal_uInt32 *)(((sal_uInt8 *)pInput)+(m_indices1[i]*dwStride)))>>24;
+                        if(Radix<128) m_indices2[m_offset[Radix]++] = m_indices1[i];
+                        else m_indices2[--m_offset[Radix]] = m_indices1[i];
+                    }
+                    sal_uInt32 *Tmp = m_indices1;
+                    m_indices1 = m_indices2;
+                    m_indices2 = Tmp;
+                }
+                else {
+                    if(unique_value>=128) {
+                        for(i=0;i<nNumElements;i++)
+                            m_indices2[i] = m_indices1[nNumElements-i-1];
+                        sal_uInt32 *Tmp = m_indices1;
+                        m_indices1 = m_indices2;
+                        m_indices2 = Tmp;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    //************************************************************
+    // Internal vertex storage of B2DPolyPolygonRasterConverter
+    //************************************************************
+
+    inline B2DPolyPolygonRasterConverter::Vertex::Vertex() :
+        aP1(),
+        aP2(),
+        bDownwards( true )
+    {
+    }
+
+    inline B2DPolyPolygonRasterConverter::Vertex::Vertex( const B2DPoint& rP1, const B2DPoint& rP2, bool bDown ) :
+        aP1( rP1 ),
+        aP2( rP2 ),
+        bDownwards( bDown )
+    {
+    }
+
+
+    //************************************************************
+    // Helper class for holding horizontal line segments during raster
+    // conversion
+    //************************************************************
+
+    namespace
+    {
+        class ImplLineNode
+        {
+        public:
+            sal_Int32   mnYCounter;
+            float       mfXPos;
+            float       mfXDelta;
+            bool        mbDownwards;
+
+        public:
+            /**rP1 and rP2 must not have equal y values, when rounded
+               to integer!
+            */
+            ImplLineNode(const B2DPoint& rP1, const B2DPoint& rP2, bool bDown) :
+                mnYCounter( fround(rP2.getY()) - fround(rP1.getY()) ),
+                mfXPos( (float)(rP1.getX()) ),
+                mfXDelta((float) ((rP2.getX() - rP1.getX()) / mnYCounter) ),
+                mbDownwards( bDown )
+            {
+            }
+
+            /// get current x position
+            const float& getXPos() const
+            {
+                return mfXPos;
+            }
+
+            /// returns true, if line ends on this Y value
+            float nextLine()
+            {
+                if(mnYCounter>=0)
+                {
+                    // go one step in Y
+                    mfXPos += mfXDelta;
+                    --mnYCounter;
+                    return mfXDelta;
+                }
+
+                return 0.0f;
+            }
+
+            bool isEnded()
+            {
+                return mnYCounter<=0;
+            }
+
+            bool isDownwards()
+            {
+                return mbDownwards;
+            }
+        };
+    }
+
+    typedef ::std::vector<ImplLineNode> VectorOfLineNodes;
+
+
+    //************************************************************
+    //   Base2D PolyPolygon Raster Converter (Rasterizer)
+    //************************************************************
+
+    namespace
+    {
+        struct VertexComparator
+        {
+            bool operator()( const B2DPolyPolygonRasterConverter::Vertex& rLHS,
+                             const B2DPolyPolygonRasterConverter::Vertex& rRHS )
+            {
+                return rLHS.aP1.getX() < rRHS.aP1.getX();
+            }
+        };
+    }
+
+    void B2DPolyPolygonRasterConverter::init()
+    {
+        if(!maPolyPolyRectangle.isEmpty())
+        {
+            const sal_Int32 nMinY( fround(maPolyPolyRectangle.getMinY()) );
+            const sal_Int32 nScanlines(fround(maPolyPolyRectangle.getMaxY()) - nMinY);
+
+            maScanlines.resize( nScanlines+1 );
+
+            // add all polygons
+            for( sal_uInt32 i(0), nCount(maPolyPolygon.count());
+                 i < nCount;
+                 ++i )
+            {
+                // add all vertices
+                const B2DPolygon& rPoly( maPolyPolygon.getB2DPolygon(i) );
+                for( sal_uInt32 k(0), nVertices(rPoly.count());
+                     k<nVertices;
+                     ++k )
+                {
+                    const B2DPoint& rP1( rPoly.getB2DPoint(k) );
+                    const B2DPoint& rP2( rPoly.getB2DPoint( (k + 1) % nVertices ) );
+
+                    const sal_Int32 nVertexYP1( fround(rP1.getY()) );
+                    const sal_Int32 nVertexYP2( fround(rP2.getY()) );
+
+                    // insert only vertices which are not strictly
+                    // horizontal. Note that the ImplLineNode relies on
+                    // this.
+                    if(nVertexYP1 != nVertexYP2)
+                    {
+                        if( nVertexYP2 < nVertexYP1 )
+                        {
+                            const sal_Int32 nStartScanline(nVertexYP2 - nMinY);
+
+                            // swap edges
+                            maScanlines[ nStartScanline ].push_back( Vertex(rP2, rP1, false) );
+                        }
+                        else
+                        {
+                            const sal_Int32 nStartScanline(nVertexYP1 - nMinY);
+
+                            maScanlines[ nStartScanline ].push_back( Vertex(rP1, rP2, true) );
+                        }
+                    }
+                }
+            }
+
+            // now sort all scanlines, with increasing x coordinates
+            VectorOfVertexVectors::iterator aIter( maScanlines.begin() );
+            VectorOfVertexVectors::iterator aEnd( maScanlines.end() );
+            while( aIter != aEnd )
+            {
+                ::std::sort( aIter->begin(),
+                             aIter->end(),
+                             VertexComparator() );
+                ++aIter;
+            }
+        }
+    }
+
+    B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter( const B2DPolyPolygon& rPolyPoly ) :
+        maPolyPolygon( rPolyPoly ),
+        maPolyPolyRectangle( tools::getRange( rPolyPoly ) ),
+        maScanlines()
+    {
+        init();
+    }
+
+    namespace
+    {
+        B2DRectangle getCombinedBounds( const B2DPolyPolygon& rPolyPolyRaster,
+                                        const B2DRectangle&   rRasterArea )
+        {
+            B2DRectangle aRect( tools::getRange( rPolyPolyRaster ) );
+            aRect.expand( rRasterArea );
+
+            return aRect;
+        }
+    }
+
+    B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter( const B2DPolyPolygon& rPolyPolyRaster,
+                                                                  const B2DRectangle&   rRasterArea ) :
+        maPolyPolygon( rPolyPolyRaster ),
+        maPolyPolyRectangle(
+            getCombinedBounds( rPolyPolyRaster,
+                               rRasterArea ) ),
+        maScanlines()
+    {
+        init();
+    }
+
+    B2DPolyPolygonRasterConverter::~B2DPolyPolygonRasterConverter()
+    {
+    }
+
+    namespace
+    {
+        class LineNodeGenerator
+        {
+        public:
+            LineNodeGenerator( VectorOfLineNodes& rActiveVertices ) :
+                mrActiveVertices( rActiveVertices )
+            {
+            }
+
+            void operator()( const B2DPolyPolygonRasterConverter::Vertex& rVertex )
+            {
+                mrActiveVertices.push_back( ImplLineNode(rVertex.aP1,
+                                                         rVertex.aP2,
+                                                         rVertex.bDownwards) );
+            }
+
+        private:
+            VectorOfLineNodes& mrActiveVertices;
+        };
+
+        struct LineNodeComparator
+        {
+            bool operator()( const ImplLineNode& rLHS, const ImplLineNode& rRHS )
+            {
+                return rLHS.getXPos() < rRHS.getXPos();
+            }
+        };
+    }
+
+    void B2DPolyPolygonRasterConverter::rasterConvert( FillRule eFillRule )
+    {
+        if( maScanlines.empty() )
+            return; // no scanlines at all -> bail out
+
+        const sal_Int32 nMinY( fround(maPolyPolyRectangle.getMinY()) );
+        const sal_Int32 nScanlines(fround(maPolyPolyRectangle.getMaxY()) - nMinY);
+
+        // Vector of currently active vertices. A vertex is active, if
+        // it crosses or touches the current scanline.
+        VectorOfLineNodes   aActiveVertices;
+
+        // mickey's optimized version...
+        radixSort   rs;
+        std::size_t nb(0);
+        std::size_t nb_previous(0);
+        bool        bSort(false);
+
+        // process each scanline
+        for( sal_Int32 y(0); y <= nScanlines; ++y )
+        {
+            // add vertices which start at current scanline into
+            // active vertex vector
+            ::std::for_each( maScanlines[y].begin(),
+                             maScanlines[y].end(),
+                             LineNodeGenerator( aActiveVertices ) );
+            nb = aActiveVertices.size();
+            if(nb != nb_previous)
+            {
+                nb_previous = nb;
+                bSort = true;
+            }
+
+            // sort with increasing X
+            if(bSort)
+            {
+                bSort = false;
+
+                if( nb )
+                {
+                    rs.sort(&aActiveVertices[0].mfXPos,
+                            nb,
+                            sizeof(ImplLineNode));
+                }
+            }
+
+            const std::size_t nLen( nb );
+            if( !nLen )
+            {
+                // empty scanline - call derived with an 'off' span
+                // for the full width
+                span( maPolyPolyRectangle.getMinX(),
+                      maPolyPolyRectangle.getMaxX(),
+                      nMinY + y,
+                      false );
+            }
+            else
+            {
+                const sal_Int32 nCurrY( nMinY + y );
+
+                // scanline not empty - forward all scans to derived,
+                // according to selected fill rule
+
+                // TODO(P1): Maybe allow these 'off' span calls to be
+                // switched off (or all 'on' span calls, depending on
+                // use case scenario)
+
+                // sorting didn't change the order of the elements
+                // in memory but prepared a list of indices in sorted order.
+                // thus we now process the nodes with an additional indirection.
+                sal_uInt32 *sorted = rs.indices();
+
+                // call derived with 'off' span for everything left of first active span
+                if( aActiveVertices[sorted[0]].getXPos() > maPolyPolyRectangle.getMinX() )
+                {
+                    span( maPolyPolyRectangle.getMinX(),
+                          aActiveVertices[sorted[0]].getXPos(),
+                          nCurrY,
+                          false );
+                }
+
+                switch( eFillRule )
+                {
+                    default:
+                        OSL_ENSURE(false,
+                                   "B2DPolyPolygonRasterConverter::rasterConvert(): Unexpected fill rule");
+                        return;
+
+                    case FillRule_EVEN_ODD:
+                        // process each span in current scanline, with
+                        // even-odd fill rule
+                        for( ::std::size_t i(0), nLength(aActiveVertices.size());
+                             i+1 < nLength;
+                             ++i )
+                        {
+                            sal_uInt32 nIndex = sorted[i];
+                            sal_uInt32 nNextIndex = sorted[i+1];
+                            span( aActiveVertices[nIndex].getXPos(),
+                                  aActiveVertices[nNextIndex].getXPos(),
+                                  nCurrY,
+                                  i % 2 == 0 );
+
+                            float delta = aActiveVertices[nIndex].nextLine();
+                            if(delta > 0.0f)
+                            {
+                                if(aActiveVertices[nIndex].getXPos() > aActiveVertices[nNextIndex].getXPos())
+                                    bSort = true;
+                            }
+                            else if(delta < 0.0f)
+                            {
+                                if(i)
+                                {
+                                    sal_uInt32 nPrevIndex = sorted[i-1];
+                                    if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos())
+                                        bSort = true;
+                                }
+                            }
+                        }
+                        break;
+
+                    case FillRule_NONZERO_WINDING_NUMBER:
+                        // process each span in current scanline, with
+                        // non-zero winding numbe fill rule
+                        sal_Int32 nWindingNumber(0);
+                        for( ::std::size_t i(0), nLength(aActiveVertices.size());
+                             i+1 < nLength;
+                             ++i )
+                        {
+                            sal_uInt32 nIndex = sorted[i];
+                            sal_uInt32 nNextIndex = sorted[i+1];
+                            nWindingNumber += -1 + 2*aActiveVertices[nIndex].isDownwards();
+
+                            span( aActiveVertices[nIndex].getXPos(),
+                                  aActiveVertices[nNextIndex].getXPos(),
+                                  nCurrY,
+                                  nWindingNumber != 0 );
+
+                            float delta = aActiveVertices[nIndex].nextLine();
+                            if(delta > 0.0f)
+                            {
+                                if(aActiveVertices[nIndex].getXPos() > aActiveVertices[nNextIndex].getXPos())
+                                    bSort = true;
+                            }
+                            else if(delta < 0.0f)
+                            {
+                                if(i)
+                                {
+                                    sal_uInt32 nPrevIndex = sorted[i-1];
+                                    if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos())
+                                        bSort = true;
+                                }
+                            }
+                        }
+                        break;
+                }
+
+                // call derived with 'off' span for everything right of last active span
+                if( aActiveVertices[sorted[nb-1]].getXPos()+1.0 < maPolyPolyRectangle.getMaxX() )
+                {
+                    span( aActiveVertices[sorted[nb-1]].getXPos()+1.0,
+                          maPolyPolyRectangle.getMaxX(),
+                          nCurrY,
+                          false );
+                }
+
+                // also call nextLine on very last line node
+                sal_uInt32 nIndex = sorted[nb-1];
+                float delta = aActiveVertices[nIndex].nextLine();
+                if(delta < 0.0f)
+                {
+                    if(nb)
+                    {
+                        sal_uInt32 nPrevIndex = sorted[nb-2];
+                        if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos())
+                            bSort = true;
+                    }
+                }
+            }
+
+            // remove line nodes which have ended on the current scanline
+            aActiveVertices.erase( ::std::remove_if( aActiveVertices.begin(),
+                                                     aActiveVertices.end(),
+                                                     ::boost::mem_fn( &ImplLineNode::isEnded ) ),
+                                   aActiveVertices.end() );
+            nb = aActiveVertices.size();
+            if(nb != nb_previous)
+            {
+                nb_previous = nb;
+                bSort = true;
+            }
+        }
+    }
+}
+// eof
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
new file mode 100644
index 000000000000..dcfa34f93c02
--- /dev/null
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -0,0 +1,585 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+
+#include <numeric>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        B2DPolyPolygon correctOrientations(const B2DPolyPolygon& rCandidate)
+        {
+            B2DPolyPolygon aRetval(rCandidate);
+            const sal_uInt32 nCount(aRetval.count());
+
+            for(sal_uInt32 a(0L); a < nCount; a++)
+            {
+                const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+                const B2VectorOrientation aOrientation(tools::getOrientation(aCandidate));
+                sal_uInt32 nDepth(0L);
+
+                for(sal_uInt32 b(0L); b < nCount; b++)
+                {
+                    if(b != a)
+                    {
+                        const B2DPolygon aCompare(rCandidate.getB2DPolygon(b));
+
+                        if(tools::isInside(aCompare, aCandidate, true))
+                        {
+                            nDepth++;
+                        }
+                    }
+                }
+
+                const bool bShallBeHole(1L == (nDepth & 0x00000001));
+                const bool bIsHole(ORIENTATION_NEGATIVE == aOrientation);
+
+                if(bShallBeHole != bIsHole && ORIENTATION_NEUTRAL != aOrientation)
+                {
+                    B2DPolygon aFlipped(aCandidate);
+                    aFlipped.flip();
+                    aRetval.setB2DPolygon(a, aFlipped);
+                }
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon correctOutmostPolygon(const B2DPolyPolygon& rCandidate)
+        {
+            const sal_uInt32 nCount(rCandidate.count());
+
+            if(nCount > 1L)
+            {
+                for(sal_uInt32 a(0L); a < nCount; a++)
+                {
+                    const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+                    sal_uInt32 nDepth(0L);
+
+                    for(sal_uInt32 b(0L); b < nCount; b++)
+                    {
+                        if(b != a)
+                        {
+                            const B2DPolygon aCompare(rCandidate.getB2DPolygon(b));
+
+                            if(tools::isInside(aCompare, aCandidate, true))
+                            {
+                                nDepth++;
+                            }
+                        }
+                    }
+
+                    if(!nDepth)
+                    {
+                        B2DPolyPolygon aRetval(rCandidate);
+
+                        if(a != 0L)
+                        {
+                            // exchange polygon a and polygon 0L
+                            aRetval.setB2DPolygon(0L, aCandidate);
+                            aRetval.setB2DPolygon(a, rCandidate.getB2DPolygon(0L));
+                        }
+
+                        // exit
+                        return aRetval;
+                    }
+                }
+            }
+
+            return rCandidate;
+        }
+
+        B2DPolyPolygon adaptiveSubdivideByDistance(const B2DPolyPolygon& rCandidate, double fDistanceBound)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nPolygonCount(rCandidate.count());
+                B2DPolyPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+                {
+                    const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                    if(aCandidate.areControlPointsUsed())
+                    {
+                        aRetval.append(tools::adaptiveSubdivideByDistance(aCandidate, fDistanceBound));
+                    }
+                    else
+                    {
+                        aRetval.append(aCandidate);
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nPolygonCount(rCandidate.count());
+                B2DPolyPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+                {
+                    const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                    if(aCandidate.areControlPointsUsed())
+                    {
+                        aRetval.append(tools::adaptiveSubdivideByAngle(aCandidate, fAngleBound));
+                    }
+                    else
+                    {
+                        aRetval.append(aCandidate);
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nPolygonCount(rCandidate.count());
+                B2DPolyPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+                {
+                    const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                    if(aCandidate.areControlPointsUsed())
+                    {
+                        aRetval.append(tools::adaptiveSubdivideByCount(aCandidate, nCount));
+                    }
+                    else
+                    {
+                        aRetval.append(aCandidate);
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+
+            if(1L == nPolygonCount)
+            {
+                return isInside(rCandidate.getB2DPolygon(0L), rPoint, bWithBorder);
+            }
+            else
+            {
+                sal_Int32 nInsideCount(0L);
+
+                for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+                {
+                    const B2DPolygon aPolygon(rCandidate.getB2DPolygon(a));
+                    const bool bInside(isInside(aPolygon, rPoint, bWithBorder));
+
+                    if(bInside)
+                    {
+                        nInsideCount++;
+                    }
+                }
+
+                return (nInsideCount % 2L);
+            }
+        }
+
+        B2DRange getRangeWithControlPoints(const B2DPolyPolygon& rCandidate)
+        {
+            B2DRange aRetval;
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                B2DPolygon aCandidate = rCandidate.getB2DPolygon(a);
+                aRetval.expand(tools::getRangeWithControlPoints(aCandidate));
+            }
+
+            return aRetval;
+        }
+
+        B2DRange getRange(const B2DPolyPolygon& rCandidate)
+        {
+            B2DRange aRetval;
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                B2DPolygon aCandidate = rCandidate.getB2DPolygon(a);
+                aRetval.expand(tools::getRange(aCandidate));
+            }
+
+            return aRetval;
+        }
+
+        void applyLineDashing(const B2DPolyPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B2DPolyPolygon* pLineTarget, B2DPolyPolygon* pGapTarget, double fFullDashDotLen)
+        {
+            if(0.0 == fFullDashDotLen && rDotDashArray.size())
+            {
+                // calculate fFullDashDotLen from rDotDashArray
+                fFullDashDotLen = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
+            }
+
+            if(rCandidate.count() && fFullDashDotLen > 0.0)
+            {
+                B2DPolyPolygon aLineTarget, aGapTarget;
+
+                for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+                {
+                    const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                    applyLineDashing(
+                        aCandidate,
+                        rDotDashArray,
+                        pLineTarget ? &aLineTarget : 0,
+                        pGapTarget ? &aGapTarget : 0,
+                        fFullDashDotLen);
+
+                    if(pLineTarget)
+                    {
+                        pLineTarget->append(aLineTarget);
+                    }
+
+                    if(pGapTarget)
+                    {
+                        pGapTarget->append(aGapTarget);
+                    }
+                }
+            }
+        }
+
+        bool isInEpsilonRange(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPosition, double fDistance)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                if(isInEpsilonRange(aCandidate, rTestPosition, fDistance))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        B3DPolyPolygon createB3DPolyPolygonFromB2DPolyPolygon(const B2DPolyPolygon& rCandidate, double fZCoordinate)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                aRetval.append(createB3DPolygonFromB2DPolygon(aCandidate, fZCoordinate));
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon createB2DPolyPolygonFromB3DPolyPolygon(const B3DPolyPolygon& rCandidate, const B3DHomMatrix& rMat)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                B3DPolygon aCandidate(rCandidate.getB3DPolygon(a));
+
+                aRetval.append(createB2DPolygonFromB3DPolygon(aCandidate, rMat));
+            }
+
+            return aRetval;
+        }
+
+        double getSmallestDistancePointToPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPoint& rTestPoint, sal_uInt32& rPolygonIndex, sal_uInt32& rEdgeIndex, double& rCut)
+        {
+            double fRetval(DBL_MAX);
+            const double fZero(0.0);
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+                sal_uInt32 nNewEdgeIndex;
+                double fNewCut;
+                const double fNewDistance(getSmallestDistancePointToPolygon(aCandidate, rTestPoint, nNewEdgeIndex, fNewCut));
+
+                if(DBL_MAX == fRetval || fNewDistance < fRetval)
+                {
+                    fRetval = fNewDistance;
+                    rPolygonIndex = a;
+                    rEdgeIndex = nNewEdgeIndex;
+                    rCut = fNewCut;
+
+                    if(fTools::equal(fRetval, fZero))
+                    {
+                        // already found zero distance, cannot get better. Ensure numerical zero value and end loop.
+                        fRetval = 0.0;
+                        break;
+                    }
+                }
+            }
+
+            return fRetval;
+        }
+
+        B2DPolyPolygon distort(const B2DPolyPolygon& rCandidate, const B2DRange& rOriginal, const B2DPoint& rTopLeft, const B2DPoint& rTopRight, const B2DPoint& rBottomLeft, const B2DPoint& rBottomRight)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                aRetval.append(distort(aCandidate, rOriginal, rTopLeft, rTopRight, rBottomLeft, rBottomRight));
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon rotateAroundPoint(const B2DPolyPolygon& rCandidate, const B2DPoint& rCenter, double fAngle)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                aRetval.append(rotateAroundPoint(aCandidate, rCenter, fAngle));
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon expandToCurve(const B2DPolyPolygon& rCandidate)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                aRetval.append(expandToCurve(aCandidate));
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon setContinuity(const B2DPolyPolygon& rCandidate, B2VectorContinuity eContinuity)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                const sal_uInt32 nPolygonCount(rCandidate.count());
+                B2DPolyPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+                {
+                    const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
+
+                    aRetval.append(setContinuity(aCandidate, eContinuity));
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolyPolygon growInNormalDirection(const B2DPolyPolygon& rCandidate, double fValue)
+        {
+            if(0.0 != fValue)
+            {
+                B2DPolyPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+                {
+                    aRetval.append(growInNormalDirection(rCandidate.getB2DPolygon(a), fValue));
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        void correctGrowShrinkPolygonPair(B2DPolyPolygon& /*rOriginal*/, B2DPolyPolygon& /*rGrown*/)
+        {
+        }
+
+        B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, sal_uInt32 nSegments)
+        {
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(reSegmentPolygon(rCandidate.getB2DPolygon(a), nSegments));
+            }
+
+            return aRetval;
+        }
+
+        B2DPolyPolygon interpolate(const B2DPolyPolygon& rOld1, const B2DPolyPolygon& rOld2, double t)
+        {
+            OSL_ENSURE(rOld1.count() == rOld2.count(), "B2DPolyPolygon interpolate: Different geometry (!)");
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rOld1.count(); a++)
+            {
+                aRetval.append(interpolate(rOld1.getB2DPolygon(a), rOld2.getB2DPolygon(a), t));
+            }
+
+            return aRetval;
+        }
+
+        bool isRectangle( const B2DPolyPolygon& rPoly )
+        {
+            // exclude some cheap cases first
+            if( rPoly.count() != 1 )
+                return false;
+
+            return isRectangle( rPoly.getB2DPolygon(0) );
+        }
+
+        // #i76891#
+        B2DPolyPolygon simplifyCurveSegments(const B2DPolyPolygon& rCandidate)
+        {
+            if(rCandidate.areControlPointsUsed())
+            {
+                B2DPolyPolygon aRetval;
+
+                for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+                {
+                    aRetval.append(simplifyCurveSegments(rCandidate.getB2DPolygon(a)));
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+        B2DPolyPolygon reSegmentPolyPolygonEdges(const B2DPolyPolygon& rCandidate, sal_uInt32 nSubEdges, bool bHandleCurvedEdges, bool bHandleStraightEdges)
+        {
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(reSegmentPolygonEdges(rCandidate.getB2DPolygon(a), nSubEdges, bHandleCurvedEdges, bHandleStraightEdges));
+            }
+
+            return aRetval;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 2D PolyPolygons
+
+        bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB, const double& rfSmallValue)
+        {
+            const sal_uInt32 nPolygonCount(rCandidateA.count());
+
+            if(nPolygonCount != rCandidateB.count())
+                return false;
+
+            for(sal_uInt32 a(0); a < nPolygonCount; a++)
+            {
+                const B2DPolygon aCandidate(rCandidateA.getB2DPolygon(a));
+
+                if(!equal(aCandidate, rCandidateB.getB2DPolygon(a), rfSmallValue))
+                    return false;
+            }
+
+            return true;
+        }
+
+        bool equal(const B2DPolyPolygon& rCandidateA, const B2DPolyPolygon& rCandidateB)
+        {
+            const double fSmallValue(fTools::getSmallValue());
+
+            return equal(rCandidateA, rCandidateB, fSmallValue);
+        }
+
+        B2DPolyPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolyPolygon& rCandidate)
+        {
+            B2DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(snapPointsOfHorizontalOrVerticalEdges(rCandidate.getB2DPolygon(a)));
+            }
+
+            return aRetval;
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
new file mode 100644
index 000000000000..d2815337edaf
--- /dev/null
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -0,0 +1,1108 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/math.hxx>
+
+namespace basegfx
+{
+    namespace tools
+    {
+        namespace
+        {
+            void lcl_skipSpaces(sal_Int32&              io_rPos,
+                                const ::rtl::OUString&  rStr,
+                                const sal_Int32         nLen)
+            {
+                while( io_rPos < nLen &&
+                       sal_Unicode(' ') == rStr[io_rPos] )
+                {
+                    ++io_rPos;
+                }
+            }
+
+            void lcl_skipSpacesAndCommas(sal_Int32&             io_rPos,
+                                         const ::rtl::OUString& rStr,
+                                         const sal_Int32        nLen)
+            {
+                while(io_rPos < nLen
+                      && (sal_Unicode(' ') == rStr[io_rPos] || sal_Unicode(',') == rStr[io_rPos]))
+                {
+                    ++io_rPos;
+                }
+            }
+
+            inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool bSignAllowed = true)
+            {
+                const bool bPredicate( (sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
+                                       || (bSignAllowed && sal_Unicode('+') == aChar)
+                                       || (bSignAllowed && sal_Unicode('-') == aChar) );
+
+                return bPredicate;
+            }
+
+            inline bool lcl_isOnNumberChar(const ::rtl::OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true)
+            {
+                return lcl_isOnNumberChar(rStr[nPos],
+                                          bSignAllowed);
+            }
+
+            bool lcl_getDoubleChar(double&                  o_fRetval,
+                                   sal_Int32&               io_rPos,
+                                   const ::rtl::OUString&   rStr,
+                                   const sal_Int32          /*nLen*/)
+            {
+                sal_Unicode aChar( rStr[io_rPos] );
+                ::rtl::OUStringBuffer sNumberString;
+
+                if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
+                {
+                    sNumberString.append(rStr[io_rPos]);
+                    aChar = rStr[++io_rPos];
+                }
+
+                while((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
+                      || sal_Unicode('.') == aChar)
+                {
+                    sNumberString.append(rStr[io_rPos]);
+                    aChar = rStr[++io_rPos];
+                }
+
+                if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar)
+                {
+                    sNumberString.append(rStr[io_rPos]);
+                    aChar = rStr[++io_rPos];
+
+                    if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
+                    {
+                        sNumberString.append(rStr[io_rPos]);
+                        aChar = rStr[++io_rPos];
+                    }
+
+                    while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
+                    {
+                        sNumberString.append(rStr[io_rPos]);
+                        aChar = rStr[++io_rPos];
+                    }
+                }
+
+                if(sNumberString.getLength())
+                {
+                    rtl_math_ConversionStatus eStatus;
+                    o_fRetval = ::rtl::math::stringToDouble( sNumberString.makeStringAndClear(),
+                                                             (sal_Unicode)('.'),
+                                                             (sal_Unicode)(','),
+                                                             &eStatus,
+                                                             NULL );
+                    return ( eStatus == rtl_math_ConversionStatus_Ok );
+                }
+
+                return false;
+            }
+
+            bool lcl_importDoubleAndSpaces( double&                 o_fRetval,
+                                            sal_Int32&              io_rPos,
+                                            const ::rtl::OUString&  rStr,
+                                            const sal_Int32         nLen )
+            {
+                if( !lcl_getDoubleChar(o_fRetval, io_rPos, rStr, nLen) )
+                    return false;
+
+                lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
+
+                return true;
+            }
+
+            bool lcl_importNumberAndSpaces(sal_Int32&                o_nRetval,
+                                           sal_Int32&               io_rPos,
+                                           const ::rtl::OUString&   rStr,
+                                           const sal_Int32      nLen)
+            {
+                sal_Unicode aChar( rStr[io_rPos] );
+                ::rtl::OUStringBuffer sNumberString;
+
+                if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
+                {
+                    sNumberString.append(rStr[io_rPos]);
+                    aChar = rStr[++io_rPos];
+                }
+
+                while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
+                {
+                    sNumberString.append(rStr[io_rPos]);
+                    aChar = rStr[++io_rPos];
+                }
+
+                if(sNumberString.getLength())
+                {
+                    o_nRetval = sNumberString.makeStringAndClear().toInt32();
+                    lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
+
+                    return true;
+                }
+
+                return false;
+            }
+
+            void lcl_skipNumber(sal_Int32&              io_rPos,
+                                const ::rtl::OUString&  rStr,
+                                const sal_Int32         nLen)
+            {
+                bool bSignAllowed(true);
+
+                while(io_rPos < nLen && lcl_isOnNumberChar(rStr, io_rPos, bSignAllowed))
+                {
+                    bSignAllowed = false;
+                    ++io_rPos;
+                }
+            }
+
+            void lcl_skipDouble(sal_Int32&              io_rPos,
+                                const ::rtl::OUString&  rStr,
+                                const sal_Int32         /*nLen*/)
+            {
+                sal_Unicode aChar( rStr[io_rPos] );
+
+                if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
+                    aChar = rStr[++io_rPos];
+
+                while((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
+                      || sal_Unicode('.') == aChar)
+                {
+                    aChar = rStr[++io_rPos];
+                }
+
+                if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar)
+                {
+                    aChar = rStr[++io_rPos];
+
+                    if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
+                        aChar = rStr[++io_rPos];
+
+                    while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
+                    {
+                        aChar = rStr[++io_rPos];
+                    }
+                }
+            }
+            void lcl_skipNumberAndSpacesAndCommas(sal_Int32&                io_rPos,
+                                                  const ::rtl::OUString&    rStr,
+                                                  const sal_Int32           nLen)
+            {
+                lcl_skipNumber(io_rPos, rStr, nLen);
+                lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
+            }
+
+            // #100617# Allow to skip doubles, too.
+            void lcl_skipDoubleAndSpacesAndCommas(sal_Int32&                io_rPos,
+                                                  const ::rtl::OUString&    rStr,
+                                                  const sal_Int32           nLen)
+            {
+                lcl_skipDouble(io_rPos, rStr, nLen);
+                lcl_skipSpacesAndCommas(io_rPos, rStr, nLen);
+            }
+
+            void lcl_putNumberChar( ::rtl::OUStringBuffer& rStr,
+                                    double                 fValue )
+            {
+                rStr.append( fValue );
+            }
+
+            void lcl_putNumberCharWithSpace( ::rtl::OUStringBuffer& rStr,
+                                             double                 fValue,
+                                             double                 fOldValue,
+                                             bool                   bUseRelativeCoordinates )
+            {
+                if( bUseRelativeCoordinates )
+                    fValue -= fOldValue;
+
+                const sal_Int32 aLen( rStr.getLength() );
+                if(aLen)
+                {
+                    if( lcl_isOnNumberChar(rStr.charAt(aLen - 1), false) &&
+                        fValue >= 0.0 )
+                    {
+                        rStr.append( sal_Unicode(' ') );
+                    }
+                }
+
+                lcl_putNumberChar(rStr, fValue);
+            }
+
+            inline sal_Unicode lcl_getCommand( sal_Char cUpperCaseCommand,
+                                               sal_Char cLowerCaseCommand,
+                                               bool     bUseRelativeCoordinates )
+            {
+                return bUseRelativeCoordinates ? cLowerCaseCommand : cUpperCaseCommand;
+            }
+        }
+
+        bool importFromSvgD(B2DPolyPolygon& o_rPolyPolygon, const ::rtl::OUString&  rSvgDStatement)
+        {
+            o_rPolyPolygon.clear();
+            const sal_Int32 nLen(rSvgDStatement.getLength());
+            sal_Int32 nPos(0);
+            bool bIsClosed(false);
+            double nLastX( 0.0 );
+            double nLastY( 0.0 );
+            B2DPolygon aCurrPoly;
+
+            // skip initial whitespace
+            lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+            while(nPos < nLen)
+            {
+                bool bRelative(false);
+                bool bMoveTo(false);
+                const sal_Unicode aCurrChar(rSvgDStatement[nPos]);
+
+                switch(aCurrChar)
+                {
+                    case 'z' :
+                    case 'Z' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        // remember closed state of current polygon
+                        bIsClosed = true;
+                        break;
+                    }
+
+                    case 'm' :
+                    case 'M' :
+                    {
+                        bMoveTo = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'l' :
+                    case 'L' :
+                    {
+                        if('m' == aCurrChar || 'l' == aCurrChar)
+                        {
+                            bRelative = true;
+                        }
+
+                        if(bMoveTo)
+                        {
+                            // new polygon start, finish old one
+                            if(aCurrPoly.count())
+                            {
+                                // add current polygon
+                                if(bIsClosed)
+                                {
+                                    closeWithGeometryChange(aCurrPoly);
+                                }
+
+                                o_rPolyPolygon.append(aCurrPoly);
+
+                                // reset import values
+                                bIsClosed = false;
+                                aCurrPoly.clear();
+                            }
+                        }
+
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX, nY;
+
+                            if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nX += nLastX;
+                                nY += nLastY;
+                            }
+
+                            // set last position
+                            nLastX = nX;
+                            nLastY = nY;
+
+                            // add point
+                            aCurrPoly.append(B2DPoint(nX, nY));
+                        }
+                        break;
+                    }
+
+                    case 'h' :
+                    {
+                        bRelative = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'H' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX, nY(nLastY);
+
+                            if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nX += nLastX;
+                            }
+
+                            // set last position
+                            nLastX = nX;
+
+                            // add point
+                            aCurrPoly.append(B2DPoint(nX, nY));
+                        }
+                        break;
+                    }
+
+                    case 'v' :
+                    {
+                        bRelative = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'V' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX(nLastX), nY;
+
+                            if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nY += nLastY;
+                            }
+
+                            // set last position
+                            nLastY = nY;
+
+                            // add point
+                            aCurrPoly.append(B2DPoint(nX, nY));
+                        }
+                        break;
+                    }
+
+                    case 's' :
+                    {
+                        bRelative = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'S' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX, nY;
+                            double nX2, nY2;
+
+                            if(!lcl_importDoubleAndSpaces(nX2, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY2, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nX2 += nLastX;
+                                nY2 += nLastY;
+                                nX += nLastX;
+                                nY += nLastY;
+                            }
+
+                            // ensure existance of start point
+                            if(!aCurrPoly.count())
+                            {
+                                aCurrPoly.append(B2DPoint(nLastX, nLastY));
+                            }
+
+                            // get first control point. It's the reflection of the PrevControlPoint
+                            // of the last point. If not existent, use current point (see SVG)
+                            B2DPoint aPrevControl(B2DPoint(nLastX, nLastY));
+                            const sal_uInt32 nIndex(aCurrPoly.count() - 1);
+
+                            if(aCurrPoly.areControlPointsUsed() && aCurrPoly.isPrevControlPointUsed(nIndex))
+                            {
+                                const B2DPoint aPrevPoint(aCurrPoly.getB2DPoint(nIndex));
+                                const B2DPoint aPrevControlPoint(aCurrPoly.getPrevControlPoint(nIndex));
+
+                                // use mirrored previous control point
+                                aPrevControl.setX((2.0 * aPrevPoint.getX()) - aPrevControlPoint.getX());
+                                aPrevControl.setY((2.0 * aPrevPoint.getY()) - aPrevControlPoint.getY());
+                            }
+
+                            // append curved edge
+                            aCurrPoly.appendBezierSegment(aPrevControl, B2DPoint(nX2, nY2), B2DPoint(nX, nY));
+
+                            // set last position
+                            nLastX = nX;
+                            nLastY = nY;
+                        }
+                        break;
+                    }
+
+                    case 'c' :
+                    {
+                        bRelative = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'C' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX, nY;
+                            double nX1, nY1;
+                            double nX2, nY2;
+
+                            if(!lcl_importDoubleAndSpaces(nX1, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY1, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nX2, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY2, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nX1 += nLastX;
+                                nY1 += nLastY;
+                                nX2 += nLastX;
+                                nY2 += nLastY;
+                                nX += nLastX;
+                                nY += nLastY;
+                            }
+
+                            // ensure existance of start point
+                            if(!aCurrPoly.count())
+                            {
+                                aCurrPoly.append(B2DPoint(nLastX, nLastY));
+                            }
+
+                            // append curved edge
+                            aCurrPoly.appendBezierSegment(B2DPoint(nX1, nY1), B2DPoint(nX2, nY2), B2DPoint(nX, nY));
+
+                            // set last position
+                            nLastX = nX;
+                            nLastY = nY;
+                        }
+                        break;
+                    }
+
+                    // #100617# quadratic beziers are imported as cubic ones
+                    case 'q' :
+                    {
+                        bRelative = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'Q' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX, nY;
+                            double nX1, nY1;
+
+                            if(!lcl_importDoubleAndSpaces(nX1, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY1, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nX1 += nLastX;
+                                nY1 += nLastY;
+                                nX += nLastX;
+                                nY += nLastY;
+                            }
+
+                            // calculate the cubic bezier coefficients from the quadratic ones
+                            const double nX1Prime((nX1 * 2.0 + nLastX) / 3.0);
+                            const double nY1Prime((nY1 * 2.0 + nLastY) / 3.0);
+                            const double nX2Prime((nX1 * 2.0 + nX) / 3.0);
+                            const double nY2Prime((nY1 * 2.0 + nY) / 3.0);
+
+                            // ensure existance of start point
+                            if(!aCurrPoly.count())
+                            {
+                                aCurrPoly.append(B2DPoint(nLastX, nLastY));
+                            }
+
+                            // append curved edge
+                            aCurrPoly.appendBezierSegment(B2DPoint(nX1Prime, nY1Prime), B2DPoint(nX2Prime, nY2Prime), B2DPoint(nX, nY));
+
+                            // set last position
+                            nLastX = nX;
+                            nLastY = nY;
+                        }
+                        break;
+                    }
+
+                    // #100617# relative quadratic beziers are imported as cubic
+                    case 't' :
+                    {
+                        bRelative = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'T' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX, nY;
+
+                            if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nX += nLastX;
+                                nY += nLastY;
+                            }
+
+                            // ensure existance of start point
+                            if(!aCurrPoly.count())
+                            {
+                                aCurrPoly.append(B2DPoint(nLastX, nLastY));
+                            }
+
+                            // get first control point. It's the reflection of the PrevControlPoint
+                            // of the last point. If not existent, use current point (see SVG)
+                            B2DPoint aPrevControl(B2DPoint(nLastX, nLastY));
+                            const sal_uInt32 nIndex(aCurrPoly.count() - 1);
+                            const B2DPoint aPrevPoint(aCurrPoly.getB2DPoint(nIndex));
+
+                            if(aCurrPoly.areControlPointsUsed() && aCurrPoly.isPrevControlPointUsed(nIndex))
+                            {
+                                const B2DPoint aPrevControlPoint(aCurrPoly.getPrevControlPoint(nIndex));
+
+                                // use mirrored previous control point
+                                aPrevControl.setX((2.0 * aPrevPoint.getX()) - aPrevControlPoint.getX());
+                                aPrevControl.setY((2.0 * aPrevPoint.getY()) - aPrevControlPoint.getY());
+                            }
+
+                            if(!aPrevControl.equal(aPrevPoint))
+                            {
+                                // there is a prev control point, and we have the already mirrored one
+                                // in aPrevControl. We also need the quadratic control point for this
+                                // new quadratic segment to calculate the 2nd cubic control point
+                                const B2DPoint aQuadControlPoint(
+                                    ((3.0 * aPrevControl.getX()) - aPrevPoint.getX()) / 2.0,
+                                    ((3.0 * aPrevControl.getY()) - aPrevPoint.getY()) / 2.0);
+
+                                // calculate the cubic bezier coefficients from the quadratic ones.
+                                const double nX2Prime((aQuadControlPoint.getX() * 2.0 + nX) / 3.0);
+                                const double nY2Prime((aQuadControlPoint.getY() * 2.0 + nY) / 3.0);
+
+                                // append curved edge, use mirrored cubic control point directly
+                                aCurrPoly.appendBezierSegment(aPrevControl, B2DPoint(nX2Prime, nY2Prime), B2DPoint(nX, nY));
+                            }
+                            else
+                            {
+                                // when no previous control, SVG says to use current point -> straight line.
+                                // Just add end point
+                                aCurrPoly.append(B2DPoint(nX, nY));
+                            }
+
+                            // set last position
+                            nLastX = nX;
+                            nLastY = nY;
+                        }
+                        break;
+                    }
+
+                    case 'a' :
+                    {
+                        bRelative = true;
+                        // FALLTHROUGH intended
+                    }
+                    case 'A' :
+                    {
+                        nPos++;
+                        lcl_skipSpaces(nPos, rSvgDStatement, nLen);
+
+                        while(nPos < nLen && lcl_isOnNumberChar(rSvgDStatement, nPos))
+                        {
+                            double nX, nY;
+                            double fRX, fRY, fPhi;
+                            sal_Int32 bLargeArcFlag, bSweepFlag;
+
+                            if(!lcl_importDoubleAndSpaces(fRX, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(fRY, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(fPhi, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importNumberAndSpaces(bLargeArcFlag, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importNumberAndSpaces(bSweepFlag, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+                            if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                            if(bRelative)
+                            {
+                                nX += nLastX;
+                                nY += nLastY;
+                            }
+
+                            const B2DPoint aPrevPoint(aCurrPoly.getB2DPoint(aCurrPoly.count() - 1));
+
+                            if( nX == nLastX && nY == nLastY )
+                                continue; // start==end -> skip according to SVG spec
+
+                            if( fRX == 0.0 || fRY == 0.0 )
+                            {
+                                // straight line segment according to SVG spec
+                                aCurrPoly.append(B2DPoint(nX, nY));
+                            }
+                            else
+                            {
+                                // normalize according to SVG spec
+                                fRX=fabs(fRX); fRY=fabs(fRY);
+
+                                // from the SVG spec, appendix F.6.4
+
+                                // |x1'|   |cos phi   sin phi|  |(x1 - x2)/2|
+                                // |y1'| = |-sin phi  cos phi|  |(y1 - y2)/2|
+                                const B2DPoint p1(nLastX, nLastY);
+                                const B2DPoint p2(nX, nY);
+                                B2DHomMatrix aTransform(basegfx::tools::createRotateB2DHomMatrix(-fPhi*M_PI/180));
+
+                                const B2DPoint p1_prime( aTransform * B2DPoint(((p1-p2)/2.0)) );
+
+                                //           ______________________________________       rx y1'
+                                // |cx'|  + /  rx^2 ry^2 - rx^2 y1'^2 - ry^2 x1^2           ry
+                                // |cy'| =-/       rx^2y1'^2 + ry^2 x1'^2               - ry x1'
+                                //                                                          rx
+                                // chose + if f_A != f_S
+                                // chose - if f_A  = f_S
+                                B2DPoint aCenter_prime;
+                                const double fRadicant(
+                                    (fRX*fRX*fRY*fRY - fRX*fRX*p1_prime.getY()*p1_prime.getY() - fRY*fRY*p1_prime.getX()*p1_prime.getX())/
+                                    (fRX*fRX*p1_prime.getY()*p1_prime.getY() + fRY*fRY*p1_prime.getX()*p1_prime.getX()));
+                                if( fRadicant < 0.0 )
+                                {
+                                    // no solution - according to SVG
+                                    // spec, scale up ellipse
+                                    // uniformly such that it passes
+                                    // through end points (denominator
+                                    // of radicant solved for fRY,
+                                    // with s=fRX/fRY)
+                                    const double fRatio(fRX/fRY);
+                                    const double fRadicant2(
+                                        p1_prime.getY()*p1_prime.getY() +
+                                        p1_prime.getX()*p1_prime.getX()/(fRatio*fRatio));
+                                    if( fRadicant2 < 0.0 )
+                                    {
+                                        // only trivial solution, one
+                                        // of the axes 0 -> straight
+                                        // line segment according to
+                                        // SVG spec
+                                        aCurrPoly.append(B2DPoint(nX, nY));
+                                        continue;
+                                    }
+
+                                    fRY=sqrt(fRadicant2);
+                                    fRX=fRatio*fRY;
+
+                                    // keep center_prime forced to (0,0)
+                                }
+                                else
+                                {
+                                    const double fFactor(
+                                        (bLargeArcFlag==bSweepFlag ? -1.0 : 1.0) *
+                                        sqrt(fRadicant));
+
+                                    // actually calculate center_prime
+                                    aCenter_prime = B2DPoint(
+                                        fFactor*fRX*p1_prime.getY()/fRY,
+                                        -fFactor*fRY*p1_prime.getX()/fRX);
+                                }
+
+                                //              +           u - v
+                                // angle(u,v) =  arccos( ------------ )     (take the sign of (ux vy - uy vx))
+                                //              -        ||u|| ||v||
+
+                                //                  1    | (x1' - cx')/rx |
+                                // theta1 = angle((   ), |                | )
+                                //                  0    | (y1' - cy')/ry |
+                                const B2DPoint aRadii(fRX,fRY);
+                                double fTheta1(
+                                    B2DVector(1.0,0.0).angle(
+                                        (p1_prime-aCenter_prime)/aRadii));
+
+                                //                 |1|    |  (-x1' - cx')/rx |
+                                // theta2 = angle( | | ,  |                  | )
+                                //                 |0|    |  (-y1' - cy')/ry |
+                                double fTheta2(
+                                    B2DVector(1.0,0.0).angle(
+                                        (-p1_prime-aCenter_prime)/aRadii));
+
+                                // map both angles to [0,2pi)
+                                fTheta1 = fmod(2*M_PI+fTheta1,2*M_PI);
+                                fTheta2 = fmod(2*M_PI+fTheta2,2*M_PI);
+
+                                // make sure the large arc is taken
+                                // (since
+                                // createPolygonFromEllipseSegment()
+                                // normalizes to e.g. cw arc)
+                                const bool bFlipSegment( (bLargeArcFlag!=0) ==
+                                    (fmod(fTheta2+2*M_PI-fTheta1,
+                                          2*M_PI)<M_PI) );
+                                if( bFlipSegment )
+                                    std::swap(fTheta1,fTheta2);
+
+                                // finally, create bezier polygon from this
+                                B2DPolygon aSegment(
+                                    tools::createPolygonFromUnitEllipseSegment(
+                                        fTheta1, fTheta2 ));
+
+                                // transform ellipse by rotation & move to final center
+                                aTransform = basegfx::tools::createScaleB2DHomMatrix(fRX, fRY);
+                                aTransform.translate(aCenter_prime.getX(),
+                                                     aCenter_prime.getY());
+                                aTransform.rotate(fPhi*M_PI/180);
+                                const B2DPoint aOffset((p1+p2)/2.0);
+                                aTransform.translate(aOffset.getX(),
+                                                     aOffset.getY());
+                                aSegment.transform(aTransform);
+
+                                // createPolygonFromEllipseSegment()
+                                // always creates arcs that are
+                                // positively oriented - flip polygon
+                                // if we swapped angles above
+                                if( bFlipSegment )
+                                    aSegment.flip();
+                                aCurrPoly.append(aSegment);
+                            }
+
+                            // set last position
+                            nLastX = nX;
+                            nLastY = nY;
+                        }
+                        break;
+                    }
+
+                    default:
+                    {
+                        OSL_ENSURE(false, "importFromSvgD(): skipping tags in svg:d element (unknown)!");
+                        OSL_TRACE("importFromSvgD(): skipping tags in svg:d element (unknown: \"%c\")!", aCurrChar);
+                        ++nPos;
+                        break;
+                    }
+                }
+            }
+
+            if(aCurrPoly.count())
+            {
+                // end-process last poly
+                if(bIsClosed)
+                {
+                    closeWithGeometryChange(aCurrPoly);
+                }
+
+                o_rPolyPolygon.append(aCurrPoly);
+            }
+
+            return true;
+        }
+
+        bool importFromSvgPoints( B2DPolygon&            o_rPoly,
+                                  const ::rtl::OUString& rSvgPointsAttribute )
+        {
+            o_rPoly.clear();
+            const sal_Int32 nLen(rSvgPointsAttribute.getLength());
+            sal_Int32 nPos(0);
+            double nX, nY;
+
+            // skip initial whitespace
+            lcl_skipSpaces(nPos, rSvgPointsAttribute, nLen);
+
+            while(nPos < nLen)
+            {
+                if(!lcl_importDoubleAndSpaces(nX, nPos, rSvgPointsAttribute, nLen)) return false;
+                if(!lcl_importDoubleAndSpaces(nY, nPos, rSvgPointsAttribute, nLen)) return false;
+
+                // add point
+                o_rPoly.append(B2DPoint(nX, nY));
+
+                // skip to next number, or finish
+                lcl_skipSpaces(nPos, rSvgPointsAttribute, nLen);
+            }
+
+            return true;
+        }
+
+        ::rtl::OUString exportToSvgD(
+            const B2DPolyPolygon& rPolyPolygon,
+            bool bUseRelativeCoordinates,
+            bool bDetectQuadraticBeziers)
+        {
+            const sal_uInt32 nCount(rPolyPolygon.count());
+            ::rtl::OUStringBuffer aResult;
+            B2DPoint aCurrentSVGPosition(0.0, 0.0); // SVG assumes (0,0) as the initial current point
+
+            for(sal_uInt32 i(0); i < nCount; i++)
+            {
+                const B2DPolygon aPolygon(rPolyPolygon.getB2DPolygon(i));
+                const sal_uInt32 nPointCount(aPolygon.count());
+
+                if(nPointCount)
+                {
+                    const bool bPolyUsesControlPoints(aPolygon.areControlPointsUsed());
+                    const sal_uInt32 nEdgeCount(aPolygon.isClosed() ? nPointCount : nPointCount - 1);
+                    sal_Unicode aLastSVGCommand(' '); // last SVG command char
+                    B2DPoint aLeft, aRight; // for quadratic bezier test
+
+                    // handle polygon start point
+                    B2DPoint aEdgeStart(aPolygon.getB2DPoint(0));
+                    aResult.append(lcl_getCommand('M', 'm', bUseRelativeCoordinates));
+                    lcl_putNumberCharWithSpace(aResult, aEdgeStart.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                    lcl_putNumberCharWithSpace(aResult, aEdgeStart.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                    aLastSVGCommand =  lcl_getCommand('L', 'l', bUseRelativeCoordinates);
+                    aCurrentSVGPosition = aEdgeStart;
+
+                    for(sal_uInt32 nIndex(0); nIndex < nEdgeCount; nIndex++)
+                    {
+                        // prepare access to next point
+                        const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount);
+                        const B2DPoint aEdgeEnd(aPolygon.getB2DPoint(nNextIndex));
+
+                        // handle edge from (aEdgeStart, aEdgeEnd) using indices (nIndex, nNextIndex)
+                        const bool bEdgeIsBezier(bPolyUsesControlPoints
+                            && (aPolygon.isNextControlPointUsed(nIndex) || aPolygon.isPrevControlPointUsed(nNextIndex)));
+
+                        if(bEdgeIsBezier)
+                        {
+                            // handle bezier edge
+                            const B2DPoint aControlEdgeStart(aPolygon.getNextControlPoint(nIndex));
+                            const B2DPoint aControlEdgeEnd(aPolygon.getPrevControlPoint(nNextIndex));
+                            bool bIsQuadraticBezier(false);
+
+                            // check continuity at current edge's start point. For SVG, do NOT use an
+                            // existing continuity since no 'S' or 's' statement should be written. At
+                            // import, that 'previous' control vector is not available. SVG documentation
+                            // says for interpretation:
+                            //
+                            // "(If there is no previous command or if the previous command was
+                            // not an C, c, S or s, assume the first control point is coincident
+                            // with the current point.)"
+                            //
+                            // That's what is done from our import, so avoid exporting it as first statement
+                            // is necessary.
+                            const bool bSymmetricAtEdgeStart(
+                                0 != nIndex
+                                && CONTINUITY_C2 == aPolygon.getContinuityInPoint(nIndex));
+
+                            if(bDetectQuadraticBeziers)
+                            {
+                                // check for quadratic beziers - that's
+                                // the case if both control points are in
+                                // the same place when they are prolonged
+                                // to the common quadratic control point
+                                //
+                                // Left: P = (3P1 - P0) / 2
+                                // Right: P = (3P2 - P3) / 2
+                                aLeft = B2DPoint((3.0 * aControlEdgeStart - aEdgeStart) / 2.0);
+                                aRight= B2DPoint((3.0 * aControlEdgeEnd - aEdgeEnd) / 2.0);
+                                bIsQuadraticBezier = aLeft.equal(aRight);
+                            }
+
+                            if(bIsQuadraticBezier)
+                            {
+                                // approximately equal, export as quadratic bezier
+                                if(bSymmetricAtEdgeStart)
+                                {
+                                    const sal_Unicode aCommand(lcl_getCommand('T', 't', bUseRelativeCoordinates));
+
+                                    if(aLastSVGCommand != aCommand)
+                                    {
+                                        aResult.append(aCommand);
+                                        aLastSVGCommand = aCommand;
+                                    }
+
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    aLastSVGCommand = aCommand;
+                                    aCurrentSVGPosition = aEdgeEnd;
+                                }
+                                else
+                                {
+                                    const sal_Unicode aCommand(lcl_getCommand('Q', 'q', bUseRelativeCoordinates));
+
+                                    if(aLastSVGCommand != aCommand)
+                                    {
+                                        aResult.append(aCommand);
+                                        aLastSVGCommand = aCommand;
+                                    }
+
+                                    lcl_putNumberCharWithSpace(aResult, aLeft.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aLeft.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    aLastSVGCommand = aCommand;
+                                    aCurrentSVGPosition = aEdgeEnd;
+                                }
+                            }
+                            else
+                            {
+                                // export as cubic bezier
+                                if(bSymmetricAtEdgeStart)
+                                {
+                                    const sal_Unicode aCommand(lcl_getCommand('S', 's', bUseRelativeCoordinates));
+
+                                    if(aLastSVGCommand != aCommand)
+                                    {
+                                        aResult.append(aCommand);
+                                        aLastSVGCommand = aCommand;
+                                    }
+
+                                    lcl_putNumberCharWithSpace(aResult, aControlEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aControlEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    aLastSVGCommand = aCommand;
+                                    aCurrentSVGPosition = aEdgeEnd;
+                                }
+                                else
+                                {
+                                    const sal_Unicode aCommand(lcl_getCommand('C', 'c', bUseRelativeCoordinates));
+
+                                    if(aLastSVGCommand != aCommand)
+                                    {
+                                        aResult.append(aCommand);
+                                        aLastSVGCommand = aCommand;
+                                    }
+
+                                    lcl_putNumberCharWithSpace(aResult, aControlEdgeStart.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aControlEdgeStart.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aControlEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aControlEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    aLastSVGCommand = aCommand;
+                                    aCurrentSVGPosition = aEdgeEnd;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // straight edge
+                            if(0 == nNextIndex)
+                            {
+                                // it's a closed polygon's last edge and it's not a bezier edge, so there is
+                                // no need to write it
+                            }
+                            else
+                            {
+                                const bool bXEqual(aEdgeStart.getX() == aEdgeEnd.getX());
+                                const bool bYEqual(aEdgeStart.getY() == aEdgeEnd.getY());
+
+                                if(bXEqual && bYEqual)
+                                {
+                                    // point is a double point; do not export at all
+                                }
+                                else if(bXEqual)
+                                {
+                                    // export as vertical line
+                                    const sal_Unicode aCommand(lcl_getCommand('V', 'v', bUseRelativeCoordinates));
+
+                                    if(aLastSVGCommand != aCommand)
+                                    {
+                                        aResult.append(aCommand);
+                                        aLastSVGCommand = aCommand;
+                                    }
+
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    aCurrentSVGPosition = aEdgeEnd;
+                                }
+                                else if(bYEqual)
+                                {
+                                    // export as horizontal line
+                                    const sal_Unicode aCommand(lcl_getCommand('H', 'h', bUseRelativeCoordinates));
+
+                                    if(aLastSVGCommand != aCommand)
+                                    {
+                                        aResult.append(aCommand);
+                                        aLastSVGCommand = aCommand;
+                                    }
+
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    aCurrentSVGPosition = aEdgeEnd;
+                                }
+                                else
+                                {
+                                    // export as line
+                                    const sal_Unicode aCommand(lcl_getCommand('L', 'l', bUseRelativeCoordinates));
+
+                                    if(aLastSVGCommand != aCommand)
+                                    {
+                                        aResult.append(aCommand);
+                                        aLastSVGCommand = aCommand;
+                                    }
+
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getX(), aCurrentSVGPosition.getX(), bUseRelativeCoordinates);
+                                    lcl_putNumberCharWithSpace(aResult, aEdgeEnd.getY(), aCurrentSVGPosition.getY(), bUseRelativeCoordinates);
+                                    aCurrentSVGPosition = aEdgeEnd;
+                                }
+                            }
+                        }
+
+                        // prepare edge start for next loop step
+                        aEdgeStart = aEdgeEnd;
+                    }
+
+                    // close path if closed poly (Z and z are equivalent here, but looks nicer when case is matched)
+                    if(aPolygon.isClosed())
+                    {
+                        aResult.append(lcl_getCommand('Z', 'z', bUseRelativeCoordinates));
+                    }
+                }
+            }
+
+            return aResult.makeStringAndClear();
+        }
+    }
+}
+
+// eof
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
new file mode 100644
index 000000000000..4cd63f938114
--- /dev/null
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -0,0 +1,1227 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dpolygontriangulator.cxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b2dtrapezoid.hxx>
+#include <basegfx/range/b1drange.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <list>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace trapezoidhelper
+    {
+        //////////////////////////////////////////////////////////////////////////////
+        // helper class to hold a simple ege. This is only used for horizontal edges
+        // currently, thus the YPositions will be equal. I did not create a special
+        // class for this since holdingthe pointers is more effective and also can be
+        // used as baseclass for the traversing edges
+
+        class TrDeSimpleEdge
+        {
+        protected:
+            // pointers to start and end point
+            const B2DPoint*     mpStart;
+            const B2DPoint*     mpEnd;
+
+        public:
+            // constructor
+            TrDeSimpleEdge(
+                const B2DPoint* pStart,
+                const B2DPoint* pEnd)
+            :   mpStart(pStart),
+                mpEnd(pEnd)
+            {
+            }
+
+            // data read access
+            const B2DPoint& getStart() const { return *mpStart; }
+            const B2DPoint& getEnd() const { return *mpEnd; }
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+        // define vector of simple edges
+
+        typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges;
+
+        //////////////////////////////////////////////////////////////////////////////
+        // helper class for holding a traversing edge. It will always have some
+        // distance in YPos. The slope (in a numerically useful form, see comments) is
+        // hold and used in SortValue to allow sorting traversing edges by Y, X and slope
+        // (in that order)
+
+        class TrDeEdgeEntry : public TrDeSimpleEdge
+        {
+        private:
+            // the slope in a numerical useful form for sorting
+            sal_uInt32          mnSortValue;
+
+        public:
+            // convenience data read access
+            double getDeltaX() const { return mpEnd->getX() - mpStart->getX(); }
+            double getDeltaY() const { return mpEnd->getY() - mpStart->getY(); }
+
+            // convenience data read access. SortValue is created on demand since
+            // it is not always used
+            sal_uInt32 getSortValue() const
+            {
+                if(0 != mnSortValue)
+                    return mnSortValue;
+
+                // get radiant; has to be in the range ]0.0 .. pi[, thus scale to full
+                // sal_uInt32 range for maximum precision
+                const double fRadiant(atan2(getDeltaY(), getDeltaX()) * (SAL_MAX_UINT32 / F_PI));
+
+                // convert to sal_uInt32 value
+                const_cast< TrDeEdgeEntry* >(this)->mnSortValue = sal_uInt32(fRadiant);
+
+                return mnSortValue;
+            }
+
+            // constructor. SortValue can be given when known, use zero otherwise
+            TrDeEdgeEntry(
+                const B2DPoint* pStart,
+                const B2DPoint* pEnd,
+                sal_uInt32 nSortValue = 0)
+            :   TrDeSimpleEdge(pStart, pEnd),
+                mnSortValue(nSortValue)
+            {
+                // force traversal of deltaY downward
+                if(mpEnd->getY() < mpStart->getY())
+                {
+                    std::swap(mpStart, mpEnd);
+                }
+
+                // no horizontal edges allowed, all neeed to traverse vertically
+                OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
+            }
+
+            // data write access to StartPoint
+            void setStart( const B2DPoint* pNewStart)
+            {
+                OSL_ENSURE(0 != pNewStart, "No null pointer allowed here (!)");
+
+                if(mpStart != pNewStart)
+                {
+                    mpStart = pNewStart;
+
+                    // no horizontal edges allowed, all neeed to traverse vertivally
+                    OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
+                }
+            }
+
+            // data write access to EndPoint
+            void setEnd( const B2DPoint* pNewEnd)
+            {
+                OSL_ENSURE(0 != pNewEnd, "No null pointer allowed here (!)");
+
+                if(mpEnd != pNewEnd)
+                {
+                    mpEnd = pNewEnd;
+
+                    // no horizontal edges allowed, all neeed to traverse vertivally
+                    OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
+                }
+            }
+
+            // operator for sort support. Sort by Y, X and slope (in that order)
+            bool operator<(const TrDeEdgeEntry& rComp) const
+            {
+                if(fTools::equal(getStart().getY(), rComp.getStart().getY(), fTools::getSmallValue()))
+                {
+                    if(fTools::equal(getStart().getX(), rComp.getStart().getX(), fTools::getSmallValue()))
+                    {
+                        // when start points are equal, use the direction the edge is pointing
+                        // to. That value is created on demand and derived from atan2 in the
+                        // range ]0.0 .. pi[ (without extremas, we always have a deltaY in this
+                        // class) and scaled to sal_uInt32 range for best precision. 0 means no angle,
+                        // while SAL_MAX_UINT32 means pi. Thus, the higher the value, the more left
+                        // the edge traverses.
+                        return (getSortValue() > rComp.getSortValue());
+                    }
+                    else
+                    {
+                        return fTools::less(getStart().getX(), rComp.getStart().getX());
+                    }
+                }
+                else
+                {
+                    return fTools::less(getStart().getY(), rComp.getStart().getY());
+                }
+            }
+
+            // method for cut support
+            B2DPoint getCutPointForGivenY(double fGivenY)
+            {
+                // Calculate cut point locally (do not use interpolate) since it is numerically
+                // necessary to guarantee the new, equal Y-coordinate
+                const double fFactor((fGivenY - getStart().getY()) / getDeltaY());
+                const double fDeltaXNew(fFactor * getDeltaX());
+
+                return B2DPoint(getStart().getX() + fDeltaXNew, fGivenY);
+            }
+        };
+
+        //////////////////////////////////////////////////////////////////////////////
+        // define double linked list of edges (for fast random insert)
+
+        typedef ::std::list< TrDeEdgeEntry > TrDeEdgeEntries;
+
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace trapezoidhelper
+    {
+        // helper class to handle the complete trapezoid subdivision of a PolyPolygon
+        class TrapezoidSubdivider
+        {
+        private:
+            // local data
+            sal_uInt32                  mnInitialEdgeEntryCount;
+            TrDeEdgeEntries             maTrDeEdgeEntries;
+            ::std::vector< B2DPoint >   maPoints;
+            ::std::vector< B2DPoint* >  maNewPoints;
+
+            void addEdgeSorted(
+                TrDeEdgeEntries::iterator aCurrent,
+                const TrDeEdgeEntry& rNewEdge)
+            {
+                // Loop while new entry is bigger, use operator<
+                while(aCurrent != maTrDeEdgeEntries.end() && (*aCurrent) < rNewEdge)
+                {
+                    aCurrent++;
+                }
+
+                // Insert before first which is smaller or equal or at end
+                maTrDeEdgeEntries.insert(aCurrent, rNewEdge);
+            }
+
+            bool splitEdgeAtGivenPoint(
+                TrDeEdgeEntries::reference aEdge,
+                const B2DPoint& rCutPoint,
+                TrDeEdgeEntries::iterator aCurrent)
+            {
+                // do not create edges without deltaY: do not split when start is identical
+                if(aEdge.getStart().equal(rCutPoint, fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                // do not create edges without deltaY: do not split when end is identical
+                if(aEdge.getEnd().equal(rCutPoint, fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                const double fOldDeltaYStart(rCutPoint.getY() - aEdge.getStart().getY());
+
+                if(fTools::lessOrEqual(fOldDeltaYStart, 0.0))
+                {
+                    // do not split: the resulting edge would be horizontal
+                    // correct it to new start point
+                    aEdge.setStart(&rCutPoint);
+                    return false;
+                }
+
+                const double fNewDeltaYStart(aEdge.getEnd().getY() - rCutPoint.getY());
+
+                if(fTools::lessOrEqual(fNewDeltaYStart, 0.0))
+                {
+                    // do not split: the resulting edge would be horizontal
+                    // correct it to new end point
+                    aEdge.setEnd(&rCutPoint);
+                    return false;
+                }
+
+                // Create new entry
+                const TrDeEdgeEntry aNewEdge(
+                    &rCutPoint,
+                    &aEdge.getEnd(),
+                    aEdge.getSortValue());
+
+                // Correct old entry
+                aEdge.setEnd(&rCutPoint);
+
+                // Insert sorted (to avoid new sort)
+                addEdgeSorted(aCurrent, aNewEdge);
+
+                return true;
+            }
+
+            bool testAndCorrectEdgeIntersection(
+                TrDeEdgeEntries::reference aEdgeA,
+                TrDeEdgeEntries::reference aEdgeB,
+                TrDeEdgeEntries::iterator aCurrent)
+            {
+                // Exclude simple cases: same start or end point
+                if(aEdgeA.getStart().equal(aEdgeB.getStart(), fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                if(aEdgeA.getStart().equal(aEdgeB.getEnd(), fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                if(aEdgeA.getEnd().equal(aEdgeB.getStart(), fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                if(aEdgeA.getEnd().equal(aEdgeB.getEnd(), fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                // Exclude simple cases: one of the edges has no length anymore
+                if(aEdgeA.getStart().equal(aEdgeA.getEnd(), fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                if(aEdgeB.getStart().equal(aEdgeB.getEnd(), fTools::getSmallValue()))
+                {
+                    return false;
+                }
+
+                // check if one point is on the other edge (a touch, not a cut)
+                const B2DVector aDeltaB(aEdgeB.getDeltaX(), aEdgeB.getDeltaY());
+
+                if(tools::isPointOnEdge(aEdgeA.getStart(), aEdgeB.getStart(), aDeltaB))
+                {
+                    return splitEdgeAtGivenPoint(aEdgeB, aEdgeA.getStart(), aCurrent);
+                }
+
+                if(tools::isPointOnEdge(aEdgeA.getEnd(), aEdgeB.getStart(), aDeltaB))
+                {
+                    return splitEdgeAtGivenPoint(aEdgeB, aEdgeA.getEnd(), aCurrent);
+                }
+
+                const B2DVector aDeltaA(aEdgeA.getDeltaX(), aEdgeA.getDeltaY());
+
+                if(tools::isPointOnEdge(aEdgeB.getStart(), aEdgeA.getStart(), aDeltaA))
+                {
+                    return splitEdgeAtGivenPoint(aEdgeA, aEdgeB.getStart(), aCurrent);
+                }
+
+                if(tools::isPointOnEdge(aEdgeB.getEnd(), aEdgeA.getStart(), aDeltaA))
+                {
+                    return splitEdgeAtGivenPoint(aEdgeA, aEdgeB.getEnd(), aCurrent);
+                }
+
+                // check for cut inside edges. Use both t-values to choose the more precise
+                // one later
+                double fCutA(0.0);
+                double fCutB(0.0);
+
+                if(tools::findCut(
+                    aEdgeA.getStart(), aDeltaA,
+                    aEdgeB.getStart(), aDeltaB,
+                    CUTFLAG_LINE,
+                    &fCutA,
+                    &fCutB))
+                {
+                    // use a simple metric (length criteria) for choosing the numerically
+                    // better cut
+                    const double fSimpleLengthA(aDeltaA.getX() + aDeltaA.getY());
+                    const double fSimpleLengthB(aDeltaB.getX() + aDeltaB.getY());
+                    const bool bAIsLonger(fSimpleLengthA > fSimpleLengthB);
+                    B2DPoint* pNewPoint = bAIsLonger
+                        ? new B2DPoint(aEdgeA.getStart() + (fCutA * aDeltaA))
+                        : new B2DPoint(aEdgeB.getStart() + (fCutB * aDeltaB));
+                    bool bRetval(false);
+
+                    // try to split both edges
+                    bRetval = splitEdgeAtGivenPoint(aEdgeA, *pNewPoint, aCurrent);
+                    bRetval |= splitEdgeAtGivenPoint(aEdgeB, *pNewPoint, aCurrent);
+
+                    if(bRetval)
+                    {
+                        maNewPoints.push_back(pNewPoint);
+                    }
+                    else
+                    {
+                        delete pNewPoint;
+                    }
+
+                    return bRetval;
+                }
+
+                return false;
+            }
+
+            void solveHorizontalEdges(TrDeSimpleEdges& rTrDeSimpleEdges)
+            {
+                if(rTrDeSimpleEdges.size() && maTrDeEdgeEntries.size())
+                {
+                    // there were horizontal edges. These can be excluded, but
+                    // cuts with other edges need to be solved and added before
+                    // ignoring them
+                    sal_uInt32 a(0);
+
+                    for(a = 0; a < rTrDeSimpleEdges.size(); a++)
+                    {
+                        // get horizontal edge as candidate; prepare it's range and fixed Y
+                        const TrDeSimpleEdge& rHorEdge = rTrDeSimpleEdges[a];
+                        const B1DRange aRange(rHorEdge.getStart().getX(), rHorEdge.getEnd().getX());
+                        const double fFixedY(rHorEdge.getStart().getY());
+
+                        // loop over traversing edges
+                        TrDeEdgeEntries::iterator aCurrent(maTrDeEdgeEntries.begin());
+
+                        do
+                        {
+                            // get compare edge
+                            TrDeEdgeEntries::reference aCompare(*aCurrent++);
+
+                            if(fTools::lessOrEqual(aCompare.getEnd().getY(), fFixedY))
+                            {
+                                // edge ends above horizontal edge, continue
+                                continue;
+                            }
+
+                            if(fTools::moreOrEqual(aCompare.getStart().getY(), fFixedY))
+                            {
+                                // edge starts below horizontal edge, continue
+                                continue;
+                            }
+
+                            // vertical overlap, get horizontal range
+                            const B1DRange aCompareRange(aCompare.getStart().getX(), aCompare.getEnd().getX());
+
+                            if(aRange.overlaps(aCompareRange))
+                            {
+                                // possible cut, get cut point
+                                const B2DPoint aSplit(aCompare.getCutPointForGivenY(fFixedY));
+
+                                if(fTools::more(aSplit.getX(), aRange.getMinimum())
+                                    && fTools::less(aSplit.getX(), aRange.getMaximum()))
+                                {
+                                    // cut is in XRange of horizontal edge, potenitally needed cut
+                                    B2DPoint* pNewPoint = new B2DPoint(aSplit);
+
+                                    if(splitEdgeAtGivenPoint(aCompare, *pNewPoint, aCurrent))
+                                    {
+                                        maNewPoints.push_back(pNewPoint);
+                                    }
+                                    else
+                                    {
+                                        delete pNewPoint;
+                                    }
+                                }
+                            }
+                        }
+                        while(aCurrent != maTrDeEdgeEntries.end()
+                            && fTools::less(aCurrent->getStart().getY(), fFixedY));
+                    }
+                }
+            }
+
+        public:
+            TrapezoidSubdivider(
+                const B2DPolyPolygon& rSourcePolyPolygon)
+            :   mnInitialEdgeEntryCount(0),
+                maTrDeEdgeEntries(),
+                maPoints(),
+                maNewPoints()
+            {
+                B2DPolyPolygon aSource(rSourcePolyPolygon);
+                const sal_uInt32 nPolygonCount(rSourcePolyPolygon.count());
+                TrDeSimpleEdges aTrDeSimpleEdges;
+                sal_uInt32 a(0), b(0);
+                sal_uInt32 nAllPointCount(0);
+
+                // ensure there are no curves used
+                if(aSource.areControlPointsUsed())
+                {
+                    aSource = aSource.getDefaultAdaptiveSubdivision();
+                }
+
+                for(a = 0; a < nPolygonCount; a++)
+                {
+                    // 1st run: count points
+                    const B2DPolygon aPolygonCandidate(aSource.getB2DPolygon(a));
+                    const sal_uInt32 nCount(aPolygonCandidate.count());
+
+                    if(nCount > 2)
+                    {
+                        nAllPointCount += nCount;
+                    }
+                }
+
+                if(nAllPointCount)
+                {
+                    // reserve needed points. CAUTION: maPoints size is NOT to be changed anymore
+                    // after 2nd loop since pointers to it are used in the edges
+                    maPoints.reserve(nAllPointCount);
+
+                    for(a = 0; a < nPolygonCount; a++)
+                    {
+                        // 2nd run: add points
+                        const B2DPolygon aPolygonCandidate(aSource.getB2DPolygon(a));
+                        const sal_uInt32 nCount(aPolygonCandidate.count());
+
+                        if(nCount > 2)
+                        {
+                            for(b = 0; b < nCount; b++)
+                            {
+                                maPoints.push_back(aPolygonCandidate.getB2DPoint(b));
+                            }
+                        }
+                    }
+
+                    // Moved the edge construction to a 3rd run: doing it in the 2nd run is
+                    // possible(and i used it), but requires a working vector::reserve()
+                    // implementation, else the vector will be reallocated and the pointers
+                    // in the edges may be wrong. Security first here.
+                    sal_uInt32 nStartIndex(0);
+
+                    for(a = 0; a < nPolygonCount; a++)
+                    {
+                        const B2DPolygon aPolygonCandidate(aSource.getB2DPolygon(a));
+                        const sal_uInt32 nCount(aPolygonCandidate.count());
+
+                        if(nCount > 2)
+                        {
+                            // get the last point of the current polygon
+                            B2DPoint* pPrev(&maPoints[nCount + nStartIndex - 1]);
+
+                            for(b = 0; b < nCount; b++)
+                            {
+                                // get next point
+                                B2DPoint* pCurr(&maPoints[nStartIndex++]);
+
+                                if(fTools::equal(pPrev->getY(), pCurr->getY(), fTools::getSmallValue()))
+                                {
+                                    // horizontal edge, check for single point
+                                    if(!fTools::equal(pPrev->getX(), pCurr->getX(), fTools::getSmallValue()))
+                                    {
+                                        // X-order not needed, just add
+                                        aTrDeSimpleEdges.push_back(TrDeSimpleEdge(pPrev, pCurr));
+
+                                        const double fMiddle((pPrev->getY() + pCurr->getY()) * 0.5);
+                                        pPrev->setY(fMiddle);
+                                        pCurr->setY(fMiddle);
+                                    }
+                                }
+                                else
+                                {
+                                    // vertical edge. Positive Y-direction is guaranteed by the
+                                    // TrDeEdgeEntry constructor
+                                    maTrDeEdgeEntries.push_back(TrDeEdgeEntry(pPrev, pCurr, 0));
+                                    mnInitialEdgeEntryCount++;
+                                }
+
+                                // prepare next step
+                                pPrev = pCurr;
+                            }
+                        }
+                    }
+                }
+
+                if(maTrDeEdgeEntries.size())
+                {
+                    // single and initial sort of traversing edges
+                    maTrDeEdgeEntries.sort();
+
+                    // solve horizontal edges if there are any detected
+                    solveHorizontalEdges(aTrDeSimpleEdges);
+                }
+            }
+
+            ~TrapezoidSubdivider()
+            {
+                // delete the extra points created for cuts
+                const sal_uInt32 nCount(maNewPoints.size());
+
+                for(sal_uInt32 a(0); a < nCount; a++)
+                {
+                    delete maNewPoints[a];
+                }
+            }
+
+            void Subdivide(B2DTrapezoidVector& ro_Result)
+            {
+                // This is the central subdivider. The strategy is to use the first two entries
+                // from the traversing edges as a potential trapezoid and do the needed corrections
+                // and adaptions on the way.
+                //
+                // There always must be two edges with the same YStart value: When adding the polygons
+                // in the constructor, there is always a topmost point from which two edges start; when
+                // the topmost is an edge, there is a start and end of this edge from which two edges
+                // start. All cases have two edges with same StartY (QED).
+                //
+                // Based on this these edges get corrected when:
+                // - one is longer than the other
+                // - they intersect
+                // - they intersect with other edges
+                // - another edge starts inside the thought trapezoid
+                //
+                // All this cases again produce a valid state so that the first two edges have a common
+                // Ystart again. Some cases lead to a restart of the process, some allow consuming the
+                // edges and create the intended trapezoid.
+                //
+                // Be careful when doing chages here: It is essential to keep all possible paths
+                // in valid states and to be numerically correct. This is especially needed e.g.
+                // by using fTools::equal(..) in the more robust small-value incarnation.
+                B1DRange aLeftRange;
+                B1DRange aRightRange;
+
+                if(!maTrDeEdgeEntries.empty())
+                {
+                    // measuring shows that the relation between edges and created trapezoids is
+                    // mostly in the 1:1 range, thus reserve as much trapezoids as edges exist. Do
+                    // not use maTrDeEdgeEntries.size() since that may be a non-constant time
+                    // operation for Lists. Instead, use mnInitialEdgeEntryCount which will contain
+                    // the roughly counted adds to the List
+                    ro_Result.reserve(ro_Result.size() + mnInitialEdgeEntryCount);
+                }
+
+                while(!maTrDeEdgeEntries.empty())
+                {
+                    // Prepare current operator and get first edge
+                    TrDeEdgeEntries::iterator aCurrent(maTrDeEdgeEntries.begin());
+                    TrDeEdgeEntries::reference aLeft(*aCurrent++);
+
+                    if(aCurrent == maTrDeEdgeEntries.end())
+                    {
+                        // Should not happen: No 2nd edge; consume the single edge
+                        // to not have an endless loop and start next. During development
+                        // i constantly had breakpoints here, so i am sure enough to add an
+                        // assertion here
+                        OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)");
+                        maTrDeEdgeEntries.pop_front();
+                        continue;
+                    }
+
+                    // get second edge
+                    TrDeEdgeEntries::reference aRight(*aCurrent++);
+
+                    if(!fTools::equal(aLeft.getStart().getY(), aRight.getStart().getY(), fTools::getSmallValue()))
+                    {
+                        // Should not happen: We have a 2nd edge, but YStart is on another
+                        // line; consume the single edge to not have an endless loop and start
+                        // next. During development i constantly had breakpoints here, so i am
+                        // sure enough to add an assertion here
+                        OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)");
+                        maTrDeEdgeEntries.pop_front();
+                        continue;
+                    }
+
+                    // aLeft and aRight build a thought trapezoid now. They have a common
+                    // start line (same Y for start points). Potentially, one of the edges
+                    // is longer than the other. It is only needed to look at the shorter
+                    // length which build the potential trapezoid. To do so, get the end points
+                    // locally and adapt the evtl. longer one. Use only aLeftEnd and aRightEnd
+                    // from here on, not the aLeft.getEnd() or aRight.getEnd() accesses.
+                    B2DPoint aLeftEnd(aLeft.getEnd());
+                    B2DPoint aRightEnd(aRight.getEnd());
+
+                    // check if end points are on the same line. If yes, no adaption
+                    // needs to be prepared. Also remember which one actually is longer.
+                    const bool bEndOnSameLine(fTools::equal(aLeftEnd.getY(), aRightEnd.getY(), fTools::getSmallValue()));
+                    bool bLeftIsLonger(false);
+
+                    if(!bEndOnSameLine)
+                    {
+                        // check which edge is longer and correct accordingly
+                        bLeftIsLonger = fTools::more(aLeftEnd.getY(), aRightEnd.getY());
+
+                        if(bLeftIsLonger)
+                        {
+                            aLeftEnd = aLeft.getCutPointForGivenY(aRightEnd.getY());
+                        }
+                        else
+                        {
+                            aRightEnd = aRight.getCutPointForGivenY(aLeftEnd.getY());
+                        }
+                    }
+
+                    // check for same start and end points
+                    const bool bSameStartPoint(aLeft.getStart().equal(aRight.getStart(), fTools::getSmallValue()));
+                    const bool bSameEndPoint(aLeftEnd.equal(aRightEnd, fTools::getSmallValue()));
+
+                    // check the simple case that the edges form a 'blind' edge (deadend)
+                    if(bSameStartPoint && bSameEndPoint)
+                    {
+                        // correct the longer edge if prepared
+                        if(!bEndOnSameLine)
+                        {
+                            if(bLeftIsLonger)
+                            {
+                                B2DPoint* pNewPoint = new B2DPoint(aLeftEnd);
+
+                                if(splitEdgeAtGivenPoint(aLeft, *pNewPoint, aCurrent))
+                                {
+                                    maNewPoints.push_back(pNewPoint);
+                                }
+                                else
+                                {
+                                    delete pNewPoint;
+                                }
+                            }
+                            else
+                            {
+                                B2DPoint* pNewPoint = new B2DPoint(aRightEnd);
+
+                                if(splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
+                                {
+                                    maNewPoints.push_back(pNewPoint);
+                                }
+                                else
+                                {
+                                    delete pNewPoint;
+                                }
+                            }
+                        }
+
+                        // consume both edges and start next run
+                        maTrDeEdgeEntries.pop_front();
+                        maTrDeEdgeEntries.pop_front();
+
+                        continue;
+                    }
+
+                    // check if the edges self-intersect. This can only happen when
+                    // start and end point are different
+                    bool bRangesSet(false);
+
+                    if(!(bSameStartPoint || bSameEndPoint))
+                    {
+                        // get XRanges of edges
+                        aLeftRange = B1DRange(aLeft.getStart().getX(), aLeftEnd.getX());
+                        aRightRange = B1DRange(aRight.getStart().getX(), aRightEnd.getX());
+                        bRangesSet = true;
+
+                        // use fast range test first
+                        if(aLeftRange.overlaps(aRightRange))
+                        {
+                            // real cut test and correction. If correction was needed,
+                            // start new run
+                            if(testAndCorrectEdgeIntersection(aLeft, aRight, aCurrent))
+                            {
+                                continue;
+                            }
+                        }
+                    }
+
+                    // now we need to check if there are intersections with other edges
+                    // or if other edges start inside the candidate trapezoid
+                    if(aCurrent != maTrDeEdgeEntries.end()
+                        && fTools::less(aCurrent->getStart().getY(), aLeftEnd.getY()))
+                    {
+                        // get XRanges of edges
+                        if(!bRangesSet)
+                        {
+                            aLeftRange = B1DRange(aLeft.getStart().getX(), aLeftEnd.getX());
+                            aRightRange = B1DRange(aRight.getStart().getX(), aRightEnd.getX());
+                        }
+
+                        // build full XRange for fast check
+                        B1DRange aAllRange(aLeftRange);
+                        aAllRange.expand(aRightRange);
+
+                        // prepare loop iterator; aCurrent needs to stay unchanged for
+                        // eventual sorted insertions of new EdgeNodes. Also prepare stop flag
+                        TrDeEdgeEntries::iterator aLoop(aCurrent);
+                        bool bDone(false);
+
+                        do
+                        {
+                            // get compare edge and it's XRange
+                            TrDeEdgeEntries::reference aCompare(*aLoop++);
+
+                            // avoid edges using the same start point as one of
+                            // the edges. These can neither have their start point
+                            // in the thought trapezoid nor cut with one of the edges
+                            if(aCompare.getStart().equal(aRight.getStart(), fTools::getSmallValue()))
+                            {
+                                continue;
+                            }
+
+                            // get compare XRange
+                            const B1DRange aCompareRange(aCompare.getStart().getX(), aCompare.getEnd().getX());
+
+                            // use fast range test first
+                            if(aAllRange.overlaps(aCompareRange))
+                            {
+                                // check for start point inside thought trapezoid
+                                if(fTools::more(aCompare.getStart().getY(), aLeft.getStart().getY()))
+                                {
+                                    // calculate the two possible split points at compare's Y
+                                    const B2DPoint aSplitLeft(aLeft.getCutPointForGivenY(aCompare.getStart().getY()));
+                                    const B2DPoint aSplitRight(aRight.getCutPointForGivenY(aCompare.getStart().getY()));
+
+                                    // check for start point of aCompare being inside thought
+                                    // trapezoid
+                                    if(aCompare.getStart().getX() >= aSplitLeft.getX() &&
+                                        aCompare.getStart().getX() <= aSplitRight.getX())
+                                    {
+                                        // is inside, correct and restart loop
+                                        B2DPoint* pNewLeft = new B2DPoint(aSplitLeft);
+
+                                        if(splitEdgeAtGivenPoint(aLeft, *pNewLeft, aCurrent))
+                                        {
+                                            maNewPoints.push_back(pNewLeft);
+                                        }
+                                        else
+                                        {
+                                            delete pNewLeft;
+                                        }
+
+                                        B2DPoint* pNewRight = new B2DPoint(aSplitRight);
+
+                                        if(splitEdgeAtGivenPoint(aRight, *pNewRight, aCurrent))
+                                        {
+                                            maNewPoints.push_back(pNewRight);
+                                        }
+                                        else
+                                        {
+                                            delete pNewRight;
+                                        }
+
+                                        bDone = true;
+                                    }
+                                }
+
+                                if(!bDone && aLeftRange.overlaps(aCompareRange))
+                                {
+                                    // test for concrete cut of compare edge with left edge
+                                    bDone = testAndCorrectEdgeIntersection(aLeft, aCompare, aCurrent);
+                                }
+
+                                if(!bDone && aRightRange.overlaps(aCompareRange))
+                                {
+                                    // test for concrete cut of compare edge with Right edge
+                                    bDone = testAndCorrectEdgeIntersection(aRight, aCompare, aCurrent);
+                                }
+                            }
+                        }
+                        while(!bDone
+                            && aLoop != maTrDeEdgeEntries.end()
+                            && fTools::less(aLoop->getStart().getY(), aLeftEnd.getY()));
+
+                        if(bDone)
+                        {
+                            // something needed to be changed; start next loop
+                            continue;
+                        }
+                    }
+
+                    // when we get here, the intended trapezoid can be used. It needs to
+                    // be corrected, eventually (if prepared); but this is no reason not to
+                    // use it in the same loop iteration
+                    if(!bEndOnSameLine)
+                    {
+                        if(bLeftIsLonger)
+                        {
+                            B2DPoint* pNewPoint = new B2DPoint(aLeftEnd);
+
+                            if(splitEdgeAtGivenPoint(aLeft, *pNewPoint, aCurrent))
+                            {
+                                maNewPoints.push_back(pNewPoint);
+                            }
+                            else
+                            {
+                                delete pNewPoint;
+                            }
+                        }
+                        else
+                        {
+                            B2DPoint* pNewPoint = new B2DPoint(aRightEnd);
+
+                            if(splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
+                            {
+                                maNewPoints.push_back(pNewPoint);
+                            }
+                            else
+                            {
+                                delete pNewPoint;
+                            }
+                        }
+                    }
+
+                    // the two edges start at the same Y, they use the same DeltaY, they
+                    // do not cut themselves and not any other edge in range. Create a
+                    // B2DTrapezoid and consume both edges
+                    ro_Result.push_back(
+                        B2DTrapezoid(
+                            aLeft.getStart().getX(),
+                            aRight.getStart().getX(),
+                            aLeft.getStart().getY(),
+                            aLeftEnd.getX(),
+                            aRightEnd.getX(),
+                            aLeftEnd.getY()));
+
+                    maTrDeEdgeEntries.pop_front();
+                    maTrDeEdgeEntries.pop_front();
+                }
+            }
+        };
+    } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    B2DTrapezoid::B2DTrapezoid(
+        const double& rfTopXLeft,
+        const double& rfTopXRight,
+        const double& rfTopY,
+        const double& rfBottomXLeft,
+        const double& rfBottomXRight,
+        const double& rfBottomY)
+    :   mfTopXLeft(rfTopXLeft),
+        mfTopXRight(rfTopXRight),
+        mfTopY(rfTopY),
+        mfBottomXLeft(rfBottomXLeft),
+        mfBottomXRight(rfBottomXRight),
+        mfBottomY(rfBottomY)
+    {
+        // guarantee mfTopXRight >= mfTopXLeft
+        if(mfTopXLeft > mfTopXRight)
+        {
+            std::swap(mfTopXLeft, mfTopXRight);
+        }
+
+        // guarantee mfBottomXRight >= mfBottomXLeft
+        if(mfBottomXLeft > mfBottomXRight)
+        {
+            std::swap(mfBottomXLeft, mfBottomXRight);
+        }
+
+        // guarantee mfBottomY >= mfTopY
+        if(mfTopY > mfBottomY)
+        {
+            std::swap(mfTopY, mfBottomY);
+            std::swap(mfTopXLeft, mfBottomXLeft);
+            std::swap(mfTopXRight, mfBottomXRight);
+        }
+    }
+
+    B2DPolygon B2DTrapezoid::getB2DPolygon() const
+    {
+        B2DPolygon aRetval;
+
+        aRetval.append(B2DPoint(getTopXLeft(), getTopY()));
+        aRetval.append(B2DPoint(getTopXRight(), getTopY()));
+        aRetval.append(B2DPoint(getBottomXRight(), getBottomY()));
+        aRetval.append(B2DPoint(getBottomXLeft(), getBottomY()));
+        aRetval.setClosed(true);
+
+        return aRetval;
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        // convert Source PolyPolygon to trapezoids
+        void trapezoidSubdivide(B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon)
+        {
+            trapezoidhelper::TrapezoidSubdivider aTrapezoidSubdivider(rSourcePolyPolygon);
+
+            aTrapezoidSubdivider.Subdivide(ro_Result);
+        }
+
+        void createLineTrapezoidFromEdge(
+            B2DTrapezoidVector& ro_Result,
+            const B2DPoint& rPointA,
+            const B2DPoint& rPointB,
+            double fLineWidth)
+        {
+            if(fTools::lessOrEqual(fLineWidth, 0.0))
+            {
+                // no line witdh
+                return;
+            }
+
+            if(rPointA.equal(rPointB, fTools::getSmallValue()))
+            {
+                // points are equal, no edge
+                return;
+            }
+
+            const double fHalfLineWidth(0.5 * fLineWidth);
+
+            if(fTools::equal(rPointA.getX(), rPointB.getX(), fTools::getSmallValue()))
+            {
+                // vertical line
+                const double fLeftX(rPointA.getX() - fHalfLineWidth);
+                const double fRightX(rPointA.getX() + fHalfLineWidth);
+
+                ro_Result.push_back(
+                    B2DTrapezoid(
+                        fLeftX,
+                        fRightX,
+                        std::min(rPointA.getY(), rPointB.getY()),
+                        fLeftX,
+                        fRightX,
+                        std::max(rPointA.getY(), rPointB.getY())));
+            }
+            else if(fTools::equal(rPointA.getY(), rPointB.getY(), fTools::getSmallValue()))
+            {
+                // horizontal line
+                const double fLeftX(std::min(rPointA.getX(), rPointB.getX()));
+                const double fRightX(std::max(rPointA.getX(), rPointB.getX()));
+
+                ro_Result.push_back(
+                    B2DTrapezoid(
+                        fLeftX,
+                        fRightX,
+                        rPointA.getY() - fHalfLineWidth,
+                        fLeftX,
+                        fRightX,
+                        rPointA.getY() + fHalfLineWidth));
+            }
+            else
+            {
+                // diagonal line
+                // create perpendicular vector
+                const B2DVector aDelta(rPointB - rPointA);
+                B2DVector aPerpendicular(-aDelta.getY(), aDelta.getX());
+                aPerpendicular.setLength(fHalfLineWidth);
+
+                // create StartLow, StartHigh, EndLow and EndHigh
+                const B2DPoint aStartLow(rPointA + aPerpendicular);
+                const B2DPoint aStartHigh(rPointA - aPerpendicular);
+                const B2DPoint aEndHigh(rPointB - aPerpendicular);
+                const B2DPoint aEndLow(rPointB + aPerpendicular);
+
+                // create EdgeEntries
+                basegfx::trapezoidhelper::TrDeEdgeEntries aTrDeEdgeEntries;
+
+                aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aStartLow, &aStartHigh, 0));
+                aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aStartHigh, &aEndHigh, 0));
+                aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aEndHigh, &aEndLow, 0));
+                aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aEndLow, &aStartLow, 0));
+                aTrDeEdgeEntries.sort();
+
+                // here we know we have exactly four edges, and they do not cut, touch or
+                // intersect. This makes processing much easier. Get the first two as start
+                // edges for the thought trapezoid
+                basegfx::trapezoidhelper::TrDeEdgeEntries::iterator aCurrent(aTrDeEdgeEntries.begin());
+                basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft(*aCurrent++);
+                basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight(*aCurrent++);
+                const bool bEndOnSameLine(fTools::equal(aLeft.getEnd().getY(), aRight.getEnd().getY(), fTools::getSmallValue()));
+
+                if(bEndOnSameLine)
+                {
+                    // create two triangle trapezoids
+                    ro_Result.push_back(
+                        B2DTrapezoid(
+                            aLeft.getStart().getX(),
+                            aRight.getStart().getX(),
+                            aLeft.getStart().getY(),
+                            aLeft.getEnd().getX(),
+                            aRight.getEnd().getX(),
+                            aLeft.getEnd().getY()));
+
+                    basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
+                    basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
+
+                    ro_Result.push_back(
+                        B2DTrapezoid(
+                            aLeft2.getStart().getX(),
+                            aRight2.getStart().getX(),
+                            aLeft2.getStart().getY(),
+                            aLeft2.getEnd().getX(),
+                            aRight2.getEnd().getX(),
+                            aLeft2.getEnd().getY()));
+                }
+                else
+                {
+                    // create three trapezoids. Check which edge is longer and
+                    // correct accordingly
+                    const bool bLeftIsLonger(fTools::more(aLeft.getEnd().getY(), aRight.getEnd().getY()));
+
+                    if(bLeftIsLonger)
+                    {
+                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
+                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
+                        const B2DPoint aSplitLeft(aLeft.getCutPointForGivenY(aRight.getEnd().getY()));
+                        const B2DPoint aSplitRight(aRight2.getCutPointForGivenY(aLeft.getEnd().getY()));
+
+                        ro_Result.push_back(
+                            B2DTrapezoid(
+                                aLeft.getStart().getX(),
+                                aRight.getStart().getX(),
+                                aLeft.getStart().getY(),
+                                aSplitLeft.getX(),
+                                aRight.getEnd().getX(),
+                                aRight.getEnd().getY()));
+
+                        ro_Result.push_back(
+                            B2DTrapezoid(
+                                aSplitLeft.getX(),
+                                aRight.getEnd().getX(),
+                                aRight.getEnd().getY(),
+                                aLeft2.getStart().getX(),
+                                aSplitRight.getX(),
+                                aLeft2.getStart().getY()));
+
+                        ro_Result.push_back(
+                            B2DTrapezoid(
+                                aLeft2.getStart().getX(),
+                                aSplitRight.getX(),
+                                aLeft2.getStart().getY(),
+                                aLeft2.getEnd().getX(),
+                                aRight2.getEnd().getX(),
+                                aLeft2.getEnd().getY()));
+                    }
+                    else
+                    {
+                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
+                        basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
+                        const B2DPoint aSplitRight(aRight.getCutPointForGivenY(aLeft.getEnd().getY()));
+                        const B2DPoint aSplitLeft(aLeft2.getCutPointForGivenY(aRight.getEnd().getY()));
+
+                        ro_Result.push_back(
+                            B2DTrapezoid(
+                                aLeft.getStart().getX(),
+                                aRight.getStart().getX(),
+                                aLeft.getStart().getY(),
+                                aLeft.getEnd().getX(),
+                                aSplitRight.getX(),
+                                aLeft.getEnd().getY()));
+
+                        ro_Result.push_back(
+                            B2DTrapezoid(
+                                aLeft.getEnd().getX(),
+                                aSplitRight.getX(),
+                                aLeft.getEnd().getY(),
+                                aSplitLeft.getX(),
+                                aRight.getEnd().getX(),
+                                aRight2.getStart().getY()));
+
+                        ro_Result.push_back(
+                            B2DTrapezoid(
+                                aSplitLeft.getX(),
+                                aRight.getEnd().getX(),
+                                aRight2.getStart().getY(),
+                                aLeft2.getEnd().getX(),
+                                aRight2.getEnd().getX(),
+                                aLeft2.getEnd().getY()));
+                    }
+                }
+            }
+        }
+
+        void createLineTrapezoidFromB2DPolygon(
+            B2DTrapezoidVector& ro_Result,
+            const B2DPolygon& rPolygon,
+            double fLineWidth)
+        {
+            if(fTools::lessOrEqual(fLineWidth, 0.0))
+            {
+                return;
+            }
+
+            // ensure there are no curves used
+            B2DPolygon aSource(rPolygon);
+
+            if(aSource.areControlPointsUsed())
+            {
+                aSource = aSource.getDefaultAdaptiveSubdivision();
+            }
+
+            const sal_uInt32 nPointCount(aSource.count());
+
+            if(!nPointCount)
+            {
+                return;
+            }
+
+            const sal_uInt32 nEdgeCount(aSource.isClosed() ? nPointCount : nPointCount - 1);
+            B2DPoint aCurrent(aSource.getB2DPoint(0));
+
+            ro_Result.reserve(ro_Result.size() + (3 * nEdgeCount));
+
+            for(sal_uInt32 a(0); a < nEdgeCount; a++)
+            {
+                const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                const B2DPoint aNext(aSource.getB2DPoint(nNextIndex));
+
+                createLineTrapezoidFromEdge(ro_Result, aCurrent, aNext, fLineWidth);
+                aCurrent = aNext;
+            }
+        }
+
+        void createLineTrapezoidFromB2DPolyPolygon(
+            B2DTrapezoidVector& ro_Result,
+            const B2DPolyPolygon& rPolyPolygon,
+            double fLineWidth)
+        {
+            if(fTools::lessOrEqual(fLineWidth, 0.0))
+            {
+                return;
+            }
+
+            // ensure there are no curves used
+            B2DPolyPolygon aSource(rPolyPolygon);
+
+            if(aSource.areControlPointsUsed())
+            {
+                aSource = aSource.getDefaultAdaptiveSubdivision();
+            }
+
+            const sal_uInt32 nCount(aSource.count());
+
+            if(!nCount)
+            {
+                return;
+            }
+
+            for(sal_uInt32 a(0); a < nCount; a++)
+            {
+                createLineTrapezoidFromB2DPolygon(
+                    ro_Result,
+                    aSource.getB2DPolygon(a),
+                    fLineWidth);
+            }
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
new file mode 100644
index 000000000000..1985d3301d4b
--- /dev/null
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -0,0 +1,1816 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b3dpolygon.hxx>
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <rtl/instance.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/color/bcolor.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <vector>
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+
+class CoordinateData3D
+{
+    basegfx::B3DPoint                               maPoint;
+
+public:
+    CoordinateData3D()
+    :   maPoint()
+    {
+    }
+
+    explicit CoordinateData3D(const basegfx::B3DPoint& rData)
+    :   maPoint(rData)
+    {
+    }
+
+    const basegfx::B3DPoint& getCoordinate() const
+    {
+        return maPoint;
+    }
+
+    void setCoordinate(const basegfx::B3DPoint& rValue)
+    {
+        if(rValue != maPoint)
+            maPoint = rValue;
+    }
+
+    bool operator==(const CoordinateData3D& rData) const
+    {
+        return (maPoint == rData.getCoordinate());
+    }
+
+    void transform(const basegfx::B3DHomMatrix& rMatrix)
+    {
+        maPoint *= rMatrix;
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class CoordinateDataArray3D
+{
+    typedef ::std::vector< CoordinateData3D > CoordinateData3DVector;
+
+    CoordinateData3DVector                          maVector;
+
+public:
+    explicit CoordinateDataArray3D(sal_uInt32 nCount)
+    :   maVector(nCount)
+    {
+    }
+
+    explicit CoordinateDataArray3D(const CoordinateDataArray3D& rOriginal)
+    :   maVector(rOriginal.maVector)
+    {
+    }
+
+    CoordinateDataArray3D(const CoordinateDataArray3D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maVector(rOriginal.maVector.begin() + nIndex, rOriginal.maVector.begin() + (nIndex + nCount))
+    {
+    }
+
+    ~CoordinateDataArray3D()
+    {
+    }
+
+    ::basegfx::B3DVector getNormal() const
+    {
+        ::basegfx::B3DVector aRetval;
+        const sal_uInt32 nPointCount(maVector.size());
+
+        if(nPointCount > 2)
+        {
+            sal_uInt32 nISmallest(0);
+            sal_uInt32 a(0);
+            const basegfx::B3DPoint* pSmallest(&maVector[0].getCoordinate());
+            const basegfx::B3DPoint* pNext(0);
+            const basegfx::B3DPoint* pPrev(0);
+
+            // To guarantee a correctly oriented point, choose an outmost one
+            // which then cannot be concave
+            for(a = 1; a < nPointCount; a++)
+            {
+                const basegfx::B3DPoint& rCandidate = maVector[a].getCoordinate();
+
+                if((rCandidate.getX() < pSmallest->getX())
+                    || (rCandidate.getX() == pSmallest->getX() && rCandidate.getY() < pSmallest->getY())
+                    || (rCandidate.getX() == pSmallest->getX() && rCandidate.getY() == pSmallest->getY() && rCandidate.getZ() < pSmallest->getZ()))
+                {
+                    nISmallest = a;
+                    pSmallest = &rCandidate;
+                }
+            }
+
+            // look for a next point different from minimal one
+            for(a = (nISmallest + 1) % nPointCount; a != nISmallest; a = (a + 1) % nPointCount)
+            {
+                const basegfx::B3DPoint& rCandidate = maVector[a].getCoordinate();
+
+                if(!rCandidate.equal(*pSmallest))
+                {
+                    pNext = &rCandidate;
+                    break;
+                }
+            }
+
+            // look for a previous point different from minimal one
+            for(a = (nISmallest + nPointCount - 1) % nPointCount; a != nISmallest; a = (a + nPointCount - 1) % nPointCount)
+            {
+                const basegfx::B3DPoint& rCandidate = maVector[a].getCoordinate();
+
+                if(!rCandidate.equal(*pSmallest))
+                {
+                    pPrev = &rCandidate;
+                    break;
+                }
+            }
+
+            // we always have a minimal point. If we also have a different next and previous,
+            // we can calculate the normal
+            if(pNext && pPrev)
+            {
+                const basegfx::B3DVector aPrev(*pPrev - *pSmallest);
+                const basegfx::B3DVector aNext(*pNext - *pSmallest);
+
+                aRetval = cross(aPrev, aNext);
+                aRetval.normalize();
+            }
+        }
+
+        return aRetval;
+    }
+
+    sal_uInt32 count() const
+    {
+        return maVector.size();
+    }
+
+    bool operator==(const CoordinateDataArray3D& rCandidate) const
+    {
+        return (maVector == rCandidate.maVector);
+    }
+
+    const basegfx::B3DPoint& getCoordinate(sal_uInt32 nIndex) const
+    {
+        return maVector[nIndex].getCoordinate();
+    }
+
+    void setCoordinate(sal_uInt32 nIndex, const basegfx::B3DPoint& rValue)
+    {
+        maVector[nIndex].setCoordinate(rValue);
+    }
+
+    void insert(sal_uInt32 nIndex, const CoordinateData3D& rValue, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rValue
+            CoordinateData3DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            maVector.insert(aIndex, nCount, rValue);
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const CoordinateDataArray3D& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maVector.size());
+
+        if(nCount)
+        {
+            // insert data
+            CoordinateData3DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            CoordinateData3DVector::const_iterator aStart(rSource.maVector.begin());
+            CoordinateData3DVector::const_iterator aEnd(rSource.maVector.end());
+            maVector.insert(aIndex, aStart, aEnd);
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // remove point data
+            CoordinateData3DVector::iterator aStart(maVector.begin());
+            aStart += nIndex;
+            const CoordinateData3DVector::iterator aEnd(aStart + nCount);
+            maVector.erase(aStart, aEnd);
+        }
+    }
+
+    void flip()
+    {
+        if(maVector.size() > 1)
+        {
+            const sal_uInt32 nHalfSize(maVector.size() >> 1L);
+            CoordinateData3DVector::iterator aStart(maVector.begin());
+            CoordinateData3DVector::iterator aEnd(maVector.end() - 1L);
+
+            for(sal_uInt32 a(0); a < nHalfSize; a++)
+            {
+                ::std::swap(*aStart, *aEnd);
+                aStart++;
+                aEnd--;
+            }
+        }
+    }
+
+    void transform(const ::basegfx::B3DHomMatrix& rMatrix)
+    {
+        CoordinateData3DVector::iterator aStart(maVector.begin());
+        CoordinateData3DVector::iterator aEnd(maVector.end());
+
+        for(; aStart != aEnd; aStart++)
+        {
+            aStart->transform(rMatrix);
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class BColorArray
+{
+    typedef ::std::vector< ::basegfx::BColor > BColorDataVector;
+
+    BColorDataVector                                    maVector;
+    sal_uInt32                                          mnUsedEntries;
+
+public:
+    explicit BColorArray(sal_uInt32 nCount)
+    :   maVector(nCount),
+        mnUsedEntries(0L)
+    {
+    }
+
+    explicit BColorArray(const BColorArray& rOriginal)
+    :   maVector(rOriginal.maVector),
+        mnUsedEntries(rOriginal.mnUsedEntries)
+    {
+    }
+
+    BColorArray(const BColorArray& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maVector(),
+        mnUsedEntries(0L)
+    {
+        BColorDataVector::const_iterator aStart(rOriginal.maVector.begin());
+        aStart += nIndex;
+        BColorDataVector::const_iterator aEnd(aStart);
+        aEnd += nCount;
+        maVector.reserve(nCount);
+
+        for(; aStart != aEnd; aStart++)
+        {
+            if(!aStart->equalZero())
+                mnUsedEntries++;
+
+            maVector.push_back(*aStart);
+        }
+    }
+
+    ~BColorArray()
+    {
+    }
+
+    sal_uInt32 count() const
+    {
+        return maVector.size();
+    }
+
+    bool operator==(const BColorArray& rCandidate) const
+    {
+        return (maVector == rCandidate.maVector);
+    }
+
+    bool isUsed() const
+    {
+        return (0L != mnUsedEntries);
+    }
+
+    const ::basegfx::BColor& getBColor(sal_uInt32 nIndex) const
+    {
+        return maVector[nIndex];
+    }
+
+    void setBColor(sal_uInt32 nIndex, const ::basegfx::BColor& rValue)
+    {
+        bool bWasUsed(mnUsedEntries && !maVector[nIndex].equalZero());
+        bool bIsUsed(!rValue.equalZero());
+
+        if(bWasUsed)
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex] = rValue;
+            }
+            else
+            {
+                maVector[nIndex] = ::basegfx::BColor::getEmptyBColor();
+                mnUsedEntries--;
+            }
+        }
+        else
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex] = rValue;
+                mnUsedEntries++;
+            }
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const ::basegfx::BColor& rValue, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rValue
+            BColorDataVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            maVector.insert(aIndex, nCount, rValue);
+
+            if(!rValue.equalZero())
+                mnUsedEntries += nCount;
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const BColorArray& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maVector.size());
+
+        if(nCount)
+        {
+            // insert data
+            BColorDataVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            BColorDataVector::const_iterator aStart(rSource.maVector.begin());
+            BColorDataVector::const_iterator aEnd(rSource.maVector.end());
+            maVector.insert(aIndex, aStart, aEnd);
+
+            for(; aStart != aEnd; aStart++)
+            {
+                if(!aStart->equalZero())
+                    mnUsedEntries++;
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            const BColorDataVector::iterator aDeleteStart(maVector.begin() + nIndex);
+            const BColorDataVector::iterator aDeleteEnd(aDeleteStart + nCount);
+            BColorDataVector::const_iterator aStart(aDeleteStart);
+
+            for(; mnUsedEntries && aStart != aDeleteEnd; aStart++)
+            {
+                if(!aStart->equalZero())
+                    mnUsedEntries--;
+            }
+
+            // remove point data
+            maVector.erase(aDeleteStart, aDeleteEnd);
+        }
+    }
+
+    void flip()
+    {
+        if(maVector.size() > 1)
+        {
+            const sal_uInt32 nHalfSize(maVector.size() >> 1L);
+            BColorDataVector::iterator aStart(maVector.begin());
+            BColorDataVector::iterator aEnd(maVector.end() - 1L);
+
+            for(sal_uInt32 a(0); a < nHalfSize; a++)
+            {
+                ::std::swap(*aStart, *aEnd);
+                aStart++;
+                aEnd--;
+            }
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class NormalsArray3D
+{
+    typedef ::std::vector< ::basegfx::B3DVector > NormalsData3DVector;
+
+    NormalsData3DVector                                 maVector;
+    sal_uInt32                                          mnUsedEntries;
+
+public:
+    explicit NormalsArray3D(sal_uInt32 nCount)
+    :   maVector(nCount),
+        mnUsedEntries(0L)
+    {
+    }
+
+    explicit NormalsArray3D(const NormalsArray3D& rOriginal)
+    :   maVector(rOriginal.maVector),
+        mnUsedEntries(rOriginal.mnUsedEntries)
+    {
+    }
+
+    NormalsArray3D(const NormalsArray3D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maVector(),
+        mnUsedEntries(0L)
+    {
+        NormalsData3DVector::const_iterator aStart(rOriginal.maVector.begin());
+        aStart += nIndex;
+        NormalsData3DVector::const_iterator aEnd(aStart);
+        aEnd += nCount;
+        maVector.reserve(nCount);
+
+        for(; aStart != aEnd; aStart++)
+        {
+            if(!aStart->equalZero())
+                mnUsedEntries++;
+
+            maVector.push_back(*aStart);
+        }
+    }
+
+    ~NormalsArray3D()
+    {
+    }
+
+    sal_uInt32 count() const
+    {
+        return maVector.size();
+    }
+
+    bool operator==(const NormalsArray3D& rCandidate) const
+    {
+        return (maVector == rCandidate.maVector);
+    }
+
+    bool isUsed() const
+    {
+        return (0L != mnUsedEntries);
+    }
+
+    const ::basegfx::B3DVector& getNormal(sal_uInt32 nIndex) const
+    {
+        return maVector[nIndex];
+    }
+
+    void setNormal(sal_uInt32 nIndex, const ::basegfx::B3DVector& rValue)
+    {
+        bool bWasUsed(mnUsedEntries && !maVector[nIndex].equalZero());
+        bool bIsUsed(!rValue.equalZero());
+
+        if(bWasUsed)
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex] = rValue;
+            }
+            else
+            {
+                maVector[nIndex] = ::basegfx::B3DVector::getEmptyVector();
+                mnUsedEntries--;
+            }
+        }
+        else
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex] = rValue;
+                mnUsedEntries++;
+            }
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const ::basegfx::B3DVector& rValue, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rValue
+            NormalsData3DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            maVector.insert(aIndex, nCount, rValue);
+
+            if(!rValue.equalZero())
+                mnUsedEntries += nCount;
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const NormalsArray3D& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maVector.size());
+
+        if(nCount)
+        {
+            // insert data
+            NormalsData3DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            NormalsData3DVector::const_iterator aStart(rSource.maVector.begin());
+            NormalsData3DVector::const_iterator aEnd(rSource.maVector.end());
+            maVector.insert(aIndex, aStart, aEnd);
+
+            for(; aStart != aEnd; aStart++)
+            {
+                if(!aStart->equalZero())
+                    mnUsedEntries++;
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            const NormalsData3DVector::iterator aDeleteStart(maVector.begin() + nIndex);
+            const NormalsData3DVector::iterator aDeleteEnd(aDeleteStart + nCount);
+            NormalsData3DVector::const_iterator aStart(aDeleteStart);
+
+            for(; mnUsedEntries && aStart != aDeleteEnd; aStart++)
+            {
+                if(!aStart->equalZero())
+                    mnUsedEntries--;
+            }
+
+            // remove point data
+            maVector.erase(aDeleteStart, aDeleteEnd);
+        }
+    }
+
+    void flip()
+    {
+        if(maVector.size() > 1)
+        {
+            const sal_uInt32 nHalfSize(maVector.size() >> 1L);
+            NormalsData3DVector::iterator aStart(maVector.begin());
+            NormalsData3DVector::iterator aEnd(maVector.end() - 1L);
+
+            for(sal_uInt32 a(0); a < nHalfSize; a++)
+            {
+                ::std::swap(*aStart, *aEnd);
+                aStart++;
+                aEnd--;
+            }
+        }
+    }
+
+    void transform(const basegfx::B3DHomMatrix& rMatrix)
+    {
+        NormalsData3DVector::iterator aStart(maVector.begin());
+        NormalsData3DVector::iterator aEnd(maVector.end());
+
+        for(; aStart != aEnd; aStart++)
+        {
+            (*aStart) *= rMatrix;
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class TextureCoordinate2D
+{
+    typedef ::std::vector< ::basegfx::B2DPoint > TextureData2DVector;
+
+    TextureData2DVector                                 maVector;
+    sal_uInt32                                          mnUsedEntries;
+
+public:
+    explicit TextureCoordinate2D(sal_uInt32 nCount)
+    :   maVector(nCount),
+        mnUsedEntries(0L)
+    {
+    }
+
+    explicit TextureCoordinate2D(const TextureCoordinate2D& rOriginal)
+    :   maVector(rOriginal.maVector),
+        mnUsedEntries(rOriginal.mnUsedEntries)
+    {
+    }
+
+    TextureCoordinate2D(const TextureCoordinate2D& rOriginal, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maVector(),
+        mnUsedEntries(0L)
+    {
+        TextureData2DVector::const_iterator aStart(rOriginal.maVector.begin());
+        aStart += nIndex;
+        TextureData2DVector::const_iterator aEnd(aStart);
+        aEnd += nCount;
+        maVector.reserve(nCount);
+
+        for(; aStart != aEnd; aStart++)
+        {
+            if(!aStart->equalZero())
+                mnUsedEntries++;
+
+            maVector.push_back(*aStart);
+        }
+    }
+
+    ~TextureCoordinate2D()
+    {
+    }
+
+    sal_uInt32 count() const
+    {
+        return maVector.size();
+    }
+
+    bool operator==(const TextureCoordinate2D& rCandidate) const
+    {
+        return (maVector == rCandidate.maVector);
+    }
+
+    bool isUsed() const
+    {
+        return (0L != mnUsedEntries);
+    }
+
+    const ::basegfx::B2DPoint& getTextureCoordinate(sal_uInt32 nIndex) const
+    {
+        return maVector[nIndex];
+    }
+
+    void setTextureCoordinate(sal_uInt32 nIndex, const ::basegfx::B2DPoint& rValue)
+    {
+        bool bWasUsed(mnUsedEntries && !maVector[nIndex].equalZero());
+        bool bIsUsed(!rValue.equalZero());
+
+        if(bWasUsed)
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex] = rValue;
+            }
+            else
+            {
+                maVector[nIndex] = ::basegfx::B2DPoint::getEmptyPoint();
+                mnUsedEntries--;
+            }
+        }
+        else
+        {
+            if(bIsUsed)
+            {
+                maVector[nIndex] = rValue;
+                mnUsedEntries++;
+            }
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const ::basegfx::B2DPoint& rValue, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rValue
+            TextureData2DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            maVector.insert(aIndex, nCount, rValue);
+
+            if(!rValue.equalZero())
+                mnUsedEntries += nCount;
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const TextureCoordinate2D& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maVector.size());
+
+        if(nCount)
+        {
+            // insert data
+            TextureData2DVector::iterator aIndex(maVector.begin());
+            aIndex += nIndex;
+            TextureData2DVector::const_iterator aStart(rSource.maVector.begin());
+            TextureData2DVector::const_iterator aEnd(rSource.maVector.end());
+            maVector.insert(aIndex, aStart, aEnd);
+
+            for(; aStart != aEnd; aStart++)
+            {
+                if(!aStart->equalZero())
+                    mnUsedEntries++;
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            const TextureData2DVector::iterator aDeleteStart(maVector.begin() + nIndex);
+            const TextureData2DVector::iterator aDeleteEnd(aDeleteStart + nCount);
+            TextureData2DVector::const_iterator aStart(aDeleteStart);
+
+            for(; mnUsedEntries && aStart != aDeleteEnd; aStart++)
+            {
+                if(!aStart->equalZero())
+                    mnUsedEntries--;
+            }
+
+            // remove point data
+            maVector.erase(aDeleteStart, aDeleteEnd);
+        }
+    }
+
+    void flip()
+    {
+        if(maVector.size() > 1)
+        {
+            const sal_uInt32 nHalfSize(maVector.size() >> 1L);
+            TextureData2DVector::iterator aStart(maVector.begin());
+            TextureData2DVector::iterator aEnd(maVector.end() - 1L);
+
+            for(sal_uInt32 a(0); a < nHalfSize; a++)
+            {
+                ::std::swap(*aStart, *aEnd);
+                aStart++;
+                aEnd--;
+            }
+        }
+    }
+
+    void transform(const ::basegfx::B2DHomMatrix& rMatrix)
+    {
+        TextureData2DVector::iterator aStart(maVector.begin());
+        TextureData2DVector::iterator aEnd(maVector.end());
+
+        for(; aStart != aEnd; aStart++)
+        {
+            (*aStart) *= rMatrix;
+        }
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ImplB3DPolygon
+{
+    // The point vector. This vector exists always and defines the
+    // count of members.
+    CoordinateDataArray3D                           maPoints;
+
+    // The BColor vector. This vectors are created on demand
+    // and may be zero.
+    BColorArray*                                    mpBColors;
+
+    // The Normals vector. This vectors are created on demand
+    // and may be zero.
+    NormalsArray3D*                                 mpNormals;
+
+    // The TextureCoordinates vector. This vectors are created on demand
+    // and may be zero.
+    TextureCoordinate2D*                            mpTextureCoordiantes;
+
+    // The calculated plane normal. mbPlaneNormalValid says if it's valid.
+    ::basegfx::B3DVector                            maPlaneNormal;
+
+    // bitfield
+    // flag which decides if this polygon is opened or closed
+    unsigned                                        mbIsClosed : 1;
+
+    // flag which says if maPlaneNormal is up-to-date
+    unsigned                                        mbPlaneNormalValid : 1;
+
+protected:
+    void invalidatePlaneNormal()
+    {
+        if(mbPlaneNormalValid)
+        {
+            mbPlaneNormalValid = false;
+        }
+    }
+
+public:
+    // This constructor is only used from the static identity polygon, thus
+    // the RefCount is set to 1 to never 'delete' this static incarnation.
+    ImplB3DPolygon()
+    :   maPoints(0L),
+        mpBColors(0L),
+        mpNormals(0L),
+        mpTextureCoordiantes(0L),
+        maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
+        mbIsClosed(false),
+        mbPlaneNormalValid(true)
+    {
+        // complete initialization with defaults
+    }
+
+    ImplB3DPolygon(const ImplB3DPolygon& rToBeCopied)
+    :   maPoints(rToBeCopied.maPoints),
+        mpBColors(0L),
+        mpNormals(0L),
+        mpTextureCoordiantes(0L),
+        maPlaneNormal(rToBeCopied.maPlaneNormal),
+        mbIsClosed(rToBeCopied.mbIsClosed),
+        mbPlaneNormalValid(rToBeCopied.mbPlaneNormalValid)
+    {
+        // complete initialization using copy
+        if(rToBeCopied.mpBColors && rToBeCopied.mpBColors->isUsed())
+        {
+            mpBColors = new BColorArray(*rToBeCopied.mpBColors);
+        }
+
+        if(rToBeCopied.mpNormals && rToBeCopied.mpNormals->isUsed())
+        {
+            mpNormals = new NormalsArray3D(*rToBeCopied.mpNormals);
+        }
+
+        if(rToBeCopied.mpTextureCoordiantes && rToBeCopied.mpTextureCoordiantes->isUsed())
+        {
+            mpTextureCoordiantes = new TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes);
+        }
+    }
+
+    ImplB3DPolygon(const ImplB3DPolygon& rToBeCopied, sal_uInt32 nIndex, sal_uInt32 nCount)
+    :   maPoints(rToBeCopied.maPoints, nIndex, nCount),
+        mpBColors(0L),
+        mpNormals(0L),
+        mpTextureCoordiantes(0L),
+        maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
+        mbIsClosed(rToBeCopied.mbIsClosed),
+        mbPlaneNormalValid(false)
+    {
+        // complete initialization using partly copy
+        if(rToBeCopied.mpBColors && rToBeCopied.mpBColors->isUsed())
+        {
+            mpBColors = new BColorArray(*rToBeCopied.mpBColors, nIndex, nCount);
+
+            if(!mpBColors->isUsed())
+            {
+                delete mpBColors;
+                mpBColors = 0L;
+            }
+        }
+
+        if(rToBeCopied.mpNormals && rToBeCopied.mpNormals->isUsed())
+        {
+            mpNormals = new NormalsArray3D(*rToBeCopied.mpNormals, nIndex, nCount);
+
+            if(!mpNormals->isUsed())
+            {
+                delete mpNormals;
+                mpNormals = 0L;
+            }
+        }
+
+        if(rToBeCopied.mpTextureCoordiantes && rToBeCopied.mpTextureCoordiantes->isUsed())
+        {
+            mpTextureCoordiantes = new TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes, nIndex, nCount);
+
+            if(!mpTextureCoordiantes->isUsed())
+            {
+                delete mpTextureCoordiantes;
+                mpTextureCoordiantes = 0L;
+            }
+        }
+    }
+
+    ~ImplB3DPolygon()
+    {
+        if(mpBColors)
+        {
+            delete mpBColors;
+            mpBColors = 0L;
+        }
+
+        if(mpNormals)
+        {
+            delete mpNormals;
+            mpNormals = 0L;
+        }
+
+        if(mpTextureCoordiantes)
+        {
+            delete mpTextureCoordiantes;
+            mpTextureCoordiantes = 0L;
+        }
+    }
+
+    sal_uInt32 count() const
+    {
+        return maPoints.count();
+    }
+
+    bool isClosed() const
+    {
+        return mbIsClosed;
+    }
+
+    void setClosed(bool bNew)
+    {
+        if(bNew != (bool)mbIsClosed)
+        {
+            mbIsClosed = bNew;
+        }
+    }
+
+    inline bool impBColorsAreEqual(const ImplB3DPolygon& rCandidate) const
+    {
+        bool bBColorsAreEqual(true);
+
+        if(mpBColors)
+        {
+            if(rCandidate.mpBColors)
+            {
+                bBColorsAreEqual = (*mpBColors == *rCandidate.mpBColors);
+            }
+            else
+            {
+                // candidate has no BColors, so it's assumed all unused.
+                bBColorsAreEqual = !mpBColors->isUsed();
+            }
+        }
+        else
+        {
+            if(rCandidate.mpBColors)
+            {
+                // we have no TextureCoordiantes, so it's assumed all unused.
+                bBColorsAreEqual = !rCandidate.mpBColors->isUsed();
+            }
+        }
+
+        return bBColorsAreEqual;
+    }
+
+    inline bool impNormalsAreEqual(const ImplB3DPolygon& rCandidate) const
+    {
+        bool bNormalsAreEqual(true);
+
+        if(mpNormals)
+        {
+            if(rCandidate.mpNormals)
+            {
+                bNormalsAreEqual = (*mpNormals == *rCandidate.mpNormals);
+            }
+            else
+            {
+                // candidate has no normals, so it's assumed all unused.
+                bNormalsAreEqual = !mpNormals->isUsed();
+            }
+        }
+        else
+        {
+            if(rCandidate.mpNormals)
+            {
+                // we have no normals, so it's assumed all unused.
+                bNormalsAreEqual = !rCandidate.mpNormals->isUsed();
+            }
+        }
+
+        return bNormalsAreEqual;
+    }
+
+    inline bool impTextureCoordinatesAreEqual(const ImplB3DPolygon& rCandidate) const
+    {
+        bool bTextureCoordinatesAreEqual(true);
+
+        if(mpTextureCoordiantes)
+        {
+            if(rCandidate.mpTextureCoordiantes)
+            {
+                bTextureCoordinatesAreEqual = (*mpTextureCoordiantes == *rCandidate.mpTextureCoordiantes);
+            }
+            else
+            {
+                // candidate has no TextureCoordinates, so it's assumed all unused.
+                bTextureCoordinatesAreEqual = !mpTextureCoordiantes->isUsed();
+            }
+        }
+        else
+        {
+            if(rCandidate.mpTextureCoordiantes)
+            {
+                // we have no TextureCoordiantes, so it's assumed all unused.
+                bTextureCoordinatesAreEqual = !rCandidate.mpTextureCoordiantes->isUsed();
+            }
+        }
+
+        return bTextureCoordinatesAreEqual;
+    }
+
+    bool operator==(const ImplB3DPolygon& rCandidate) const
+    {
+        if(mbIsClosed == rCandidate.mbIsClosed)
+        {
+            if(maPoints == rCandidate.maPoints)
+            {
+                if(impBColorsAreEqual(rCandidate))
+                {
+                    if(impNormalsAreEqual(rCandidate))
+                    {
+                        if(impTextureCoordinatesAreEqual(rCandidate))
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    const ::basegfx::B3DPoint& getPoint(sal_uInt32 nIndex) const
+    {
+        return maPoints.getCoordinate(nIndex);
+    }
+
+    void setPoint(sal_uInt32 nIndex, const ::basegfx::B3DPoint& rValue)
+    {
+        maPoints.setCoordinate(nIndex, rValue);
+        invalidatePlaneNormal();
+    }
+
+    void insert(sal_uInt32 nIndex, const ::basegfx::B3DPoint& rPoint, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            CoordinateData3D aCoordinate(rPoint);
+            maPoints.insert(nIndex, aCoordinate, nCount);
+            invalidatePlaneNormal();
+
+            if(mpBColors)
+            {
+                mpBColors->insert(nIndex, ::basegfx::BColor::getEmptyBColor(), nCount);
+            }
+
+            if(mpNormals)
+            {
+                mpNormals->insert(nIndex, ::basegfx::B3DVector::getEmptyVector(), nCount);
+            }
+
+            if(mpTextureCoordiantes)
+            {
+                mpTextureCoordiantes->insert(nIndex, ::basegfx::B2DPoint::getEmptyPoint(), nCount);
+            }
+        }
+    }
+
+    const ::basegfx::BColor& getBColor(sal_uInt32 nIndex) const
+    {
+        if(mpBColors)
+        {
+            return mpBColors->getBColor(nIndex);
+        }
+        else
+        {
+            return ::basegfx::BColor::getEmptyBColor();
+        }
+    }
+
+    void setBColor(sal_uInt32 nIndex, const ::basegfx::BColor& rValue)
+    {
+        if(!mpBColors)
+        {
+            if(!rValue.equalZero())
+            {
+                mpBColors = new BColorArray(maPoints.count());
+                mpBColors->setBColor(nIndex, rValue);
+            }
+        }
+        else
+        {
+            mpBColors->setBColor(nIndex, rValue);
+
+            if(!mpBColors->isUsed())
+            {
+                delete mpBColors;
+                mpBColors = 0L;
+            }
+        }
+    }
+
+    bool areBColorsUsed() const
+    {
+        return (mpBColors && mpBColors->isUsed());
+    }
+
+    void clearBColors()
+    {
+        if(mpBColors)
+        {
+            delete mpBColors;
+            mpBColors = 0L;
+        }
+    }
+
+    const ::basegfx::B3DVector& getNormal() const
+    {
+        if(!mbPlaneNormalValid)
+        {
+            const_cast< ImplB3DPolygon* >(this)->maPlaneNormal = maPoints.getNormal();
+            const_cast< ImplB3DPolygon* >(this)->mbPlaneNormalValid = true;
+        }
+
+        return maPlaneNormal;
+    }
+
+    const ::basegfx::B3DVector& getNormal(sal_uInt32 nIndex) const
+    {
+        if(mpNormals)
+        {
+            return mpNormals->getNormal(nIndex);
+        }
+        else
+        {
+            return ::basegfx::B3DVector::getEmptyVector();
+        }
+    }
+
+    void setNormal(sal_uInt32 nIndex, const ::basegfx::B3DVector& rValue)
+    {
+        if(!mpNormals)
+        {
+            if(!rValue.equalZero())
+            {
+                mpNormals = new NormalsArray3D(maPoints.count());
+                mpNormals->setNormal(nIndex, rValue);
+            }
+        }
+        else
+        {
+            mpNormals->setNormal(nIndex, rValue);
+
+            if(!mpNormals->isUsed())
+            {
+                delete mpNormals;
+                mpNormals = 0L;
+            }
+        }
+    }
+
+    void transformNormals(const ::basegfx::B3DHomMatrix& rMatrix)
+    {
+        if(mpNormals)
+        {
+            mpNormals->transform(rMatrix);
+        }
+    }
+
+    bool areNormalsUsed() const
+    {
+        return (mpNormals && mpNormals->isUsed());
+    }
+
+    void clearNormals()
+    {
+        if(mpNormals)
+        {
+            delete mpNormals;
+            mpNormals = 0L;
+        }
+    }
+
+    const ::basegfx::B2DPoint& getTextureCoordinate(sal_uInt32 nIndex) const
+    {
+        if(mpTextureCoordiantes)
+        {
+            return mpTextureCoordiantes->getTextureCoordinate(nIndex);
+        }
+        else
+        {
+            return ::basegfx::B2DPoint::getEmptyPoint();
+        }
+    }
+
+    void setTextureCoordinate(sal_uInt32 nIndex, const ::basegfx::B2DPoint& rValue)
+    {
+        if(!mpTextureCoordiantes)
+        {
+            if(!rValue.equalZero())
+            {
+                mpTextureCoordiantes = new TextureCoordinate2D(maPoints.count());
+                mpTextureCoordiantes->setTextureCoordinate(nIndex, rValue);
+            }
+        }
+        else
+        {
+            mpTextureCoordiantes->setTextureCoordinate(nIndex, rValue);
+
+            if(!mpTextureCoordiantes->isUsed())
+            {
+                delete mpTextureCoordiantes;
+                mpTextureCoordiantes = 0L;
+            }
+        }
+    }
+
+    bool areTextureCoordinatesUsed() const
+    {
+        return (mpTextureCoordiantes && mpTextureCoordiantes->isUsed());
+    }
+
+    void clearTextureCoordinates()
+    {
+        if(mpTextureCoordiantes)
+        {
+            delete mpTextureCoordiantes;
+            mpTextureCoordiantes = 0L;
+        }
+    }
+
+    void transformTextureCoordinates(const ::basegfx::B2DHomMatrix& rMatrix)
+    {
+        if(mpTextureCoordiantes)
+        {
+            mpTextureCoordiantes->transform(rMatrix);
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const ImplB3DPolygon& rSource)
+    {
+        const sal_uInt32 nCount(rSource.maPoints.count());
+
+        if(nCount)
+        {
+            maPoints.insert(nIndex, rSource.maPoints);
+            invalidatePlaneNormal();
+
+            if(rSource.mpBColors && rSource.mpBColors->isUsed())
+            {
+                if(!mpBColors)
+                {
+                    mpBColors = new BColorArray(maPoints.count());
+                }
+
+                mpBColors->insert(nIndex, *rSource.mpBColors);
+            }
+            else
+            {
+                if(mpBColors)
+                {
+                    mpBColors->insert(nIndex, ::basegfx::BColor::getEmptyBColor(), nCount);
+                }
+            }
+
+            if(rSource.mpNormals && rSource.mpNormals->isUsed())
+            {
+                if(!mpNormals)
+                {
+                    mpNormals = new NormalsArray3D(maPoints.count());
+                }
+
+                mpNormals->insert(nIndex, *rSource.mpNormals);
+            }
+            else
+            {
+                if(mpNormals)
+                {
+                    mpNormals->insert(nIndex, ::basegfx::B3DVector::getEmptyVector(), nCount);
+                }
+            }
+
+            if(rSource.mpTextureCoordiantes && rSource.mpTextureCoordiantes->isUsed())
+            {
+                if(!mpTextureCoordiantes)
+                {
+                    mpTextureCoordiantes = new TextureCoordinate2D(maPoints.count());
+                }
+
+                mpTextureCoordiantes->insert(nIndex, *rSource.mpTextureCoordiantes);
+            }
+            else
+            {
+                if(mpTextureCoordiantes)
+                {
+                    mpTextureCoordiantes->insert(nIndex, ::basegfx::B2DPoint::getEmptyPoint(), nCount);
+                }
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            maPoints.remove(nIndex, nCount);
+            invalidatePlaneNormal();
+
+            if(mpBColors)
+            {
+                mpBColors->remove(nIndex, nCount);
+
+                if(!mpBColors->isUsed())
+                {
+                    delete mpBColors;
+                    mpBColors = 0L;
+                }
+            }
+
+            if(mpNormals)
+            {
+                mpNormals->remove(nIndex, nCount);
+
+                if(!mpNormals->isUsed())
+                {
+                    delete mpNormals;
+                    mpNormals = 0L;
+                }
+            }
+
+            if(mpTextureCoordiantes)
+            {
+                mpTextureCoordiantes->remove(nIndex, nCount);
+
+                if(!mpTextureCoordiantes->isUsed())
+                {
+                    delete mpTextureCoordiantes;
+                    mpTextureCoordiantes = 0L;
+                }
+            }
+        }
+    }
+
+    void flip()
+    {
+        if(maPoints.count() > 1)
+        {
+            maPoints.flip();
+
+            if(mbPlaneNormalValid)
+            {
+                // mirror plane normal
+                maPlaneNormal = -maPlaneNormal;
+            }
+
+            if(mpBColors)
+            {
+                mpBColors->flip();
+            }
+
+            if(mpNormals)
+            {
+                mpNormals->flip();
+            }
+
+            if(mpTextureCoordiantes)
+            {
+                mpTextureCoordiantes->flip();
+            }
+        }
+    }
+
+    bool hasDoublePoints() const
+    {
+        if(mbIsClosed)
+        {
+            // check for same start and end point
+            const sal_uInt32 nIndex(maPoints.count() - 1L);
+
+            if(maPoints.getCoordinate(0L) == maPoints.getCoordinate(nIndex))
+            {
+                const bool bBColorEqual(!mpBColors || (mpBColors->getBColor(0L) == mpBColors->getBColor(nIndex)));
+
+                if(bBColorEqual)
+                {
+                    const bool bNormalsEqual(!mpNormals || (mpNormals->getNormal(0L) == mpNormals->getNormal(nIndex)));
+
+                    if(bNormalsEqual)
+                    {
+                        const bool bTextureCoordinatesEqual(!mpTextureCoordiantes || (mpTextureCoordiantes->getTextureCoordinate(0L) == mpTextureCoordiantes->getTextureCoordinate(nIndex)));
+
+                        if(bTextureCoordinatesEqual)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+
+        // test for range
+        for(sal_uInt32 a(0L); a < maPoints.count() - 1L; a++)
+        {
+            if(maPoints.getCoordinate(a) == maPoints.getCoordinate(a + 1L))
+            {
+                const bool bBColorEqual(!mpBColors || (mpBColors->getBColor(a) == mpBColors->getBColor(a + 1L)));
+
+                if(bBColorEqual)
+                {
+                    const bool bNormalsEqual(!mpNormals || (mpNormals->getNormal(a) == mpNormals->getNormal(a + 1L)));
+
+                    if(bNormalsEqual)
+                    {
+                        const bool bTextureCoordinatesEqual(!mpTextureCoordiantes || (mpTextureCoordiantes->getTextureCoordinate(a) == mpTextureCoordiantes->getTextureCoordinate(a + 1L)));
+
+                        if(bTextureCoordinatesEqual)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    void removeDoublePointsAtBeginEnd()
+    {
+        // Only remove DoublePoints at Begin and End when poly is closed
+        if(mbIsClosed)
+        {
+            bool bRemove;
+
+            do
+            {
+                bRemove = false;
+
+                if(maPoints.count() > 1L)
+                {
+                    const sal_uInt32 nIndex(maPoints.count() - 1L);
+                    bRemove = (maPoints.getCoordinate(0L) == maPoints.getCoordinate(nIndex));
+
+                    if(bRemove && mpBColors && !(mpBColors->getBColor(0L) == mpBColors->getBColor(nIndex)))
+                    {
+                        bRemove = false;
+                    }
+
+                    if(bRemove && mpNormals && !(mpNormals->getNormal(0L) == mpNormals->getNormal(nIndex)))
+                    {
+                        bRemove = false;
+                    }
+
+                    if(bRemove && mpTextureCoordiantes && !(mpTextureCoordiantes->getTextureCoordinate(0L) == mpTextureCoordiantes->getTextureCoordinate(nIndex)))
+                    {
+                        bRemove = false;
+                    }
+                }
+
+                if(bRemove)
+                {
+                    const sal_uInt32 nIndex(maPoints.count() - 1L);
+                    remove(nIndex, 1L);
+                }
+            } while(bRemove);
+        }
+    }
+
+    void removeDoublePointsWholeTrack()
+    {
+        sal_uInt32 nIndex(0L);
+
+        // test as long as there are at least two points and as long as the index
+        // is smaller or equal second last point
+        while((maPoints.count() > 1L) && (nIndex <= maPoints.count() - 2L))
+        {
+            const sal_uInt32 nNextIndex(nIndex + 1L);
+            bool bRemove(maPoints.getCoordinate(nIndex) == maPoints.getCoordinate(nNextIndex));
+
+            if(bRemove && mpBColors && !(mpBColors->getBColor(nIndex) == mpBColors->getBColor(nNextIndex)))
+            {
+                bRemove = false;
+            }
+
+            if(bRemove && mpNormals && !(mpNormals->getNormal(nIndex) == mpNormals->getNormal(nNextIndex)))
+            {
+                bRemove = false;
+            }
+
+            if(bRemove && mpTextureCoordiantes && !(mpTextureCoordiantes->getTextureCoordinate(nIndex) == mpTextureCoordiantes->getTextureCoordinate(nNextIndex)))
+            {
+                bRemove = false;
+            }
+
+            if(bRemove)
+            {
+                // if next is same as index and the control vectors are unused, delete index
+                remove(nIndex, 1L);
+            }
+            else
+            {
+                // if different, step forward
+                nIndex++;
+            }
+        }
+    }
+
+    void transform(const ::basegfx::B3DHomMatrix& rMatrix)
+    {
+        maPoints.transform(rMatrix);
+
+        // Here, it seems to be possible to transform a valid plane normal and to avoid
+        // invalidation, but it's not true. If the transformation contains shears or e.g.
+        // perspective projection, the orthogonality to the transformed plane will not
+        // be preserved. It may be possible to test that at the matrix to not invalidate in
+        // all cases or to extract a matrix which does not 'shear' the vector which is
+        // a normal in this case. As long as this is not sure, i will just invalidate.
+        invalidatePlaneNormal();
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace { struct DefaultPolygon : public rtl::Static< B3DPolygon::ImplType,
+                                                            DefaultPolygon > {}; }
+
+    B3DPolygon::B3DPolygon() :
+        mpPolygon(DefaultPolygon::get())
+    {
+    }
+
+    B3DPolygon::B3DPolygon(const B3DPolygon& rPolygon) :
+        mpPolygon(rPolygon.mpPolygon)
+    {
+    }
+
+    B3DPolygon::B3DPolygon(const B3DPolygon& rPolygon, sal_uInt32 nIndex, sal_uInt32 nCount) :
+        mpPolygon(ImplB3DPolygon(*rPolygon.mpPolygon, nIndex, nCount))
+    {
+        // TODO(P2): one extra temporary here (cow_wrapper copies
+        // given ImplB3DPolygon into its internal impl_t wrapper type)
+        OSL_ENSURE(nIndex + nCount > rPolygon.mpPolygon->count(), "B3DPolygon constructor outside range (!)");
+    }
+
+    B3DPolygon::~B3DPolygon()
+    {
+    }
+
+    B3DPolygon& B3DPolygon::operator=(const B3DPolygon& rPolygon)
+    {
+        mpPolygon = rPolygon.mpPolygon;
+        return *this;
+    }
+
+    void B3DPolygon::makeUnique()
+    {
+        mpPolygon.make_unique();
+    }
+
+    bool B3DPolygon::operator==(const B3DPolygon& rPolygon) const
+    {
+        if(mpPolygon.same_object(rPolygon.mpPolygon))
+            return true;
+
+        return (*mpPolygon == *rPolygon.mpPolygon);
+    }
+
+    bool B3DPolygon::operator!=(const B3DPolygon& rPolygon) const
+    {
+        return !(*this == rPolygon);
+    }
+
+    sal_uInt32 B3DPolygon::count() const
+    {
+        return mpPolygon->count();
+    }
+
+    basegfx::B3DPoint B3DPolygon::getB3DPoint(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        return mpPolygon->getPoint(nIndex);
+    }
+
+    void B3DPolygon::setB3DPoint(sal_uInt32 nIndex, const basegfx::B3DPoint& rValue)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        if(getB3DPoint(nIndex) != rValue)
+            mpPolygon->setPoint(nIndex, rValue);
+    }
+
+    BColor B3DPolygon::getBColor(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        return mpPolygon->getBColor(nIndex);
+    }
+
+    void B3DPolygon::setBColor(sal_uInt32 nIndex, const BColor& rValue)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        if(mpPolygon->getBColor(nIndex) != rValue)
+            mpPolygon->setBColor(nIndex, rValue);
+    }
+
+    bool B3DPolygon::areBColorsUsed() const
+    {
+        return mpPolygon->areBColorsUsed();
+    }
+
+    void B3DPolygon::clearBColors()
+    {
+        if(mpPolygon->areBColorsUsed())
+            mpPolygon->clearBColors();
+    }
+
+    B3DVector B3DPolygon::getNormal() const
+    {
+        return mpPolygon->getNormal();
+    }
+
+    B3DVector B3DPolygon::getNormal(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        return mpPolygon->getNormal(nIndex);
+    }
+
+    void B3DPolygon::setNormal(sal_uInt32 nIndex, const B3DVector& rValue)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        if(mpPolygon->getNormal(nIndex) != rValue)
+            mpPolygon->setNormal(nIndex, rValue);
+    }
+
+    void B3DPolygon::transformNormals(const B3DHomMatrix& rMatrix)
+    {
+        if(mpPolygon->areNormalsUsed() && !rMatrix.isIdentity())
+            mpPolygon->transformNormals(rMatrix);
+    }
+
+    bool B3DPolygon::areNormalsUsed() const
+    {
+        return mpPolygon->areNormalsUsed();
+    }
+
+    void B3DPolygon::clearNormals()
+    {
+        if(mpPolygon->areNormalsUsed())
+            mpPolygon->clearNormals();
+    }
+
+    B2DPoint B3DPolygon::getTextureCoordinate(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        return mpPolygon->getTextureCoordinate(nIndex);
+    }
+
+    void B3DPolygon::setTextureCoordinate(sal_uInt32 nIndex, const B2DPoint& rValue)
+    {
+        OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside range (!)");
+
+        if(mpPolygon->getTextureCoordinate(nIndex) != rValue)
+            mpPolygon->setTextureCoordinate(nIndex, rValue);
+    }
+
+    void B3DPolygon::transformTextureCoordiantes(const B2DHomMatrix& rMatrix)
+    {
+        if(mpPolygon->areTextureCoordinatesUsed() && !rMatrix.isIdentity())
+            mpPolygon->transformTextureCoordinates(rMatrix);
+    }
+
+    bool B3DPolygon::areTextureCoordinatesUsed() const
+    {
+        return mpPolygon->areTextureCoordinatesUsed();
+    }
+
+    void B3DPolygon::clearTextureCoordinates()
+    {
+        if(mpPolygon->areTextureCoordinatesUsed())
+            mpPolygon->clearTextureCoordinates();
+    }
+
+    void B3DPolygon::insert(sal_uInt32 nIndex, const ::basegfx::B3DPoint& rPoint, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex <= mpPolygon->count(), "B3DPolygon Insert outside range (!)");
+
+        if(nCount)
+            mpPolygon->insert(nIndex, rPoint, nCount);
+    }
+
+    void B3DPolygon::append(const basegfx::B3DPoint& rPoint, sal_uInt32 nCount)
+    {
+        if(nCount)
+            mpPolygon->insert(mpPolygon->count(), rPoint, nCount);
+    }
+
+    void B3DPolygon::insert(sal_uInt32 nIndex, const B3DPolygon& rPoly, sal_uInt32 nIndex2, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex <= mpPolygon->count(), "B3DPolygon Insert outside range (!)");
+
+        if(rPoly.count())
+        {
+            if(!nCount)
+            {
+                nCount = rPoly.count();
+            }
+
+            if(0L == nIndex2 && nCount == rPoly.count())
+            {
+                mpPolygon->insert(nIndex, *rPoly.mpPolygon);
+            }
+            else
+            {
+                OSL_ENSURE(nIndex2 + nCount <= rPoly.mpPolygon->count(), "B3DPolygon Insert outside range (!)");
+                ImplB3DPolygon aTempPoly(*rPoly.mpPolygon, nIndex2, nCount);
+                mpPolygon->insert(nIndex, aTempPoly);
+            }
+        }
+    }
+
+    void B3DPolygon::append(const B3DPolygon& rPoly, sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(rPoly.count())
+        {
+            if(!nCount)
+            {
+                nCount = rPoly.count();
+            }
+
+            if(0L == nIndex && nCount == rPoly.count())
+            {
+                mpPolygon->insert(mpPolygon->count(), *rPoly.mpPolygon);
+            }
+            else
+            {
+                OSL_ENSURE(nIndex + nCount <= rPoly.mpPolygon->count(), "B3DPolygon Append outside range (!)");
+                ImplB3DPolygon aTempPoly(*rPoly.mpPolygon, nIndex, nCount);
+                mpPolygon->insert(mpPolygon->count(), aTempPoly);
+            }
+        }
+    }
+
+    void B3DPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex + nCount <= mpPolygon->count(), "B3DPolygon Remove outside range (!)");
+
+        if(nCount)
+            mpPolygon->remove(nIndex, nCount);
+    }
+
+    void B3DPolygon::clear()
+    {
+        mpPolygon = DefaultPolygon::get();
+    }
+
+    bool B3DPolygon::isClosed() const
+    {
+        return mpPolygon->isClosed();
+    }
+
+    void B3DPolygon::setClosed(bool bNew)
+    {
+        if(isClosed() != bNew)
+            mpPolygon->setClosed(bNew);
+    }
+
+    void B3DPolygon::flip()
+    {
+        if(count() > 1)
+            mpPolygon->flip();
+    }
+
+    bool B3DPolygon::hasDoublePoints() const
+    {
+        return (mpPolygon->count() > 1L && mpPolygon->hasDoublePoints());
+    }
+
+    void B3DPolygon::removeDoublePoints()
+    {
+        if(hasDoublePoints())
+        {
+            mpPolygon->removeDoublePointsAtBeginEnd();
+            mpPolygon->removeDoublePointsWholeTrack();
+        }
+    }
+
+    void B3DPolygon::transform(const basegfx::B3DHomMatrix& rMatrix)
+    {
+        if(mpPolygon->count() && !rMatrix.isIdentity())
+        {
+            mpPolygon->transform(rMatrix);
+        }
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/b3dpolygonclipper.cxx b/basegfx/source/polygon/b3dpolygonclipper.cxx
new file mode 100644
index 000000000000..88ebf12dae7b
--- /dev/null
+++ b/basegfx/source/polygon/b3dpolygonclipper.cxx
@@ -0,0 +1,574 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/polygon/b3dpolygonclipper.hxx>
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b3dpolygontools.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <basegfx/polygon/b3dpolygontools.hxx>
+#include <basegfx/range/b3drange.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/color/bcolor.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace
+    {
+        inline bool impIsInside(const B3DPoint& rCandidate, double fPlaneOffset, tools::B3DOrientation ePlaneOrthogonal)
+        {
+            if(tools::B3DORIENTATION_X == ePlaneOrthogonal)
+            {
+                return fTools::moreOrEqual(rCandidate.getX(), fPlaneOffset);
+            }
+            else if(tools::B3DORIENTATION_Y == ePlaneOrthogonal)
+            {
+                return fTools::moreOrEqual(rCandidate.getY(), fPlaneOffset);
+            }
+            else
+            {
+                return fTools::moreOrEqual(rCandidate.getZ(), fPlaneOffset);
+            }
+        }
+
+        inline double impGetCut(const B3DPoint& rCurrent, const B3DPoint& rNext, double fPlaneOffset, tools::B3DOrientation ePlaneOrthogonal)
+        {
+            if(tools::B3DORIENTATION_X == ePlaneOrthogonal)
+            {
+                return ((fPlaneOffset - rCurrent.getX())/(rNext.getX() - rCurrent.getX()));
+            }
+            else if(tools::B3DORIENTATION_Y == ePlaneOrthogonal)
+            {
+                return ((fPlaneOffset - rCurrent.getY())/(rNext.getY() - rCurrent.getY()));
+            }
+            else
+            {
+                return ((fPlaneOffset - rCurrent.getZ())/(rNext.getZ() - rCurrent.getZ()));
+            }
+        }
+
+        void impAppendCopy(B3DPolygon& rDest, const B3DPolygon& rSource, sal_uInt32 nIndex)
+        {
+            rDest.append(rSource.getB3DPoint(nIndex));
+
+            if(rSource.areBColorsUsed())
+            {
+                rDest.setBColor(rDest.count() - 1L, rSource.getBColor(nIndex));
+            }
+
+            if(rSource.areNormalsUsed())
+            {
+                rDest.setNormal(rDest.count() - 1L, rSource.getNormal(nIndex));
+            }
+
+            if(rSource.areTextureCoordinatesUsed())
+            {
+                rDest.setTextureCoordinate(rDest.count() - 1L, rSource.getTextureCoordinate(nIndex));
+            }
+        }
+
+        void impAppendInterpolate(B3DPolygon& rDest, const B3DPolygon& rSource, sal_uInt32 nIndA, sal_uInt32 nIndB, double fCut)
+        {
+            const B3DPoint aCurrPoint(rSource.getB3DPoint(nIndA));
+            const B3DPoint aNextPoint(rSource.getB3DPoint(nIndB));
+            rDest.append(interpolate(aCurrPoint, aNextPoint, fCut));
+
+            if(rSource.areBColorsUsed())
+            {
+                const BColor aCurrBColor(rSource.getBColor(nIndA));
+                const BColor aNextBColor(rSource.getBColor(nIndB));
+                rDest.setBColor(rDest.count() - 1L, interpolate(aCurrBColor, aNextBColor, fCut));
+            }
+
+            if(rSource.areNormalsUsed())
+            {
+                const B3DVector aCurrVector(rSource.getNormal(nIndA));
+                const B3DVector aNextVector(rSource.getNormal(nIndB));
+                rDest.setNormal(rDest.count() - 1L, interpolate(aCurrVector, aNextVector, fCut));
+            }
+
+            if(rSource.areTextureCoordinatesUsed())
+            {
+                const B2DPoint aCurrTxCo(rSource.getTextureCoordinate(nIndA));
+                const B2DPoint aNextTxCo(rSource.getTextureCoordinate(nIndB));
+                rDest.setTextureCoordinate(rDest.count() - 1L, interpolate(aCurrTxCo, aNextTxCo, fCut));
+            }
+        }
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(rCandidate.count())
+            {
+                const B3DRange aCandidateRange(getRange(rCandidate));
+
+                if(B3DORIENTATION_X == ePlaneOrthogonal && fTools::moreOrEqual(aCandidateRange.getMinX(), fPlaneOffset))
+                {
+                    // completely above and on the clip plane.
+                    if(bClipPositive)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(B3DORIENTATION_X == ePlaneOrthogonal && fTools::lessOrEqual(aCandidateRange.getMaxX(), fPlaneOffset))
+                {
+                    // completely below and on the clip plane.
+                    if(!bClipPositive)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(B3DORIENTATION_Y == ePlaneOrthogonal && fTools::moreOrEqual(aCandidateRange.getMinY(), fPlaneOffset))
+                {
+                    // completely above and on the clip plane.
+                    if(bClipPositive)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(B3DORIENTATION_Y == ePlaneOrthogonal && fTools::lessOrEqual(aCandidateRange.getMaxY(), fPlaneOffset))
+                {
+                    // completely below and on the clip plane.
+                    if(!bClipPositive)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(B3DORIENTATION_Z == ePlaneOrthogonal && fTools::moreOrEqual(aCandidateRange.getMinZ(), fPlaneOffset))
+                {
+                    // completely above and on the clip plane.
+                    if(bClipPositive)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(B3DORIENTATION_Z == ePlaneOrthogonal && fTools::lessOrEqual(aCandidateRange.getMaxZ(), fPlaneOffset))
+                {
+                    // completely below and on the clip plane.
+                    if(!bClipPositive)
+                    {
+                        // add completely
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else
+                {
+                    // prepare loop(s)
+                    B3DPolygon aNewPolygon;
+                    B3DPoint aCurrent(rCandidate.getB3DPoint(0L));
+                    const sal_uInt32 nPointCount(rCandidate.count());
+                    const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                    bool bCurrentInside(impIsInside(aCurrent, fPlaneOffset, ePlaneOrthogonal) == bClipPositive);
+
+                    if(bCurrentInside)
+                    {
+                        impAppendCopy(aNewPolygon, rCandidate, 0L);
+                    }
+
+                    if(bStroke)
+                    {
+                        // open polygon, create clipped line snippets.
+                        for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                        {
+                            // get next point data
+                            const sal_uInt32 nNextIndex((a + 1L == nPointCount) ? 0L : a + 1L);
+                            const B3DPoint aNext(rCandidate.getB3DPoint(nNextIndex));
+                            const bool bNextInside(impIsInside(aNext, fPlaneOffset, ePlaneOrthogonal) == bClipPositive);
+
+                            if(bCurrentInside != bNextInside)
+                            {
+                                // change inside/outside
+                                if(bNextInside)
+                                {
+                                    // entering, finish existing and start new line polygon
+                                    if(aNewPolygon.count() > 1L)
+                                    {
+                                        aRetval.append(aNewPolygon);
+                                    }
+
+                                    aNewPolygon.clear();
+                                }
+
+                                // calculate and add cut point
+                                const double fCut(impGetCut(aCurrent, aNext, fPlaneOffset, ePlaneOrthogonal));
+                                impAppendInterpolate(aNewPolygon, rCandidate, a, nNextIndex, fCut);
+
+                                // pepare next step
+                                bCurrentInside = bNextInside;
+                            }
+
+                            if(bNextInside)
+                            {
+                                impAppendCopy(aNewPolygon, rCandidate, nNextIndex);
+                            }
+
+                            // pepare next step
+                            aCurrent = aNext;
+                        }
+
+                        if(aNewPolygon.count() > 1L)
+                        {
+                            aRetval.append(aNewPolygon);
+                        }
+                    }
+                    else
+                    {
+                        // closed polygon, create single clipped closed polygon
+                        for(sal_uInt32 a(0L); a < nEdgeCount; a++)
+                        {
+                            // get next point data, use offset
+                            const sal_uInt32 nNextIndex((a + 1L == nPointCount) ? 0L : a + 1L);
+                            const B3DPoint aNext(rCandidate.getB3DPoint(nNextIndex));
+                            const bool bNextInside(impIsInside(aNext, fPlaneOffset, ePlaneOrthogonal) == bClipPositive);
+
+                            if(bCurrentInside != bNextInside)
+                            {
+                                // calculate and add cut point
+                                const double fCut(impGetCut(aCurrent, aNext, fPlaneOffset, ePlaneOrthogonal));
+                                impAppendInterpolate(aNewPolygon, rCandidate, a, nNextIndex, fCut);
+
+                                // pepare next step
+                                bCurrentInside = bNextInside;
+                            }
+
+                            if(bNextInside && nNextIndex)
+                            {
+                                impAppendCopy(aNewPolygon, rCandidate, nNextIndex);
+                            }
+
+                            // pepare next step
+                            aCurrent = aNext;
+                        }
+
+                        if(aNewPolygon.count() > 2L)
+                        {
+                            aNewPolygon.setClosed(true);
+                            aRetval.append(aNewPolygon);
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon clipPolyPolygonOnOrthogonalPlane(const B3DPolyPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(clipPolygonOnOrthogonalPlane(rCandidate.getB3DPolygon(a), ePlaneOrthogonal, bClipPositive, fPlaneOffset, bStroke));
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(clipPolygonOnRange(rCandidate.getB3DPolygon(a), rRange, bInside, bStroke));
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(rRange.isEmpty())
+            {
+                // clipping against an empty range. Nothing is inside an empty range, so the polygon
+                // is outside the range. So only return if not inside is wanted
+                if(!bInside && rCandidate.count())
+                {
+                    aRetval.append(rCandidate);
+                }
+            }
+            else if(rCandidate.count())
+            {
+                const B3DRange aCandidateRange3D(getRange(rCandidate));
+                const B2DRange aCandidateRange(
+                    aCandidateRange3D.getMinX(), aCandidateRange3D.getMinY(),
+                    aCandidateRange3D.getMaxX(), aCandidateRange3D.getMaxY());
+
+                if(rRange.isInside(aCandidateRange))
+                {
+                    // candidate is completely inside given range, nothing to do. Is also true with curves.
+                    if(bInside)
+                    {
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(!rRange.overlaps(aCandidateRange))
+                {
+                    // candidate is completely outside given range, nothing to do. Is also true with curves.
+                    if(!bInside)
+                    {
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else
+                {
+                    // clip against the six planes of the range
+                    // against lower X
+                    aRetval = clipPolygonOnOrthogonalPlane(rCandidate, tools::B3DORIENTATION_X, bInside, rRange.getMinX(), bStroke);
+
+                    if(aRetval.count())
+                    {
+                        // against lower Y
+                        if(1L == aRetval.count())
+                        {
+                            aRetval = clipPolygonOnOrthogonalPlane(aRetval.getB3DPolygon(0L), tools::B3DORIENTATION_Y, bInside, rRange.getMinY(), bStroke);
+                        }
+                        else
+                        {
+                            aRetval = clipPolyPolygonOnOrthogonalPlane(aRetval, tools::B3DORIENTATION_Y, bInside, rRange.getMinY(), bStroke);
+                        }
+
+                        if(aRetval.count())
+                        {
+                            // against higher X
+                            if(1L == aRetval.count())
+                            {
+                                aRetval = clipPolygonOnOrthogonalPlane(aRetval.getB3DPolygon(0L), tools::B3DORIENTATION_X, !bInside, rRange.getMaxX(), bStroke);
+                            }
+                            else
+                            {
+                                aRetval = clipPolyPolygonOnOrthogonalPlane(aRetval, tools::B3DORIENTATION_X, !bInside, rRange.getMaxX(), bStroke);
+                            }
+
+                            if(aRetval.count())
+                            {
+                                // against higher Y
+                                if(1L == aRetval.count())
+                                {
+                                    aRetval = clipPolygonOnOrthogonalPlane(aRetval.getB3DPolygon(0L), tools::B3DORIENTATION_Y, !bInside, rRange.getMaxY(), bStroke);
+                                }
+                                else
+                                {
+                                    aRetval = clipPolyPolygonOnOrthogonalPlane(aRetval, tools::B3DORIENTATION_Y, !bInside, rRange.getMaxY(), bStroke);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(clipPolygonOnRange(rCandidate.getB3DPolygon(a), rRange, bInside, bStroke));
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(rRange.isEmpty())
+            {
+                // clipping against an empty range. Nothing is inside an empty range, so the polygon
+                // is outside the range. So only return if not inside is wanted
+                if(!bInside && rCandidate.count())
+                {
+                    aRetval.append(rCandidate);
+                }
+            }
+            else if(rCandidate.count())
+            {
+                const B3DRange aCandidateRange(getRange(rCandidate));
+
+                if(rRange.isInside(aCandidateRange))
+                {
+                    // candidate is completely inside given range, nothing to do. Is also true with curves.
+                    if(bInside)
+                    {
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else if(!rRange.overlaps(aCandidateRange))
+                {
+                    // candidate is completely outside given range, nothing to do. Is also true with curves.
+                    if(!bInside)
+                    {
+                        aRetval.append(rCandidate);
+                    }
+                }
+                else
+                {
+                    // clip against X,Y first and see if there's something left
+                    const B2DRange aCandidateRange2D(rRange.getMinX(), rRange.getMinY(), rRange.getMaxX(), rRange.getMaxY());
+                    aRetval = clipPolygonOnRange(rCandidate, aCandidateRange2D, bInside, bStroke);
+
+                    if(aRetval.count())
+                    {
+                        // against lower Z
+                        if(1L == aRetval.count())
+                        {
+                            aRetval = clipPolygonOnOrthogonalPlane(aRetval.getB3DPolygon(0L), tools::B3DORIENTATION_Z, bInside, rRange.getMinZ(), bStroke);
+                        }
+                        else
+                        {
+                            aRetval = clipPolyPolygonOnOrthogonalPlane(aRetval, tools::B3DORIENTATION_Z, bInside, rRange.getMinZ(), bStroke);
+                        }
+
+                        if(aRetval.count())
+                        {
+                            // against higher Z
+                            if(1L == aRetval.count())
+                            {
+                                aRetval = clipPolygonOnOrthogonalPlane(aRetval.getB3DPolygon(0L), tools::B3DORIENTATION_Z, !bInside, rRange.getMaxZ(), bStroke);
+                            }
+                            else
+                            {
+                                aRetval = clipPolyPolygonOnOrthogonalPlane(aRetval, tools::B3DORIENTATION_Z, !bInside, rRange.getMaxZ(), bStroke);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon clipPolygonOnPlane(const B3DPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(rPlaneNormal.equalZero())
+            {
+                // not really a plane definition, return polygon
+                aRetval.append(rCandidate);
+            }
+            else if(rCandidate.count())
+            {
+                // build transform to project planeNormal on X-Axis and pointOnPlane to null point
+                B3DHomMatrix aMatrixTransform;
+                aMatrixTransform.translate(-rPointOnPlane.getX(), -rPointOnPlane.getY(), -rPointOnPlane.getZ());
+                const double fRotInXY(atan2(rPlaneNormal.getY(), rPlaneNormal.getX()));
+                const double fRotInXZ(atan2(-rPlaneNormal.getZ(), rPlaneNormal.getXYLength()));
+                if(!fTools::equalZero(fRotInXY) || !fTools::equalZero(fRotInXZ))
+                {
+                    aMatrixTransform.rotate(0.0, fRotInXZ, fRotInXY);
+                }
+
+                // transform polygon to clip scenario
+                B3DPolygon aCandidate(rCandidate);
+                aCandidate.transform(aMatrixTransform);
+
+                // clip on YZ plane
+                aRetval = clipPolygonOnOrthogonalPlane(aCandidate, tools::B3DORIENTATION_X, bClipPositive, 0.0, bStroke);
+
+                if(aRetval.count())
+                {
+                    // if there is a result, it needs to be transformed back
+                    aMatrixTransform.invert();
+                    aRetval.transform(aMatrixTransform);
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon clipPolyPolygonOnPlane(const B3DPolyPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(rPlaneNormal.equalZero())
+            {
+                // not really a plane definition, return polygon
+                aRetval = rCandidate;
+            }
+            else if(rCandidate.count())
+            {
+                // build transform to project planeNormal on X-Axis and pointOnPlane to null point
+                B3DHomMatrix aMatrixTransform;
+                aMatrixTransform.translate(-rPointOnPlane.getX(), -rPointOnPlane.getY(), -rPointOnPlane.getZ());
+                const double fRotInXY(atan2(rPlaneNormal.getY(), rPlaneNormal.getX()));
+                const double fRotInXZ(atan2(-rPlaneNormal.getZ(), rPlaneNormal.getXYLength()));
+                if(!fTools::equalZero(fRotInXY) || !fTools::equalZero(fRotInXZ))
+                {
+                    aMatrixTransform.rotate(0.0, fRotInXZ, fRotInXY);
+                }
+
+                // transform polygon to clip scenario
+                aRetval = rCandidate;
+                aRetval.transform(aMatrixTransform);
+
+                // clip on YZ plane
+                aRetval = clipPolyPolygonOnOrthogonalPlane(aRetval, tools::B3DORIENTATION_X, bClipPositive, 0.0, bStroke);
+
+                if(aRetval.count())
+                {
+                    // if there is a result, it needs to be transformed back
+                    aMatrixTransform.invert();
+                    aRetval.transform(aMatrixTransform);
+                }
+            }
+
+            return aRetval;
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+// eof
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
new file mode 100644
index 000000000000..77bbbd379d3c
--- /dev/null
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -0,0 +1,1263 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b3dpolygontools.hxx>
+#include <basegfx/polygon/b3dpolygon.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/range/b3drange.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/tuple/b3ituple.hxx>
+#include <numeric>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        // B3DPolygon tools
+        void checkClosed(B3DPolygon& rCandidate)
+        {
+            while(rCandidate.count() > 1L
+                && rCandidate.getB3DPoint(0L).equal(rCandidate.getB3DPoint(rCandidate.count() - 1L)))
+            {
+                rCandidate.setClosed(true);
+                rCandidate.remove(rCandidate.count() - 1L);
+            }
+        }
+
+        // Get successor and predecessor indices. Returning the same index means there
+        // is none. Same for successor.
+        sal_uInt32 getIndexOfPredecessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "getIndexOfPredecessor: Access to polygon out of range (!)");
+
+            if(nIndex)
+            {
+                return nIndex - 1L;
+            }
+            else if(rCandidate.count())
+            {
+                return rCandidate.count() - 1L;
+            }
+            else
+            {
+                return nIndex;
+            }
+        }
+
+        sal_uInt32 getIndexOfSuccessor(sal_uInt32 nIndex, const B3DPolygon& rCandidate)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "getIndexOfPredecessor: Access to polygon out of range (!)");
+
+            if(nIndex + 1L < rCandidate.count())
+            {
+                return nIndex + 1L;
+            }
+            else
+            {
+                return 0L;
+            }
+        }
+
+        B3DRange getRange(const B3DPolygon& rCandidate)
+        {
+            B3DRange aRetval;
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            for(sal_uInt32 a(0L); a < nPointCount; a++)
+            {
+                const B3DPoint aTestPoint(rCandidate.getB3DPoint(a));
+                aRetval.expand(aTestPoint);
+            }
+
+            return aRetval;
+        }
+
+        B3DVector getNormal(const B3DPolygon& rCandidate)
+        {
+            return rCandidate.getNormal();
+        }
+
+        B3DVector getPositiveOrientedNormal(const B3DPolygon& rCandidate)
+        {
+            B3DVector aRetval(rCandidate.getNormal());
+
+            if(ORIENTATION_NEGATIVE == getOrientation(rCandidate))
+            {
+                aRetval = -aRetval;
+            }
+
+            return aRetval;
+        }
+
+        B2VectorOrientation getOrientation(const B3DPolygon& rCandidate)
+        {
+            B2VectorOrientation eRetval(ORIENTATION_NEUTRAL);
+
+            if(rCandidate.count() > 2L)
+            {
+                const double fSignedArea(getSignedArea(rCandidate));
+
+                if(fSignedArea > 0.0)
+                {
+                    eRetval = ORIENTATION_POSITIVE;
+                }
+                else if(fSignedArea < 0.0)
+                {
+                    eRetval = ORIENTATION_NEGATIVE;
+                }
+            }
+
+            return eRetval;
+        }
+
+        double getSignedArea(const B3DPolygon& rCandidate)
+        {
+            double fRetval(0.0);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 2)
+            {
+                const B3DVector aAbsNormal(absolute(getNormal(rCandidate)));
+                sal_uInt16 nCase(3); // default: ignore z
+
+                if(aAbsNormal.getX() > aAbsNormal.getY())
+                {
+                    if(aAbsNormal.getX() > aAbsNormal.getZ())
+                    {
+                        nCase = 1; // ignore x
+                    }
+                }
+                else if(aAbsNormal.getY() > aAbsNormal.getZ())
+                {
+                    nCase = 2; // ignore y
+                }
+
+                B3DPoint aPreviousPoint(rCandidate.getB3DPoint(nPointCount - 1L));
+
+                for(sal_uInt32 a(0L); a < nPointCount; a++)
+                {
+                    const B3DPoint aCurrentPoint(rCandidate.getB3DPoint(a));
+
+                    switch(nCase)
+                    {
+                        case 1: // ignore x
+                            fRetval += aPreviousPoint.getZ() * aCurrentPoint.getY();
+                            fRetval -= aPreviousPoint.getY() * aCurrentPoint.getZ();
+                            break;
+                        case 2: // ignore y
+                            fRetval += aPreviousPoint.getX() * aCurrentPoint.getZ();
+                            fRetval -= aPreviousPoint.getZ() * aCurrentPoint.getX();
+                            break;
+                        case 3: // ignore z
+                            fRetval += aPreviousPoint.getX() * aCurrentPoint.getY();
+                            fRetval -= aPreviousPoint.getY() * aCurrentPoint.getX();
+                            break;
+                    }
+
+                    // prepare next step
+                    aPreviousPoint = aCurrentPoint;
+                }
+
+                switch(nCase)
+                {
+                    case 1: // ignore x
+                        fRetval /= 2.0 * aAbsNormal.getX();
+                        break;
+                    case 2: // ignore y
+                        fRetval /= 2.0 * aAbsNormal.getY();
+                        break;
+                    case 3: // ignore z
+                        fRetval /= 2.0 * aAbsNormal.getZ();
+                        break;
+                }
+            }
+
+            return fRetval;
+        }
+
+        double getArea(const B3DPolygon& rCandidate)
+        {
+            double fRetval(0.0);
+
+            if(rCandidate.count() > 2)
+            {
+                fRetval = getSignedArea(rCandidate);
+                const double fZero(0.0);
+
+                if(fTools::less(fRetval, fZero))
+                {
+                    fRetval = -fRetval;
+                }
+            }
+
+            return fRetval;
+        }
+
+        double getEdgeLength(const B3DPolygon& rCandidate, sal_uInt32 nIndex)
+        {
+            OSL_ENSURE(nIndex < rCandidate.count(), "getEdgeLength: Access to polygon out of range (!)");
+            double fRetval(0.0);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nIndex < nPointCount)
+            {
+                if(rCandidate.isClosed() || ((nIndex + 1L) != nPointCount))
+                {
+                    const sal_uInt32 nNextIndex(getIndexOfSuccessor(nIndex, rCandidate));
+                    const B3DPoint aCurrentPoint(rCandidate.getB3DPoint(nIndex));
+                    const B3DPoint aNextPoint(rCandidate.getB3DPoint(nNextIndex));
+                    const B3DVector aVector(aNextPoint - aCurrentPoint);
+                    fRetval = aVector.getLength();
+                }
+            }
+
+            return fRetval;
+        }
+
+        double getLength(const B3DPolygon& rCandidate)
+        {
+            double fRetval(0.0);
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 1L)
+            {
+                const sal_uInt32 nLoopCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+
+                for(sal_uInt32 a(0L); a < nLoopCount; a++)
+                {
+                    const sal_uInt32 nNextIndex(getIndexOfSuccessor(a, rCandidate));
+                    const B3DPoint aCurrentPoint(rCandidate.getB3DPoint(a));
+                    const B3DPoint aNextPoint(rCandidate.getB3DPoint(nNextIndex));
+                    const B3DVector aVector(aNextPoint - aCurrentPoint);
+                    fRetval += aVector.getLength();
+                }
+            }
+
+            return fRetval;
+        }
+
+        B3DPoint getPositionAbsolute(const B3DPolygon& rCandidate, double fDistance, double fLength)
+        {
+            B3DPoint aRetval;
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 1L)
+            {
+                sal_uInt32 nIndex(0L);
+                bool bIndexDone(false);
+                const double fZero(0.0);
+                double fEdgeLength(fZero);
+
+                // get length if not given
+                if(fTools::equalZero(fLength))
+                {
+                    fLength = getLength(rCandidate);
+                }
+
+                // handle fDistance < 0.0
+                if(fTools::less(fDistance, fZero))
+                {
+                    if(rCandidate.isClosed())
+                    {
+                        // if fDistance < 0.0 increment with multiple of fLength
+                        sal_uInt32 nCount(sal_uInt32(-fDistance / fLength));
+                        fDistance += double(nCount + 1L) * fLength;
+                    }
+                    else
+                    {
+                        // crop to polygon start
+                        fDistance = fZero;
+                        bIndexDone = true;
+                    }
+                }
+
+                // handle fDistance >= fLength
+                if(fTools::moreOrEqual(fDistance, fLength))
+                {
+                    if(rCandidate.isClosed())
+                    {
+                        // if fDistance >= fLength decrement with multiple of fLength
+                        sal_uInt32 nCount(sal_uInt32(fDistance / fLength));
+                        fDistance -= (double)(nCount) * fLength;
+                    }
+                    else
+                    {
+                        // crop to polygon end
+                        fDistance = fZero;
+                        nIndex = nPointCount - 1L;
+                        bIndexDone = true;
+                    }
+                }
+
+                // look for correct index. fDistance is now [0.0 .. fLength[
+                if(!bIndexDone)
+                {
+                    do
+                    {
+                        // get length of next edge
+                        fEdgeLength = getEdgeLength(rCandidate, nIndex);
+
+                        if(fTools::moreOrEqual(fDistance, fEdgeLength))
+                        {
+                            // go to next edge
+                            fDistance -= fEdgeLength;
+                            nIndex++;
+                        }
+                        else
+                        {
+                            // it's on this edge, stop
+                            bIndexDone = true;
+                        }
+                    } while (!bIndexDone);
+                }
+
+                // get the point using nIndex
+                aRetval = rCandidate.getB3DPoint(nIndex);
+
+                // if fDistance != 0.0, move that length on the edge. The edge
+                // length is in fEdgeLength.
+                if(!fTools::equalZero(fDistance))
+                {
+                    sal_uInt32 nNextIndex(getIndexOfSuccessor(nIndex, rCandidate));
+                    const B3DPoint aNextPoint(rCandidate.getB3DPoint(nNextIndex));
+                    double fRelative(fZero);
+
+                    if(!fTools::equalZero(fEdgeLength))
+                    {
+                        fRelative = fDistance / fEdgeLength;
+                    }
+
+                    // add calculated average value to the return value
+                    aRetval += interpolate(aRetval, aNextPoint, fRelative);
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPoint getPositionRelative(const B3DPolygon& rCandidate, double fDistance, double fLength)
+        {
+            // get length if not given
+            if(fTools::equalZero(fLength))
+            {
+                fLength = getLength(rCandidate);
+            }
+
+            // multiply fDistance with real length to get absolute position and
+            // use getPositionAbsolute
+            return getPositionAbsolute(rCandidate, fDistance * fLength, fLength);
+        }
+
+        void applyLineDashing(const B3DPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, B3DPolyPolygon* pGapTarget, double fDotDashLength)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+            const sal_uInt32 nDotDashCount(rDotDashArray.size());
+
+            if(fTools::lessOrEqual(fDotDashLength, 0.0))
+            {
+                fDotDashLength = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
+            }
+
+            if(fTools::more(fDotDashLength, 0.0) && (pLineTarget || pGapTarget) && nPointCount)
+            {
+                // clear targets
+                if(pLineTarget)
+                {
+                    pLineTarget->clear();
+                }
+
+                if(pGapTarget)
+                {
+                    pGapTarget->clear();
+                }
+
+                // prepare current edge's start
+                B3DPoint aCurrentPoint(rCandidate.getB3DPoint(0));
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1);
+
+                // prepare DotDashArray iteration and the line/gap switching bool
+                sal_uInt32 nDotDashIndex(0);
+                bool bIsLine(true);
+                double fDotDashMovingLength(rDotDashArray[0]);
+                B3DPolygon aSnippet;
+
+                // iterate over all edges
+                for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                {
+                    // update current edge
+                    double fLastDotDashMovingLength(0.0);
+                    const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                    const B3DPoint aNextPoint(rCandidate.getB3DPoint(nNextIndex));
+                    const double fEdgeLength(B3DVector(aNextPoint - aCurrentPoint).getLength());
+
+                    while(fTools::less(fDotDashMovingLength, fEdgeLength))
+                    {
+                        // new split is inside edge, create and append snippet [fLastDotDashMovingLength, fDotDashMovingLength]
+                        const bool bHandleLine(bIsLine && pLineTarget);
+                        const bool bHandleGap(!bIsLine && pGapTarget);
+
+                        if(bHandleLine || bHandleGap)
+                        {
+                            if(!aSnippet.count())
+                            {
+                                aSnippet.append(interpolate(aCurrentPoint, aNextPoint, fLastDotDashMovingLength / fEdgeLength));
+                            }
+
+                            aSnippet.append(interpolate(aCurrentPoint, aNextPoint, fDotDashMovingLength / fEdgeLength));
+
+                            if(bHandleLine)
+                            {
+                                pLineTarget->append(aSnippet);
+                            }
+                            else
+                            {
+                                pGapTarget->append(aSnippet);
+                            }
+
+                            aSnippet.clear();
+                        }
+
+                        // prepare next DotDashArray step and flip line/gap flag
+                        fLastDotDashMovingLength = fDotDashMovingLength;
+                        fDotDashMovingLength += rDotDashArray[(++nDotDashIndex) % nDotDashCount];
+                        bIsLine = !bIsLine;
+                    }
+
+                    // append snippet [fLastDotDashMovingLength, fEdgeLength]
+                    const bool bHandleLine(bIsLine && pLineTarget);
+                    const bool bHandleGap(!bIsLine && pGapTarget);
+
+                    if(bHandleLine || bHandleGap)
+                    {
+                        if(!aSnippet.count())
+                        {
+                            aSnippet.append(interpolate(aCurrentPoint, aNextPoint, fLastDotDashMovingLength / fEdgeLength));
+                        }
+
+                        aSnippet.append(aNextPoint);
+                    }
+
+                    // prepare move to next edge
+                    fDotDashMovingLength -= fEdgeLength;
+
+                    // prepare next edge step (end point gets new start point)
+                    aCurrentPoint = aNextPoint;
+                }
+
+                // append last intermediate results (if exists)
+                if(aSnippet.count())
+                {
+                    if(bIsLine && pLineTarget)
+                    {
+                        pLineTarget->append(aSnippet);
+                    }
+                    else if(!bIsLine && pGapTarget)
+                    {
+                        pGapTarget->append(aSnippet);
+                    }
+                }
+
+                // check if start and end polygon may be merged
+                if(pLineTarget)
+                {
+                    const sal_uInt32 nCount(pLineTarget->count());
+
+                    if(nCount > 1)
+                    {
+                        // these polygons were created above, there exists none with less than two points,
+                        // thus dircet point access below is allowed
+                        const B3DPolygon aFirst(pLineTarget->getB3DPolygon(0));
+                        B3DPolygon aLast(pLineTarget->getB3DPolygon(nCount - 1));
+
+                        if(aFirst.getB3DPoint(0).equal(aLast.getB3DPoint(aLast.count() - 1)))
+                        {
+                            // start of first and end of last are the same -> merge them
+                            aLast.append(aFirst);
+                            aLast.removeDoublePoints();
+                            pLineTarget->setB3DPolygon(0, aLast);
+                            pLineTarget->remove(nCount - 1);
+                        }
+                    }
+                }
+
+                if(pGapTarget)
+                {
+                    const sal_uInt32 nCount(pGapTarget->count());
+
+                    if(nCount > 1)
+                    {
+                        // these polygons were created above, there exists none with less than two points,
+                        // thus dircet point access below is allowed
+                        const B3DPolygon aFirst(pGapTarget->getB3DPolygon(0));
+                        B3DPolygon aLast(pGapTarget->getB3DPolygon(nCount - 1));
+
+                        if(aFirst.getB3DPoint(0).equal(aLast.getB3DPoint(aLast.count() - 1)))
+                        {
+                            // start of first and end of last are the same -> merge them
+                            aLast.append(aFirst);
+                            aLast.removeDoublePoints();
+                            pGapTarget->setB3DPolygon(0, aLast);
+                            pGapTarget->remove(nCount - 1);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // parameters make no sense, just add source to targets
+                if(pLineTarget)
+                {
+                    pLineTarget->append(rCandidate);
+                }
+
+                if(pGapTarget)
+                {
+                    pGapTarget->append(rCandidate);
+                }
+            }
+        }
+
+        B3DPolygon applyDefaultNormalsSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter)
+        {
+            B3DPolygon aRetval(rCandidate);
+
+            for(sal_uInt32 a(0L); a < aRetval.count(); a++)
+            {
+                B3DVector aVector(aRetval.getB3DPoint(a) - rCenter);
+                aVector.normalize();
+                aRetval.setNormal(a, aVector);
+            }
+
+            return aRetval;
+        }
+
+        B3DPolygon invertNormals( const B3DPolygon& rCandidate)
+        {
+            B3DPolygon aRetval(rCandidate);
+
+            if(aRetval.areNormalsUsed())
+            {
+                for(sal_uInt32 a(0L); a < aRetval.count(); a++)
+                {
+                    aRetval.setNormal(a, -aRetval.getNormal(a));
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPolygon applyDefaultTextureCoordinatesParallel( const B3DPolygon& rCandidate, const B3DRange& rRange, bool bChangeX, bool bChangeY)
+        {
+            B3DPolygon aRetval(rCandidate);
+
+            if(bChangeX || bChangeY)
+            {
+                // create projection of standard texture coordinates in (X, Y) onto
+                // the 3d coordinates straight
+                const double fWidth(rRange.getWidth());
+                const double fHeight(rRange.getHeight());
+                const bool bWidthSet(!fTools::equalZero(fWidth));
+                const bool bHeightSet(!fTools::equalZero(fHeight));
+                const double fOne(1.0);
+
+                for(sal_uInt32 a(0L); a < aRetval.count(); a++)
+                {
+                    const B3DPoint aPoint(aRetval.getB3DPoint(a));
+                    B2DPoint aTextureCoordinate(aRetval.getTextureCoordinate(a));
+
+                    if(bChangeX)
+                    {
+                        if(bWidthSet)
+                        {
+                            aTextureCoordinate.setX((aPoint.getX() - rRange.getMinX()) / fWidth);
+                        }
+                        else
+                        {
+                            aTextureCoordinate.setX(0.0);
+                        }
+                    }
+
+                    if(bChangeY)
+                    {
+                        if(bHeightSet)
+                        {
+                            aTextureCoordinate.setY(fOne - ((aPoint.getY() - rRange.getMinY()) / fHeight));
+                        }
+                        else
+                        {
+                            aTextureCoordinate.setY(fOne);
+                        }
+                    }
+
+                    aRetval.setTextureCoordinate(a, aTextureCoordinate);
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPolygon applyDefaultTextureCoordinatesSphere( const B3DPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX, bool bChangeY)
+        {
+            B3DPolygon aRetval(rCandidate);
+
+            if(bChangeX || bChangeY)
+            {
+                // create texture coordinates using sphere projection to cartesian coordinates,
+                // use object's center as base
+                const double fOne(1.0);
+                const sal_uInt32 nPointCount(aRetval.count());
+                bool bPolarPoints(false);
+                sal_uInt32 a;
+
+                // create center cartesian coordinates to have a possibility to decide if on boundary
+                // transitions which value to choose
+                const B3DRange aPlaneRange(getRange(rCandidate));
+                const B3DPoint aPlaneCenter(aPlaneRange.getCenter() - rCenter);
+                const double fXCenter(fOne - ((atan2(aPlaneCenter.getZ(), aPlaneCenter.getX()) + F_PI) / F_2PI));
+
+                for(a = 0L; a < nPointCount; a++)
+                {
+                    const B3DVector aVector(aRetval.getB3DPoint(a) - rCenter);
+                    const double fY(fOne - ((atan2(aVector.getY(), aVector.getXZLength()) + F_PI2) / F_PI));
+                    B2DPoint aTexCoor(aRetval.getTextureCoordinate(a));
+
+                    if(fTools::equalZero(fY))
+                    {
+                        // point is a north polar point, no useful X-coordinate can be created.
+                        if(bChangeY)
+                        {
+                            aTexCoor.setY(0.0);
+
+                            if(bChangeX)
+                            {
+                                bPolarPoints = true;
+                            }
+                        }
+                    }
+                    else if(fTools::equal(fY, fOne))
+                    {
+                        // point is a south polar point, no useful X-coordinate can be created. Set
+                        // Y-coordinte, though
+                        if(bChangeY)
+                        {
+                            aTexCoor.setY(fOne);
+
+                            if(bChangeX)
+                            {
+                                bPolarPoints = true;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        double fX(fOne - ((atan2(aVector.getZ(), aVector.getX()) + F_PI) / F_2PI));
+
+                        // correct cartesinan point coordiante dependent from center value
+                        if(fX > fXCenter + 0.5)
+                        {
+                            fX -= fOne;
+                        }
+                        else if(fX < fXCenter - 0.5)
+                        {
+                            fX += fOne;
+                        }
+
+                        if(bChangeX)
+                        {
+                            aTexCoor.setX(fX);
+                        }
+
+                        if(bChangeY)
+                        {
+                            aTexCoor.setY(fY);
+                        }
+                    }
+
+                    aRetval.setTextureCoordinate(a, aTexCoor);
+                }
+
+                if(bPolarPoints)
+                {
+                    // correct X-texture coordinates if polar points are contained. Those
+                    // coordinates cannot be correct, so use prev or next X-coordinate
+                    for(a = 0L; a < nPointCount; a++)
+                    {
+                        B2DPoint aTexCoor(aRetval.getTextureCoordinate(a));
+
+                        if(fTools::equalZero(aTexCoor.getY()) || fTools::equal(aTexCoor.getY(), fOne))
+                        {
+                            // get prev, next TexCoor and test for pole
+                            const B2DPoint aPrevTexCoor(aRetval.getTextureCoordinate(a ? a - 1L : nPointCount - 1L));
+                            const B2DPoint aNextTexCoor(aRetval.getTextureCoordinate((a + 1L) % nPointCount));
+                            const bool bPrevPole(fTools::equalZero(aPrevTexCoor.getY()) || fTools::equal(aPrevTexCoor.getY(), fOne));
+                            const bool bNextPole(fTools::equalZero(aNextTexCoor.getY()) || fTools::equal(aNextTexCoor.getY(), fOne));
+
+                            if(!bPrevPole && !bNextPole)
+                            {
+                                // both no poles, mix them
+                                aTexCoor.setX((aPrevTexCoor.getX() + aNextTexCoor.getX()) / 2.0);
+                            }
+                            else if(!bNextPole)
+                            {
+                                // copy next
+                                aTexCoor.setX(aNextTexCoor.getX());
+                            }
+                            else
+                            {
+                                // copy prev, even if it's a pole, hopefully it is already corrected
+                                aTexCoor.setX(aPrevTexCoor.getX());
+                            }
+
+                            aRetval.setTextureCoordinate(a, aTexCoor);
+                        }
+                    }
+                }
+            }
+
+            return aRetval;
+        }
+
+        bool isInEpsilonRange(const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, const B3DPoint& rTestPosition, double fDistance)
+        {
+            // build edge vector
+            const B3DVector aEdge(rEdgeEnd - rEdgeStart);
+            bool bDoDistanceTestStart(false);
+            bool bDoDistanceTestEnd(false);
+
+            if(aEdge.equalZero())
+            {
+                // no edge, just a point. Do one of the distance tests.
+                bDoDistanceTestStart = true;
+            }
+            else
+            {
+                // calculate fCut in aEdge
+                const B3DVector aTestEdge(rTestPosition - rEdgeStart);
+                const double fScalarTestEdge(aEdge.scalar(aTestEdge));
+                const double fScalarStartEdge(aEdge.scalar(rEdgeStart));
+                const double fScalarEdge(aEdge.scalar(aEdge));
+                const double fCut((fScalarTestEdge - fScalarStartEdge) / fScalarEdge);
+                const double fZero(0.0);
+                const double fOne(1.0);
+
+                if(fTools::less(fCut, fZero))
+                {
+                    // left of rEdgeStart
+                    bDoDistanceTestStart = true;
+                }
+                else if(fTools::more(fCut, fOne))
+                {
+                    // right of rEdgeEnd
+                    bDoDistanceTestEnd = true;
+                }
+                else
+                {
+                    // inside line [0.0 .. 1.0]
+                    const B3DPoint aCutPoint(interpolate(rEdgeStart, rEdgeEnd, fCut));
+                    const B3DVector aDelta(rTestPosition - aCutPoint);
+                    const double fDistanceSquare(aDelta.scalar(aDelta));
+
+                    if(fDistanceSquare <= fDistance * fDistance * fDistance)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            if(bDoDistanceTestStart)
+            {
+                const B3DVector aDelta(rTestPosition - rEdgeStart);
+                const double fDistanceSquare(aDelta.scalar(aDelta));
+
+                if(fDistanceSquare <= fDistance * fDistance * fDistance)
+                {
+                    return true;
+                }
+            }
+            else if(bDoDistanceTestEnd)
+            {
+                const B3DVector aDelta(rTestPosition - rEdgeEnd);
+                const double fDistanceSquare(aDelta.scalar(aDelta));
+
+                if(fDistanceSquare <= fDistance * fDistance * fDistance)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool isInEpsilonRange(const B3DPolygon& rCandidate, const B3DPoint& rTestPosition, double fDistance)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount)
+            {
+                const sal_uInt32 nEdgeCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                B3DPoint aCurrent(rCandidate.getB3DPoint(0));
+
+                if(nEdgeCount)
+                {
+                    // edges
+                    for(sal_uInt32 a(0); a < nEdgeCount; a++)
+                    {
+                        const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+                        const B3DPoint aNext(rCandidate.getB3DPoint(nNextIndex));
+
+                        if(isInEpsilonRange(aCurrent, aNext, rTestPosition, fDistance))
+                        {
+                            return true;
+                        }
+
+                        // prepare next step
+                        aCurrent = aNext;
+                    }
+                }
+                else
+                {
+                    // no edges, but points -> not closed. Check single point. Just
+                    // use isInEpsilonRange with twice the same point, it handles those well
+                    if(isInEpsilonRange(aCurrent, aCurrent, rTestPosition, fDistance))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        bool isInside(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder)
+        {
+            if(bWithBorder && isPointOnPolygon(rCandidate, rPoint, true))
+            {
+                return true;
+            }
+            else
+            {
+                bool bRetval(false);
+                const B3DVector aPlaneNormal(rCandidate.getNormal());
+
+                if(!aPlaneNormal.equalZero())
+                {
+                    const sal_uInt32 nPointCount(rCandidate.count());
+
+                    if(nPointCount)
+                    {
+                        B3DPoint aCurrentPoint(rCandidate.getB3DPoint(nPointCount - 1));
+                        const double fAbsX(fabs(aPlaneNormal.getX()));
+                        const double fAbsY(fabs(aPlaneNormal.getY()));
+                        const double fAbsZ(fabs(aPlaneNormal.getZ()));
+
+                        if(fAbsX > fAbsY && fAbsX > fAbsZ)
+                        {
+                            // normal points mostly in X-Direction, use YZ-Polygon projection for check
+                            // x -> y, y -> z
+                            for(sal_uInt32 a(0); a < nPointCount; a++)
+                            {
+                                const B3DPoint aPreviousPoint(aCurrentPoint);
+                                aCurrentPoint = rCandidate.getB3DPoint(a);
+
+                                // cross-over in Z?
+                                const bool bCompZA(fTools::more(aPreviousPoint.getZ(), rPoint.getZ()));
+                                const bool bCompZB(fTools::more(aCurrentPoint.getZ(), rPoint.getZ()));
+
+                                if(bCompZA != bCompZB)
+                                {
+                                    // cross-over in Y?
+                                    const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
+                                    const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
+
+                                    if(bCompYA == bCompYB)
+                                    {
+                                        if(bCompYA)
+                                        {
+                                            bRetval = !bRetval;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        const double fCompare(
+                                            aCurrentPoint.getY() - (aCurrentPoint.getZ() - rPoint.getZ()) *
+                                            (aPreviousPoint.getY() - aCurrentPoint.getY()) /
+                                            (aPreviousPoint.getZ() - aCurrentPoint.getZ()));
+
+                                        if(fTools::more(fCompare, rPoint.getY()))
+                                        {
+                                            bRetval = !bRetval;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else if(fAbsY > fAbsX && fAbsY > fAbsZ)
+                        {
+                            // normal points mostly in Y-Direction, use XZ-Polygon projection for check
+                            // x -> x, y -> z
+                            for(sal_uInt32 a(0); a < nPointCount; a++)
+                            {
+                                const B3DPoint aPreviousPoint(aCurrentPoint);
+                                aCurrentPoint = rCandidate.getB3DPoint(a);
+
+                                // cross-over in Z?
+                                const bool bCompZA(fTools::more(aPreviousPoint.getZ(), rPoint.getZ()));
+                                const bool bCompZB(fTools::more(aCurrentPoint.getZ(), rPoint.getZ()));
+
+                                if(bCompZA != bCompZB)
+                                {
+                                    // cross-over in X?
+                                    const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
+                                    const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
+
+                                    if(bCompXA == bCompXB)
+                                    {
+                                        if(bCompXA)
+                                        {
+                                            bRetval = !bRetval;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        const double fCompare(
+                                            aCurrentPoint.getX() - (aCurrentPoint.getZ() - rPoint.getZ()) *
+                                            (aPreviousPoint.getX() - aCurrentPoint.getX()) /
+                                            (aPreviousPoint.getZ() - aCurrentPoint.getZ()));
+
+                                        if(fTools::more(fCompare, rPoint.getX()))
+                                        {
+                                            bRetval = !bRetval;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // normal points mostly in Z-Direction, use XY-Polygon projection for check
+                            // x -> x, y -> y
+                            for(sal_uInt32 a(0); a < nPointCount; a++)
+                            {
+                                const B3DPoint aPreviousPoint(aCurrentPoint);
+                                aCurrentPoint = rCandidate.getB3DPoint(a);
+
+                                // cross-over in Y?
+                                const bool bCompYA(fTools::more(aPreviousPoint.getY(), rPoint.getY()));
+                                const bool bCompYB(fTools::more(aCurrentPoint.getY(), rPoint.getY()));
+
+                                if(bCompYA != bCompYB)
+                                {
+                                    // cross-over in X?
+                                    const bool bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
+                                    const bool bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
+
+                                    if(bCompXA == bCompXB)
+                                    {
+                                        if(bCompXA)
+                                        {
+                                            bRetval = !bRetval;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        const double fCompare(
+                                            aCurrentPoint.getX() - (aCurrentPoint.getY() - rPoint.getY()) *
+                                            (aPreviousPoint.getX() - aCurrentPoint.getX()) /
+                                            (aPreviousPoint.getY() - aCurrentPoint.getY()));
+
+                                        if(fTools::more(fCompare, rPoint.getX()))
+                                        {
+                                            bRetval = !bRetval;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                return bRetval;
+            }
+        }
+
+        bool isInside(const B3DPolygon& rCandidate, const B3DPolygon& rPolygon, bool bWithBorder)
+        {
+            const sal_uInt32 nPointCount(rPolygon.count());
+
+            for(sal_uInt32 a(0L); a < nPointCount; a++)
+            {
+                const B3DPoint aTestPoint(rPolygon.getB3DPoint(a));
+
+                if(!isInside(rCandidate, aTestPoint, bWithBorder))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        bool isPointOnLine(const B3DPoint& rStart, const B3DPoint& rEnd, const B3DPoint& rCandidate, bool bWithPoints)
+        {
+            if(rCandidate.equal(rStart) || rCandidate.equal(rEnd))
+            {
+                // candidate is in epsilon around start or end -> inside
+                return bWithPoints;
+            }
+            else if(rStart.equal(rEnd))
+            {
+                // start and end are equal, but candidate is outside their epsilon -> outside
+                return false;
+            }
+            else
+            {
+                const B3DVector aEdgeVector(rEnd - rStart);
+                const B3DVector aTestVector(rCandidate - rStart);
+
+                if(areParallel(aEdgeVector, aTestVector))
+                {
+                    const double fZero(0.0);
+                    const double fOne(1.0);
+                    double fParamTestOnCurr(0.0);
+
+                    if(aEdgeVector.getX() > aEdgeVector.getY())
+                    {
+                        if(aEdgeVector.getX() > aEdgeVector.getZ())
+                        {
+                            // X is biggest
+                            fParamTestOnCurr = aTestVector.getX() / aEdgeVector.getX();
+                        }
+                        else
+                        {
+                            // Z is biggest
+                            fParamTestOnCurr = aTestVector.getZ() / aEdgeVector.getZ();
+                        }
+                    }
+                    else
+                    {
+                        if(aEdgeVector.getY() > aEdgeVector.getZ())
+                        {
+                            // Y is biggest
+                            fParamTestOnCurr = aTestVector.getY() / aEdgeVector.getY();
+                        }
+                        else
+                        {
+                            // Z is biggest
+                            fParamTestOnCurr = aTestVector.getZ() / aEdgeVector.getZ();
+                        }
+                    }
+
+                    if(fTools::more(fParamTestOnCurr, fZero) && fTools::less(fParamTestOnCurr, fOne))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        bool isPointOnPolygon(const B3DPolygon& rCandidate, const B3DPoint& rPoint, bool bWithPoints)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 1L)
+            {
+                const sal_uInt32 nLoopCount(rCandidate.isClosed() ? nPointCount : nPointCount - 1L);
+                B3DPoint aCurrentPoint(rCandidate.getB3DPoint(0));
+
+                for(sal_uInt32 a(0); a < nLoopCount; a++)
+                {
+                    const B3DPoint aNextPoint(rCandidate.getB3DPoint((a + 1) % nPointCount));
+
+                    if(isPointOnLine(aCurrentPoint, aNextPoint, rPoint, bWithPoints))
+                    {
+                        return true;
+                    }
+
+                    aCurrentPoint = aNextPoint;
+                }
+            }
+            else if(nPointCount && bWithPoints)
+            {
+                return rPoint.equal(rCandidate.getB3DPoint(0));
+            }
+
+            return false;
+        }
+
+        bool getCutBetweenLineAndPlane(const B3DVector& rPlaneNormal, const B3DPoint& rPlanePoint, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut)
+        {
+            if(!rPlaneNormal.equalZero() && !rEdgeStart.equal(rEdgeEnd))
+            {
+                const B3DVector aTestEdge(rEdgeEnd - rEdgeStart);
+                const double fScalarEdge(rPlaneNormal.scalar(aTestEdge));
+
+                if(!fTools::equalZero(fScalarEdge))
+                {
+                    const B3DVector aCompareEdge(rPlanePoint - rEdgeStart);
+                    const double fScalarCompare(rPlaneNormal.scalar(aCompareEdge));
+
+                    fCut = fScalarCompare / fScalarEdge;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool getCutBetweenLineAndPolygon(const B3DPolygon& rCandidate, const B3DPoint& rEdgeStart, const B3DPoint& rEdgeEnd, double& fCut)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 2 && !rEdgeStart.equal(rEdgeEnd))
+            {
+                const B3DVector aPlaneNormal(rCandidate.getNormal());
+
+                if(!aPlaneNormal.equalZero())
+                {
+                    const B3DPoint aPointOnPlane(rCandidate.getB3DPoint(0));
+
+                    return getCutBetweenLineAndPlane(aPlaneNormal, aPointOnPlane, rEdgeStart, rEdgeEnd, fCut);
+                }
+            }
+
+            return false;
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 3D Polygons
+
+        bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB, const double& rfSmallValue)
+        {
+            const sal_uInt32 nPointCount(rCandidateA.count());
+
+            if(nPointCount != rCandidateB.count())
+                return false;
+
+            const bool bClosed(rCandidateA.isClosed());
+
+            if(bClosed != rCandidateB.isClosed())
+                return false;
+
+            for(sal_uInt32 a(0); a < nPointCount; a++)
+            {
+                const B3DPoint aPoint(rCandidateA.getB3DPoint(a));
+
+                if(!aPoint.equal(rCandidateB.getB3DPoint(a), rfSmallValue))
+                    return false;
+            }
+
+            return true;
+        }
+
+        bool equal(const B3DPolygon& rCandidateA, const B3DPolygon& rCandidateB)
+        {
+            const double fSmallValue(fTools::getSmallValue());
+
+            return equal(rCandidateA, rCandidateB, fSmallValue);
+        }
+
+        // snap points of horizontal or vertical edges to discrete values
+        B3DPolygon snapPointsOfHorizontalOrVerticalEdges(const B3DPolygon& rCandidate)
+        {
+            const sal_uInt32 nPointCount(rCandidate.count());
+
+            if(nPointCount > 1)
+            {
+                // Start by copying the source polygon to get a writeable copy. The closed state is
+                // copied by aRetval's initialisation, too, so no need to copy it in this method
+                B3DPolygon aRetval(rCandidate);
+
+                // prepare geometry data. Get rounded from original
+                B3ITuple aPrevTuple(basegfx::fround(rCandidate.getB3DPoint(nPointCount - 1)));
+                B3DPoint aCurrPoint(rCandidate.getB3DPoint(0));
+                B3ITuple aCurrTuple(basegfx::fround(aCurrPoint));
+
+                // loop over all points. This will also snap the implicit closing edge
+                // even when not closed, but that's no problem here
+                for(sal_uInt32 a(0); a < nPointCount; a++)
+                {
+                    // get next point. Get rounded from original
+                    const bool bLastRun(a + 1 == nPointCount);
+                    const sal_uInt32 nNextIndex(bLastRun ? 0 : a + 1);
+                    const B3DPoint aNextPoint(rCandidate.getB3DPoint(nNextIndex));
+                    const B3ITuple aNextTuple(basegfx::fround(aNextPoint));
+
+                    // get the states
+                    const bool bPrevVertical(aPrevTuple.getX() == aCurrTuple.getX());
+                    const bool bNextVertical(aNextTuple.getX() == aCurrTuple.getX());
+                    const bool bPrevHorizontal(aPrevTuple.getY() == aCurrTuple.getY());
+                    const bool bNextHorizontal(aNextTuple.getY() == aCurrTuple.getY());
+                    const bool bSnapX(bPrevVertical || bNextVertical);
+                    const bool bSnapY(bPrevHorizontal || bNextHorizontal);
+
+                    if(bSnapX || bSnapY)
+                    {
+                        const B3DPoint aSnappedPoint(
+                            bSnapX ? aCurrTuple.getX() : aCurrPoint.getX(),
+                            bSnapY ? aCurrTuple.getY() : aCurrPoint.getY(),
+                            aCurrPoint.getZ());
+
+                        aRetval.setB3DPoint(a, aSnappedPoint);
+                    }
+
+                    // prepare next point
+                    if(!bLastRun)
+                    {
+                        aPrevTuple = aCurrTuple;
+                        aCurrPoint = aNextPoint;
+                        aCurrTuple = aNextTuple;
+                    }
+                }
+
+                return aRetval;
+            }
+            else
+            {
+                return rCandidate;
+            }
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+// eof
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
new file mode 100644
index 000000000000..a29680b14a59
--- /dev/null
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -0,0 +1,446 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <osl/diagnose.h>
+#include <basegfx/polygon/b3dpolypolygon.hxx>
+#include <basegfx/polygon/b3dpolygon.hxx>
+#include <rtl/instance.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <functional>
+#include <vector>
+#include <algorithm>
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ImplB3DPolyPolygon
+{
+    typedef ::std::vector< ::basegfx::B3DPolygon >  PolygonVector;
+
+    PolygonVector                                   maPolygons;
+
+public:
+    ImplB3DPolyPolygon() : maPolygons()
+    {
+    }
+
+    ImplB3DPolyPolygon(const ::basegfx::B3DPolygon& rToBeCopied) :
+        maPolygons(1,rToBeCopied)
+    {
+    }
+
+    bool operator==(const ImplB3DPolyPolygon& rPolygonList) const
+    {
+        // same polygon count?
+        if(maPolygons.size() != rPolygonList.maPolygons.size())
+            return false;
+
+        // compare polygon content
+        if(maPolygons != rPolygonList.maPolygons)
+            return false;
+
+        return true;
+    }
+
+    const ::basegfx::B3DPolygon& getB3DPolygon(sal_uInt32 nIndex) const
+    {
+        return maPolygons[nIndex];
+    }
+
+    void setB3DPolygon(sal_uInt32 nIndex, const ::basegfx::B3DPolygon& rPolygon)
+    {
+        maPolygons[nIndex] = rPolygon;
+    }
+
+    void insert(sal_uInt32 nIndex, const ::basegfx::B3DPolygon& rPolygon, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // add nCount copies of rPolygon
+            PolygonVector::iterator aIndex(maPolygons.begin());
+            aIndex += nIndex;
+            maPolygons.insert(aIndex, nCount, rPolygon);
+        }
+    }
+
+    void insert(sal_uInt32 nIndex, const ::basegfx::B3DPolyPolygon& rPolyPolygon)
+    {
+        const sal_uInt32 nCount = rPolyPolygon.count();
+
+        if(nCount)
+        {
+            // add nCount polygons from rPolyPolygon
+            maPolygons.reserve(maPolygons.size() + nCount);
+            PolygonVector::iterator aIndex(maPolygons.begin());
+            aIndex += nIndex;
+
+            for(sal_uInt32 a(0L); a < nCount; a++)
+            {
+                maPolygons.insert(aIndex, rPolyPolygon.getB3DPolygon(a));
+                aIndex++;
+            }
+        }
+    }
+
+    void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        if(nCount)
+        {
+            // remove polygon data
+            PolygonVector::iterator aStart(maPolygons.begin());
+            aStart += nIndex;
+            const PolygonVector::iterator aEnd(aStart + nCount);
+
+            maPolygons.erase(aStart, aEnd);
+        }
+    }
+
+    sal_uInt32 count() const
+    {
+        return maPolygons.size();
+    }
+
+    void setClosed(bool bNew)
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].setClosed(bNew);
+        }
+    }
+
+    void flip()
+    {
+        std::for_each( maPolygons.begin(),
+                       maPolygons.end(),
+                       std::mem_fun_ref( &::basegfx::B3DPolygon::flip ));
+    }
+
+    void removeDoublePoints()
+    {
+        std::for_each( maPolygons.begin(),
+                       maPolygons.end(),
+                       std::mem_fun_ref( &::basegfx::B3DPolygon::removeDoublePoints ));
+    }
+
+    void transform(const ::basegfx::B3DHomMatrix& rMatrix)
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].transform(rMatrix);
+        }
+    }
+
+    void clearBColors()
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].clearBColors();
+        }
+    }
+
+    void transformNormals(const ::basegfx::B3DHomMatrix& rMatrix)
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].transformNormals(rMatrix);
+        }
+    }
+
+    void clearNormals()
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].clearNormals();
+        }
+    }
+
+    void transformTextureCoordiantes(const ::basegfx::B2DHomMatrix& rMatrix)
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].transformTextureCoordiantes(rMatrix);
+        }
+    }
+
+    void clearTextureCoordinates()
+    {
+        for(sal_uInt32 a(0L); a < maPolygons.size(); a++)
+        {
+            maPolygons[a].clearTextureCoordinates();
+        }
+    }
+
+    void makeUnique()
+    {
+        std::for_each( maPolygons.begin(),
+                       maPolygons.end(),
+                       std::mem_fun_ref( &::basegfx::B3DPolygon::makeUnique ));
+    }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace { struct DefaultPolyPolygon : public rtl::Static<B3DPolyPolygon::ImplType,
+                                                               DefaultPolyPolygon> {}; }
+
+    B3DPolyPolygon::B3DPolyPolygon() :
+        mpPolyPolygon(DefaultPolyPolygon::get())
+    {
+    }
+
+    B3DPolyPolygon::B3DPolyPolygon(const B3DPolyPolygon& rPolyPolygon) :
+        mpPolyPolygon(rPolyPolygon.mpPolyPolygon)
+    {
+    }
+
+    B3DPolyPolygon::B3DPolyPolygon(const B3DPolygon& rPolygon) :
+        mpPolyPolygon( ImplB3DPolyPolygon(rPolygon) )
+    {
+    }
+
+    B3DPolyPolygon::~B3DPolyPolygon()
+    {
+    }
+
+    B3DPolyPolygon& B3DPolyPolygon::operator=(const B3DPolyPolygon& rPolyPolygon)
+    {
+        mpPolyPolygon = rPolyPolygon.mpPolyPolygon;
+        return *this;
+    }
+
+    void B3DPolyPolygon::makeUnique()
+    {
+        mpPolyPolygon.make_unique();
+        mpPolyPolygon->makeUnique();
+    }
+
+    bool B3DPolyPolygon::operator==(const B3DPolyPolygon& rPolyPolygon) const
+    {
+        if(mpPolyPolygon.same_object(rPolyPolygon.mpPolyPolygon))
+            return true;
+
+        return ((*mpPolyPolygon) == (*rPolyPolygon.mpPolyPolygon));
+    }
+
+    bool B3DPolyPolygon::operator!=(const B3DPolyPolygon& rPolyPolygon) const
+    {
+        return !(*this == rPolyPolygon);
+    }
+
+    sal_uInt32 B3DPolyPolygon::count() const
+    {
+        return mpPolyPolygon->count();
+    }
+
+    B3DPolygon B3DPolyPolygon::getB3DPolygon(sal_uInt32 nIndex) const
+    {
+        OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B3DPolyPolygon access outside range (!)");
+
+        return mpPolyPolygon->getB3DPolygon(nIndex);
+    }
+
+    void B3DPolyPolygon::setB3DPolygon(sal_uInt32 nIndex, const B3DPolygon& rPolygon)
+    {
+        OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B3DPolyPolygon access outside range (!)");
+
+        if(getB3DPolygon(nIndex) != rPolygon)
+            mpPolyPolygon->setB3DPolygon(nIndex, rPolygon);
+    }
+
+    bool B3DPolyPolygon::areBColorsUsed() const
+    {
+        for(sal_uInt32 a(0L); a < mpPolyPolygon->count(); a++)
+        {
+            if((mpPolyPolygon->getB3DPolygon(a)).areBColorsUsed())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void B3DPolyPolygon::clearBColors()
+    {
+        if(areBColorsUsed())
+            mpPolyPolygon->clearBColors();
+    }
+
+    void B3DPolyPolygon::transformNormals(const B3DHomMatrix& rMatrix)
+    {
+        if(!rMatrix.isIdentity())
+            mpPolyPolygon->transformNormals(rMatrix);
+    }
+
+    bool B3DPolyPolygon::areNormalsUsed() const
+    {
+        for(sal_uInt32 a(0L); a < mpPolyPolygon->count(); a++)
+        {
+            if((mpPolyPolygon->getB3DPolygon(a)).areNormalsUsed())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void B3DPolyPolygon::clearNormals()
+    {
+        if(areNormalsUsed())
+            mpPolyPolygon->clearNormals();
+    }
+
+    void B3DPolyPolygon::transformTextureCoordiantes(const B2DHomMatrix& rMatrix)
+    {
+        if(!rMatrix.isIdentity())
+            mpPolyPolygon->transformTextureCoordiantes(rMatrix);
+    }
+
+    bool B3DPolyPolygon::areTextureCoordinatesUsed() const
+    {
+        for(sal_uInt32 a(0L); a < mpPolyPolygon->count(); a++)
+        {
+            if((mpPolyPolygon->getB3DPolygon(a)).areTextureCoordinatesUsed())
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void B3DPolyPolygon::clearTextureCoordinates()
+    {
+        if(areTextureCoordinatesUsed())
+            mpPolyPolygon->clearTextureCoordinates();
+    }
+
+    void B3DPolyPolygon::insert(sal_uInt32 nIndex, const B3DPolygon& rPolygon, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B3DPolyPolygon Insert outside range (!)");
+
+        if(nCount)
+            mpPolyPolygon->insert(nIndex, rPolygon, nCount);
+    }
+
+    void B3DPolyPolygon::append(const B3DPolygon& rPolygon, sal_uInt32 nCount)
+    {
+        if(nCount)
+            mpPolyPolygon->insert(mpPolyPolygon->count(), rPolygon, nCount);
+    }
+
+    void B3DPolyPolygon::insert(sal_uInt32 nIndex, const B3DPolyPolygon& rPolyPolygon)
+    {
+        OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B3DPolyPolygon Insert outside range (!)");
+
+        if(rPolyPolygon.count())
+            mpPolyPolygon->insert(nIndex, rPolyPolygon);
+    }
+
+    void B3DPolyPolygon::append(const B3DPolyPolygon& rPolyPolygon)
+    {
+        if(rPolyPolygon.count())
+            mpPolyPolygon->insert(mpPolyPolygon->count(), rPolyPolygon);
+    }
+
+    void B3DPolyPolygon::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        OSL_ENSURE(nIndex + nCount <= mpPolyPolygon->count(), "B3DPolyPolygon Remove outside range (!)");
+
+        if(nCount)
+            mpPolyPolygon->remove(nIndex, nCount);
+    }
+
+    void B3DPolyPolygon::clear()
+    {
+        mpPolyPolygon = DefaultPolyPolygon::get();
+    }
+
+    bool B3DPolyPolygon::isClosed() const
+    {
+        bool bRetval(true);
+
+        // PolyPOlygon is closed when all contained Polygons are closed or
+        // no Polygon exists.
+        for(sal_uInt32 a(0L); bRetval && a < mpPolyPolygon->count(); a++)
+        {
+            if(!(mpPolyPolygon->getB3DPolygon(a)).isClosed())
+            {
+                bRetval = false;
+            }
+        }
+
+        return bRetval;
+    }
+
+    void B3DPolyPolygon::setClosed(bool bNew)
+    {
+        if(bNew != isClosed())
+            mpPolyPolygon->setClosed(bNew);
+    }
+
+    void B3DPolyPolygon::flip()
+    {
+        mpPolyPolygon->flip();
+    }
+
+    bool B3DPolyPolygon::hasDoublePoints() const
+    {
+        bool bRetval(false);
+
+        for(sal_uInt32 a(0L); !bRetval && a < mpPolyPolygon->count(); a++)
+        {
+            if((mpPolyPolygon->getB3DPolygon(a)).hasDoublePoints())
+            {
+                bRetval = true;
+            }
+        }
+
+        return bRetval;
+    }
+
+    void B3DPolyPolygon::removeDoublePoints()
+    {
+        if(hasDoublePoints())
+            mpPolyPolygon->removeDoublePoints();
+    }
+
+    void B3DPolyPolygon::transform(const B3DHomMatrix& rMatrix)
+    {
+        if(mpPolyPolygon->count() && !rMatrix.isIdentity())
+        {
+            mpPolyPolygon->transform(rMatrix);
+        }
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
new file mode 100644
index 000000000000..d86a4526acfd
--- /dev/null
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -0,0 +1,556 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b3dpolypolygontools.hxx>
+#include <basegfx/range/b3drange.hxx>
+#include <basegfx/polygon/b3dpolypolygon.hxx>
+#include <basegfx/polygon/b3dpolygon.hxx>
+#include <basegfx/polygon/b3dpolygontools.hxx>
+#include <numeric>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <osl/mutex.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    namespace tools
+    {
+        // B3DPolyPolygon tools
+        B3DRange getRange(const B3DPolyPolygon& rCandidate)
+        {
+            B3DRange aRetval;
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+
+            for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+            {
+                B3DPolygon aCandidate = rCandidate.getB3DPolygon(a);
+                aRetval.expand(getRange(aCandidate));
+            }
+
+            return aRetval;
+        }
+
+        void applyLineDashing(const B3DPolyPolygon& rCandidate, const ::std::vector<double>& rDotDashArray, B3DPolyPolygon* pLineTarget, B3DPolyPolygon* pGapTarget, double fFullDashDotLen)
+        {
+            if(0.0 == fFullDashDotLen && rDotDashArray.size())
+            {
+                // calculate fFullDashDotLen from rDotDashArray
+                fFullDashDotLen = ::std::accumulate(rDotDashArray.begin(), rDotDashArray.end(), 0.0);
+            }
+
+            if(rCandidate.count() && fFullDashDotLen > 0.0)
+            {
+                B3DPolyPolygon aLineTarget, aGapTarget;
+
+                for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+                {
+                    const B3DPolygon aCandidate(rCandidate.getB3DPolygon(a));
+
+                    applyLineDashing(
+                        aCandidate,
+                        rDotDashArray,
+                        pLineTarget ? &aLineTarget : 0,
+                        pGapTarget ? &aGapTarget : 0,
+                        fFullDashDotLen);
+
+                    if(pLineTarget)
+                    {
+                        pLineTarget->append(aLineTarget);
+                    }
+
+                    if(pGapTarget)
+                    {
+                        pGapTarget->append(aGapTarget);
+                    }
+                }
+            }
+        }
+
+        B3DPolyPolygon createUnitCubePolyPolygon()
+        {
+            static B3DPolyPolygon aRetval;
+            ::osl::Mutex m_mutex;
+
+            if(!aRetval.count())
+            {
+                B3DPolygon aTemp;
+                aTemp.append(B3DPoint(0.0, 0.0, 1.0));
+                aTemp.append(B3DPoint(0.0, 1.0, 1.0));
+                aTemp.append(B3DPoint(1.0, 1.0, 1.0));
+                aTemp.append(B3DPoint(1.0, 0.0, 1.0));
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+
+                aTemp.clear();
+                aTemp.append(B3DPoint(0.0, 0.0, 0.0));
+                aTemp.append(B3DPoint(0.0, 1.0, 0.0));
+                aTemp.append(B3DPoint(1.0, 1.0, 0.0));
+                aTemp.append(B3DPoint(1.0, 0.0, 0.0));
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+
+                aTemp.clear();
+                aTemp.append(B3DPoint(0.0, 0.0, 0.0));
+                aTemp.append(B3DPoint(0.0, 0.0, 1.0));
+                aRetval.append(aTemp);
+
+                aTemp.clear();
+                aTemp.append(B3DPoint(0.0, 1.0, 0.0));
+                aTemp.append(B3DPoint(0.0, 1.0, 1.0));
+                aRetval.append(aTemp);
+
+                aTemp.clear();
+                aTemp.append(B3DPoint(1.0, 1.0, 0.0));
+                aTemp.append(B3DPoint(1.0, 1.0, 1.0));
+                aRetval.append(aTemp);
+
+                aTemp.clear();
+                aTemp.append(B3DPoint(1.0, 0.0, 0.0));
+                aTemp.append(B3DPoint(1.0, 0.0, 1.0));
+                aRetval.append(aTemp);
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon createUnitCubeFillPolyPolygon()
+        {
+            static B3DPolyPolygon aRetval;
+            ::osl::Mutex m_mutex;
+
+            if(!aRetval.count())
+            {
+                B3DPolygon aTemp;
+
+                // all points
+                const B3DPoint A(0.0, 0.0, 0.0);
+                const B3DPoint B(0.0, 1.0, 0.0);
+                const B3DPoint C(1.0, 1.0, 0.0);
+                const B3DPoint D(1.0, 0.0, 0.0);
+                const B3DPoint E(0.0, 0.0, 1.0);
+                const B3DPoint F(0.0, 1.0, 1.0);
+                const B3DPoint G(1.0, 1.0, 1.0);
+                const B3DPoint H(1.0, 0.0, 1.0);
+
+                // create bottom
+                aTemp.append(D);
+                aTemp.append(A);
+                aTemp.append(E);
+                aTemp.append(H);
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+
+                // create front
+                aTemp.clear();
+                aTemp.append(B);
+                aTemp.append(A);
+                aTemp.append(D);
+                aTemp.append(C);
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+
+                // create left
+                aTemp.clear();
+                aTemp.append(E);
+                aTemp.append(A);
+                aTemp.append(B);
+                aTemp.append(F);
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+
+                // create top
+                aTemp.clear();
+                aTemp.append(C);
+                aTemp.append(G);
+                aTemp.append(F);
+                aTemp.append(B);
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+
+                // create right
+                aTemp.clear();
+                aTemp.append(H);
+                aTemp.append(G);
+                aTemp.append(C);
+                aTemp.append(D);
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+
+                // create back
+                aTemp.clear();
+                aTemp.append(F);
+                aTemp.append(G);
+                aTemp.append(H);
+                aTemp.append(E);
+                aTemp.setClosed(true);
+                aRetval.append(aTemp);
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon createCubePolyPolygonFromB3DRange( const B3DRange& rRange)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(!rRange.isEmpty())
+            {
+                aRetval = createUnitCubePolyPolygon();
+                B3DHomMatrix aTrans;
+                aTrans.scale(rRange.getWidth(), rRange.getHeight(), rRange.getDepth());
+                aTrans.translate(rRange.getMinX(), rRange.getMinY(), rRange.getMinZ());
+                aRetval.transform(aTrans);
+                aRetval.removeDoublePoints();
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon createCubeFillPolyPolygonFromB3DRange( const B3DRange& rRange)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(!rRange.isEmpty())
+            {
+                aRetval = createUnitCubeFillPolyPolygon();
+                B3DHomMatrix aTrans;
+                aTrans.scale(rRange.getWidth(), rRange.getHeight(), rRange.getDepth());
+                aTrans.translate(rRange.getMinX(), rRange.getMinY(), rRange.getMinZ());
+                aRetval.transform(aTrans);
+                aRetval.removeDoublePoints();
+            }
+
+            return aRetval;
+        }
+
+        // helper for getting the 3D Point from given cartesian coordiantes. fVer is defined from
+        // [F_PI2 .. -F_PI2], fHor from [0.0 .. F_2PI]
+        inline B3DPoint getPointFromCartesian(double fVer, double fHor)
+        {
+            const double fCosHor(cos(fHor));
+            return B3DPoint(fCosHor * cos(fVer), sin(fHor), fCosHor * -sin(fVer));
+        }
+
+        B3DPolyPolygon createUnitSpherePolyPolygon(
+            sal_uInt32 nHorSeg, sal_uInt32 nVerSeg,
+            double fVerStart, double fVerStop,
+            double fHorStart, double fHorStop)
+        {
+            B3DPolyPolygon aRetval;
+            sal_uInt32 a, b;
+
+            if(!nHorSeg)
+            {
+                nHorSeg = fround(fabs(fHorStop - fHorStart) / (F_2PI / 24.0));
+            }
+
+            if(!nHorSeg)
+            {
+                nHorSeg = 1L;
+            }
+
+            if(!nVerSeg)
+            {
+                nVerSeg = fround(fabs(fVerStop - fVerStart) / (F_2PI / 24.0));
+            }
+
+            if(!nVerSeg)
+            {
+                nVerSeg = 1L;
+            }
+
+            // create constants
+            const double fVerDiffPerStep((fVerStop - fVerStart) / (double)nVerSeg);
+            const double fHorDiffPerStep((fHorStop - fHorStart) / (double)nHorSeg);
+            bool bHorClosed(fTools::equal(fHorStop - fHorStart, F_2PI));
+            bool bVerFromTop(fTools::equal(fVerStart, F_PI2));
+            bool bVerToBottom(fTools::equal(fVerStop, -F_PI2));
+
+            // create horizontal rings
+            const sal_uInt32 nLoopVerInit(bVerFromTop ? 1L : 0L);
+            const sal_uInt32 nLoopVerLimit(bVerToBottom ? nVerSeg : nVerSeg + 1L);
+            const sal_uInt32 nLoopHorLimit(bHorClosed ? nHorSeg : nHorSeg + 1L);
+
+            for(a = nLoopVerInit; a < nLoopVerLimit; a++)
+            {
+                const double fVer(fVerStart + ((double)(a) * fVerDiffPerStep));
+                B3DPolygon aNew;
+
+                for(b = 0L; b < nLoopHorLimit; b++)
+                {
+                    const double fHor(fHorStart + ((double)(b) * fHorDiffPerStep));
+                    aNew.append(getPointFromCartesian(fHor, fVer));
+                }
+
+                aNew.setClosed(bHorClosed);
+                aRetval.append(aNew);
+            }
+
+            // create vertical half-rings
+            for(a = 0L; a < nLoopHorLimit; a++)
+            {
+                const double fHor(fHorStart + ((double)(a) * fHorDiffPerStep));
+                B3DPolygon aNew;
+
+                if(bVerFromTop)
+                {
+                    aNew.append(B3DPoint(0.0, 1.0, 0.0));
+                }
+
+                for(b = nLoopVerInit; b < nLoopVerLimit; b++)
+                {
+                    const double fVer(fVerStart + ((double)(b) * fVerDiffPerStep));
+                    aNew.append(getPointFromCartesian(fHor, fVer));
+                }
+
+                if(bVerToBottom)
+                {
+                    aNew.append(B3DPoint(0.0, -1.0, 0.0));
+                }
+
+                aRetval.append(aNew);
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon createSpherePolyPolygonFromB3DRange( const B3DRange& rRange,
+            sal_uInt32 nHorSeg, sal_uInt32 nVerSeg,
+            double fVerStart, double fVerStop,
+            double fHorStart, double fHorStop)
+        {
+            B3DPolyPolygon aRetval(createUnitSpherePolyPolygon(nHorSeg, nVerSeg, fVerStart, fVerStop, fHorStart, fHorStop));
+
+            if(aRetval.count())
+            {
+                // move and scale whole construct which is now in [-1.0 .. 1.0] in all directions
+                B3DHomMatrix aTrans;
+                aTrans.translate(1.0, 1.0, 1.0);
+                aTrans.scale(rRange.getWidth() / 2.0, rRange.getHeight() / 2.0, rRange.getDepth() / 2.0);
+                aTrans.translate(rRange.getMinX(), rRange.getMinY(), rRange.getMinZ());
+                aRetval.transform(aTrans);
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon createUnitSphereFillPolyPolygon(
+            sal_uInt32 nHorSeg, sal_uInt32 nVerSeg,
+            bool bNormals,
+            double fVerStart, double fVerStop,
+            double fHorStart, double fHorStop)
+        {
+            B3DPolyPolygon aRetval;
+
+            if(!nHorSeg)
+            {
+                nHorSeg = fround(fabs(fHorStop - fHorStart) / (F_2PI / 24.0));
+            }
+
+            if(!nHorSeg)
+            {
+                nHorSeg = 1L;
+            }
+
+            if(!nVerSeg)
+            {
+                nVerSeg = fround(fabs(fVerStop - fVerStart) / (F_2PI / 24.0));
+            }
+
+            if(!nVerSeg)
+            {
+                nVerSeg = 1L;
+            }
+
+            // vertical loop
+            for(sal_uInt32 a(0L); a < nVerSeg; a++)
+            {
+                const double fVer(fVerStart + (((fVerStop - fVerStart) * a) / nVerSeg));
+                const double fVer2(fVerStart + (((fVerStop - fVerStart) * (a + 1)) / nVerSeg));
+
+                // horizontal loop
+                for(sal_uInt32 b(0L); b < nHorSeg; b++)
+                {
+                    const double fHor(fHorStart + (((fHorStop - fHorStart) * b) / nHorSeg));
+                    const double fHor2(fHorStart + (((fHorStop - fHorStart) * (b + 1)) / nHorSeg));
+                    B3DPolygon aNew;
+
+                    aNew.append(getPointFromCartesian(fHor, fVer));
+                    aNew.append(getPointFromCartesian(fHor2, fVer));
+                    aNew.append(getPointFromCartesian(fHor2, fVer2));
+                    aNew.append(getPointFromCartesian(fHor, fVer2));
+
+                    if(bNormals)
+                    {
+                        for(sal_uInt32 c(0L); c < aNew.count(); c++)
+                        {
+                            aNew.setNormal(c, ::basegfx::B3DVector(aNew.getB3DPoint(c)));
+                        }
+                    }
+
+                    aNew.setClosed(true);
+                    aRetval.append(aNew);
+                }
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon createSphereFillPolyPolygonFromB3DRange( const B3DRange& rRange,
+            sal_uInt32 nHorSeg, sal_uInt32 nVerSeg,
+            bool bNormals,
+            double fVerStart, double fVerStop,
+            double fHorStart, double fHorStop)
+        {
+            B3DPolyPolygon aRetval(createUnitSphereFillPolyPolygon(nHorSeg, nVerSeg, bNormals, fVerStart, fVerStop, fHorStart, fHorStop));
+
+            if(aRetval.count())
+            {
+                // move and scale whole construct which is now in [-1.0 .. 1.0] in all directions
+                B3DHomMatrix aTrans;
+                aTrans.translate(1.0, 1.0, 1.0);
+                aTrans.scale(rRange.getWidth() / 2.0, rRange.getHeight() / 2.0, rRange.getDepth() / 2.0);
+                aTrans.translate(rRange.getMinX(), rRange.getMinY(), rRange.getMinZ());
+                aRetval.transform(aTrans);
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon applyDefaultNormalsSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter)
+        {
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(applyDefaultNormalsSphere(rCandidate.getB3DPolygon(a), rCenter));
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon invertNormals( const B3DPolyPolygon& rCandidate)
+        {
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(invertNormals(rCandidate.getB3DPolygon(a)));
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon applyDefaultTextureCoordinatesParallel( const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bChangeX, bool bChangeY)
+        {
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(applyDefaultTextureCoordinatesParallel(rCandidate.getB3DPolygon(a), rRange, bChangeX, bChangeY));
+            }
+
+            return aRetval;
+        }
+
+        B3DPolyPolygon applyDefaultTextureCoordinatesSphere( const B3DPolyPolygon& rCandidate, const B3DPoint& rCenter, bool bChangeX, bool bChangeY)
+        {
+            B3DPolyPolygon aRetval;
+
+            for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+            {
+                aRetval.append(applyDefaultTextureCoordinatesSphere(rCandidate.getB3DPolygon(a), rCenter, bChangeX, bChangeY));
+            }
+
+            return aRetval;
+        }
+
+        bool isInside(const B3DPolyPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder)
+        {
+            const sal_uInt32 nPolygonCount(rCandidate.count());
+
+            if(1L == nPolygonCount)
+            {
+                return isInside(rCandidate.getB3DPolygon(0), rPoint, bWithBorder);
+            }
+            else
+            {
+                sal_Int32 nInsideCount(0);
+
+                for(sal_uInt32 a(0); a < nPolygonCount; a++)
+                {
+                    const B3DPolygon aPolygon(rCandidate.getB3DPolygon(a));
+                    const bool bInside(isInside(aPolygon, rPoint, bWithBorder));
+
+                    if(bInside)
+                    {
+                        nInsideCount++;
+                    }
+                }
+
+                return (nInsideCount % 2L);
+            }
+        }
+
+        //////////////////////////////////////////////////////////////////////
+        // comparators with tolerance for 3D PolyPolygons
+
+        bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB, const double& rfSmallValue)
+        {
+            const sal_uInt32 nPolygonCount(rCandidateA.count());
+
+            if(nPolygonCount != rCandidateB.count())
+                return false;
+
+            for(sal_uInt32 a(0); a < nPolygonCount; a++)
+            {
+                const B3DPolygon aCandidate(rCandidateA.getB3DPolygon(a));
+
+                if(!equal(aCandidate, rCandidateB.getB3DPolygon(a), rfSmallValue))
+                    return false;
+            }
+
+            return true;
+        }
+
+        bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB)
+        {
+            const double fSmallValue(fTools::getSmallValue());
+
+            return equal(rCandidateA, rCandidateB, fSmallValue);
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+// eof
diff --git a/basegfx/source/polygon/makefile.mk b/basegfx/source/polygon/makefile.mk
new file mode 100644
index 000000000000..7ac71ada5e8e
--- /dev/null
+++ b/basegfx/source/polygon/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=polygon
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+ENABLE_EXCEPTIONS=TRUE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+        $(SLO)$/b2dpolygon.obj						\
+        $(SLO)$/b2dpolygontools.obj					\
+        $(SLO)$/b2dpolypolygon.obj					\
+        $(SLO)$/b2dpolypolygontools.obj				\
+        $(SLO)$/b2dsvgpolypolygon.obj				\
+        $(SLO)$/b2dlinegeometry.obj					\
+        $(SLO)$/b2dpolypolygoncutter.obj			\
+        $(SLO)$/b2dpolypolygonrasterconverter.obj	\
+        $(SLO)$/b2dpolygonclipper.obj				\
+        $(SLO)$/b2dpolygontriangulator.obj			\
+        $(SLO)$/b2dpolygoncutandtouch.obj			\
+        $(SLO)$/b2dtrapezoid.obj					\
+        $(SLO)$/b3dpolygon.obj						\
+        $(SLO)$/b3dpolygontools.obj					\
+        $(SLO)$/b3dpolypolygon.obj					\
+        $(SLO)$/b3dpolypolygontools.obj				\
+        $(SLO)$/b3dpolygonclipper.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/range/b1drange.cxx b/basegfx/source/range/b1drange.cxx
new file mode 100644
index 000000000000..6581b04680e2
--- /dev/null
+++ b/basegfx/source/range/b1drange.cxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/range/b1drange.hxx>
+#include <basegfx/range/b1irange.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    B1DRange::B1DRange( const B1IRange& rRange ) :
+        maRange()
+    {
+        if( !rRange.isEmpty() )
+        {
+            maRange = rRange.getMinimum();
+            expand(rRange.getMaximum());
+        }
+    }
+
+    B1IRange fround(const B1DRange& rRange)
+    {
+        return rRange.isEmpty() ?
+            B1IRange() :
+            B1IRange( fround( rRange.getMinimum()),
+                      fround( rRange.getMaximum()) );
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/range/b2dpolyrange.cxx b/basegfx/source/range/b2dpolyrange.cxx
new file mode 100644
index 000000000000..e212e083ef55
--- /dev/null
+++ b/basegfx/source/range/b2dpolyrange.cxx
@@ -0,0 +1,423 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dmultirange.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/range/b2dpolyrange.hxx>
+
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2drangeclipper.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+
+#include <boost/bind.hpp>
+#include <boost/tuple/tuple.hpp>
+#include <algorithm>
+#include <vector>
+
+static basegfx::B2VectorOrientation flipOrientation(
+    basegfx::B2VectorOrientation eOrient)
+{
+    return eOrient == basegfx::ORIENTATION_POSITIVE ?
+        basegfx::ORIENTATION_NEGATIVE : basegfx::ORIENTATION_POSITIVE;
+}
+
+namespace basegfx
+{
+    class ImplB2DPolyRange
+    {
+        void updateBounds()
+        {
+            maBounds.reset();
+            std::for_each(maRanges.begin(),
+                          maRanges.end(),
+                          boost::bind(
+                              (void (B2DRange::*)(const B2DRange&))(
+                 &B2DRange::expand),
+                              boost::ref(maBounds),
+                              _1));
+        }
+
+    public:
+        ImplB2DPolyRange() :
+            maBounds(),
+            maRanges(),
+            maOrient()
+        {}
+
+        explicit ImplB2DPolyRange( const B2DPolyRange::ElementType& rElem ) :
+            maBounds( boost::get<0>(rElem) ),
+            maRanges( 1, boost::get<0>(rElem) ),
+            maOrient( 1, boost::get<1>(rElem) )
+        {}
+
+        explicit ImplB2DPolyRange( const B2DRange& rRange, B2VectorOrientation eOrient ) :
+            maBounds( rRange ),
+            maRanges( 1, rRange ),
+            maOrient( 1, eOrient )
+        {}
+
+        bool operator==(const ImplB2DPolyRange& rRHS) const
+        {
+            return maRanges == rRHS.maRanges && maOrient == rRHS.maOrient;
+        }
+
+        sal_uInt32 count() const
+        {
+            return maRanges.size();
+        }
+
+        B2DPolyRange::ElementType getElement(sal_uInt32 nIndex) const
+        {
+            return boost::make_tuple(maRanges[nIndex],
+                                     maOrient[nIndex]);
+        }
+
+        void setElement(sal_uInt32 nIndex, const B2DPolyRange::ElementType& rElement )
+        {
+            maRanges[nIndex] = boost::get<0>(rElement);
+            maOrient[nIndex] = boost::get<1>(rElement);
+            updateBounds();
+        }
+
+        void setElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient )
+        {
+            maRanges[nIndex] = rRange;
+            maOrient[nIndex] = eOrient;
+            updateBounds();
+        }
+
+        void insertElement(sal_uInt32 nIndex, const B2DPolyRange::ElementType& rElement, sal_uInt32 nCount)
+        {
+            maRanges.insert(maRanges.begin()+nIndex, nCount, boost::get<0>(rElement));
+            maOrient.insert(maOrient.begin()+nIndex, nCount, boost::get<1>(rElement));
+            maBounds.expand(boost::get<0>(rElement));
+        }
+
+        void insertElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount)
+        {
+            maRanges.insert(maRanges.begin()+nIndex, nCount, rRange);
+            maOrient.insert(maOrient.begin()+nIndex, nCount, eOrient);
+            maBounds.expand(rRange);
+        }
+
+        void appendElement(const B2DPolyRange::ElementType& rElement, sal_uInt32 nCount)
+        {
+            maRanges.insert(maRanges.end(), nCount, boost::get<0>(rElement));
+            maOrient.insert(maOrient.end(), nCount, boost::get<1>(rElement));
+            maBounds.expand(boost::get<0>(rElement));
+        }
+
+        void appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount)
+        {
+            maRanges.insert(maRanges.end(), nCount, rRange);
+            maOrient.insert(maOrient.end(), nCount, eOrient);
+            maBounds.expand(rRange);
+        }
+
+        void insertPolyRange(sal_uInt32 nIndex, const ImplB2DPolyRange& rPolyRange)
+        {
+            maRanges.insert(maRanges.begin()+nIndex, rPolyRange.maRanges.begin(), rPolyRange.maRanges.end());
+            maOrient.insert(maOrient.begin()+nIndex, rPolyRange.maOrient.begin(), rPolyRange.maOrient.end());
+            updateBounds();
+        }
+
+        void appendPolyRange(const ImplB2DPolyRange& rPolyRange)
+        {
+            maRanges.insert(maRanges.end(),
+                            rPolyRange.maRanges.begin(),
+                            rPolyRange.maRanges.end());
+            maOrient.insert(maOrient.end(),
+                            rPolyRange.maOrient.begin(),
+                            rPolyRange.maOrient.end());
+            updateBounds();
+        }
+
+        void remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+        {
+            maRanges.erase(maRanges.begin()+nIndex,maRanges.begin()+nIndex+nCount);
+            maOrient.erase(maOrient.begin()+nIndex,maOrient.begin()+nIndex+nCount);
+            updateBounds();
+        }
+
+        void clear()
+        {
+            std::vector<B2DRange> aTmpRanges;
+            std::vector<B2VectorOrientation> aTmpOrient;
+
+            maRanges.swap(aTmpRanges);
+            maOrient.swap(aTmpOrient);
+
+            maBounds.reset();
+        }
+
+        void flip()
+        {
+            std::for_each(maOrient.begin(),
+                          maOrient.end(),
+                          boost::bind(
+                              &flipOrientation,
+                              _1));
+        }
+
+        B2DRange getBounds() const
+        {
+            return maBounds;
+        }
+
+        template< typename ValueType > bool isInside( const ValueType& rValue ) const
+        {
+            if( !maBounds.isInside( rValue ) )
+                return false;
+
+            // cannot use boost::bind here, since isInside is overloaded.
+            // It is currently not possible to resolve the overload
+            // by considering one of the other template arguments.
+            std::vector<B2DRange>::const_iterator       aCurr( maRanges.begin() );
+            const std::vector<B2DRange>::const_iterator aEnd ( maRanges.end() );
+            while( aCurr != aEnd )
+                if( aCurr->isInside( rValue ) )
+                    return true;
+
+            return false;
+        }
+
+        bool overlaps( const B2DRange& rRange ) const
+        {
+            if( !maBounds.overlaps( rRange ) )
+                return false;
+
+            const std::vector<B2DRange>::const_iterator aEnd( maRanges.end() );
+            return std::find_if( maRanges.begin(),
+                                 aEnd,
+                                 boost::bind<bool>( boost::mem_fn( &B2DRange::overlaps ),
+                                                    _1,
+                                                    boost::cref(rRange) ) ) != aEnd;
+        }
+
+        B2DPolyPolygon solveCrossovers() const
+        {
+            return tools::solveCrossovers(maRanges,maOrient);
+        }
+
+        const B2DRange* begin() const
+        {
+            if(maRanges.empty())
+                return 0;
+            else
+                return &maRanges.front();
+        }
+
+        const B2DRange* end() const
+        {
+            if(maRanges.empty())
+                return 0;
+            else
+                return (&maRanges.back())+1;
+        }
+
+        B2DRange* begin()
+        {
+            if(maRanges.empty())
+                return 0;
+            else
+                return &maRanges.front();
+        }
+
+        B2DRange* end()
+        {
+            if(maRanges.empty())
+                return 0;
+            else
+                return (&maRanges.back())+1;
+        }
+
+    private:
+        B2DRange                         maBounds;
+        std::vector<B2DRange>            maRanges;
+        std::vector<B2VectorOrientation> maOrient;
+    };
+
+    B2DPolyRange::B2DPolyRange() :
+        mpImpl()
+    {}
+
+    B2DPolyRange::~B2DPolyRange()
+    {}
+
+    B2DPolyRange::B2DPolyRange( const ElementType& rElem ) :
+        mpImpl( ImplB2DPolyRange( rElem ) )
+    {}
+
+    B2DPolyRange::B2DPolyRange( const B2DRange& rRange, B2VectorOrientation eOrient ) :
+        mpImpl( ImplB2DPolyRange( rRange, eOrient ) )
+    {}
+
+    B2DPolyRange::B2DPolyRange( const B2DPolyRange& rRange ) :
+        mpImpl( rRange.mpImpl )
+    {}
+
+    B2DPolyRange& B2DPolyRange::operator=( const B2DPolyRange& rRange )
+    {
+        mpImpl = rRange.mpImpl;
+        return *this;
+    }
+
+    void B2DPolyRange::makeUnique()
+    {
+        mpImpl.make_unique();
+    }
+
+    bool B2DPolyRange::operator==(const B2DPolyRange& rRange) const
+    {
+        if(mpImpl.same_object(rRange.mpImpl))
+            return true;
+
+        return ((*mpImpl) == (*rRange.mpImpl));
+    }
+
+    bool B2DPolyRange::operator!=(const B2DPolyRange& rRange) const
+    {
+        return !(*this == rRange);
+    }
+
+    sal_uInt32 B2DPolyRange::count() const
+    {
+        return mpImpl->count();
+    }
+
+    B2DPolyRange::ElementType B2DPolyRange::getElement(sal_uInt32 nIndex) const
+    {
+        return mpImpl->getElement(nIndex);
+    }
+
+    void B2DPolyRange::setElement(sal_uInt32 nIndex, const ElementType& rElement )
+    {
+        mpImpl->setElement(nIndex, rElement);
+    }
+
+    void B2DPolyRange::setElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient )
+    {
+        mpImpl->setElement(nIndex, rRange, eOrient );
+    }
+
+    void B2DPolyRange::insertElement(sal_uInt32 nIndex, const ElementType& rElement, sal_uInt32 nCount)
+    {
+        mpImpl->insertElement(nIndex, rElement, nCount );
+    }
+
+    void B2DPolyRange::insertElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount)
+    {
+        mpImpl->insertElement(nIndex, rRange, eOrient, nCount );
+    }
+
+    void B2DPolyRange::appendElement(const ElementType& rElement, sal_uInt32 nCount)
+    {
+        mpImpl->appendElement(rElement, nCount);
+    }
+
+    void B2DPolyRange::appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount)
+    {
+        mpImpl->appendElement(rRange, eOrient, nCount );
+    }
+
+    void B2DPolyRange::insertPolyRange(sal_uInt32 nIndex, const B2DPolyRange& rRange)
+    {
+        mpImpl->insertPolyRange(nIndex, *rRange.mpImpl);
+    }
+
+    void B2DPolyRange::appendPolyRange(const B2DPolyRange& rRange)
+    {
+        mpImpl->appendPolyRange(*rRange.mpImpl);
+    }
+
+    void B2DPolyRange::remove(sal_uInt32 nIndex, sal_uInt32 nCount)
+    {
+        mpImpl->remove(nIndex, nCount);
+    }
+
+    void B2DPolyRange::clear()
+    {
+        mpImpl->clear();
+    }
+
+    void B2DPolyRange::flip()
+    {
+        mpImpl->flip();
+    }
+
+    B2DRange B2DPolyRange::getBounds() const
+    {
+        return mpImpl->getBounds();
+    }
+
+    bool B2DPolyRange::isInside( const B2DTuple& rTuple ) const
+    {
+        return mpImpl->isInside(rTuple);
+    }
+
+    bool B2DPolyRange::isInside( const B2DRange& rRange ) const
+    {
+        return mpImpl->isInside(rRange);
+    }
+
+    bool B2DPolyRange::overlaps( const B2DRange& rRange ) const
+    {
+        return mpImpl->overlaps(rRange);
+    }
+
+    B2DPolyPolygon B2DPolyRange::solveCrossovers() const
+    {
+        return mpImpl->solveCrossovers();
+    }
+
+    const B2DRange* B2DPolyRange::begin() const
+    {
+        return mpImpl->begin();
+    }
+
+    const B2DRange* B2DPolyRange::end() const
+    {
+        return mpImpl->end();
+    }
+
+    B2DRange* B2DPolyRange::begin()
+    {
+        return mpImpl->begin();
+    }
+
+    B2DRange* B2DPolyRange::end()
+    {
+        return mpImpl->end();
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
new file mode 100644
index 000000000000..693470c3ef14
--- /dev/null
+++ b/basegfx/source/range/b2drange.cxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+
+namespace basegfx
+{
+    B2DRange::B2DRange( const B2IRange& rRange ) :
+        maRangeX(),
+        maRangeY()
+    {
+        if( !rRange.isEmpty() )
+        {
+            maRangeX = rRange.getMinX();
+            maRangeY = rRange.getMinY();
+
+            maRangeX.expand(rRange.getMaxX());
+            maRangeY.expand(rRange.getMaxY());
+        }
+    }
+
+    void B2DRange::transform(const B2DHomMatrix& rMatrix)
+    {
+        if(!isEmpty() && !rMatrix.isIdentity())
+        {
+            const B2DRange aSource(*this);
+            reset();
+            expand(rMatrix * B2DPoint(aSource.getMinX(), aSource.getMinY()));
+            expand(rMatrix * B2DPoint(aSource.getMaxX(), aSource.getMinY()));
+            expand(rMatrix * B2DPoint(aSource.getMinX(), aSource.getMaxY()));
+            expand(rMatrix * B2DPoint(aSource.getMaxX(), aSource.getMaxY()));
+        }
+    }
+
+    B2IRange fround(const B2DRange& rRange)
+    {
+        return rRange.isEmpty() ?
+            B2IRange() :
+            B2IRange(fround(rRange.getMinimum()),
+                     fround(rRange.getMaximum()));
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
new file mode 100644
index 000000000000..524479b4fde0
--- /dev/null
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -0,0 +1,950 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dmultirange.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <rtl/math.hxx>
+
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2dpolyrange.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+
+#include <o3tl/vector_pool.hxx>
+#include <boost/bind.hpp>
+#include <boost/utility.hpp>
+
+#include <algorithm>
+#include <deque>
+#include <list>
+
+
+namespace basegfx
+{
+    namespace
+    {
+        // Generating a poly-polygon from a bunch of rectangles
+        //
+        // Helper functionality for sweep-line algorithm
+        // ====================================================
+
+        typedef std::vector<B2DRange> VectorOfRanges;
+
+        class ImplPolygon;
+        typedef o3tl::vector_pool<ImplPolygon> VectorOfPolygons;
+
+
+        /** This class represents an active edge
+
+            As the sweep line traverses across the overall area,
+            rectangle edges parallel to it generate events, and
+            rectangle edges orthogonal to it generate active
+            edges. This class represents the latter.
+         */
+        class ActiveEdge
+        {
+        public:
+            /** The two possible active rectangle edges differ by one
+                coordinate value - the upper edge has the lower, the
+                lower edge the higher value.
+             */
+            enum EdgeType {
+                /// edge with lower coordinate value
+                UPPER=0,
+                /// edge with higher coordinate value
+                LOWER=1
+            };
+
+            enum EdgeDirection {
+                /// edge proceeds to the left
+                PROCEED_LEFT=0,
+                /// edge proceeds to the right
+                PROCEED_RIGHT=1
+            };
+
+            /** Create active edge
+
+                @param rRect
+                Rectangle this edge is part of
+
+                @param fInvariantCoord
+                The invariant ccordinate value of this edge
+
+                @param eEdgeType
+                Is fInvariantCoord the lower or the higher value, for
+                this rect?
+             */
+            ActiveEdge( const B2DRectangle& rRect,
+                        const double&       fInvariantCoord,
+                        std::ptrdiff_t      nPolyIdx,
+                        EdgeType            eEdgeType,
+                        EdgeDirection       eEdgeDirection ) :
+                mfInvariantCoord(fInvariantCoord),
+                mpAssociatedRect( &rRect ),
+                mnPolygonIdx( nPolyIdx ),
+                meEdgeType( eEdgeType ),
+                meEdgeDirection( eEdgeDirection )
+            {}
+
+            double              getInvariantCoord() const { return mfInvariantCoord; }
+            const B2DRectangle& getRect() const { return *mpAssociatedRect; }
+            std::ptrdiff_t      getTargetPolygonIndex() const { return mnPolygonIdx; }
+            void                setTargetPolygonIndex( std::ptrdiff_t nIdx ) { mnPolygonIdx = nIdx; }
+            EdgeType            getEdgeType() const { return meEdgeType; }
+            EdgeDirection       getEdgeDirection() const { return meEdgeDirection; }
+
+            /// For STL sort
+            bool operator<( const ActiveEdge& rRHS ) const { return mfInvariantCoord < rRHS.mfInvariantCoord; }
+
+        private:
+            /** The invariant coordinate value of this edge (e.g. the
+                common y value, for a horizontal edge)
+             */
+            double              mfInvariantCoord;
+
+            /** Associated rectangle
+
+                This on the one hand saves some storage space (the
+                vector of rectangles is persistent, anyway), and on
+                the other hand provides an identifier to match active
+                edges and x events (see below)
+
+                Ptr because class needs to be assignable
+             */
+            const B2DRectangle* mpAssociatedRect;
+
+            /** Index of the polygon this edge is currently involved
+                with.
+
+                Note that this can change for some kinds of edge
+                intersection, as the algorithm tends to swap
+                associated polygons there.
+
+                -1 denotes no assigned polygon
+             */
+            std::ptrdiff_t      mnPolygonIdx;
+
+            /// 'upper' or 'lower' edge of original rectangle.
+            EdgeType            meEdgeType;
+
+            /// 'left' or 'right'
+            EdgeDirection       meEdgeDirection;
+        };
+
+        // Needs to be list - various places hold ptrs to elements
+        typedef std::list< ActiveEdge > ListOfEdges;
+
+
+        /** Element of the sweep line event list
+
+            As the sweep line traverses across the overall area,
+            rectangle edges parallel to it generate events, and
+            rectangle edges orthogonal to it generate active
+            edges. This class represents the former.
+
+            The class defines an element of the sweep line list. The
+            sweep line's position jumps in steps defined by the
+            coordinates of the sorted SweepLineEvent entries.
+         */
+        class SweepLineEvent
+        {
+        public:
+            /** The two possible sweep line rectangle edges differ by
+                one coordinate value - the starting edge has the
+                lower, the finishing edge the higher value.
+             */
+            enum EdgeType {
+                /// edge with lower coordinate value
+                STARTING_EDGE=0,
+                /// edge with higher coordinate value
+                FINISHING_EDGE=1
+            };
+
+            /** The two possible sweep line directions
+             */
+            enum EdgeDirection {
+                PROCEED_UP=0,
+                PROCEED_DOWN=1
+            };
+
+            /** Create sweep line event
+
+                @param fPos
+                Coordinate position of the event
+
+                @param rRect
+                Rectangle this event is generated for.
+
+                @param eEdgeType
+                Is fPos the lower or the higher value, for the
+                rectangle this event is generated for?
+             */
+            SweepLineEvent( double              fPos,
+                            const B2DRectangle& rRect,
+                            EdgeType            eEdgeType,
+                            EdgeDirection       eDirection) :
+                mfPos( fPos ),
+                mpAssociatedRect( &rRect ),
+                meEdgeType( eEdgeType ),
+                meEdgeDirection( eDirection )
+            {}
+
+            double              getPos() const { return mfPos; }
+            const B2DRectangle& getRect() const { return *mpAssociatedRect; }
+            EdgeType            getEdgeType() const { return meEdgeType; }
+            EdgeDirection       getEdgeDirection() const { return meEdgeDirection; }
+
+            /// For STL sort
+            bool operator<( const SweepLineEvent& rRHS ) const { return mfPos < rRHS.mfPos; }
+
+        private:
+            /// position of the event, in the direction of the line sweep
+            double                mfPos;
+
+            /** Rectangle this event is generated for
+
+                This on the one hand saves some storage space (the
+                vector of rectangles is persistent, anyway), and on
+                the other hand provides an identifier to match active
+                edges and events (see below)
+
+                Ptr because class needs to be assignable
+             */
+            const B2DRectangle*   mpAssociatedRect;
+
+            /// 'upper' or 'lower' edge of original rectangle.
+            EdgeType              meEdgeType;
+
+            /// 'up' or 'down'
+            EdgeDirection         meEdgeDirection;
+        };
+
+        typedef std::vector< SweepLineEvent > VectorOfEvents;
+
+
+        /** Smart point container for B2DMultiRange::getPolyPolygon()
+
+            This class provides methods needed only here, and is used
+            as a place to store some additional information per
+            polygon. Also, most of the intersection logic is
+            implemented here.
+         */
+        class ImplPolygon
+        {
+        public:
+            /** Create polygon
+             */
+            ImplPolygon() :
+                mpLeadingRightEdge(NULL),
+                mnIdx(-1),
+                maPoints(),
+                mbIsFinished(false)
+            {
+                // completely ad-hoc. but what the hell.
+                maPoints.reserve(11);
+            }
+
+            void setPolygonPoolIndex( std::ptrdiff_t nIdx ) { mnIdx = nIdx; }
+            bool isFinished() const { return mbIsFinished; }
+
+            /// Add point to the end of the existing points
+            void append( const B2DPoint& rPoint )
+            {
+                OSL_PRECOND( maPoints.empty() ||
+                             maPoints.back().getX() == rPoint.getX() ||
+                             maPoints.back().getY() == rPoint.getY(),
+                             "ImplPolygon::append(): added point violates 90 degree line angle constraint!" );
+
+                if( maPoints.empty() ||
+                    maPoints.back() != rPoint )
+                {
+                    // avoid duplicate points
+                    maPoints.push_back( rPoint );
+                }
+            }
+
+            /** Perform the intersection of this polygon with an
+                active edge.
+
+                @param rEvent
+                The vertical line event that generated the
+                intersection
+
+                @param rActiveEdge
+                The active edge that generated the intersection
+
+                @param rPolygonPool
+                Polygon pool, we sometimes need to allocate a new one
+
+                @param bIsFinishingEdge
+                True, when this is hitting the last edge of the
+                vertical sweep - every vertical sweep starts and ends
+                with upper and lower edge of the _same_ rectangle.
+
+                @return the new current polygon (that's the one
+                processing must proceed with, when going through the
+                list of upcoming active edges).
+             */
+            std::ptrdiff_t intersect( SweepLineEvent&   rEvent,
+                                      ActiveEdge&       rActiveEdge,
+                                      VectorOfPolygons& rPolygonPool,
+                                      B2DPolyPolygon&   rRes,
+                                      bool              isFinishingEdge )
+            {
+                OSL_PRECOND( !isFinished(),
+                             "ImplPolygon::intersect(): called on already finished polygon!" );
+                OSL_PRECOND( !isFinishingEdge
+                             || (isFinishingEdge && &rEvent.getRect() == &rActiveEdge.getRect()),
+                             "ImplPolygon::intersect(): inconsistent ending!" );
+
+                const B2DPoint aIntersectionPoint( rEvent.getPos(),
+                                                   rActiveEdge.getInvariantCoord() );
+
+                // intersection point, goes to our polygon
+                // unconditionally
+                append(aIntersectionPoint);
+
+                const bool isSweepLineEnteringRect(
+                    rEvent.getEdgeType() == SweepLineEvent::STARTING_EDGE);
+                if( isFinishingEdge )
+                {
+                    if( isSweepLineEnteringRect )
+                        handleFinalOwnRightEdge(rActiveEdge);
+                    else
+                        handleFinalOwnLeftEdge(rActiveEdge,
+                                               rPolygonPool,
+                                               rRes);
+
+                    // we're done with this rect & sweep line
+                    return -1;
+                }
+                else if( metOwnEdge(rEvent,rActiveEdge) )
+                {
+                    handleInitialOwnEdge(rEvent, rActiveEdge);
+
+                    // point already added, all init done, continue
+                    // with same poly
+                    return mnIdx;
+                }
+                else
+                {
+                    OSL_ENSURE( rActiveEdge.getTargetPolygonIndex() != -1,
+                                "ImplPolygon::intersect(): non-trivial intersection hit empty polygon!" );
+
+                    const bool isHittingLeftEdge(
+                        rActiveEdge.getEdgeDirection() == ActiveEdge::PROCEED_LEFT);
+
+                    if( isHittingLeftEdge )
+                        return handleComplexLeftEdge(rActiveEdge,
+                                                     aIntersectionPoint,
+                                                     rPolygonPool,
+                                                     rRes);
+                    else
+                        return handleComplexRightEdge(rActiveEdge,
+                                                      aIntersectionPoint,
+                                                      rPolygonPool);
+                }
+            }
+
+        private:
+            std::ptrdiff_t getPolygonPoolIndex() const { return mnIdx; }
+
+            void handleInitialOwnEdge(SweepLineEvent& rEvent,
+                                      ActiveEdge&     rActiveEdge)
+            {
+                const bool isActiveEdgeProceedLeft(
+                    rActiveEdge.getEdgeDirection() == ActiveEdge::PROCEED_LEFT);
+                const bool isSweepLineEnteringRect(
+                    rEvent.getEdgeType() == SweepLineEvent::STARTING_EDGE);
+                (void)isActiveEdgeProceedLeft;
+                (void)isSweepLineEnteringRect;
+
+                OSL_ENSURE( isSweepLineEnteringRect == isActiveEdgeProceedLeft,
+                            "ImplPolygon::intersect(): sweep initial own edge hit: wrong polygon order" );
+
+                OSL_ENSURE( isSweepLineEnteringRect ||
+                            mpLeadingRightEdge == &rActiveEdge,
+                            "ImplPolygon::intersect(): sweep initial own edge hit: wrong leading edge" );
+            }
+
+            void handleFinalOwnRightEdge(ActiveEdge& rActiveEdge)
+            {
+                OSL_ENSURE( rActiveEdge.getEdgeDirection() == ActiveEdge::PROCEED_RIGHT,
+                            "ImplPolygon::handleInitialOwnRightEdge(): start edge wrong polygon order" );
+
+                rActiveEdge.setTargetPolygonIndex(mnIdx);
+                mpLeadingRightEdge = &rActiveEdge;
+            }
+
+            void handleFinalOwnLeftEdge(ActiveEdge&       rActiveEdge,
+                                        VectorOfPolygons& rPolygonPool,
+                                        B2DPolyPolygon&   rRes)
+            {
+                OSL_ENSURE( rActiveEdge.getEdgeDirection() == ActiveEdge::PROCEED_LEFT,
+                            "ImplPolygon::handleFinalOwnLeftEdge(): end edge wrong polygon order" );
+
+                const bool isHittingOurTail(
+                    rActiveEdge.getTargetPolygonIndex() == mnIdx);
+
+                if( isHittingOurTail )
+                    finish(rRes); // just finish. no fuss.
+                else
+                {
+                    // temp poly hits final left edge
+                    const std::ptrdiff_t nTmpIdx=rActiveEdge.getTargetPolygonIndex();
+                    ImplPolygon& rTmp=rPolygonPool.get(nTmpIdx);
+
+                    // active edge's polygon has points
+                    // already. ours need to go in front of them.
+                    maPoints.insert(maPoints.end(),
+                                    rTmp.maPoints.begin(),
+                                    rTmp.maPoints.end());
+
+                    // adjust leading edges, we're switching the polygon
+                    ActiveEdge* const pFarEdge=rTmp.mpLeadingRightEdge;
+
+                    mpLeadingRightEdge = pFarEdge;
+                    pFarEdge->setTargetPolygonIndex(mnIdx);
+
+                    // nTmpIdx is an empty shell, get rid of it
+                    rPolygonPool.free(nTmpIdx);
+                }
+            }
+
+            std::ptrdiff_t handleComplexLeftEdge(ActiveEdge&       rActiveEdge,
+                                                 const B2DPoint&   rIntersectionPoint,
+                                                 VectorOfPolygons& rPolygonPool,
+                                                 B2DPolyPolygon&   rRes)
+            {
+                const bool isHittingOurTail(
+                    rActiveEdge.getTargetPolygonIndex() == mnIdx);
+                if( isHittingOurTail )
+                {
+                    finish(rRes);
+
+                    // so "this" is done - need new polygon to collect
+                    // further points
+                    const std::ptrdiff_t nIdxNewPolygon=rPolygonPool.alloc();
+                    rPolygonPool.get(nIdxNewPolygon).setPolygonPoolIndex(nIdxNewPolygon);
+                    rPolygonPool.get(nIdxNewPolygon).append(rIntersectionPoint);
+
+                    rActiveEdge.setTargetPolygonIndex(nIdxNewPolygon);
+
+                    return nIdxNewPolygon;
+                }
+                else
+                {
+                    const std::ptrdiff_t nTmpIdx=rActiveEdge.getTargetPolygonIndex();
+                    ImplPolygon& rTmp=rPolygonPool.get(nTmpIdx);
+
+                    // active edge's polygon has points
+                    // already. ours need to go in front of them.
+                    maPoints.insert(maPoints.end(),
+                                    rTmp.maPoints.begin(),
+                                    rTmp.maPoints.end());
+
+                    rTmp.maPoints.clear();
+                    rTmp.append(rIntersectionPoint);
+
+                    // adjust leading edges, we're switching the polygon
+                    ActiveEdge* const pFarEdge=rTmp.mpLeadingRightEdge;
+                    ActiveEdge* const pNearEdge=&rActiveEdge;
+
+                    rTmp.mpLeadingRightEdge = NULL;
+                    pNearEdge->setTargetPolygonIndex(nTmpIdx);
+
+                    mpLeadingRightEdge = pFarEdge;
+                    pFarEdge->setTargetPolygonIndex(mnIdx);
+
+                    return nTmpIdx;
+                }
+            }
+
+            std::ptrdiff_t handleComplexRightEdge(ActiveEdge&       rActiveEdge,
+                                                  const B2DPoint&   rIntersectionPoint,
+                                                  VectorOfPolygons& rPolygonPool)
+            {
+                const std::ptrdiff_t nTmpIdx=rActiveEdge.getTargetPolygonIndex();
+                ImplPolygon& rTmp=rPolygonPool.get(nTmpIdx);
+
+                rTmp.append(rIntersectionPoint);
+
+                rActiveEdge.setTargetPolygonIndex(mnIdx);
+                mpLeadingRightEdge = &rActiveEdge;
+
+                rTmp.mpLeadingRightEdge = NULL;
+
+                return nTmpIdx;
+            }
+
+            /// True when sweep line hits our own active edge
+            bool metOwnEdge(const SweepLineEvent& rEvent,
+                            ActiveEdge&           rActiveEdge)
+            {
+                const bool bHitOwnEdge=&rEvent.getRect() == &rActiveEdge.getRect();
+                return bHitOwnEdge;
+            }
+
+            /// Retrieve B2DPolygon from this object
+            B2DPolygon getPolygon() const
+            {
+                B2DPolygon aRes;
+                std::for_each( maPoints.begin(),
+                               maPoints.end(),
+                               boost::bind(
+                     &B2DPolygon::append,
+                                   boost::ref(aRes),
+                                   _1,
+                                   1 ) );
+                aRes.setClosed( true );
+                return aRes;
+            }
+
+            /** Finish this polygon, push to result set.
+             */
+            void finish(B2DPolyPolygon& rRes)
+            {
+                OSL_PRECOND( maPoints.empty() ||
+                             maPoints.front().getX() == maPoints.back().getX() ||
+                             maPoints.front().getY() == maPoints.back().getY(),
+                             "ImplPolygon::finish(): first and last point violate 90 degree line angle constraint!" );
+
+                mbIsFinished = true;
+                mpLeadingRightEdge = NULL;
+
+                rRes.append(getPolygon());
+            }
+
+            /** Refers to the current leading edge element of this
+                polygon, or NULL. The leading edge denotes the 'front'
+                of the polygon vertex sequence, i.e. the coordinates
+                at the polygon's leading edge are returned from
+                maPoints.front()
+             */
+            ActiveEdge*           mpLeadingRightEdge;
+
+            /// current index into vector pool
+            std::ptrdiff_t        mnIdx;
+
+            /// Container for the actual polygon points
+            std::vector<B2DPoint> maPoints;
+
+            /// When true, this polygon is 'done', i.e. nothing must be added anymore.
+            bool                  mbIsFinished;
+        };
+
+        /** Init sweep line event list
+
+            This method fills the event list with the sweep line
+            events generated from the input rectangles, and sorts them
+            with increasing x.
+         */
+        void setupSweepLineEventListFromRanges( VectorOfEvents& o_rEventVector,
+                                                const std::vector<B2DRange>& rRanges,
+                                                const std::vector<B2VectorOrientation>& rOrientations )
+        {
+            // we need exactly 2*rectVec.size() events: one for the
+            // left, and one for the right edge of each rectangle
+            o_rEventVector.clear();
+            o_rEventVector.reserve( 2*rRanges.size() );
+
+            // generate events
+            // ===============
+
+            // first pass: add all left edges in increasing order
+            std::vector<B2DRange>::const_iterator aCurrRect=rRanges.begin();
+            std::vector<B2VectorOrientation>::const_iterator aCurrOrientation=rOrientations.begin();
+            const std::vector<B2DRange>::const_iterator aEnd=rRanges.end();
+            const std::vector<B2VectorOrientation>::const_iterator aEndOrientation=rOrientations.end();
+            while( aCurrRect != aEnd && aCurrOrientation != aEndOrientation )
+            {
+                const B2DRectangle& rCurrRect( *aCurrRect++ );
+
+                o_rEventVector.push_back(
+                    SweepLineEvent( rCurrRect.getMinX(),
+                                    rCurrRect,
+                                    SweepLineEvent::STARTING_EDGE,
+                                    (*aCurrOrientation++) == ORIENTATION_POSITIVE ?
+                                    SweepLineEvent::PROCEED_UP : SweepLineEvent::PROCEED_DOWN) );
+            }
+
+            // second pass: add all right edges in reversed order
+            std::vector<B2DRange>::const_reverse_iterator aCurrRectR=rRanges.rbegin();
+            std::vector<B2VectorOrientation>::const_reverse_iterator aCurrOrientationR=rOrientations.rbegin();
+            const std::vector<B2DRange>::const_reverse_iterator aEndR=rRanges.rend();
+            const std::vector<B2VectorOrientation>::const_reverse_iterator aEndOrientationR=rOrientations.rend();
+            while( aCurrRectR != aEndR )
+            {
+                const B2DRectangle& rCurrRect( *aCurrRectR++ );
+
+                o_rEventVector.push_back(
+                    SweepLineEvent( rCurrRect.getMaxX(),
+                                    rCurrRect,
+                                    SweepLineEvent::FINISHING_EDGE,
+                                    (*aCurrOrientationR++) == ORIENTATION_POSITIVE ?
+                                    SweepLineEvent::PROCEED_DOWN : SweepLineEvent::PROCEED_UP ) );
+            }
+
+            // sort events
+            // ===========
+
+            // since we use stable_sort, the order of events with the
+            // same x value will not change. The elaborate two-pass
+            // add above thus ensures, that for each two rectangles
+            // with similar left and right x coordinates, the
+            // rectangle whose left event comes first will have its
+            // right event come last. This is advantageous for the
+            // clip algorithm below, see handleRightEdgeCrossing().
+
+            // TODO(P3): Use radix sort (from
+            // b2dpolypolygonrasterconverter, or have your own
+            // templatized version).
+            std::stable_sort( o_rEventVector.begin(),
+                              o_rEventVector.end() );
+        }
+
+        /** Insert two active edge segments for the given rectangle.
+
+            This method creates two active edge segments from the
+            given rect, and inserts them into the active edge list,
+            such that this stays sorted (if it was before).
+
+            @param io_rEdgeList
+            Active edge list to insert into
+
+            @param io_rPolygons
+            Vector of polygons. Each rectangle added creates one
+            tentative result polygon in this vector, and the edge list
+            entries holds a reference to that polygon (this _requires_
+            that the polygon vector does not reallocate, i.e. it must
+            have at least the maximal number of rectangles reserved)
+
+            @param o_CurrentPolygon
+            The then-current polygon when processing this sweep line
+            event
+
+            @param rCurrEvent
+            The actual event that caused this call
+         */
+        void createActiveEdgesFromStartEvent( ListOfEdges&      io_rEdgeList,
+                                              VectorOfPolygons& io_rPolygonPool,
+                                              SweepLineEvent&   rCurrEvent )
+        {
+            ListOfEdges         aNewEdges;
+            const B2DRectangle& rRect=rCurrEvent.getRect();
+            const bool          bGoesDown=rCurrEvent.getEdgeDirection() == SweepLineEvent::PROCEED_DOWN;
+
+            // start event - new rect starts here, needs polygon to
+            // collect points into
+            const std::ptrdiff_t nIdxPolygon=io_rPolygonPool.alloc();
+            io_rPolygonPool.get(nIdxPolygon).setPolygonPoolIndex(nIdxPolygon);
+
+            // upper edge
+            aNewEdges.push_back(
+                ActiveEdge(
+                    rRect,
+                    rRect.getMinY(),
+                    bGoesDown ? nIdxPolygon : -1,
+                    ActiveEdge::UPPER,
+                    bGoesDown ? ActiveEdge::PROCEED_LEFT : ActiveEdge::PROCEED_RIGHT) );
+            // lower edge
+            aNewEdges.push_back(
+                ActiveEdge(
+                    rRect,
+                    rRect.getMaxY(),
+                    bGoesDown ? -1 : nIdxPolygon,
+                    ActiveEdge::LOWER,
+                    bGoesDown ? ActiveEdge::PROCEED_RIGHT : ActiveEdge::PROCEED_LEFT ) );
+
+            // furthermore, have to respect a special tie-breaking
+            // rule here, for edges which share the same y value:
+            // newly added upper edges must be inserted _before_ any
+            // other edge with the same y value, and newly added lower
+            // edges must be _after_ all other edges with the same
+            // y. This ensures that the left vertical edge processing
+            // below encounters the upper edge of the current rect
+            // first, and the lower edge last, which automatically
+            // starts and finishes this rect correctly (as only then,
+            // the polygon will have their associated active edges
+            // set).
+            const double                nMinY( rRect.getMinY() );
+            const double                nMaxY( rRect.getMaxY() );
+            ListOfEdges::iterator       aCurr( io_rEdgeList.begin() );
+            const ListOfEdges::iterator aEnd ( io_rEdgeList.end() );
+            while( aCurr != aEnd )
+            {
+                const double nCurrY( aCurr->getInvariantCoord() );
+
+                if( nCurrY >= nMinY &&
+                    aNewEdges.size() == 2 ) // only add, if not yet done.
+                {
+                    // insert upper edge _before_ aCurr. Thus, it will
+                    // be the first entry for a range of equal y
+                    // values. Using splice here, since we hold
+                    // references to the moved list element!
+                    io_rEdgeList.splice( aCurr,
+                                         aNewEdges,
+                                         aNewEdges.begin() );
+                }
+
+                if( nCurrY > nMaxY )
+                {
+                    // insert lower edge _before_ aCurr. Thus, it will
+                    // be the last entry for a range of equal y values
+                    // (aCurr is the first entry strictly larger than
+                    // nMaxY). Using splice here, since we hold
+                    // references to the moved list element!
+                    io_rEdgeList.splice( aCurr,
+                                         aNewEdges,
+                                         aNewEdges.begin() );
+                    // done with insertion, can early-exit here.
+                    return;
+                }
+
+                ++aCurr;
+            }
+
+            // append remainder of aNewList (might still contain 2 or
+            // 1 elements, depending of the contents of io_rEdgeList).
+            io_rEdgeList.splice( aCurr,
+                                 aNewEdges );
+        }
+
+        inline bool isSameRect(ActiveEdge&              rEdge,
+                               const basegfx::B2DRange& rRect)
+        {
+            return &rEdge.getRect() == &rRect;
+        }
+
+        // wow what a hack. necessary because stl's list::erase does
+        // not eat reverse_iterator
+        template<typename Cont, typename Iter> Iter eraseFromList(Cont&, Iter);
+        template<> inline ListOfEdges::iterator eraseFromList(
+            ListOfEdges& rList, ListOfEdges::iterator aIter)
+        {
+            return rList.erase(aIter);
+        }
+        template<> inline ListOfEdges::reverse_iterator eraseFromList(
+            ListOfEdges& rList, ListOfEdges::reverse_iterator aIter)
+        {
+            return ListOfEdges::reverse_iterator(
+                    rList.erase(boost::prior(aIter.base())));
+        }
+
+        template<int bPerformErase,
+                 typename Iterator> inline void processActiveEdges(
+            Iterator          first,
+            Iterator          last,
+            ListOfEdges&      rActiveEdgeList,
+            SweepLineEvent&   rCurrEvent,
+            VectorOfPolygons& rPolygonPool,
+            B2DPolyPolygon&   rRes )
+        {
+            const basegfx::B2DRange& rCurrRect=rCurrEvent.getRect();
+
+            // fast-forward to rCurrEvent's first active edge (holds
+            // for both starting and finishing sweep line events, a
+            // rect is regarded _outside_ any rects whose events have
+            // started earlier
+            first = std::find_if(first, last,
+                                 boost::bind(
+                         &isSameRect,
+                                     _1,
+                                     boost::cref(rCurrRect)));
+
+            if(first == last)
+                return;
+
+            int nCount=0;
+            std::ptrdiff_t nCurrPolyIdx=-1;
+            while(first != last)
+            {
+                if( nCurrPolyIdx == -1 )
+                    nCurrPolyIdx=first->getTargetPolygonIndex();
+
+                OSL_ASSERT(nCurrPolyIdx != -1);
+
+                // second encounter of my rect -> second edge
+                // encountered, done
+                const bool bExit=
+                    nCount &&
+                    isSameRect(*first,
+                               rCurrRect);
+
+                // deal with current active edge
+                nCurrPolyIdx =
+                    rPolygonPool.get(nCurrPolyIdx).intersect(
+                        rCurrEvent,
+                        *first,
+                        rPolygonPool,
+                        rRes,
+                        bExit);
+
+                // prune upper & lower active edges, if requested
+                if( bPerformErase && (bExit || !nCount) )
+                    first = eraseFromList(rActiveEdgeList,first);
+                else
+                    ++first;
+
+                // delayed exit, had to prune first
+                if( bExit )
+                    return;
+
+                ++nCount;
+            }
+        }
+
+        template<int bPerformErase> inline void processActiveEdgesTopDown(
+            SweepLineEvent&   rCurrEvent,
+            ListOfEdges&      rActiveEdgeList,
+            VectorOfPolygons& rPolygonPool,
+            B2DPolyPolygon&   rRes )
+        {
+            processActiveEdges<bPerformErase>(
+                rActiveEdgeList. begin(),
+                rActiveEdgeList. end(),
+                rActiveEdgeList,
+                rCurrEvent,
+                rPolygonPool,
+                rRes);
+        }
+
+        template<int bPerformErase> inline void processActiveEdgesBottomUp(
+            SweepLineEvent&   rCurrEvent,
+            ListOfEdges&      rActiveEdgeList,
+            VectorOfPolygons& rPolygonPool,
+            B2DPolyPolygon&   rRes )
+        {
+            processActiveEdges<bPerformErase>(
+                rActiveEdgeList. rbegin(),
+                rActiveEdgeList. rend(),
+                rActiveEdgeList,
+                rCurrEvent,
+                rPolygonPool,
+                rRes);
+        }
+
+        enum{ NoErase=0, PerformErase=1 };
+
+        void handleStartingEdge( SweepLineEvent&   rCurrEvent,
+                                 ListOfEdges&      rActiveEdgeList,
+                                 VectorOfPolygons& rPolygonPool,
+                                 B2DPolyPolygon&   rRes)
+        {
+            // inject two new active edges for rect
+            createActiveEdgesFromStartEvent( rActiveEdgeList,
+                                             rPolygonPool,
+                                             rCurrEvent );
+
+            if( SweepLineEvent::PROCEED_DOWN == rCurrEvent.getEdgeDirection() )
+                processActiveEdgesTopDown<NoErase>(
+                    rCurrEvent, rActiveEdgeList, rPolygonPool, rRes);
+            else
+                processActiveEdgesBottomUp<NoErase>(
+                    rCurrEvent, rActiveEdgeList, rPolygonPool, rRes);
+        }
+
+        void handleFinishingEdge( SweepLineEvent&   rCurrEvent,
+                                  ListOfEdges&      rActiveEdgeList,
+                                  VectorOfPolygons& rPolygonPool,
+                                  B2DPolyPolygon&   rRes)
+        {
+            if( SweepLineEvent::PROCEED_DOWN == rCurrEvent.getEdgeDirection() )
+                processActiveEdgesTopDown<PerformErase>(
+                    rCurrEvent, rActiveEdgeList, rPolygonPool, rRes);
+            else
+                processActiveEdgesBottomUp<PerformErase>(
+                    rCurrEvent, rActiveEdgeList, rPolygonPool, rRes);
+        }
+
+        inline void handleSweepLineEvent( SweepLineEvent&   rCurrEvent,
+                                          ListOfEdges&      rActiveEdgeList,
+                                          VectorOfPolygons& rPolygonPool,
+                                          B2DPolyPolygon&   rRes)
+        {
+            if( SweepLineEvent::STARTING_EDGE == rCurrEvent.getEdgeType() )
+                handleStartingEdge(rCurrEvent,rActiveEdgeList,rPolygonPool,rRes);
+            else
+                handleFinishingEdge(rCurrEvent,rActiveEdgeList,rPolygonPool,rRes);
+        }
+    }
+
+    namespace tools
+    {
+        B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges,
+                                       const std::vector<B2VectorOrientation>& rOrientations)
+        {
+            // sweep-line algorithm to generate a poly-polygon
+            // from a bunch of rectangles
+            // ===============================================
+            //
+            // This algorithm uses the well-known sweep line
+            // concept, explained in every good text book about
+            // computational geometry.
+            //
+            // We start with creating two structures for every
+            // rectangle, one representing the left x coordinate,
+            // one representing the right x coordinate (and both
+            // referencing the original rect). These structs are
+            // sorted with increasing x coordinates.
+            //
+            // Then, we start processing the resulting list from
+            // the beginning. Every entry in the list defines a
+            // point in time of the line sweeping from left to
+            // right across all rectangles.
+            VectorOfEvents aSweepLineEvents;
+            setupSweepLineEventListFromRanges( aSweepLineEvents,
+                                               rRanges,
+                                               rOrientations );
+
+            B2DPolyPolygon   aRes;
+            VectorOfPolygons aPolygonPool;
+            ListOfEdges      aActiveEdgeList;
+
+            // sometimes not enough, but a usable compromise
+            aPolygonPool.reserve( rRanges.size() );
+
+            std::for_each( aSweepLineEvents.begin(),
+                           aSweepLineEvents.end(),
+                           boost::bind(
+                               &handleSweepLineEvent,
+                               _1,
+                               boost::ref(aActiveEdgeList),
+                               boost::ref(aPolygonPool),
+                               boost::ref(aRes)) );
+
+            return aRes;
+        }
+    }
+}
+
diff --git a/basegfx/source/range/b2xrange.cxx b/basegfx/source/range/b2xrange.cxx
new file mode 100644
index 000000000000..296b54574800
--- /dev/null
+++ b/basegfx/source/range/b2xrange.cxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2ibox.hxx>
+
+
+namespace basegfx
+{
+    namespace
+    {
+        /** Generic implementation of the difference set computation
+
+            @tpl RangeType
+            Type to operate on. Must provide ValueType and TraitsType
+            nested types.
+         */
+        template< class RangeType > void doComputeSetDifference(
+            ::std::vector< RangeType >& o_rRanges,
+            const RangeType&            a,
+            const RangeType&            b )
+        {
+            o_rRanges.clear();
+
+            // special-casing the empty rect case (this will fail most
+            // of the times below, because of the DBL_MIN/MAX special
+            // values denoting emptyness in the rectangle.
+            if( a.isEmpty() )
+            {
+                o_rRanges.push_back( b );
+                return;
+            }
+            if( b.isEmpty() )
+            {
+                o_rRanges.push_back( a );
+                return;
+            }
+
+            const typename RangeType::ValueType                     ax(a.getMinX());
+            const typename RangeType::ValueType                     ay(a.getMinY());
+            const typename RangeType::TraitsType::DifferenceType    aw(a.getWidth());
+            const typename RangeType::TraitsType::DifferenceType    ah(a.getHeight());
+            const typename RangeType::ValueType                     bx(b.getMinX());
+            const typename RangeType::ValueType                     by(b.getMinY());
+            const typename RangeType::TraitsType::DifferenceType    bw(b.getWidth());
+            const typename RangeType::TraitsType::DifferenceType    bh(b.getHeight());
+
+            const typename RangeType::TraitsType::DifferenceType    h0( (by > ay) ? by - ay : 0 );
+            const typename RangeType::TraitsType::DifferenceType    h3( (by + bh < ay + ah) ? ay + ah - by - bh : 0 );
+            const typename RangeType::TraitsType::DifferenceType    w1( (bx > ax) ? bx - ax : 0 );
+            const typename RangeType::TraitsType::DifferenceType    w2( (ax + aw > bx + bw) ? ax + aw - bx - bw : 0 );
+            const typename RangeType::TraitsType::DifferenceType    h12( (h0 + h3 < ah) ? ah - h0 - h3 : 0 );
+
+            // TODO(E2): Use numeric_cast instead of static_cast here,
+            // need range checks!
+            if (h0 > 0)
+                o_rRanges.push_back(
+                    RangeType(ax,ay,
+                              static_cast<typename RangeType::ValueType>(ax+aw),
+                              static_cast<typename RangeType::ValueType>(ay+h0)) );
+
+            if (w1 > 0 && h12 > 0)
+                o_rRanges.push_back(
+                    RangeType(ax,
+                              static_cast<typename RangeType::ValueType>(ay+h0),
+                              static_cast<typename RangeType::ValueType>(ax+w1),
+                              static_cast<typename RangeType::ValueType>(ay+h0+h12)) );
+
+            if (w2 > 0 && h12 > 0)
+                o_rRanges.push_back(
+                    RangeType(static_cast<typename RangeType::ValueType>(bx+bw),
+                              static_cast<typename RangeType::ValueType>(ay+h0),
+                              static_cast<typename RangeType::ValueType>(bx+bw+w2),
+                              static_cast<typename RangeType::ValueType>(ay+h0+h12)) );
+
+            if (h3 > 0)
+                o_rRanges.push_back(
+                    RangeType(ax,
+                              static_cast<typename RangeType::ValueType>(ay+h0+h12),
+                              static_cast<typename RangeType::ValueType>(ax+aw),
+                              static_cast<typename RangeType::ValueType>(ay+h0+h12+h3)) );
+        }
+    }
+
+    ::std::vector< B2IRange >& computeSetDifference( ::std::vector< B2IRange >& o_rResult,
+                                                     const B2IRange&            rFirst,
+                                                     const B2IRange&            rSecond )
+    {
+        doComputeSetDifference( o_rResult, rFirst, rSecond );
+
+        return o_rResult;
+    }
+
+    ::std::vector< B2DRange >& computeSetDifference( ::std::vector< B2DRange >& o_rResult,
+                                                     const B2DRange&            rFirst,
+                                                     const B2DRange&            rSecond )
+    {
+        doComputeSetDifference( o_rResult, rFirst, rSecond );
+
+        return o_rResult;
+    }
+
+    ::std::vector< B2IBox >& computeSetDifference( ::std::vector< B2IBox >& o_rResult,
+                                                   const B2IBox&            rFirst,
+                                                   const B2IBox&            rSecond )
+    {
+        doComputeSetDifference( o_rResult, rFirst, rSecond );
+
+        return o_rResult;
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/range/b3drange.cxx b/basegfx/source/range/b3drange.cxx
new file mode 100644
index 000000000000..aaeeae684bdd
--- /dev/null
+++ b/basegfx/source/range/b3drange.cxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/range/b3drange.hxx>
+#include <basegfx/range/b3irange.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+
+namespace basegfx
+{
+    B3DRange::B3DRange(const B3IRange& rRange) :
+        maRangeX(),
+        maRangeY(),
+        maRangeZ()
+    {
+        if( !rRange.isEmpty() )
+        {
+            maRangeX = rRange.getMinX();
+            maRangeY = rRange.getMinY();
+            maRangeZ = rRange.getMinZ();
+
+            maRangeX.expand( rRange.getMaxX() );
+            maRangeY.expand( rRange.getMaxY() );
+            maRangeZ.expand( rRange.getMaxZ() );
+        }
+    }
+
+    void B3DRange::transform(const B3DHomMatrix& rMatrix)
+    {
+        if(!isEmpty() && !rMatrix.isIdentity())
+        {
+            const B3DRange aSource(*this);
+            reset();
+            expand(rMatrix * B3DPoint(aSource.getMinX(), aSource.getMinY(), aSource.getMinZ()));
+            expand(rMatrix * B3DPoint(aSource.getMaxX(), aSource.getMinY(), aSource.getMinZ()));
+            expand(rMatrix * B3DPoint(aSource.getMinX(), aSource.getMaxY(), aSource.getMinZ()));
+            expand(rMatrix * B3DPoint(aSource.getMaxX(), aSource.getMaxY(), aSource.getMinZ()));
+            expand(rMatrix * B3DPoint(aSource.getMinX(), aSource.getMinY(), aSource.getMaxZ()));
+            expand(rMatrix * B3DPoint(aSource.getMaxX(), aSource.getMinY(), aSource.getMaxZ()));
+            expand(rMatrix * B3DPoint(aSource.getMinX(), aSource.getMaxY(), aSource.getMaxZ()));
+            expand(rMatrix * B3DPoint(aSource.getMaxX(), aSource.getMaxY(), aSource.getMaxZ()));
+        }
+    }
+
+    B3IRange fround(const B3DRange& rRange )
+    {
+        return rRange.isEmpty() ?
+            B3IRange() :
+            B3IRange(fround(rRange.getMinX()),
+                     fround(rRange.getMinY()),
+                     fround(rRange.getMinZ()),
+                     fround(rRange.getMaxX()),
+                     fround(rRange.getMaxY()),
+                     fround(rRange.getMaxZ()));
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/range/makefile.mk b/basegfx/source/range/makefile.mk
new file mode 100644
index 000000000000..5e05eeda94d9
--- /dev/null
+++ b/basegfx/source/range/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=range
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+ENABLE_EXCEPTIONS=TRUE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/b1drange.obj		\
+                $(SLO)$/b2drange.obj		\
+                $(SLO)$/b2xrange.obj		\
+                $(SLO)$/b2dpolyrange.obj	\
+                $(SLO)$/b2drangeclipper.obj	\
+                $(SLO)$/b3drange.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/raster/bpixelraster.cxx b/basegfx/source/raster/bpixelraster.cxx
new file mode 100644
index 000000000000..dd62ebd67634
--- /dev/null
+++ b/basegfx/source/raster/bpixelraster.cxx
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/raster/bpixelraster.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/raster/bzpixelraster.cxx b/basegfx/source/raster/bzpixelraster.cxx
new file mode 100644
index 000000000000..dd1fe7719b1b
--- /dev/null
+++ b/basegfx/source/raster/bzpixelraster.cxx
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/raster/bzpixelraster.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/raster/makefile.mk b/basegfx/source/raster/makefile.mk
new file mode 100644
index 000000000000..1381b9f6d716
--- /dev/null
+++ b/basegfx/source/raster/makefile.mk
@@ -0,0 +1,49 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=raster
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+ENABLE_EXCEPTIONS=TRUE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/bpixelraster.obj	\
+                $(SLO)$/bzpixelraster.obj	\
+                $(SLO)$/rasterconvert3d.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx
new file mode 100644
index 000000000000..2c42dc313451
--- /dev/null
+++ b/basegfx/source/raster/rasterconvert3d.cxx
@@ -0,0 +1,353 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/raster/rasterconvert3d.hxx>
+#include <basegfx/polygon/b3dpolygon.hxx>
+#include <basegfx/polygon/b3dpolypolygon.hxx>
+#include <basegfx/point/b3dpoint.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// implementations of the 3D raster converter
+
+namespace basegfx
+{
+    void RasterConverter3D::addArea(const B3DPolygon& rFill, const B3DHomMatrix* pViewToEye)
+    {
+        const sal_uInt32 nPointCount(rFill.count());
+
+        for(sal_uInt32 a(0); a < nPointCount; a++)
+        {
+            addEdge(rFill, a, (a + 1) % nPointCount, pViewToEye);
+        }
+    }
+
+    void RasterConverter3D::addArea(const B3DPolyPolygon& rFill, const B3DHomMatrix* pViewToEye)
+    {
+        const sal_uInt32 nPolyCount(rFill.count());
+
+        for(sal_uInt32 a(0); a < nPolyCount; a++)
+        {
+            addArea(rFill.getB3DPolygon(a), pViewToEye);
+        }
+    }
+
+    RasterConverter3D::RasterConverter3D()
+    :   InterpolatorProvider3D(),
+        maLineEntries()
+    {}
+
+    RasterConverter3D::~RasterConverter3D()
+    {}
+
+    void RasterConverter3D::rasterconvertB3DArea(sal_Int32 nStartLine, sal_Int32 nStopLine)
+    {
+        if(maLineEntries.size())
+        {
+            OSL_ENSURE(nStopLine >= nStartLine, "nStopLine is bigger than nStartLine (!)");
+
+            // sort global entries by Y, X once. After this, the vector
+            // is seen as frozen. Pointers to it's entries will be used in the following code.
+            ::std::sort(maLineEntries.begin(), maLineEntries.end());
+
+            // local parameters
+            ::std::vector< RasterConversionLineEntry3D >::iterator aCurrentEntry(maLineEntries.begin());
+            ::std::vector< RasterConversionLineEntry3D* > aCurrentLine;
+            ::std::vector< RasterConversionLineEntry3D* > aNextLine;
+            ::std::vector< RasterConversionLineEntry3D* >::iterator aRasterConversionLineEntry3D;
+            sal_uInt32 nPairCount(0);
+
+            // get scanlines first LineNumber as start
+            sal_Int32 nLineNumber(::std::max(aCurrentEntry->getY(), nStartLine));
+
+            while((aCurrentLine.size() || aCurrentEntry != maLineEntries.end()) && (nLineNumber < nStopLine))
+            {
+                // add all entries which start at current line to current scanline
+                while(aCurrentEntry != maLineEntries.end())
+                {
+                    const sal_Int32 nCurrentLineNumber(aCurrentEntry->getY());
+
+                    if(nCurrentLineNumber > nLineNumber)
+                    {
+                        // line is below current one, done (since array is sorted)
+                        break;
+                    }
+                    else
+                    {
+                        // less or equal. Line is above or at current one. Advance it exactly to
+                        // current line
+                        const sal_uInt32 nStep(nLineNumber - nCurrentLineNumber);
+
+                        if(!nStep || aCurrentEntry->decrementRasterConversionLineEntry3D(nStep))
+                        {
+                            // add when exactly on current line or when incremet to it did not
+                            // completely consume it
+                            if(nStep)
+                            {
+                                aCurrentEntry->incrementRasterConversionLineEntry3D(nStep, *this);
+                            }
+
+                            aCurrentLine.push_back(&(*(aCurrentEntry)));
+                        }
+                    }
+
+                    aCurrentEntry++;
+                }
+
+                // sort current scanline using comparator. Only X is used there
+                // since all entries are already in one processed line. This needs to be done
+                // everytime since not only new spans may have benn added or old removed,
+                // but incrementing may also have changed the order
+                ::std::sort(aCurrentLine.begin(), aCurrentLine.end(), lineComparator());
+
+                // process current scanline
+                aRasterConversionLineEntry3D = aCurrentLine.begin();
+                aNextLine.clear();
+                nPairCount = 0;
+
+                while(aRasterConversionLineEntry3D != aCurrentLine.end())
+                {
+                    RasterConversionLineEntry3D& rPrevScanRasterConversionLineEntry3D(**aRasterConversionLineEntry3D++);
+
+                    // look for 2nd span
+                    if(aRasterConversionLineEntry3D != aCurrentLine.end())
+                    {
+                        // work on span from rPrevScanRasterConversionLineEntry3D to aRasterConversionLineEntry3D, fLineNumber is valid
+                        processLineSpan(rPrevScanRasterConversionLineEntry3D, **aRasterConversionLineEntry3D, nLineNumber, nPairCount++);
+                    }
+
+                    // increment to next line
+                    if(rPrevScanRasterConversionLineEntry3D.decrementRasterConversionLineEntry3D(1))
+                    {
+                        rPrevScanRasterConversionLineEntry3D.incrementRasterConversionLineEntry3D(1, *this);
+                        aNextLine.push_back(&rPrevScanRasterConversionLineEntry3D);
+                    }
+                }
+
+                // copy back next scanline if count has changed
+                if(aNextLine.size() != aCurrentLine.size())
+                {
+                    aCurrentLine = aNextLine;
+                }
+
+                // increment fLineNumber
+                nLineNumber++;
+            }
+        }
+    }
+
+    void RasterConverter3D::addEdge(const B3DPolygon& rFill, sal_uInt32 a, sal_uInt32 b, const B3DHomMatrix* pViewToEye)
+    {
+        B3DPoint aStart(rFill.getB3DPoint(a));
+        B3DPoint aEnd(rFill.getB3DPoint(b));
+        sal_Int32 nYStart(fround(aStart.getY()));
+        sal_Int32 nYEnd(fround(aEnd.getY()));
+
+        if(nYStart != nYEnd)
+        {
+            if(nYStart > nYEnd)
+            {
+                ::std::swap(aStart, aEnd);
+                ::std::swap(nYStart, nYEnd);
+                ::std::swap(a, b);
+            }
+
+            const sal_uInt32 nYDelta(nYEnd - nYStart);
+            const double fInvYDelta(1.0 / nYDelta);
+            maLineEntries.push_back(RasterConversionLineEntry3D(
+                aStart.getX(), (aEnd.getX() - aStart.getX()) * fInvYDelta,
+                aStart.getZ(), (aEnd.getZ() - aStart.getZ()) * fInvYDelta,
+                nYStart, nYDelta));
+
+            // if extra interpolation data is used, add it to the last created entry
+            RasterConversionLineEntry3D& rEntry = maLineEntries[maLineEntries.size() - 1];
+
+            if(rFill.areBColorsUsed())
+            {
+                rEntry.setColorIndex(addColorInterpolator(rFill.getBColor(a), rFill.getBColor(b), fInvYDelta));
+            }
+
+            if(rFill.areNormalsUsed())
+            {
+                rEntry.setNormalIndex(addNormalInterpolator(rFill.getNormal(a), rFill.getNormal(b), fInvYDelta));
+            }
+
+            if(rFill.areTextureCoordinatesUsed())
+            {
+                if(pViewToEye)
+                {
+                    const double fEyeA(((*pViewToEye) * aStart).getZ());
+                    const double fEyeB(((*pViewToEye) * aEnd).getZ());
+
+                    rEntry.setInverseTextureIndex(addInverseTextureInterpolator(
+                        rFill.getTextureCoordinate(a),
+                        rFill.getTextureCoordinate(b),
+                        fEyeA, fEyeB, fInvYDelta));
+                }
+                else
+                {
+                    rEntry.setTextureIndex(addTextureInterpolator(
+                        rFill.getTextureCoordinate(a),
+                        rFill.getTextureCoordinate(b),
+                        fInvYDelta));
+                }
+            }
+        }
+    }
+
+    void RasterConverter3D::rasterconvertB3DEdge(const B3DPolygon& rLine, sal_uInt32 nA, sal_uInt32 nB, sal_Int32 nStartLine, sal_Int32 nStopLine, sal_uInt16 nLineWidth)
+    {
+        B3DPoint aStart(rLine.getB3DPoint(nA));
+        B3DPoint aEnd(rLine.getB3DPoint(nB));
+        const double fZBufferLineAdd(0x00ff);
+        static bool bForceToPolygon(false);
+
+        if(nLineWidth > 1 || bForceToPolygon)
+        {
+            // this is not a hairline anymore, in most cases since it's an oversampled
+            // hairline to get e.g. AA for Z-Buffering. Create fill geometry.
+            if(!aStart.equal(aEnd))
+            {
+                reset();
+                maLineEntries.clear();
+
+                B2DVector aVector(aEnd.getX() - aStart.getX(), aEnd.getY() - aStart.getY());
+                aVector.normalize();
+                const B2DVector aPerpend(getPerpendicular(aVector) * ((static_cast<double>(nLineWidth) + 0.5) * 0.5));
+                const double fZStartWithAdd(aStart.getZ() + fZBufferLineAdd);
+                const double fZEndWithAdd(aEnd.getZ() + fZBufferLineAdd);
+
+                B3DPolygon aPolygon;
+                aPolygon.append(B3DPoint(aStart.getX() + aPerpend.getX(), aStart.getY() + aPerpend.getY(), fZStartWithAdd));
+                aPolygon.append(B3DPoint(aEnd.getX() + aPerpend.getX(), aEnd.getY() + aPerpend.getY(), fZEndWithAdd));
+                aPolygon.append(B3DPoint(aEnd.getX() - aPerpend.getX(), aEnd.getY() - aPerpend.getY(), fZEndWithAdd));
+                aPolygon.append(B3DPoint(aStart.getX() - aPerpend.getX(), aStart.getY() - aPerpend.getY(), fZStartWithAdd));
+                aPolygon.setClosed(true);
+
+                addArea(aPolygon, 0);
+            }
+        }
+        else
+        {
+            // it's a hairline. Use direct RasterConversionLineEntry creation to
+            // rasterconvert lines as similar to areas as possible to avoid Z-Fighting
+            sal_Int32 nYStart(fround(aStart.getY()));
+            sal_Int32 nYEnd(fround(aEnd.getY()));
+
+            if(nYStart == nYEnd)
+            {
+                // horizontal line, check X
+                const sal_Int32 nXStart(static_cast<sal_Int32>(aStart.getX()));
+                const sal_Int32 nXEnd(static_cast<sal_Int32>(aEnd.getX()));
+
+                if(nXStart != nXEnd)
+                {
+                    reset();
+                    maLineEntries.clear();
+
+                    // horizontal line, create vertical entries. These will be sorted by
+                    // X anyways, so no need to distinguish the case here
+                    maLineEntries.push_back(RasterConversionLineEntry3D(
+                        aStart.getX(), 0.0,
+                        aStart.getZ() + fZBufferLineAdd, 0.0,
+                        nYStart, 1));
+                    maLineEntries.push_back(RasterConversionLineEntry3D(
+                        aEnd.getX(), 0.0,
+                        aEnd.getZ() + fZBufferLineAdd, 0.0,
+                        nYStart, 1));
+                }
+            }
+            else
+            {
+                reset();
+                maLineEntries.clear();
+
+                if(nYStart > nYEnd)
+                {
+                    ::std::swap(aStart, aEnd);
+                    ::std::swap(nYStart, nYEnd);
+                }
+
+                const sal_uInt32 nYDelta(static_cast<sal_uInt32>(nYEnd - nYStart));
+                const double fInvYDelta(1.0 / nYDelta);
+
+                // non-horizontal line, create two parallell entries. These will be sorted by
+                // X anyways, so no need to distinguish the case here
+                maLineEntries.push_back(RasterConversionLineEntry3D(
+                    aStart.getX(), (aEnd.getX() - aStart.getX()) * fInvYDelta,
+                    aStart.getZ() + fZBufferLineAdd, (aEnd.getZ() - aStart.getZ()) * fInvYDelta,
+                    nYStart, nYDelta));
+
+                RasterConversionLineEntry3D& rEntry = maLineEntries[maLineEntries.size() - 1];
+
+                // need to choose a X-Distance for the 2nd edge which guarantees all pixels
+                // of the line to be set. This is exactly the X-Increment for one Y-Step.
+                // Same is true for Z, so in both cases, add one increment to them. To also
+                // guarantee one pixel per line, add a minimum of one for X.
+                const double fDistanceX(fabs(rEntry.getX().getInc()) >= 1.0 ? rEntry.getX().getInc() : 1.0);
+
+                maLineEntries.push_back(RasterConversionLineEntry3D(
+                    rEntry.getX().getVal() + fDistanceX, rEntry.getX().getInc(),
+                    rEntry.getZ().getVal() + rEntry.getZ().getInc(), rEntry.getZ().getInc(),
+                    nYStart, nYDelta));
+            }
+        }
+
+        if(maLineEntries.size())
+        {
+            rasterconvertB3DArea(nStartLine, nStopLine);
+        }
+    }
+
+    void RasterConverter3D::rasterconvertB3DPolyPolygon(const B3DPolyPolygon& rFill, const B3DHomMatrix* pViewToEye, sal_Int32 nStartLine, sal_Int32 nStopLine)
+    {
+        reset();
+        maLineEntries.clear();
+        addArea(rFill, pViewToEye);
+        rasterconvertB3DArea(nStartLine, nStopLine);
+    }
+
+    void RasterConverter3D::rasterconvertB3DPolygon(const B3DPolygon& rLine, sal_Int32 nStartLine, sal_Int32 nStopLine, sal_uInt16 nLineWidth)
+    {
+        const sal_uInt32 nPointCount(rLine.count());
+
+        if(nPointCount)
+        {
+            const sal_uInt32 nEdgeCount(rLine.isClosed() ? nPointCount : nPointCount - 1);
+
+            for(sal_uInt32 a(0); a < nEdgeCount; a++)
+            {
+                rasterconvertB3DEdge(rLine, a, (a + 1) % nPointCount, nStartLine, nStopLine, nLineWidth);
+            }
+        }
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx
new file mode 100644
index 000000000000..005dca1aa66a
--- /dev/null
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -0,0 +1,662 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dmultirange.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/tools/b2dclipstate.hxx>
+
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2dpolyrange.hxx>
+#include <basegfx/range/b2drangeclipper.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+
+namespace basegfx
+{
+namespace tools
+{
+    struct ImplB2DClipState
+    {
+    public:
+        enum Operation {UNION, INTERSECT, XOR, SUBTRACT};
+
+        ImplB2DClipState() :
+            maPendingPolygons(),
+            maPendingRanges(),
+            maClipPoly(),
+            mePendingOps(UNION)
+        {}
+
+        explicit ImplB2DClipState( const B2DRange& rRange ) :
+            maPendingPolygons(),
+            maPendingRanges(),
+            maClipPoly(
+                tools::createPolygonFromRect(rRange)),
+            mePendingOps(UNION)
+        {}
+
+        explicit ImplB2DClipState( const B2DPolygon& rPoly ) :
+            maPendingPolygons(),
+            maPendingRanges(),
+            maClipPoly(rPoly),
+            mePendingOps(UNION)
+        {}
+
+        explicit ImplB2DClipState( const B2DPolyPolygon& rPoly ) :
+            maPendingPolygons(),
+            maPendingRanges(),
+            maClipPoly(rPoly),
+            mePendingOps(UNION)
+        {}
+
+        bool isCleared() const
+        {
+            return !maClipPoly.count()
+                && !maPendingPolygons.count()
+                && !maPendingRanges.count();
+        }
+
+        void makeClear()
+        {
+            maPendingPolygons.clear();
+            maPendingRanges.clear();
+            maClipPoly.clear();
+            mePendingOps = UNION;
+        }
+
+        bool isNullClipPoly() const
+        {
+            return maClipPoly.count() == 1
+                && !maClipPoly.getB2DPolygon(0).count();
+        }
+
+        bool isNull() const
+        {
+            return !maPendingPolygons.count()
+                && !maPendingRanges.count()
+                && isNullClipPoly();
+        }
+
+        void makeNull()
+        {
+            maPendingPolygons.clear();
+            maPendingRanges.clear();
+            maClipPoly.clear();
+            maClipPoly.append(B2DPolygon());
+            mePendingOps = UNION;
+        }
+
+        bool operator==(const ImplB2DClipState& rRHS) const
+        {
+            return maPendingPolygons == rRHS.maPendingPolygons
+                && maPendingRanges == rRHS.maPendingRanges
+                && maClipPoly == rRHS.maClipPoly
+                && mePendingOps == rRHS.mePendingOps;
+        }
+
+        void addRange(const B2DRange& rRange, Operation eOp)
+        {
+            if( rRange.isEmpty() )
+                return;
+
+            commitPendingPolygons();
+            if( mePendingOps != eOp )
+                commitPendingRanges();
+
+            mePendingOps = eOp;
+            maPendingRanges.appendElement(
+                rRange,
+                ORIENTATION_POSITIVE);
+        }
+
+        void addPolygon(B2DPolygon aPoly, Operation eOp)
+        {
+            commitPendingRanges();
+            if( mePendingOps != eOp )
+                commitPendingPolygons();
+
+            mePendingOps = eOp;
+            maPendingPolygons.append(aPoly);
+        }
+
+        void addPolyPolygon(B2DPolyPolygon aPoly, Operation eOp)
+        {
+            commitPendingRanges();
+            if( mePendingOps != eOp )
+                commitPendingPolygons();
+
+            mePendingOps = eOp;
+            maPendingPolygons.append(aPoly);
+        }
+
+        void addClipState(const ImplB2DClipState& rOther, Operation eOp)
+        {
+            if( rOther.mePendingOps == mePendingOps
+                && !rOther.maClipPoly.count()
+                && !rOther.maPendingPolygons.count() )
+            {
+                maPendingRanges.appendPolyRange( rOther.maPendingRanges );
+            }
+            else
+            {
+                commitPendingRanges();
+                commitPendingPolygons();
+                rOther.commitPendingRanges();
+                rOther.commitPendingPolygons();
+
+                maPendingPolygons = rOther.maClipPoly;
+                mePendingOps = eOp;
+            }
+        }
+
+        void unionRange(const B2DRange& rRange)
+        {
+            if( isCleared() )
+                return;
+
+            addRange(rRange,UNION);
+        }
+
+        void unionPolygon(const B2DPolygon& rPoly)
+        {
+            if( isCleared() )
+                return;
+
+            addPolygon(rPoly,UNION);
+        }
+
+        void unionPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+        {
+            if( isCleared() )
+                return;
+
+            addPolyPolygon(rPolyPoly,UNION);
+        }
+
+        void unionClipState(const ImplB2DClipState& rOther)
+        {
+            if( isCleared() )
+                return;
+
+            addClipState(rOther, UNION);
+        }
+
+        void intersectRange(const B2DRange& rRange)
+        {
+            if( isNull() )
+                return;
+
+            addRange(rRange,INTERSECT);
+        }
+
+        void intersectPolygon(const B2DPolygon& rPoly)
+        {
+            if( isNull() )
+                return;
+
+            addPolygon(rPoly,INTERSECT);
+        }
+
+        void intersectPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+        {
+            if( isNull() )
+                return;
+
+            addPolyPolygon(rPolyPoly,INTERSECT);
+        }
+
+        void intersectClipState(const ImplB2DClipState& rOther)
+        {
+            if( isNull() )
+                return;
+
+            addClipState(rOther, INTERSECT);
+        }
+
+        void subtractRange(const B2DRange& rRange )
+        {
+            if( isNull() )
+                return;
+
+            addRange(rRange,SUBTRACT);
+        }
+
+        void subtractPolygon(const B2DPolygon& rPoly)
+        {
+            if( isNull() )
+                return;
+
+            addPolygon(rPoly,SUBTRACT);
+        }
+
+        void subtractPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+        {
+            if( isNull() )
+                return;
+
+            addPolyPolygon(rPolyPoly,SUBTRACT);
+        }
+
+        void subtractClipState(const ImplB2DClipState& rOther)
+        {
+            if( isNull() )
+                return;
+
+            addClipState(rOther, SUBTRACT);
+        }
+
+        void xorRange(const B2DRange& rRange)
+        {
+            addRange(rRange,XOR);
+        }
+
+        void xorPolygon(const B2DPolygon& rPoly)
+        {
+            addPolygon(rPoly,XOR);
+        }
+
+        void xorPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+        {
+            addPolyPolygon(rPolyPoly,XOR);
+        }
+
+        void xorClipState(const ImplB2DClipState& rOther)
+        {
+            addClipState(rOther, XOR);
+        }
+
+        B2DPolyPolygon getClipPoly() const
+        {
+            commitPendingRanges();
+            commitPendingPolygons();
+
+            return maClipPoly;
+        }
+
+    private:
+        void commitPendingPolygons() const
+        {
+            if( !maPendingPolygons.count() )
+                return;
+
+            // assumption: maClipPoly has kept polygons prepared for
+            // clipping; i.e. no neutral polygons & correct
+            // orientation
+            maPendingPolygons = tools::prepareForPolygonOperation(maPendingPolygons);
+            const bool bIsEmpty=isNullClipPoly();
+            const bool bIsCleared=!maClipPoly.count();
+            switch(mePendingOps)
+            {
+                case UNION:
+                    OSL_ASSERT( !bIsCleared );
+
+                    if( bIsEmpty )
+                        maClipPoly = maPendingPolygons;
+                    else
+                        maClipPoly = tools::solvePolygonOperationOr(
+                            maClipPoly,
+                            maPendingPolygons);
+                    break;
+                case INTERSECT:
+                    OSL_ASSERT( !bIsEmpty );
+
+                    if( bIsCleared )
+                        maClipPoly = maPendingPolygons;
+                    else
+                        maClipPoly = tools::solvePolygonOperationAnd(
+                            maClipPoly,
+                            maPendingPolygons);
+                    break;
+                case XOR:
+                    if( bIsEmpty )
+                        maClipPoly = maPendingPolygons;
+                    else if( bIsCleared )
+                    {
+                        // not representable, strictly speaking,
+                        // using polygons with the common even/odd
+                        // or nonzero winding number fill rule. If
+                        // we'd want to represent it, fill rule
+                        // would need to be "non-negative winding
+                        // number" (and we then would return
+                        // 'holes' here)
+
+                        // going for an ugly hack meanwhile
+                        maClipPoly = tools::solvePolygonOperationXor(
+                            B2DPolyPolygon(
+                                tools::createPolygonFromRect(B2DRange(-1E20,-1E20,1E20,1E20))),
+                            maPendingPolygons);
+                    }
+                    else
+                        maClipPoly = tools::solvePolygonOperationXor(
+                            maClipPoly,
+                            maPendingPolygons);
+                    break;
+                case SUBTRACT:
+                    OSL_ASSERT( !bIsEmpty );
+
+                    // first union all pending ones, subtract en bloc then
+                    maPendingPolygons = solveCrossovers(maPendingPolygons);
+                    maPendingPolygons = stripNeutralPolygons(maPendingPolygons);
+                    maPendingPolygons = stripDispensablePolygons(maPendingPolygons, false);
+
+                    if( bIsCleared )
+                    {
+                        // not representable, strictly speaking,
+                        // using polygons with the common even/odd
+                        // or nonzero winding number fill rule. If
+                        // we'd want to represent it, fill rule
+                        // would need to be "non-negative winding
+                        // number" (and we then would return
+                        // 'holes' here)
+
+                        // going for an ugly hack meanwhile
+                        maClipPoly = tools::solvePolygonOperationDiff(
+                            B2DPolyPolygon(
+                                tools::createPolygonFromRect(B2DRange(-1E20,-1E20,1E20,1E20))),
+                            maPendingPolygons);
+                    }
+                    else
+                        maClipPoly = tools::solvePolygonOperationDiff(
+                            maClipPoly,
+                            maPendingPolygons);
+                    break;
+            }
+
+            maPendingPolygons.clear();
+            mePendingOps = UNION;
+        }
+
+        void commitPendingRanges() const
+        {
+            if( !maPendingRanges.count() )
+                return;
+
+            // use the specialized range clipper for the win
+            B2DPolyPolygon aCollectedRanges;
+            const bool bIsEmpty=isNullClipPoly();
+            const bool bIsCleared=!maClipPoly.count();
+            switch(mePendingOps)
+            {
+                case UNION:
+                    OSL_ASSERT( !bIsCleared );
+
+                    aCollectedRanges = maPendingRanges.solveCrossovers();
+                    aCollectedRanges = stripNeutralPolygons(aCollectedRanges);
+                    aCollectedRanges = stripDispensablePolygons(aCollectedRanges, false);
+                    if( bIsEmpty )
+                        maClipPoly = aCollectedRanges;
+                    else
+                        maClipPoly = tools::solvePolygonOperationOr(
+                            maClipPoly,
+                            aCollectedRanges);
+                    break;
+                case INTERSECT:
+                    OSL_ASSERT( !bIsEmpty );
+
+                    aCollectedRanges = maPendingRanges.solveCrossovers();
+                    aCollectedRanges = stripNeutralPolygons(aCollectedRanges);
+                    if( maPendingRanges.count() > 1 )
+                        aCollectedRanges = stripDispensablePolygons(aCollectedRanges, true);
+
+                    if( bIsCleared )
+                        maClipPoly = aCollectedRanges;
+                    else
+                        maClipPoly = tools::solvePolygonOperationAnd(
+                            maClipPoly,
+                            aCollectedRanges);
+                    break;
+                case XOR:
+                    aCollectedRanges = maPendingRanges.solveCrossovers();
+                    aCollectedRanges = stripNeutralPolygons(aCollectedRanges);
+                    aCollectedRanges = correctOrientations(aCollectedRanges);
+
+                    if( bIsEmpty )
+                        maClipPoly = aCollectedRanges;
+                    else if( bIsCleared )
+                    {
+                        // not representable, strictly speaking,
+                        // using polygons with the common even/odd
+                        // or nonzero winding number fill rule. If
+                        // we'd want to represent it, fill rule
+                        // would need to be "non-negative winding
+                        // number" (and we then would return
+                        // 'holes' here)
+
+                        // going for an ugly hack meanwhile
+                        maClipPoly = tools::solvePolygonOperationXor(
+                            B2DPolyPolygon(
+                                tools::createPolygonFromRect(B2DRange(-1E20,-1E20,1E20,1E20))),
+                            aCollectedRanges);
+                    }
+                    else
+                        maClipPoly = tools::solvePolygonOperationXor(
+                            maClipPoly,
+                            aCollectedRanges);
+                    break;
+                case SUBTRACT:
+                    OSL_ASSERT( !bIsEmpty );
+
+                    // first union all pending ranges, subtract en bloc then
+                    aCollectedRanges = maPendingRanges.solveCrossovers();
+                    aCollectedRanges = stripNeutralPolygons(aCollectedRanges);
+                    aCollectedRanges = stripDispensablePolygons(aCollectedRanges, false);
+
+                    if( bIsCleared )
+                    {
+                        // not representable, strictly speaking,
+                        // using polygons with the common even/odd
+                        // or nonzero winding number fill rule. If
+                        // we'd want to represent it, fill rule
+                        // would need to be "non-negative winding
+                        // number" (and we then would return
+                        // 'holes' here)
+
+                        // going for an ugly hack meanwhile
+                        maClipPoly = tools::solvePolygonOperationDiff(
+                            B2DPolyPolygon(
+                                tools::createPolygonFromRect(B2DRange(-1E20,-1E20,1E20,1E20))),
+                            aCollectedRanges);
+                    }
+                    else
+                        maClipPoly = tools::solvePolygonOperationDiff(
+                            maClipPoly,
+                            aCollectedRanges);
+                    break;
+            }
+
+            maPendingRanges.clear();
+            mePendingOps = UNION;
+        }
+
+        mutable B2DPolyPolygon maPendingPolygons;
+        mutable B2DPolyRange   maPendingRanges;
+        mutable B2DPolyPolygon maClipPoly;
+        mutable Operation      mePendingOps;
+    };
+
+    B2DClipState::B2DClipState() :
+        mpImpl()
+    {}
+
+    B2DClipState::~B2DClipState()
+    {}
+
+    B2DClipState::B2DClipState( const B2DClipState& rOrig ) :
+        mpImpl(rOrig.mpImpl)
+    {}
+
+    B2DClipState::B2DClipState( const B2DRange& rRange ) :
+        mpImpl( ImplB2DClipState(rRange) )
+    {}
+
+    B2DClipState::B2DClipState( const B2DPolygon& rPoly ) :
+        mpImpl( ImplB2DClipState(rPoly) )
+    {}
+
+    B2DClipState::B2DClipState( const B2DPolyPolygon& rPolyPoly ) :
+        mpImpl( ImplB2DClipState(rPolyPoly) )
+    {}
+
+    B2DClipState& B2DClipState::operator=( const B2DClipState& rRHS )
+    {
+        mpImpl = rRHS.mpImpl;
+        return *this;
+    }
+
+    void B2DClipState::makeUnique()
+    {
+        mpImpl.make_unique();
+    }
+
+    void B2DClipState::makeNull()
+    {
+        mpImpl->makeNull();
+    }
+
+    bool B2DClipState::isNull() const
+    {
+        return mpImpl->isNull();
+    }
+
+    void B2DClipState::makeClear()
+    {
+        mpImpl->makeClear();
+    }
+
+    bool B2DClipState::isCleared() const
+    {
+        return mpImpl->isCleared();
+    }
+
+    bool B2DClipState::operator==(const B2DClipState& rRHS) const
+    {
+        if(mpImpl.same_object(rRHS.mpImpl))
+            return true;
+
+        return ((*mpImpl) == (*rRHS.mpImpl));
+    }
+
+    bool B2DClipState::operator!=(const B2DClipState& rRHS) const
+    {
+        return !(*this == rRHS);
+    }
+
+    void B2DClipState::unionRange(const B2DRange& rRange)
+    {
+        mpImpl->unionRange(rRange);
+    }
+
+    void B2DClipState::unionPolygon(const B2DPolygon& rPoly)
+    {
+        mpImpl->unionPolygon(rPoly);
+    }
+
+    void B2DClipState::unionPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+    {
+        mpImpl->unionPolyPolygon(rPolyPoly);
+    }
+
+    void B2DClipState::unionClipState(const B2DClipState& rState)
+    {
+        mpImpl->unionClipState(*rState.mpImpl);
+    }
+
+    void B2DClipState::intersectRange(const B2DRange& rRange)
+    {
+        mpImpl->intersectRange(rRange);
+    }
+
+    void B2DClipState::intersectPolygon(const B2DPolygon& rPoly)
+    {
+        mpImpl->intersectPolygon(rPoly);
+    }
+
+    void B2DClipState::intersectPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+    {
+        mpImpl->intersectPolyPolygon(rPolyPoly);
+    }
+
+    void B2DClipState::intersectClipState(const B2DClipState& rState)
+    {
+        mpImpl->intersectClipState(*rState.mpImpl);
+    }
+
+    void B2DClipState::subtractRange(const B2DRange& rRange)
+    {
+        mpImpl->subtractRange(rRange);
+    }
+
+    void B2DClipState::subtractPolygon(const B2DPolygon& rPoly)
+    {
+        mpImpl->subtractPolygon(rPoly);
+    }
+
+    void B2DClipState::subtractPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+    {
+        mpImpl->subtractPolyPolygon(rPolyPoly);
+    }
+
+    void B2DClipState::subtractClipState(const B2DClipState& rState)
+    {
+        mpImpl->subtractClipState(*rState.mpImpl);
+    }
+
+    void B2DClipState::xorRange(const B2DRange& rRange)
+    {
+        mpImpl->xorRange(rRange);
+    }
+
+    void B2DClipState::xorPolygon(const B2DPolygon& rPoly)
+    {
+        mpImpl->xorPolygon(rPoly);
+    }
+
+    void B2DClipState::xorPolyPolygon(const B2DPolyPolygon& rPolyPoly)
+    {
+        mpImpl->xorPolyPolygon(rPolyPoly);
+    }
+
+    void B2DClipState::xorClipState(const B2DClipState& rState)
+    {
+        mpImpl->xorClipState(*rState.mpImpl);
+    }
+
+    B2DPolyPolygon B2DClipState::getClipPoly() const
+    {
+        return mpImpl->getClipPoly();
+    }
+
+} // end of namespace tools
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
new file mode 100755
index 000000000000..2192148461dc
--- /dev/null
+++ b/basegfx/source/tools/canvastools.cxx
@@ -0,0 +1,674 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <com/sun/star/geometry/RealSize2D.hpp>
+#include <com/sun/star/geometry/RealPoint2D.hpp>
+#include <com/sun/star/geometry/RealRectangle2D.hpp>
+#include <com/sun/star/geometry/RealRectangle3D.hpp>
+#include <com/sun/star/geometry/RealBezierSegment2D.hpp>
+#include <com/sun/star/geometry/AffineMatrix2D.hpp>
+#include <com/sun/star/geometry/AffineMatrix3D.hpp>
+#include <com/sun/star/geometry/Matrix2D.hpp>
+#include <com/sun/star/geometry/IntegerSize2D.hpp>
+#include <com/sun/star/geometry/IntegerPoint2D.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
+#include <com/sun/star/rendering/XGraphicDevice.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <basegfx/tools/unopolypolygon.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <basegfx/vector/b2dsize.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drectangle.hxx>
+#include <basegfx/range/b3drange.hxx>
+#include <basegfx/vector/b2isize.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/range/b2irectangle.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/tools/canvastools.hxx>
+#include <limits>
+
+using namespace ::com::sun::star;
+
+namespace basegfx
+{
+
+    namespace unotools
+    {
+        namespace
+        {
+            uno::Sequence< geometry::RealBezierSegment2D > bezierSequenceFromB2DPolygon(const ::basegfx::B2DPolygon& rPoly)
+            {
+                const sal_uInt32 nPointCount(rPoly.count());
+                uno::Sequence< geometry::RealBezierSegment2D > outputSequence(nPointCount);
+                geometry::RealBezierSegment2D* pOutput = outputSequence.getArray();
+
+                // fill sequences and imply clodes polygon on this implementation layer
+                for(sal_uInt32 a(0); a < nPointCount; a++)
+                {
+                    const basegfx::B2DPoint aStart(rPoly.getB2DPoint(a));
+                    const basegfx::B2DPoint aControlA(rPoly.getNextControlPoint(a));
+                    const basegfx::B2DPoint aControlB(rPoly.getPrevControlPoint((a + 1) % nPointCount));
+
+                    pOutput[a] = geometry::RealBezierSegment2D(
+                        aStart.getX(), aStart.getY(),
+                        aControlA.getX(), aControlA.getY(),
+                        aControlB.getX(), aControlB.getY());
+                }
+
+                return outputSequence;
+            }
+
+            uno::Sequence< geometry::RealPoint2D > pointSequenceFromB2DPolygon( const ::basegfx::B2DPolygon& rPoly )
+            {
+                const sal_uInt32 nNumPoints( rPoly.count() );
+
+                uno::Sequence< geometry::RealPoint2D > outputSequence( nNumPoints );
+                geometry::RealPoint2D* pOutput = outputSequence.getArray();
+
+                // fill sequence from polygon
+                sal_uInt32 i;
+                for( i=0; i<nNumPoints; ++i )
+                {
+                    const ::basegfx::B2DPoint   aPoint( rPoly.getB2DPoint(i) );
+
+                    pOutput[i] = geometry::RealPoint2D( aPoint.getX(),
+                                                        aPoint.getY() );
+                }
+
+                return outputSequence;
+            }
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > > bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly )
+        {
+            const sal_uInt32 nNumPolies( rPolyPoly.count() );
+            sal_uInt32 i;
+
+            uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > > outputSequence( nNumPolies );
+            uno::Sequence< geometry::RealBezierSegment2D >* pOutput = outputSequence.getArray();
+
+            for( i=0; i<nNumPolies; ++i )
+            {
+                pOutput[i] = bezierSequenceFromB2DPolygon( rPolyPoly.getB2DPolygon(i) );
+            }
+
+            return outputSequence;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        uno::Sequence< uno::Sequence< geometry::RealPoint2D > > pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly  )
+        {
+            const sal_uInt32 nNumPolies( rPolyPoly.count() );
+            sal_uInt32 i;
+
+            uno::Sequence< uno::Sequence< geometry::RealPoint2D > > outputSequence( nNumPolies );
+            uno::Sequence< geometry::RealPoint2D >* pOutput = outputSequence.getArray();
+
+            for( i=0; i<nNumPolies; ++i )
+            {
+                pOutput[i] = pointSequenceFromB2DPolygon( rPolyPoly.getB2DPolygon(i) );
+            }
+
+            return outputSequence;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolygon( const uno::Reference< rendering::XGraphicDevice >&  xGraphicDevice,
+                                                                                const ::basegfx::B2DPolygon&                        rPoly    )
+        {
+            uno::Reference< rendering::XPolyPolygon2D > xRes;
+
+            if( !xGraphicDevice.is() )
+                return xRes;
+
+            if( rPoly.areControlPointsUsed() )
+            {
+                uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > > outputSequence( 1 );
+                outputSequence[0] = bezierSequenceFromB2DPolygon( rPoly );
+
+                xRes.set( xGraphicDevice->createCompatibleBezierPolyPolygon( outputSequence ),
+                          uno::UNO_QUERY );
+            }
+            else
+            {
+                uno::Sequence< uno::Sequence< geometry::RealPoint2D > > outputSequence( 1 );
+                outputSequence[0] = pointSequenceFromB2DPolygon( rPoly );
+
+                xRes.set( xGraphicDevice->createCompatibleLinePolyPolygon( outputSequence ),
+                          uno::UNO_QUERY );
+            }
+
+            if( xRes.is() && rPoly.isClosed() )
+                xRes->setClosed( 0, sal_True );
+
+            return xRes;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolyPolygon( const uno::Reference< rendering::XGraphicDevice >&  xGraphicDevice,
+                                                                                    const ::basegfx::B2DPolyPolygon&                    rPolyPoly    )
+        {
+            uno::Reference< rendering::XPolyPolygon2D > xRes;
+
+            if( !xGraphicDevice.is() )
+                return xRes;
+
+            const sal_uInt32 nNumPolies( rPolyPoly.count() );
+            sal_uInt32 i;
+
+            if( rPolyPoly.areControlPointsUsed() )
+            {
+                xRes.set( xGraphicDevice->createCompatibleBezierPolyPolygon(
+                              bezierSequenceSequenceFromB2DPolyPolygon( rPolyPoly ) ),
+                          uno::UNO_QUERY );
+            }
+            else
+            {
+                xRes.set( xGraphicDevice->createCompatibleLinePolyPolygon(
+                              pointSequenceSequenceFromB2DPolyPolygon( rPolyPoly ) ),
+                          uno::UNO_QUERY );
+            }
+
+            for( i=0; i<nNumPolies; ++i )
+            {
+                xRes->setClosed( i, rPolyPoly.getB2DPolygon(i).isClosed() );
+            }
+
+            return xRes;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        ::basegfx::B2DPolygon polygonFromPoint2DSequence( const uno::Sequence< geometry::RealPoint2D >& points )
+        {
+            const sal_Int32 nCurrSize( points.getLength() );
+
+            ::basegfx::B2DPolygon aPoly;
+
+            for( sal_Int32 nCurrPoint=0; nCurrPoint<nCurrSize; ++nCurrPoint )
+                aPoly.append( b2DPointFromRealPoint2D( points[nCurrPoint] ) );
+
+            return aPoly;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points )
+        {
+            ::basegfx::B2DPolyPolygon aRes;
+
+            for( sal_Int32 nCurrPoly=0; nCurrPoly<points.getLength(); ++nCurrPoly )
+            {
+                aRes.append( polygonFromPoint2DSequence( points[nCurrPoly] ) );
+            }
+
+            return aRes;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        ::basegfx::B2DPolygon polygonFromBezier2DSequence( const uno::Sequence< geometry::RealBezierSegment2D >& curves )
+        {
+            const sal_Int32 nSize(curves.getLength());
+            basegfx::B2DPolygon aRetval;
+
+            if(nSize)
+            {
+                // prepare start with providing a start point. Use the first point from
+                // the sequence for this
+                const geometry::RealBezierSegment2D& rFirstSegment(curves[0]); // #i79917# first segment, not last
+                aRetval.append(basegfx::B2DPoint(rFirstSegment.Px, rFirstSegment.Py));
+
+                for(sal_Int32 a(0); a < nSize; a++)
+                {
+                    const geometry::RealBezierSegment2D& rCurrSegment(curves[a]);
+                    const geometry::RealBezierSegment2D& rNextSegment(curves[(a + 1) % nSize]);
+
+                    // append curved edge with the control points and the next point
+                    aRetval.appendBezierSegment(
+                        basegfx::B2DPoint(rCurrSegment.C1x, rCurrSegment.C1y),
+                        basegfx::B2DPoint(rCurrSegment.C2x, rCurrSegment.C2y), // #i79917# Argh! An x for an y!!
+                        basegfx::B2DPoint(rNextSegment.Px, rNextSegment.Py));
+                }
+
+                // rescue the control point and remove the now double-added point
+                aRetval.setPrevControlPoint(0, aRetval.getPrevControlPoint(aRetval.count() - 1));
+                aRetval.remove(aRetval.count() - 1);
+            }
+
+            return aRetval;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& curves )
+        {
+            ::basegfx::B2DPolyPolygon aRes;
+
+            for( sal_Int32 nCurrPoly=0; nCurrPoly<curves.getLength(); ++nCurrPoly )
+            {
+                aRes.append( polygonFromBezier2DSequence( curves[nCurrPoly] ) );
+            }
+
+            return aRes;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly )
+        {
+            ::basegfx::unotools::UnoPolyPolygon* pPolyImpl =
+                dynamic_cast< ::basegfx::unotools::UnoPolyPolygon* >( xPoly.get() );
+
+            if( pPolyImpl )
+            {
+                return pPolyImpl->getPolyPolygon();
+            }
+            else
+            {
+                // not a known implementation object - try data source
+                // interfaces
+                const sal_Int32 nPolys( xPoly->getNumberOfPolygons() );
+
+                uno::Reference< rendering::XBezierPolyPolygon2D > xBezierPoly(
+                    xPoly,
+                    uno::UNO_QUERY );
+
+                if( xBezierPoly.is() )
+                {
+                    return ::basegfx::unotools::polyPolygonFromBezier2DSequenceSequence(
+                        xBezierPoly->getBezierSegments( 0,
+                                                        nPolys,
+                                                        0,
+                                                        -1 ) );
+                }
+                else
+                {
+                    uno::Reference< rendering::XLinePolyPolygon2D > xLinePoly(
+                        xPoly,
+                        uno::UNO_QUERY );
+
+                    // no implementation class and no data provider
+                    // found - contract violation.
+                    if( !xLinePoly.is() )
+                    {
+                        throw lang::IllegalArgumentException(
+                            ::rtl::OUString::createFromAscii(
+                                    "basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
+                                    "poly-polygon, cannot retrieve vertex data"),
+                            uno::Reference< uno::XInterface >(),
+                            0 );
+                    }
+
+                    return ::basegfx::unotools::polyPolygonFromPoint2DSequenceSequence(
+                        xLinePoly->getPoints( 0,
+                                              nPolys,
+                                              0,
+                                              -1 ));
+                }
+            }
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        ::basegfx::B2DHomMatrix& homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix&        output,
+                                                            const geometry::AffineMatrix2D& input )
+        {
+            // ensure last row is [0,0,1] (and optimized away)
+            output.identity();
+
+            output.set(0,0, input.m00);
+            output.set(0,1, input.m01);
+            output.set(0,2, input.m02);
+            output.set(1,0, input.m10);
+            output.set(1,1, input.m11);
+            output.set(1,2, input.m12);
+
+            return output;
+        }
+
+        ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const geometry::AffineMatrix2D& input )
+        {
+            ::basegfx::B2DHomMatrix output;
+
+            output.set(0,0, input.m00);
+            output.set(0,1, input.m01);
+            output.set(0,2, input.m02);
+            output.set(1,0, input.m10);
+            output.set(1,1, input.m11);
+            output.set(1,2, input.m12);
+
+            return output;
+        }
+
+        ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& input )
+        {
+            ::basegfx::B3DHomMatrix output;
+
+            output.set(0,0, input.m00);
+            output.set(0,1, input.m01);
+            output.set(0,2, input.m02);
+            output.set(0,3, input.m03);
+
+            output.set(1,0, input.m10);
+            output.set(1,1, input.m11);
+            output.set(1,2, input.m12);
+            output.set(1,3, input.m13);
+
+            output.set(2,0, input.m20);
+            output.set(2,1, input.m21);
+            output.set(2,2, input.m22);
+            output.set(2,3, input.m23);
+
+            return output;
+        }
+
+        geometry::AffineMatrix2D& affineMatrixFromHomMatrix( geometry::AffineMatrix2D&      output,
+                                                             const ::basegfx::B2DHomMatrix& input)
+        {
+            output.m00 = input.get(0,0);
+            output.m01 = input.get(0,1);
+            output.m02 = input.get(0,2);
+            output.m10 = input.get(1,0);
+            output.m11 = input.get(1,1);
+            output.m12 = input.get(1,2);
+
+            return output;
+        }
+
+        geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D(
+            geometry::AffineMatrix3D& output,
+            const ::basegfx::B3DHomMatrix&  input)
+        {
+            output.m00 = input.get(0,0);
+            output.m01 = input.get(0,1);
+            output.m02 = input.get(0,2);
+            output.m03 = input.get(0,3);
+
+            output.m10 = input.get(1,0);
+            output.m11 = input.get(1,1);
+            output.m12 = input.get(1,2);
+            output.m13 = input.get(1,3);
+
+            output.m20 = input.get(2,0);
+            output.m21 = input.get(2,1);
+            output.m22 = input.get(2,2);
+            output.m23 = input.get(2,3);
+
+            return output;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        ::basegfx::B2DHomMatrix& homMatrixFromMatrix( ::basegfx::B2DHomMatrix&  output,
+                                                      const geometry::Matrix2D& input )
+        {
+            // ensure last row is [0,0,1] (and optimized away)
+            output.identity();
+
+            output.set(0,0, input.m00);
+            output.set(0,1, input.m01);
+            output.set(1,0, input.m10);
+            output.set(1,1, input.m11);
+
+            return output;
+        }
+
+        //---------------------------------------------------------------------------------------
+
+        geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& rVec )
+        {
+            return geometry::RealSize2D( rVec.getX(),
+                                         rVec.getY() );
+        }
+
+        geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& rPoint )
+        {
+            return geometry::RealPoint2D( rPoint.getX(),
+                                          rPoint.getY() );
+        }
+
+        geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& rRect )
+        {
+            return geometry::RealRectangle2D( rRect.getMinX(),
+                                              rRect.getMinY(),
+                                              rRect.getMaxX(),
+                                              rRect.getMaxY() );
+        }
+
+        geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& rRect )
+        {
+            return geometry::RealRectangle3D( rRect.getMinX(),
+                                              rRect.getMinY(),
+                                              rRect.getMinZ(),
+                                              rRect.getMaxX(),
+                                              rRect.getMaxY(),
+                                              rRect.getMaxZ());
+        }
+
+        ::basegfx::B2DVector b2DSizeFromRealSize2D( const geometry::RealSize2D& rSize )
+        {
+            return ::basegfx::B2DVector( rSize.Width,
+                                         rSize.Height );
+        }
+
+        ::basegfx::B2DPoint b2DPointFromRealPoint2D( const geometry::RealPoint2D& rPoint )
+        {
+            return ::basegfx::B2DPoint( rPoint.X,
+                                        rPoint.Y );
+        }
+
+        ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const geometry::RealRectangle2D& rRect )
+        {
+            return ::basegfx::B2DRange( rRect.X1,
+                                        rRect.Y1,
+                                        rRect.X2,
+                                        rRect.Y2 );
+        }
+
+        ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const geometry::RealRectangle3D& rRect )
+        {
+            return ::basegfx::B3DRange( rRect.X1,
+                                        rRect.Y1,
+                                        rRect.Z1,
+                                        rRect.X2,
+                                        rRect.Y2,
+                                        rRect.Z2);
+        }
+
+        geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& rSize )
+        {
+            return geometry::IntegerSize2D( rSize.getX(),
+                                            rSize.getY() );
+        }
+
+        geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& rPoint )
+        {
+            return geometry::IntegerPoint2D( rPoint.getX(),
+                                             rPoint.getY() );
+        }
+
+        geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& rRectangle )
+        {
+            return geometry::IntegerRectangle2D( rRectangle.getMinX(), rRectangle.getMinY(),
+                                                 rRectangle.getMaxX(), rRectangle.getMaxY() );
+        }
+
+        ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const geometry::IntegerSize2D& rSize )
+        {
+            return ::basegfx::B2IVector( rSize.Width,
+                                         rSize.Height );
+        }
+
+        ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const geometry::IntegerPoint2D& rPoint )
+        {
+            return ::basegfx::B2IPoint( rPoint.X,
+                                        rPoint.Y );
+        }
+
+        ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const geometry::IntegerRectangle2D& rRectangle )
+        {
+            return ::basegfx::B2IRange( rRectangle.X1, rRectangle.Y1,
+                                        rRectangle.X2, rRectangle.Y2 );
+        }
+
+        awt::Size awtSizeFromB2ISize( const ::basegfx::B2IVector& rVec )
+        {
+            return awt::Size( rVec.getX(),
+                              rVec.getY() );
+        }
+
+        awt::Point awtPointFromB2IPoint( const ::basegfx::B2IPoint& rPoint )
+        {
+            return awt::Point( rPoint.getX(),
+                               rPoint.getY() );
+        }
+
+        awt::Rectangle awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& rRect )
+        {
+            OSL_ENSURE( rRect.getWidth() < ::std::numeric_limits< sal_Int32 >::max() &&
+                        rRect.getWidth() > ::std::numeric_limits< sal_Int32 >::min(),
+                        "awtRectangleFromB2IRectangle(): width overflow" );
+            OSL_ENSURE( rRect.getHeight() < ::std::numeric_limits< sal_Int32 >::max() &&
+                        rRect.getHeight() > ::std::numeric_limits< sal_Int32 >::min(),
+                        "awtRectangleFromB2IRectangle(): height overflow" );
+
+            return awt::Rectangle( rRect.getMinX(),
+                                   rRect.getMinY(),
+                                   static_cast< sal_Int32 >(rRect.getWidth()),
+                                   static_cast< sal_Int32 >(rRect.getHeight()) );
+        }
+
+        ::basegfx::B2IVector b2ISizeFromAwtSize( const awt::Size& rSize )
+        {
+            return ::basegfx::B2IVector( rSize.Width,
+                                         rSize.Height );
+        }
+
+        ::basegfx::B2IPoint b2IPointFromAwtPoint( const awt::Point& rPoint )
+        {
+            return ::basegfx::B2IPoint( rPoint.X,
+                                        rPoint.Y );
+        }
+
+        ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const awt::Rectangle& rRect )
+        {
+            return ::basegfx::B2IRange( rRect.X,
+                                        rRect.Y,
+                                        rRect.X + rRect.Width,
+                                        rRect.Y + rRect.Height );
+        }
+
+        ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange )
+        {
+            return ::basegfx::B2IRange( static_cast<sal_Int32>( floor(rRange.getMinX()) ),
+                                        static_cast<sal_Int32>( floor(rRange.getMinY()) ),
+                                        static_cast<sal_Int32>( ceil(rRange.getMaxX()) ),
+                                        static_cast<sal_Int32>( ceil(rRange.getMaxY()) ) );
+        }
+
+        ::basegfx::B2DRange b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange )
+        {
+            return ::basegfx::B2DRange( floor(rRange.getMinX()),
+                                        floor(rRange.getMinY()),
+                                        ceil(rRange.getMaxX()),
+                                        ceil(rRange.getMaxY()) );
+        }
+
+        // Geometry comparisons
+        // ===================================================================
+
+        bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB )
+        {
+            return (rA.Width == rB.Width && rA.Height == rB.Height);
+        }
+
+        bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB )
+        {
+            return (rA.X == rB.X && rA.Y == rB.Y);
+        }
+
+        bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB )
+        {
+            return (rA.X1 == rB.X1 && rA.Y1 == rB.Y1 && rA.X2 == rB.X2 && rA.Y2 == rB.Y2);
+        }
+
+        bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB )
+        {
+            return (rA.X1 == rB.X1 && rA.Y1 == rB.Y1 && rA.Z1 == rB.Z1 && rA.X2 == rB.X2 && rA.Y2 == rB.Y2 && rA.Z2 == rB.Z2);
+        }
+
+        bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB )
+        {
+            return (rA.m00 == rB.m00 && rA.m01 == rB.m01 && rA.m02 == rB.m02 && rA.m10 == rB.m10 && rA.m11 == rB.m11 && rA.m12 == rB.m12);
+        }
+
+        bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB )
+        {
+            return (rA.Width == rB.Width && rA.Height == rB.Height);
+        }
+
+        bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB )
+        {
+            return (rA.X == rB.X && rA.Y == rB.Y);
+        }
+
+        bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB )
+        {
+            return (rA.X1 == rB.X1 && rA.Y1 == rB.Y1 && rA.X2 == rB.X2 && rA.Y2 == rB.Y2);
+        }
+
+        bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB )
+        {
+            return (rA.Width == rB.Width && rA.Height == rB.Height);
+        }
+
+        bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB )
+        {
+            return (rA.X == rB.X && rA.Y == rB.Y);
+        }
+
+        bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB )
+        {
+            return (rA.X == rB.X && rA.Y == rB.Y && rA.Width == rB.Width && rA.Height == rB.Height);
+        }
+    } // namespace bgfxtools
+
+} // namespace canvas
diff --git a/basegfx/source/tools/debugplotter.cxx b/basegfx/source/tools/debugplotter.cxx
new file mode 100755
index 000000000000..2c68eb44a846
--- /dev/null
+++ b/basegfx/source/tools/debugplotter.cxx
@@ -0,0 +1,413 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <osl/diagnose.h>
+
+#include <basegfx/curve/b2dcubicbezier.hxx>
+
+#include <basegfx/tools/debugplotter.hxx>
+#include <boost/bind.hpp>
+
+
+namespace basegfx
+{
+    namespace
+    {
+        void outputHeader( const ::rtl::OString& rTitle,
+                           ::std::ostream*       pStm )
+        {
+            // output gnuplot setup
+            if( pStm )
+            {
+                *pStm << "#!/usr/bin/gnuplot -persist" << ::std::endl <<
+                    "#" << ::std::endl <<
+                    "# automatically generated by basegfx, don't change!" << ::std::endl <<
+                    "#" << ::std::endl <<
+                    "#   --- " << (const sal_Char*)rTitle << " ---" << ::std::endl <<
+                    "#" << ::std::endl <<
+                    "set parametric" << ::std::endl <<
+                    "# set terminal postscript eps enhanced color " << ::std::endl <<
+                    "# set output \"plot.eps\"" << ::std::endl <<
+                    // This function plots a cubic bezier curve. P,q,r,s
+                    // are the control point elements of the corresponding
+                    // output coordinate component (i.e. x components for
+                    // the x plot, and y components for the y plot)
+                    "cubicBezier(p,q,r,s,t) = p*(1-t)**3+q*3*(1-t)**2*t+r*3*(1-t)*t**2+s*t**3" << ::std::endl <<
+                    // This function plots the derivative of a cubic
+                    // bezier curve. P,q,r,s are the control point
+                    // components of the _original_ curve
+                    "cubicBezDerivative(p,q,r,s,t) = 3*(q-p)*(1-t)**2+6*(r-q)*(1-t)*t+3*(s-r)*t**2" << ::std::endl <<
+                    // Plot a line's component of a line between a and b
+                    // (where a and b should be the corresponding
+                    // components of the line's start and end point,
+                    // respectively)
+                    "line(p,q,r) = p*(1-t)+q*t" << ::std::endl <<
+                    // Plot a line's x component of a line in implicit
+                    // form ax + by + c = 0
+                    "implicitLineX(a,b,c,t) = a*-c + t*-b" << ::std::endl <<
+                    // Plot a line's y component of a line in implicit
+                    // form ax + by + c = 0
+                    "implicitLineY(a,b,c,t) = b*-c + t*a" << ::std::endl <<
+                    "pointmarkx(c,t) = c-0.03*t" << ::std::endl <<                                       // hack for displaying single points in parametric form
+                    "pointmarky(c,t) = c+0.03*t" << ::std::endl <<                                       // hack for displaying single points in parametric form
+                    "# end of setup" << ::std::endl;
+            }
+            else
+            {
+                OSL_TRACE( "#!/usr/bin/gnuplot -persist\n",
+                           "#\n",
+                           "# automatically generated by basegfx, don't change!\n",
+                           "#\n",
+                           "#   --- %s ---\n",
+                           "#\n",
+                           "set parametric\n",
+                           // This function plots a cubic bezier curve. P,q,r,s
+                           // are the control point elements of the corresponding
+                           // output coordinate component (i.e. x components for
+                           // the x plot, and y components for the y plot)
+                           "cubicBezier(p,q,r,s,t) = p*(1-t)**3+q*3*(1-t)**2*t+r*3*(1-t)*t**2+s*t**3\n",
+                           // This function plots the derivative of a cubic
+                           // bezier curve. P,q,r,s are the control point
+                           // components of the _original_ curve
+                           "cubicBezDerivative(p,q,r,s,t) = 3*(q-p)*(1-t)**2+6*(r-q)*(1-t)*t+3*(s-r)*t**2\n",
+                           // Plot a line's component of a line between a and b
+                           // (where a and b should be the corresponding
+                           // components of the line's start and end point,
+                           // respectively)
+                           "line(p,q,r) = p*(1-t)+q*t\n",
+                           // Plot a line's x component of a line in implicit
+                           // form ax + by + c = 0
+                           "implicitLineX(a,b,c,t) = a*-c + t*-b\n",
+                           // Plot a line's y component of a line in implicit
+                           // form ax + by + c = 0
+                           "implicitLineY(a,b,c,t) = b*-c + t*a\n",
+                           "pointmarkx(c,t) = c-0.03*t\n",                                       // hack for displaying single points in parametric form
+                           "pointmarky(c,t) = c+0.03*t\n",                                       // hack for displaying single points in parametric form
+                           "# end of setup\n",
+                           (const sal_Char*)rTitle );
+            }
+        }
+
+        class Writer
+        {
+        public:
+            Writer( ::std::ostream* pStm ) :
+                mpStream( pStm )
+            {
+            }
+
+            void outputPoint( const ::std::pair< B2DPoint, ::rtl::OString >& rElem )
+            {
+                if( mpStream )
+                    *mpStream << " " << rElem.first.getX() << "\t" << rElem.first.getY() << ::std::endl;
+                else
+                    OSL_TRACE( " %f\t%f\n", rElem.first.getX(), rElem.first.getY() );
+            }
+
+            void outputVector( const ::std::pair< B2DVector, ::rtl::OString >& rElem )
+            {
+                if( mpStream )
+                    *mpStream << " " << rElem.first.getX() << "\t" << rElem.first.getY() << ::std::endl << ::std::endl;
+                else
+                    OSL_TRACE( " %f\t%f\n\n", rElem.first.getX(), rElem.first.getY() );
+            }
+
+            void outputRect( const ::std::pair< B2DRange, ::rtl::OString >& rElem )
+            {
+                const double nX0( rElem.first.getMinX() );
+                const double nY0( rElem.first.getMinY() );
+                const double nX1( rElem.first.getMaxX() );
+                const double nY1( rElem.first.getMaxY() );
+
+                if( mpStream )
+                    *mpStream << " "
+                              << nX0 << "\t" << nY0 << "\t"
+                              << nX1 << "\t" << nY0 << "\t"
+                              << nX1 << "\t" << nY1 << "\t"
+                              << nX0 << "\t" << nY1 << "\t"
+                              << nX0 << "\t" << nY0 << ::std::endl << ::std::endl;
+
+                else
+                    OSL_TRACE( " %f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\n\n",
+                               nX0, nY0,
+                               nX1, nY0,
+                               nX1, nY1,
+                               nX0, nY1,
+                               nX0, nY0 );
+            }
+
+        private:
+            ::std::ostream*     mpStream;
+        };
+    }
+
+    DebugPlotter::DebugPlotter( const sal_Char* pTitle ) :
+        maTitle( pTitle ),
+        maPoints(),
+        maVectors(),
+        maRanges(),
+        maPolygons(),
+        mpOutputStream(NULL)
+    {
+    }
+
+    DebugPlotter::DebugPlotter( const sal_Char* pTitle,
+                                ::std::ostream& rOutputStream ) :
+        maTitle( pTitle ),
+        maPoints(),
+        maVectors(),
+        maRanges(),
+        maPolygons(),
+        mpOutputStream(&rOutputStream)
+    {
+    }
+
+    DebugPlotter::~DebugPlotter()
+    {
+        const bool bHavePoints( !maPoints.empty() );
+        const bool bHaveVectors( !maVectors.empty() );
+        const bool bHaveRanges( !maRanges.empty() );
+        const bool bHavePolygons( !maPolygons.empty() );
+
+        if( bHavePoints ||
+            bHaveVectors ||
+            bHaveRanges ||
+            bHavePolygons )
+        {
+            outputHeader( maTitle, mpOutputStream );
+
+            print( "\n\n# parametric primitive output\n"
+                   "plot [t=0:1] \\\n" );
+
+            // output plot declarations for used entities
+            bool bNeedColon( false );
+            if( bHavePoints )
+            {
+                print( " '-' using ($1):($2) title \"Points\" with points" );
+                bNeedColon = true;
+            }
+            if( bHaveVectors )
+            {
+                if( bNeedColon )
+                    print( ", \\\n" );
+
+                print( " '-' using ($1):($2) title \"Vectors\" with lp" );
+                bNeedColon = true;
+            }
+            if( bHaveRanges )
+            {
+                if( bNeedColon )
+                    print( ", \\\n" );
+
+                print( " '-' using ($1):($2) title \"Ranges\" with lines" );
+                bNeedColon = true;
+            }
+            if( bHavePolygons )
+            {
+                const ::std::size_t nSize( maPolygons.size() );
+                for( ::std::size_t i=0; i<nSize; ++i )
+                {
+                    if( maPolygons.at(i).first.areControlPointsUsed() )
+                    {
+                        const B2DPolygon& rCurrPoly( maPolygons.at(i).first );
+
+                        const sal_uInt32 nCount( rCurrPoly.count() );
+                        for( sal_uInt32 k=0; k<nCount; ++k )
+                        {
+                            if( bNeedColon )
+                                print( ", \\\n" );
+
+                            const B2DPoint& rP0( rCurrPoly.getB2DPoint(k) );
+                            const B2DPoint& rP1( rCurrPoly.getNextControlPoint(k) );
+                            const B2DPoint& rP2( rCurrPoly.getPrevControlPoint((k + 1) % nCount) );
+                            const B2DPoint& rP3( k+1<nCount ? rCurrPoly.getB2DPoint(k+1) : rCurrPoly.getB2DPoint(k) );
+
+                            if( mpOutputStream )
+                                *mpOutputStream << "  cubicBezier("
+                                                << rP0.getX() << ","
+                                    << rP1.getX() << ","
+                                    << rP2.getX() << ","
+                                    << rP3.getX() << ",t), \\\n   cubicBezier("
+                                    << rP0.getY() << ","
+                                    << rP1.getY() << ","
+                                    << rP2.getY() << ","
+                                    << rP3.getY() << ",t)";
+                            else
+                                OSL_TRACE( "  cubicBezier(%f,%f,%f,%f,t), \\\n"
+                                           "   cubicBezier(%f,%f,%f,%f,t)",
+                                           rP0.getX(),
+                                           rP1.getX(),
+                                           rP2.getX(),
+                                           rP3.getX(),
+                                           rP0.getY(),
+                                           rP1.getY(),
+                                           rP2.getY(),
+                                           rP3.getY() );
+
+                            bNeedColon = true;
+                        }
+                    }
+                    else
+                    {
+                        if( bNeedColon )
+                            print( ", \\\n" );
+
+                        if( mpOutputStream )
+                            *mpOutputStream << " '-' using ($1):($2) title \"Polygon "
+                                            << (const sal_Char*)maPolygons.at(i).second << "\" with lp";
+                        else
+                            OSL_TRACE( " '-' using ($1):($2) title \"Polygon %s\" with lp",
+                                       (const sal_Char*)maPolygons.at(i).second );
+
+                        bNeedColon = true;
+                    }
+                }
+            }
+
+            if( bHavePoints )
+            {
+                Writer aWriter( mpOutputStream );
+
+                ::std::for_each( maPoints.begin(),
+                                 maPoints.end(),
+                                 ::boost::bind( &Writer::outputPoint,
+                                                ::boost::ref( aWriter ),
+                                                _1 ) );
+                print( "e\n" );
+            }
+
+            if( bHaveVectors )
+            {
+                Writer aWriter( mpOutputStream );
+
+                ::std::for_each( maVectors.begin(),
+                                 maVectors.end(),
+                                 ::boost::bind( &Writer::outputVector,
+                                                ::boost::ref( aWriter ),
+                                                _1 ) );
+                print( "e\n" );
+            }
+
+            if( bHaveRanges )
+            {
+                Writer aWriter( mpOutputStream );
+
+                ::std::for_each( maRanges.begin(),
+                                 maRanges.end(),
+                                 ::boost::bind( &Writer::outputRect,
+                                                ::boost::ref( aWriter ),
+                                                _1 ) );
+                print( "e\n" );
+            }
+
+            if( bHavePolygons )
+            {
+                const ::std::size_t nSize( maPolygons.size() );
+                for( ::std::size_t i=0; i<nSize; ++i )
+                {
+                    if( !maPolygons.at(i).first.areControlPointsUsed() )
+                    {
+                        const B2DPolygon& rCurrPoly( maPolygons.at(i).first );
+
+                        const sal_uInt32 nCount( rCurrPoly.count() );
+                        for( sal_uInt32 k=0; k<nCount; ++k )
+                        {
+                            const B2DPoint& rP( rCurrPoly.getB2DPoint(k) );
+
+                            if( mpOutputStream )
+                                *mpOutputStream << " " << rP.getX() << "," << rP.getY();
+                            else
+                                OSL_TRACE( " %f,%f",
+                                           rP.getX(),
+                                           rP.getX() );
+                        }
+
+                        print( "\ne\n" );
+                    }
+                }
+            }
+        }
+    }
+
+    void DebugPlotter::plot( const B2DPoint& rPoint,
+                             const sal_Char* pTitle )
+    {
+        maPoints.push_back( ::std::make_pair( rPoint,
+                                              ::rtl::OString( pTitle ) ) );
+    }
+
+    void DebugPlotter::plot( const B2DVector&   rVec,
+                             const sal_Char*    pTitle )
+    {
+        maVectors.push_back( ::std::make_pair( rVec,
+                                               ::rtl::OString( pTitle ) ) );
+    }
+
+    void DebugPlotter::plot( const B2DCubicBezier&  rBezier,
+                             const sal_Char*        pTitle )
+    {
+        B2DPolygon aPoly;
+        aPoly.append(rBezier.getStartPoint());
+        aPoly.appendBezierSegment(rBezier.getControlPointA(), rBezier.getControlPointB(), rBezier.getEndPoint());
+        maPolygons.push_back( ::std::make_pair( aPoly,
+                                                ::rtl::OString( pTitle ) ) );
+    }
+
+    void DebugPlotter::plot( const B2DRange& rRange,
+                             const sal_Char* pTitle )
+    {
+        maRanges.push_back( ::std::make_pair( rRange,
+                                              ::rtl::OString( pTitle ) ) );
+    }
+
+    void DebugPlotter::plot( const B2DPolygon&  rPoly,
+                             const sal_Char*    pTitle )
+    {
+        maPolygons.push_back( ::std::make_pair( rPoly,
+                                                ::rtl::OString( pTitle ) ) );
+    }
+
+    void DebugPlotter::plot( const B2DPolyPolygon&  rPoly,
+                             const sal_Char*        pTitle )
+    {
+        const ::rtl::OString aTitle( pTitle );
+        const sal_uInt32 nCount( rPoly.count() );
+        for( sal_uInt32 i=0; i<nCount; ++i )
+            maPolygons.push_back( ::std::make_pair( rPoly.getB2DPolygon( i ),
+                                                    aTitle ) );
+    }
+
+    void DebugPlotter::print( const sal_Char* pStr )
+    {
+        if( mpOutputStream )
+            *mpOutputStream << pStr;
+        else
+            OSL_TRACE( pStr );
+    }
+}
diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx
new file mode 100644
index 000000000000..857b668da68e
--- /dev/null
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -0,0 +1,349 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <basegfx/tools/gradienttools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+namespace basegfx
+{
+    /** Most of the setup for linear & axial gradient is the same, except
+        for the border treatment. Factored out here.
+    */
+    static void init1DGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                   const B2DRange&  rTargetRange,
+                                   sal_uInt32       nSteps,
+                                   double           fBorder,
+                                   double           fAngle,
+                                   bool             bAxial)
+    {
+        o_rGradientInfo.maTextureTransform.identity();
+        o_rGradientInfo.maBackTextureTransform.identity();
+        o_rGradientInfo.mnSteps = nSteps;
+
+        fAngle = -fAngle;
+
+        double fTargetSizeX(rTargetRange.getWidth());
+        double fTargetSizeY(rTargetRange.getHeight());
+        double fTargetOffsetX(rTargetRange.getMinX());
+        double fTargetOffsetY(rTargetRange.getMinY());
+
+        // add object expansion
+        if(0.0 != fAngle)
+        {
+            const double fAbsCos(fabs(cos(fAngle)));
+            const double fAbsSin(fabs(sin(fAngle)));
+            const double fNewX(fTargetSizeX * fAbsCos + fTargetSizeY * fAbsSin);
+            const double fNewY(fTargetSizeY * fAbsCos + fTargetSizeX * fAbsSin);
+            fTargetOffsetX -= (fNewX - fTargetSizeX) / 2.0;
+            fTargetOffsetY -= (fNewY - fTargetSizeY) / 2.0;
+            fTargetSizeX = fNewX;
+            fTargetSizeY = fNewY;
+        }
+
+        const double fSizeWithoutBorder=1.0 - fBorder;
+        if( bAxial )
+        {
+            o_rGradientInfo.maTextureTransform.scale(1.0, fSizeWithoutBorder * .5);
+            o_rGradientInfo.maTextureTransform.translate(0.0, 0.5);
+        }
+        else
+        {
+            if(!fTools::equal(fSizeWithoutBorder, 1.0))
+            {
+                o_rGradientInfo.maTextureTransform.scale(1.0, fSizeWithoutBorder);
+                o_rGradientInfo.maTextureTransform.translate(0.0, fBorder);
+            }
+        }
+
+        o_rGradientInfo.maTextureTransform.scale(fTargetSizeX, fTargetSizeY);
+
+        // add texture rotate after scale to keep perpendicular angles
+        if(0.0 != fAngle)
+        {
+            const B2DPoint aCenter(0.5*fTargetSizeX,
+                                   0.5*fTargetSizeY);
+            o_rGradientInfo.maTextureTransform *=
+                basegfx::tools::createRotateAroundPoint(aCenter, fAngle);
+        }
+
+        // add object translate
+        o_rGradientInfo.maTextureTransform.translate(fTargetOffsetX, fTargetOffsetY);
+
+        // prepare aspect for texture
+        o_rGradientInfo.mfAspectRatio = (0.0 != fTargetSizeY) ?  fTargetSizeX / fTargetSizeY : 1.0;
+
+        // build transform from u,v to [0.0 .. 1.0].
+        o_rGradientInfo.maBackTextureTransform = o_rGradientInfo.maTextureTransform;
+        o_rGradientInfo.maBackTextureTransform.invert();
+    }
+
+    /** Most of the setup for radial & ellipsoidal gradient is the same,
+        except for the border treatment. Factored out here.
+    */
+    static void initEllipticalGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                           const B2DRange&  rTargetRange,
+                                           const B2DVector& rOffset,
+                                           sal_uInt32       nSteps,
+                                           double           fBorder,
+                                           double           fAngle,
+                                           bool             bCircular)
+    {
+        o_rGradientInfo.maTextureTransform.identity();
+        o_rGradientInfo.maBackTextureTransform.identity();
+        o_rGradientInfo.mnSteps = nSteps;
+
+        fAngle = -fAngle;
+
+        double fTargetSizeX(rTargetRange.getWidth());
+        double fTargetSizeY(rTargetRange.getHeight());
+        double fTargetOffsetX(rTargetRange.getMinX());
+        double fTargetOffsetY(rTargetRange.getMinY());
+
+        // add object expansion
+        if( bCircular )
+        {
+            const double fOriginalDiag(sqrt((fTargetSizeX * fTargetSizeX) + (fTargetSizeY * fTargetSizeY)));
+            fTargetOffsetX -= (fOriginalDiag - fTargetSizeX) / 2.0;
+            fTargetOffsetY -= (fOriginalDiag - fTargetSizeY) / 2.0;
+            fTargetSizeX = fOriginalDiag;
+            fTargetSizeY = fOriginalDiag;
+        }
+        else
+        {
+            fTargetOffsetX -= (0.4142 / 2.0 ) * fTargetSizeX;
+            fTargetOffsetY -= (0.4142 / 2.0 ) * fTargetSizeY;
+            fTargetSizeX = 1.4142 * fTargetSizeX;
+            fTargetSizeY = 1.4142 * fTargetSizeY;
+        }
+
+        const double fHalfBorder((1.0 - fBorder) * 0.5);
+        o_rGradientInfo.maTextureTransform.scale(fHalfBorder, fHalfBorder);
+
+        o_rGradientInfo.maTextureTransform.translate(0.5, 0.5);
+        o_rGradientInfo.maTextureTransform.scale(fTargetSizeX, fTargetSizeY);
+
+        // add texture rotate after scale to keep perpendicular angles
+        if( !bCircular && 0.0 != fAngle)
+        {
+            const B2DPoint aCenter(0.5*fTargetSizeX,
+                                   0.5*fTargetSizeY);
+            o_rGradientInfo.maTextureTransform *=
+                basegfx::tools::createRotateAroundPoint(aCenter, fAngle);
+        }
+
+        // add defined offsets after rotation
+        if(0.5 != rOffset.getX() || 0.5 != rOffset.getY())
+        {
+            // use original target size
+            fTargetOffsetX += (rOffset.getX() - 0.5) * rTargetRange.getWidth();
+            fTargetOffsetY += (rOffset.getY() - 0.5) * rTargetRange.getHeight();
+        }
+
+        // add object translate
+        o_rGradientInfo.maTextureTransform.translate(fTargetOffsetX, fTargetOffsetY);
+
+        // prepare aspect for texture
+        o_rGradientInfo.mfAspectRatio = (0.0 != fTargetSizeY) ?  fTargetSizeX / fTargetSizeY : 1.0;
+
+        // build transform from u,v to [0.0 .. 1.0].
+        o_rGradientInfo.maBackTextureTransform = o_rGradientInfo.maTextureTransform;
+        o_rGradientInfo.maBackTextureTransform.invert();
+    }
+
+    /** Setup for rect & square gradient is exactly the same. Factored out
+        here.
+    */
+    static void initRectGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                     const B2DRange&  rTargetRange,
+                                     const B2DVector& rOffset,
+                                     sal_uInt32       nSteps,
+                                     double           fBorder,
+                                     double           fAngle)
+    {
+        o_rGradientInfo.maTextureTransform.identity();
+        o_rGradientInfo.maBackTextureTransform.identity();
+        o_rGradientInfo.mnSteps = nSteps;
+
+        fAngle = -fAngle;
+
+        double fTargetSizeX(rTargetRange.getWidth());
+        double fTargetSizeY(rTargetRange.getHeight());
+        double fTargetOffsetX(rTargetRange.getMinX());
+        double fTargetOffsetY(rTargetRange.getMinY());
+
+        // add object expansion
+        if(0.0 != fAngle)
+        {
+            const double fAbsCos(fabs(cos(fAngle)));
+            const double fAbsSin(fabs(sin(fAngle)));
+            const double fNewX(fTargetSizeX * fAbsCos + fTargetSizeY * fAbsSin);
+            const double fNewY(fTargetSizeY * fAbsCos + fTargetSizeX * fAbsSin);
+            fTargetOffsetX -= (fNewX - fTargetSizeX) / 2.0;
+            fTargetOffsetY -= (fNewY - fTargetSizeY) / 2.0;
+            fTargetSizeX = fNewX;
+            fTargetSizeY = fNewY;
+        }
+
+        const double fHalfBorder((1.0 - fBorder) * 0.5);
+        o_rGradientInfo.maTextureTransform.scale(fHalfBorder, fHalfBorder);
+
+        o_rGradientInfo.maTextureTransform.translate(0.5, 0.5);
+        o_rGradientInfo.maTextureTransform.scale(fTargetSizeX, fTargetSizeY);
+
+        // add texture rotate after scale to keep perpendicular angles
+        if(0.0 != fAngle)
+        {
+            const B2DPoint aCenter(0.5*fTargetSizeX,
+                                   0.5*fTargetSizeY);
+            o_rGradientInfo.maTextureTransform *=
+                basegfx::tools::createRotateAroundPoint(aCenter, fAngle);
+        }
+
+        // add defined offsets after rotation
+        if(0.5 != rOffset.getX() || 0.5 != rOffset.getY())
+        {
+            // use scaled target size
+            fTargetOffsetX += (rOffset.getX() - 0.5) * fTargetSizeX;
+            fTargetOffsetY += (rOffset.getY() - 0.5) * fTargetSizeY;
+        }
+
+        // add object translate
+        o_rGradientInfo.maTextureTransform.translate(fTargetOffsetX, fTargetOffsetY);
+
+        // prepare aspect for texture
+        o_rGradientInfo.mfAspectRatio = (0.0 != fTargetSizeY) ?  fTargetSizeX / fTargetSizeY : 1.0;
+
+        // build transform from u,v to [0.0 .. 1.0]. As base, use inverse texture transform
+        o_rGradientInfo.maBackTextureTransform = o_rGradientInfo.maTextureTransform;
+        o_rGradientInfo.maBackTextureTransform.invert();
+    }
+
+    namespace tools
+    {
+        ODFGradientInfo& createLinearODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                     const B2DRange&  rTargetArea,
+                                                     sal_uInt32       nSteps,
+                                                     double           fBorder,
+                                                     double           fAngle)
+        {
+            init1DGradientInfo(o_rGradientInfo,
+                               rTargetArea,
+                               nSteps,
+                               fBorder,
+                               fAngle,
+                               false);
+            return o_rGradientInfo;
+        }
+
+        ODFGradientInfo& createAxialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                    const B2DRange&  rTargetArea,
+                                                    sal_uInt32       nSteps,
+                                                    double           fBorder,
+                                                    double           fAngle)
+        {
+            init1DGradientInfo(o_rGradientInfo,
+                               rTargetArea,
+                               nSteps,
+                               fBorder,
+                               fAngle,
+                               true);
+            return o_rGradientInfo;
+        }
+
+        ODFGradientInfo& createRadialODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                     const B2DRange&  rTargetArea,
+                                                     const B2DVector& rOffset,
+                                                     sal_uInt32       nSteps,
+                                                     double           fBorder)
+        {
+            initEllipticalGradientInfo(o_rGradientInfo,
+                                       rTargetArea,
+                                       rOffset,
+                                       nSteps,
+                                       fBorder,
+                                       0.0,
+                                       true);
+            return o_rGradientInfo;
+        }
+
+        ODFGradientInfo& createEllipticalODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                         const B2DRange&  rTargetArea,
+                                                         const B2DVector& rOffset,
+                                                         sal_uInt32       nSteps,
+                                                         double           fBorder,
+                                                         double           fAngle)
+        {
+            initEllipticalGradientInfo(o_rGradientInfo,
+                                       rTargetArea,
+                                       rOffset,
+                                       nSteps,
+                                       fBorder,
+                                       fAngle,
+                                       false);
+            return o_rGradientInfo;
+        }
+
+        ODFGradientInfo& createSquareODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                     const B2DRange&  rTargetArea,
+                                                     const B2DVector& rOffset,
+                                                     sal_uInt32       nSteps,
+                                                     double           fBorder,
+                                                     double           fAngle)
+        {
+            initRectGradientInfo(o_rGradientInfo,
+                                 rTargetArea,
+                                 rOffset,
+                                 nSteps,
+                                 fBorder,
+                                 fAngle);
+            return o_rGradientInfo;
+        }
+
+        ODFGradientInfo& createRectangularODFGradientInfo(ODFGradientInfo& o_rGradientInfo,
+                                                          const B2DRange&  rTargetArea,
+                                                          const B2DVector& rOffset,
+                                                          sal_uInt32       nSteps,
+                                                          double           fBorder,
+                                                          double           fAngle)
+        {
+            initRectGradientInfo(o_rGradientInfo,
+                                 rTargetArea,
+                                 rOffset,
+                                 nSteps,
+                                 fBorder,
+                                 fAngle);
+            return o_rGradientInfo;
+        }
+
+    } // namespace tools
+
+} // namespace basegfx
diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx
new file mode 100644
index 000000000000..883bfec6bc96
--- /dev/null
+++ b/basegfx/source/tools/keystoplerp.cxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: canvastools.hxx,v $
+ * $Revision: 1.10 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include "basegfx/tools/keystoplerp.hxx"
+#include <com/sun/star/uno/Sequence.hxx>
+
+#include <algorithm>
+
+static void validateInput(const std::vector<double>& rKeyStops)
+{
+    (void)rKeyStops;
+#ifdef DBG_UTIL
+    OSL_ENSURE( rKeyStops.size() > 1,
+                "KeyStopLerp::KeyStopLerp(): key stop vector must have two entries or more" );
+
+    // rKeyStops must be sorted in ascending order
+    for( ::std::size_t i=1, len=rKeyStops.size(); i<len; ++i )
+    {
+        if( rKeyStops[i-1] > rKeyStops[i] )
+            OSL_ENSURE( false,
+                        "KeyStopLerp::KeyStopLerp(): time vector is not sorted in ascending order!" );
+    }
+#endif
+}
+
+namespace basegfx
+{
+    namespace tools
+    {
+        KeyStopLerp::KeyStopLerp( const std::vector<double>& rKeyStops ) :
+            maKeyStops(rKeyStops),
+            mnLastIndex(0)
+        {
+            validateInput(maKeyStops);
+        }
+
+        KeyStopLerp::KeyStopLerp( const ::com::sun::star::uno::Sequence<double>& rKeyStops ) :
+            maKeyStops(rKeyStops.getLength()),
+            mnLastIndex(0)
+        {
+            std::copy( rKeyStops.getConstArray(),
+                       rKeyStops.getConstArray()+rKeyStops.getLength(),
+                       maKeyStops.begin() );
+            validateInput(maKeyStops);
+        }
+
+        KeyStopLerp::ResultType KeyStopLerp::lerp(double fAlpha) const
+        {
+            // cached value still okay?
+            if( maKeyStops.at(mnLastIndex) < fAlpha ||
+                maKeyStops.at(mnLastIndex+1) >= fAlpha )
+            {
+                // nope, find new index
+                mnLastIndex = std::min<std::ptrdiff_t>(
+                    maKeyStops.size()-2,
+                    // range is ensured by max below
+                    std::max<std::ptrdiff_t>(
+                        0,
+                        std::distance( maKeyStops.begin(),
+                                       std::lower_bound( maKeyStops.begin(),
+                                                         maKeyStops.end(),
+                                                         fAlpha )) - 1 ));
+            }
+
+            // lerp between stop and stop+1
+            const double fRawLerp=
+                (fAlpha-maKeyStops.at(mnLastIndex)) /
+                (maKeyStops.at(mnLastIndex+1) - maKeyStops.at(mnLastIndex));
+
+            // clamp to permissible range (input fAlpha might be
+            // everything)
+            return ResultType(
+                mnLastIndex,
+                clamp(fRawLerp,0.0,1.0));
+        }
+    }
+}
diff --git a/basegfx/source/tools/liangbarsky.cxx b/basegfx/source/tools/liangbarsky.cxx
new file mode 100644
index 000000000000..f07cea4a34d9
--- /dev/null
+++ b/basegfx/source/tools/liangbarsky.cxx
@@ -0,0 +1,132 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include "basegfx/tools/tools.hxx"
+#include "basegfx/numeric/ftools.hxx"
+#include "basegfx/range/b2drange.hxx"
+
+
+namespace basegfx
+{
+    namespace tools
+    {
+        namespace
+        {
+            // see Foley/vanDam, pp. 122 for the Liang-Barsky line
+            // clipping algorithm
+            inline bool liangBarskyClipT( double  nDenom,
+                                          double  nNumerator,
+                                          double& io_rTE,
+                                          double& io_rTL )
+            {
+                double t;
+                if( nDenom > 0 )
+                {
+                    t = nNumerator / nDenom;
+                    if( t > io_rTL )
+                        return false;
+                    else if( t > io_rTE )
+                        io_rTE = t;
+                }
+                else if( nDenom < 0 )
+                {
+                    t = nNumerator / nDenom;
+                    if( t < io_rTE )
+                        return false;
+                    else
+                        io_rTL = t;
+                }
+                else if( nNumerator > 0 )
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+
+        // see Foley/vanDam, pp. 122 for the Liang-Barsky line
+        // clipping algorithm
+        bool liangBarskyClip2D( ::basegfx::B2DPoint&        io_rStart,
+                                ::basegfx::B2DPoint&        io_rEnd,
+                                const ::basegfx::B2DRange&  rClipRect )
+        {
+            const double nDX( io_rEnd.getX() - io_rStart.getX() );
+            const double nDY( io_rEnd.getY() - io_rStart.getY() );
+
+            if( ::basegfx::fTools::equalZero( nDX ) &&
+                ::basegfx::fTools::equalZero( nDY ) )
+            {
+                return rClipRect.isInside( io_rStart );
+            }
+            else
+            {
+                double nTE( 0.0 );
+                double nTL( 1.0 );
+                if( liangBarskyClipT(nDX, rClipRect.getMinX() - io_rStart.getX(),
+                                     nTE, nTL ) )                   // inside wrt. left edge
+                {
+                    if( liangBarskyClipT(-nDX, io_rStart.getX() - rClipRect.getMaxX(),
+                                         nTE, nTL ) )               // inside wrt. right edge
+                    {
+                        if( liangBarskyClipT(nDY, rClipRect.getMinY() - io_rStart.getY(),
+                                             nTE, nTL ) )           // inside wrt. bottom edge
+                        {
+                            if( liangBarskyClipT(-nDY, io_rStart.getY() - rClipRect.getMaxY(),
+                                                 nTE, nTL ) )       // inside wrt. top edge
+                            {
+                                // compute actual intersection points,
+                                // if nTL has changed
+                                if( nTL < 1.0 )
+                                {
+                                    io_rEnd.setX( io_rStart.getX() + nTL*nDX );
+                                    io_rEnd.setY( io_rStart.getY() + nTL*nDY );
+                                }
+
+                                // compute actual intersection points,
+                                // if nTE has changed
+                                if( nTE > 0.0 )
+                                {
+                                    io_rStart.setX( io_rStart.getX() + nTE*nDX );
+                                    io_rStart.setY( io_rStart.getY() + nTE*nDY );
+                                }
+
+                                // line is (at least partially) visible
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/basegfx/source/tools/makefile.mk b/basegfx/source/tools/makefile.mk
new file mode 100755
index 000000000000..0a0977f7305d
--- /dev/null
+++ b/basegfx/source/tools/makefile.mk
@@ -0,0 +1,51 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=tools
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= $(SLO)$/b2dclipstate.obj	\
+          $(SLO)$/canvastools.obj	\
+          $(SLO)$/gradienttools.obj	\
+          $(SLO)$/debugplotter.obj	\
+          $(SLO)$/keystoplerp.obj	\
+          $(SLO)$/liangbarsky.obj	\
+          $(SLO)$/tools.obj		    \
+          $(SLO)$/unopolypolygon.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx
new file mode 100644
index 000000000000..d375f144169d
--- /dev/null
+++ b/basegfx/source/tools/tools.cxx
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include "basegfx/tools/tools.hxx"
+#include "basegfx/range/b2drange.hxx"
+
+#include <algorithm>
+
+
+namespace basegfx
+{
+    namespace tools
+    {
+        namespace
+        {
+            inline double distance( const double&                   nX,
+                                    const double&                   nY,
+                                    const ::basegfx::B2DVector&     rNormal,
+                                    const double&                   nC )
+            {
+                return nX*rNormal.getX() + nY*rNormal.getY() - nC;
+            }
+
+            void moveLineOutsideRect( ::basegfx::B2DPoint&          io_rStart,
+                                      ::basegfx::B2DPoint&          io_rEnd,
+                                      const ::basegfx::B2DVector&   rMoveDirection,
+                                      const ::basegfx::B2DRange&    rFitTarget      )
+            {
+                // calc c for normal line form equation n x - c = 0
+                const double nC( rMoveDirection.scalar( io_rStart ) );
+
+                // calc maximum orthogonal distance for all four bound
+                // rect corners to the line
+                const double nMaxDistance( ::std::max(
+                                               0.0,
+                                               ::std::max(
+                                                   distance(rFitTarget.getMinX(),
+                                                            rFitTarget.getMinY(),
+                                                            rMoveDirection,
+                                                            nC),
+                                                   ::std::max(
+                                                       distance(rFitTarget.getMinX(),
+                                                                rFitTarget.getMaxY(),
+                                                                rMoveDirection,
+                                                                nC),
+                                                       ::std::max(
+                                                           distance(rFitTarget.getMaxX(),
+                                                                    rFitTarget.getMinY(),
+                                                                    rMoveDirection,
+                                                                    nC),
+                                                           distance(rFitTarget.getMaxX(),
+                                                                    rFitTarget.getMaxY(),
+                                                                    rMoveDirection,
+                                                                    nC) ) ) ) ) );
+
+                // now move line points, such that the bound rect
+                // points are all either 'on' or on the negative side
+                // of the half-plane
+                io_rStart += nMaxDistance*rMoveDirection;
+                io_rEnd   += nMaxDistance*rMoveDirection;
+            }
+        }
+
+        void infiniteLineFromParallelogram( ::basegfx::B2DPoint&        io_rLeftTop,
+                                            ::basegfx::B2DPoint&        io_rLeftBottom,
+                                            ::basegfx::B2DPoint&        io_rRightTop,
+                                            ::basegfx::B2DPoint&        io_rRightBottom,
+                                            const ::basegfx::B2DRange&  rFitTarget  )
+        {
+            // For the top and bottom border line of the
+            // parallelogram, we determine the distance to all four
+            // corner points of the bound rect (tl, tr, bl, br). When
+            // using the unit normal form for lines (n x - c = 0), and
+            // choosing n to point 'outwards' the parallelogram, then
+            // all bound rect corner points having positive distance
+            // to the line lie outside the extended gradient rect, and
+            // thus, the corresponding border line must be moved the
+            // maximum distance outwards.
+
+            // don't use the top and bottom border line direction, and
+            // calculate the normal from them. Instead, use the
+            // vertical lines (lt - lb or rt - rb), as they more
+            // faithfully represent the direction of the
+            // to-be-generated infinite line
+            ::basegfx::B2DVector aDirectionVertical( io_rLeftTop - io_rLeftBottom );
+            aDirectionVertical.normalize();
+
+            const ::basegfx::B2DVector aNormalTop( aDirectionVertical );
+            const ::basegfx::B2DVector aNormalBottom( -aDirectionVertical );
+
+            // now extend parallelogram, such that the bound rect
+            // point are included
+            moveLineOutsideRect( io_rLeftTop, io_rRightTop, aNormalTop, rFitTarget );
+            moveLineOutsideRect( io_rLeftBottom, io_rRightBottom, aNormalBottom, rFitTarget );
+        }
+    }
+}
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
new file mode 100755
index 000000000000..871fed7c7d18
--- /dev/null
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -0,0 +1,486 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <com/sun/star/geometry/AffineMatrix2D.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
+#include <com/sun/star/rendering/CompositeOperation.hpp>
+
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2drectangle.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/tools/unopolypolygon.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+
+using namespace ::com::sun::star;
+
+namespace basegfx
+{
+namespace unotools
+{
+    UnoPolyPolygon::UnoPolyPolygon( const B2DPolyPolygon& rPolyPoly ) :
+        UnoPolyPolygonBase( m_aMutex ),
+        maPolyPoly( rPolyPoly ),
+        meFillRule( rendering::FillRule_EVEN_ODD )
+    {
+        // or else races will haunt us.
+        maPolyPoly.makeUnique();
+    }
+
+    void SAL_CALL UnoPolyPolygon::addPolyPolygon(
+        const geometry::RealPoint2D&                        position,
+        const uno::Reference< rendering::XPolyPolygon2D >&  polyPolygon ) throw (lang::IllegalArgumentException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        modifying();
+
+        // TODO(F1): Correctly fulfill the UNO API
+        // specification. This will probably result in a vector of
+        // poly-polygons to be stored in this object.
+
+        const sal_Int32 nPolys( polyPolygon->getNumberOfPolygons() );
+
+        if( !polyPolygon.is() || !nPolys )
+        {
+            // invalid or empty polygon - nothing to do.
+            return;
+        }
+
+        B2DPolyPolygon        aSrcPoly;
+        const UnoPolyPolygon* pSrc( dynamic_cast< UnoPolyPolygon* >(polyPolygon.get()) );
+
+        // try to extract polygon data from interface. First,
+        // check whether it's the same implementation object,
+        // which we can tunnel then.
+        if( pSrc )
+        {
+            aSrcPoly = pSrc->getPolyPolygon();
+        }
+        else
+        {
+            // not a known implementation object - try data source
+            // interfaces
+            uno::Reference< rendering::XBezierPolyPolygon2D > xBezierPoly(
+                polyPolygon,
+                uno::UNO_QUERY );
+
+            if( xBezierPoly.is() )
+            {
+                aSrcPoly = unotools::polyPolygonFromBezier2DSequenceSequence(
+                    xBezierPoly->getBezierSegments( 0,
+                                                    nPolys,
+                                                    0,
+                                                    -1 ) );
+            }
+            else
+            {
+                uno::Reference< rendering::XLinePolyPolygon2D > xLinePoly(
+                    polyPolygon,
+                    uno::UNO_QUERY );
+
+                // no implementation class and no data provider
+                // found - contract violation.
+                if( !xLinePoly.is() )
+                    throw lang::IllegalArgumentException(
+                        ::rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "UnoPolyPolygon::addPolyPolygon(): Invalid input "
+                                "poly-polygon, cannot retrieve vertex data")),
+                        static_cast<cppu::OWeakObject*>(this), 1);
+
+                aSrcPoly = unotools::polyPolygonFromPoint2DSequenceSequence(
+                    xLinePoly->getPoints( 0,
+                                          nPolys,
+                                          0,
+                                          -1 ) );
+            }
+        }
+
+        const B2DRange  aBounds( tools::getRange( aSrcPoly ) );
+        const B2DVector     aOffset( unotools::b2DPointFromRealPoint2D( position ) -
+                                             aBounds.getMinimum() );
+
+        if( !aOffset.equalZero() )
+        {
+            const B2DHomMatrix aTranslate(tools::createTranslateB2DHomMatrix(aOffset));
+            aSrcPoly.transform( aTranslate );
+        }
+
+        maPolyPoly.append( aSrcPoly );
+    }
+
+    sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons() throw (uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        return maPolyPoly.count();
+    }
+
+    sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygonPoints(
+        sal_Int32 polygon ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        checkIndex( polygon );
+
+        return maPolyPoly.getB2DPolygon(polygon).count();
+    }
+
+    rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule() throw (uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        return meFillRule;
+    }
+
+    void SAL_CALL UnoPolyPolygon::setFillRule(
+        rendering::FillRule fillRule ) throw (uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        modifying();
+
+        meFillRule = fillRule;
+    }
+
+    sal_Bool SAL_CALL UnoPolyPolygon::isClosed(
+        sal_Int32 index ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        checkIndex( index );
+
+        return maPolyPoly.getB2DPolygon(index).isClosed();
+    }
+
+    void SAL_CALL UnoPolyPolygon::setClosed(
+        sal_Int32 index,
+        sal_Bool closedState ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        modifying();
+
+        if( index == -1L )
+        {
+            // set all
+            maPolyPoly.setClosed( closedState );
+        }
+        else
+        {
+            checkIndex( index );
+
+            // fetch referenced polygon, change state
+            B2DPolygon aTmp( maPolyPoly.getB2DPolygon(index) );
+            aTmp.setClosed( closedState );
+
+            // set back to container
+            maPolyPoly.setB2DPolygon( index, aTmp );
+        }
+    }
+
+    uno::Sequence< uno::Sequence< geometry::RealPoint2D > > SAL_CALL UnoPolyPolygon::getPoints(
+        sal_Int32 nPolygonIndex,
+        sal_Int32 nNumberOfPolygons,
+        sal_Int32 nPointIndex,
+        sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+
+        return unotools::pointSequenceSequenceFromB2DPolyPolygon(
+            getSubsetPolyPolygon( nPolygonIndex,
+                                  nNumberOfPolygons,
+                                  nPointIndex,
+                                  nNumberOfPoints ) );
+    }
+
+    void SAL_CALL UnoPolyPolygon::setPoints(
+        const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points,
+        sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        modifying();
+
+        const B2DPolyPolygon& rNewPolyPoly(
+            unotools::polyPolygonFromPoint2DSequenceSequence( points ) );
+
+        if( nPolygonIndex == -1 )
+        {
+            maPolyPoly = rNewPolyPoly;
+        }
+        else
+        {
+            checkIndex( nPolygonIndex );
+
+            maPolyPoly.insert( nPolygonIndex, rNewPolyPoly );
+        }
+    }
+
+    geometry::RealPoint2D SAL_CALL UnoPolyPolygon::getPoint(
+        sal_Int32 nPolygonIndex,
+        sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        checkIndex( nPolygonIndex );
+
+        const B2DPolygon& rPoly( maPolyPoly.getB2DPolygon( nPolygonIndex ) );
+
+        if( nPointIndex < 0 || nPointIndex >= static_cast<sal_Int32>(rPoly.count()) )
+            throw lang::IndexOutOfBoundsException();
+
+        return unotools::point2DFromB2DPoint( rPoly.getB2DPoint( nPointIndex ) );
+    }
+
+    void SAL_CALL UnoPolyPolygon::setPoint(
+        const geometry::RealPoint2D& point,
+        sal_Int32 nPolygonIndex,
+        sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        checkIndex( nPolygonIndex );
+        modifying();
+
+        B2DPolygon aPoly( maPolyPoly.getB2DPolygon( nPolygonIndex ) );
+
+        if( nPointIndex < 0 || nPointIndex >= static_cast<sal_Int32>(aPoly.count()) )
+            throw lang::IndexOutOfBoundsException();
+
+        aPoly.setB2DPoint( nPointIndex,
+                           unotools::b2DPointFromRealPoint2D( point ) );
+        maPolyPoly.setB2DPolygon( nPolygonIndex, aPoly );
+    }
+
+    uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > > SAL_CALL UnoPolyPolygon::getBezierSegments(
+        sal_Int32 nPolygonIndex,
+        sal_Int32 nNumberOfPolygons,
+        sal_Int32 nPointIndex,
+        sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        return unotools::bezierSequenceSequenceFromB2DPolyPolygon(
+            getSubsetPolyPolygon( nPolygonIndex,
+                                  nNumberOfPolygons,
+                                  nPointIndex,
+                                  nNumberOfPoints ) );
+    }
+
+    void SAL_CALL UnoPolyPolygon::setBezierSegments(
+        const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&  points,
+        sal_Int32                                                               nPolygonIndex ) throw (lang::IndexOutOfBoundsException,
+                                                                                                       uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        modifying();
+        const B2DPolyPolygon& rNewPolyPoly(
+            unotools::polyPolygonFromBezier2DSequenceSequence( points ) );
+
+        if( nPolygonIndex == -1 )
+        {
+            maPolyPoly = rNewPolyPoly;
+        }
+        else
+        {
+            checkIndex( nPolygonIndex );
+
+            maPolyPoly.insert( nPolygonIndex, rNewPolyPoly );
+        }
+    }
+
+    geometry::RealBezierSegment2D SAL_CALL UnoPolyPolygon::getBezierSegment( sal_Int32 nPolygonIndex,
+                                                                             sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,
+                                                                                                            uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        checkIndex( nPolygonIndex );
+
+        const B2DPolygon& rPoly( maPolyPoly.getB2DPolygon( nPolygonIndex ) );
+        const sal_uInt32  nPointCount(rPoly.count());
+
+        if( nPointIndex < 0 || nPointIndex >= static_cast<sal_Int32>(nPointCount) )
+            throw lang::IndexOutOfBoundsException();
+
+        const B2DPoint& rPt( rPoly.getB2DPoint( nPointIndex ) );
+        const B2DPoint& rCtrl0( rPoly.getNextControlPoint(nPointIndex) );
+        const B2DPoint& rCtrl1( rPoly.getPrevControlPoint((nPointIndex + 1) % nPointCount) );
+
+        return geometry::RealBezierSegment2D( rPt.getX(),
+                                              rPt.getY(),
+                                              rCtrl0.getX(),
+                                              rCtrl0.getY(),
+                                              rCtrl1.getX(),
+                                              rCtrl1.getY() );
+    }
+
+    void SAL_CALL UnoPolyPolygon::setBezierSegment( const geometry::RealBezierSegment2D& segment,
+                                                         sal_Int32                       nPolygonIndex,
+                                                         sal_Int32                       nPointIndex ) throw (lang::IndexOutOfBoundsException,
+                                                                                                              uno::RuntimeException)
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        checkIndex( nPolygonIndex );
+        modifying();
+
+        B2DPolygon aPoly( maPolyPoly.getB2DPolygon( nPolygonIndex ) );
+        const sal_uInt32 nPointCount(aPoly.count());
+
+        if( nPointIndex < 0 || nPointIndex >= static_cast<sal_Int32>(nPointCount) )
+            throw lang::IndexOutOfBoundsException();
+
+        aPoly.setB2DPoint( nPointIndex,
+                           B2DPoint( segment.Px,
+                                     segment.Py ) );
+        aPoly.setNextControlPoint(nPointIndex,
+                                  B2DPoint(segment.C1x, segment.C1y));
+        aPoly.setPrevControlPoint((nPointIndex + 1) % nPointCount,
+                                  B2DPoint(segment.C2x, segment.C2y));
+
+        maPolyPoly.setB2DPolygon( nPolygonIndex, aPoly );
+    }
+
+    B2DPolyPolygon UnoPolyPolygon::getSubsetPolyPolygon(
+        sal_Int32 nPolygonIndex,
+        sal_Int32 nNumberOfPolygons,
+        sal_Int32 nPointIndex,
+        sal_Int32 nNumberOfPoints ) const
+    {
+        osl::MutexGuard const guard( m_aMutex );
+        checkIndex( nPolygonIndex );
+
+        const sal_Int32 nPolyCount( maPolyPoly.count() );
+
+        // check for "full polygon" case
+        if( !nPolygonIndex &&
+            !nPointIndex &&
+            nNumberOfPolygons == nPolyCount &&
+            nNumberOfPoints == -1 )
+        {
+            return maPolyPoly;
+        }
+
+        B2DPolyPolygon aSubsetPoly;
+
+        // create temporary polygon (as an extract from maPoly,
+        // which contains the requested subset)
+        for( sal_Int32 i=nPolygonIndex; i<nNumberOfPolygons; ++i )
+        {
+            checkIndex(i);
+
+            const B2DPolygon& rCurrPoly( maPolyPoly.getB2DPolygon(i) );
+
+            sal_Int32 nFirstPoint(0);
+            sal_Int32 nLastPoint(nPolyCount-1);
+
+            if( nPointIndex && i==nPolygonIndex )
+            {
+                // very first polygon - respect nPointIndex, if
+                // not zero
+
+                // empty polygon - impossible to specify _any_
+                // legal value except 0 here!
+                if( !nPolyCount && nPointIndex )
+                    throw lang::IndexOutOfBoundsException();
+
+                nFirstPoint = nPointIndex;
+            }
+
+            if( i==nNumberOfPolygons-1 && nNumberOfPoints != -1 )
+            {
+                // very last polygon - respect nNumberOfPoints
+
+                // empty polygon - impossible to specify _any_
+                // legal value except -1 here!
+                if( !nPolyCount )
+                    throw lang::IndexOutOfBoundsException();
+
+                nLastPoint = nFirstPoint+nNumberOfPoints;
+            }
+
+            if( !nPolyCount )
+            {
+                // empty polygon - index checks already performed
+                // above, now simply append empty polygon
+                aSubsetPoly.append( rCurrPoly );
+            }
+            else
+            {
+                if( nFirstPoint < 0 || nFirstPoint >= nPolyCount )
+                    throw lang::IndexOutOfBoundsException();
+
+                if( nLastPoint < 0 || nLastPoint >= nPolyCount )
+                    throw lang::IndexOutOfBoundsException();
+
+                B2DPolygon aTmp;
+                for( sal_Int32 j=nFirstPoint; j<nLastPoint; ++j )
+                    aTmp.append( rCurrPoly.getB2DPoint(j) );
+
+                aSubsetPoly.append( aTmp );
+            }
+        }
+
+        return aSubsetPoly;
+    }
+
+    B2DPolyPolygon UnoPolyPolygon::getPolyPolygonUnsafe() const
+    {
+        return maPolyPoly;
+    }
+
+#define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
+#define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
+    ::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+    }
+
+    sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+    {
+        return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) );
+    }
+
+    uno::Sequence< ::rtl::OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames()  throw( uno::RuntimeException )
+    {
+        uno::Sequence< ::rtl::OUString > aRet(1);
+        aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+
+        return aRet;
+    }
+
+    B2DPolyPolygon UnoPolyPolygon::getPolyPolygon() const
+    {
+        osl::MutexGuard const guard( m_aMutex );
+
+        // detach result from us
+        B2DPolyPolygon aRet( maPolyPoly );
+        aRet.makeUnique();
+        return aRet;
+    }
+
+}
+}
diff --git a/basegfx/source/tuple/b2dtuple.cxx b/basegfx/source/tuple/b2dtuple.cxx
new file mode 100644
index 000000000000..01a3bf145d7e
--- /dev/null
+++ b/basegfx/source/tuple/b2dtuple.cxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B2DTuple, EmptyTuple> {}; }
+#include <basegfx/tuple/b2ituple.hxx>
+
+namespace basegfx
+{
+    const B2DTuple& B2DTuple::getEmptyTuple()
+    {
+        return EmptyTuple::get();
+    }
+
+    B2DTuple::B2DTuple(const B2ITuple& rTup)
+    :   mfX( rTup.getX() ),
+        mfY( rTup.getY() )
+    {}
+
+    void B2DTuple::correctValues(const double fCompareValue)
+    {
+        if(0.0 == fCompareValue)
+        {
+            if(::basegfx::fTools::equalZero(mfX))
+            {
+                mfX = 0.0;
+            }
+
+            if(::basegfx::fTools::equalZero(mfY))
+            {
+                mfY = 0.0;
+            }
+        }
+        else
+        {
+            if(::basegfx::fTools::equal(mfX, fCompareValue))
+            {
+                mfX = fCompareValue;
+            }
+
+            if(::basegfx::fTools::equal(mfY, fCompareValue))
+            {
+                mfY = fCompareValue;
+            }
+        }
+    }
+
+    B2ITuple fround(const B2DTuple& rTup)
+    {
+        return B2ITuple(fround(rTup.getX()), fround(rTup.getY()));
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/tuple/b2i64tuple.cxx b/basegfx/source/tuple/b2i64tuple.cxx
new file mode 100644
index 000000000000..3457fc138dd1
--- /dev/null
+++ b/basegfx/source/tuple/b2i64tuple.cxx
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/tuple/b2i64tuple.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B2I64Tuple, EmptyTuple> {}; }
+
+namespace basegfx
+{
+    const B2I64Tuple& B2I64Tuple::getEmptyTuple()
+    {
+        return EmptyTuple::get();
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/tuple/b2ituple.cxx b/basegfx/source/tuple/b2ituple.cxx
new file mode 100644
index 000000000000..eb9888f11ecb
--- /dev/null
+++ b/basegfx/source/tuple/b2ituple.cxx
@@ -0,0 +1,153 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/tuple/b2ituple.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B2ITuple, EmptyTuple> {}; }
+
+namespace basegfx
+{
+    const B2ITuple& B2ITuple::getEmptyTuple()
+    {
+            return EmptyTuple::get();
+    }
+
+    // external operators
+    //////////////////////////////////////////////////////////////////////////
+
+    B2ITuple minimum(const B2ITuple& rTupA, const B2ITuple& rTupB)
+    {
+        B2ITuple aMin(
+            (rTupB.getX() < rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() < rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+        return aMin;
+    }
+
+    B2ITuple maximum(const B2ITuple& rTupA, const B2ITuple& rTupB)
+    {
+        B2ITuple aMax(
+            (rTupB.getX() > rTupA.getX()) ? rTupB.getX() : rTupA.getX(),
+            (rTupB.getY() > rTupA.getY()) ? rTupB.getY() : rTupA.getY());
+        return aMax;
+    }
+
+    B2ITuple absolute(const B2ITuple& rTup)
+    {
+        B2ITuple aAbs(
+            (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
+            (0 > rTup.getY()) ? -rTup.getY() : rTup.getY());
+        return aAbs;
+    }
+
+    B2DTuple interpolate(const B2ITuple& rOld1, const B2ITuple& rOld2, double t)
+    {
+        B2DTuple aInt(
+            ((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX(),
+            ((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY());
+        return aInt;
+    }
+
+    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2)
+    {
+        B2DTuple aAvg(
+            (rOld1.getX() + rOld2.getX()) * 0.5,
+            (rOld1.getY() + rOld2.getY()) * 0.5);
+        return aAvg;
+    }
+
+    B2DTuple average(const B2ITuple& rOld1, const B2ITuple& rOld2, const B2ITuple& rOld3)
+    {
+        B2DTuple aAvg(
+            (rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0),
+            (rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0));
+        return aAvg;
+    }
+
+    B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB)
+    {
+        B2ITuple aSum(rTupA);
+        aSum += rTupB;
+        return aSum;
+    }
+
+    B2ITuple operator-(const B2ITuple& rTupA, const B2ITuple& rTupB)
+    {
+        B2ITuple aSub(rTupA);
+        aSub -= rTupB;
+        return aSub;
+    }
+
+    B2ITuple operator/(const B2ITuple& rTupA, const B2ITuple& rTupB)
+    {
+        B2ITuple aDiv(rTupA);
+        aDiv /= rTupB;
+        return aDiv;
+    }
+
+    B2ITuple operator*(const B2ITuple& rTupA, const B2ITuple& rTupB)
+    {
+        B2ITuple aMul(rTupA);
+        aMul *= rTupB;
+        return aMul;
+    }
+
+    B2ITuple operator*(const B2ITuple& rTup, sal_Int32 t)
+    {
+        B2ITuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    B2ITuple operator*(sal_Int32 t, const B2ITuple& rTup)
+    {
+        B2ITuple aNew(rTup);
+        aNew *= t;
+        return aNew;
+    }
+
+    B2ITuple operator/(const B2ITuple& rTup, sal_Int32 t)
+    {
+        B2ITuple aNew(rTup);
+        aNew /= t;
+        return aNew;
+    }
+
+    B2ITuple operator/(sal_Int32 t, const B2ITuple& rTup)
+    {
+        B2ITuple aNew(t, t);
+        B2ITuple aTmp(rTup);
+        aNew /= aTmp;
+        return aNew;
+    }
+
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/tuple/b3dtuple.cxx b/basegfx/source/tuple/b3dtuple.cxx
new file mode 100644
index 000000000000..d9204154b192
--- /dev/null
+++ b/basegfx/source/tuple/b3dtuple.cxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/tuple/b3dtuple.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B3DTuple, EmptyTuple> {}; }
+#include <basegfx/tuple/b3ituple.hxx>
+
+namespace basegfx
+{
+    const B3DTuple& B3DTuple::getEmptyTuple()
+    {
+        return EmptyTuple::get();
+    }
+
+    B3DTuple::B3DTuple(const B3ITuple& rTup)
+    :   mfX( rTup.getX() ),
+        mfY( rTup.getY() ),
+        mfZ( rTup.getZ() )
+    {}
+
+    B3ITuple fround(const B3DTuple& rTup)
+    {
+        return B3ITuple(fround(rTup.getX()), fround(rTup.getY()), fround(rTup.getZ()));
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/tuple/b3i64tuple.cxx b/basegfx/source/tuple/b3i64tuple.cxx
new file mode 100644
index 000000000000..ce2094568bb8
--- /dev/null
+++ b/basegfx/source/tuple/b3i64tuple.cxx
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/tuple/b3i64tuple.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B3I64Tuple, EmptyTuple> {}; }
+
+namespace basegfx
+{
+    const B3I64Tuple& B3I64Tuple::getEmptyTuple()
+    {
+        return EmptyTuple::get();
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/tuple/b3ituple.cxx b/basegfx/source/tuple/b3ituple.cxx
new file mode 100644
index 000000000000..014e8876588c
--- /dev/null
+++ b/basegfx/source/tuple/b3ituple.cxx
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/tuple/b3ituple.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B3ITuple, EmptyTuple> {}; }
+
+namespace basegfx
+{
+    const B3ITuple& B3ITuple::getEmptyTuple()
+    {
+        return EmptyTuple::get();
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/tuple/makefile.mk b/basegfx/source/tuple/makefile.mk
new file mode 100644
index 000000000000..01a4c6de2d3c
--- /dev/null
+++ b/basegfx/source/tuple/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=tuple
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+#ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/b2dtuple.obj		\
+                $(SLO)$/b3dtuple.obj		\
+                $(SLO)$/b2ituple.obj		\
+                $(SLO)$/b3ituple.obj		\
+                $(SLO)$/b2i64tuple.obj		\
+                $(SLO)$/b3i64tuple.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/vector/b2dvector.cxx b/basegfx/source/vector/b2dvector.cxx
new file mode 100644
index 000000000000..bb08b104eff8
--- /dev/null
+++ b/basegfx/source/vector/b2dvector.cxx
@@ -0,0 +1,219 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    B2DVector& B2DVector::normalize()
+    {
+        double fLen(scalar(*this));
+
+        if(fTools::equalZero(fLen))
+        {
+            mfX = 0.0;
+            mfY = 0.0;
+        }
+        else
+        {
+            const double fOne(1.0);
+
+            if(!fTools::equal(fOne, fLen))
+            {
+                fLen = sqrt(fLen);
+
+                if(!fTools::equalZero(fLen))
+                {
+                    mfX /= fLen;
+                    mfY /= fLen;
+                }
+            }
+        }
+
+        return *this;
+    }
+
+    B2DVector& B2DVector::operator=( const B2DTuple& rVec )
+    {
+        mfX = rVec.getX();
+        mfY = rVec.getY();
+        return *this;
+    }
+
+
+    double B2DVector::getLength() const
+    {
+        if(fTools::equalZero(mfX))
+        {
+            return fabs(mfY);
+        }
+        else if(fTools::equalZero(mfY))
+        {
+            return fabs(mfX);
+        }
+
+        return hypot( mfX, mfY );
+    }
+
+    double B2DVector::scalar( const B2DVector& rVec ) const
+    {
+        return((mfX * rVec.mfX) + (mfY * rVec.mfY));
+    }
+
+    double B2DVector::cross( const B2DVector& rVec ) const
+    {
+        return(mfX * rVec.getY() - mfY * rVec.getX());
+    }
+
+    double B2DVector::angle( const B2DVector& rVec ) const
+    {
+        return atan2(mfX * rVec.getY() - mfY * rVec.getX(),
+            mfX * rVec.getX() + mfY * rVec.getY());
+    }
+
+    const B2DVector& B2DVector::getEmptyVector()
+    {
+        return (const B2DVector&) B2DTuple::getEmptyTuple();
+    }
+
+    B2DVector& B2DVector::operator*=( const B2DHomMatrix& rMat )
+    {
+        const double fTempX( rMat.get(0,0)*mfX +
+                            rMat.get(0,1)*mfY );
+        const double fTempY( rMat.get(1,0)*mfX +
+                            rMat.get(1,1)*mfY );
+        mfX = fTempX;
+        mfY = fTempY;
+
+        return *this;
+    }
+
+    B2DVector& B2DVector::setLength(double fLen)
+    {
+        double fLenNow(scalar(*this));
+
+        if(!fTools::equalZero(fLenNow))
+        {
+            const double fOne(10.0);
+
+            if(!fTools::equal(fOne, fLenNow))
+            {
+                fLen /= sqrt(fLenNow);
+            }
+
+            mfX *= fLen;
+            mfY *= fLen;
+        }
+
+        return *this;
+    }
+
+    bool B2DVector::isNormalized() const
+    {
+        const double fOne(1.0);
+        const double fScalar(scalar(*this));
+
+        return fTools::equal(fOne, fScalar);
+    }
+
+    bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB )
+    {
+        const double fValA(rVecA.getX() * rVecB.getY());
+        const double fValB(rVecA.getY() * rVecB.getX());
+
+        return fTools::equal(fValA, fValB);
+    }
+
+    B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB )
+    {
+        double fVal(rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
+
+        if(fTools::equalZero(fVal))
+        {
+            return ORIENTATION_NEUTRAL;
+        }
+
+        if(fVal > 0.0)
+        {
+            return ORIENTATION_POSITIVE;
+        }
+        else
+        {
+            return ORIENTATION_NEGATIVE;
+        }
+    }
+
+    B2DVector getPerpendicular( const B2DVector& rNormalizedVec )
+    {
+        B2DVector aPerpendicular(-rNormalizedVec.getY(), rNormalizedVec.getX());
+        return aPerpendicular;
+    }
+
+    B2DVector getNormalizedPerpendicular( const B2DVector& rVec )
+    {
+        B2DVector aPerpendicular(rVec);
+        aPerpendicular.normalize();
+        const double aTemp(-aPerpendicular.getY());
+        aPerpendicular.setY(aPerpendicular.getX());
+        aPerpendicular.setX(aTemp);
+        return aPerpendicular;
+    }
+
+    B2DVector operator*( const B2DHomMatrix& rMat, const B2DVector& rVec )
+    {
+        B2DVector aRes( rVec );
+        return aRes*=rMat;
+    }
+
+    B2VectorContinuity getContinuity(const B2DVector& rBackVector, const B2DVector& rForwardVector )
+    {
+        if(rBackVector.equalZero() || rForwardVector.equalZero())
+        {
+            return CONTINUITY_NONE;
+        }
+
+        if(fTools::equal(rBackVector.getX(), -rForwardVector.getX()) && fTools::equal(rBackVector.getY(), -rForwardVector.getY()))
+        {
+            // same direction and same length -> C2
+            return CONTINUITY_C2;
+        }
+
+        if(areParallel(rBackVector, rForwardVector) && rBackVector.scalar(rForwardVector) < 0.0)
+        {
+            // parallel and opposite direction -> C1
+            return CONTINUITY_C1;
+        }
+
+        return CONTINUITY_NONE;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/vector/b2ivector.cxx b/basegfx/source/vector/b2ivector.cxx
new file mode 100644
index 000000000000..026a600c0c94
--- /dev/null
+++ b/basegfx/source/vector/b2ivector.cxx
@@ -0,0 +1,159 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/vector/b2ivector.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
+namespace basegfx
+{
+    B2IVector& B2IVector::operator=( const ::basegfx::B2ITuple& rVec )
+    {
+        mnX = rVec.getX();
+        mnY = rVec.getY();
+        return *this;
+    }
+
+
+    double B2IVector::getLength() const
+    {
+        return hypot( mnX, mnY );
+    }
+
+    double B2IVector::scalar( const B2IVector& rVec ) const
+    {
+        return((mnX * rVec.mnX) + (mnY * rVec.mnY));
+    }
+
+    double B2IVector::cross( const B2IVector& rVec ) const
+    {
+        return(mnX * rVec.getY() - mnY * rVec.getX());
+    }
+
+    double B2IVector::angle( const B2IVector& rVec ) const
+    {
+        return atan2(double( mnX * rVec.getY() - mnY * rVec.getX()),
+            double( mnX * rVec.getX() + mnY * rVec.getY()));
+    }
+
+    const B2IVector& B2IVector::getEmptyVector()
+    {
+        return (const B2IVector&) ::basegfx::B2ITuple::getEmptyTuple();
+    }
+
+    B2IVector& B2IVector::operator*=( const B2DHomMatrix& rMat )
+    {
+        mnX = fround( rMat.get(0,0)*mnX +
+                      rMat.get(0,1)*mnY );
+        mnY = fround( rMat.get(1,0)*mnX +
+                      rMat.get(1,1)*mnY );
+
+        return *this;
+    }
+
+    B2IVector& B2IVector::setLength(double fLen)
+    {
+        double fLenNow(scalar(*this));
+
+        if(!::basegfx::fTools::equalZero(fLenNow))
+        {
+            const double fOne(10.0);
+
+            if(!::basegfx::fTools::equal(fOne, fLenNow))
+            {
+                fLen /= sqrt(fLenNow);
+            }
+
+            mnX = fround( mnX*fLen );
+            mnY = fround( mnY*fLen );
+        }
+
+        return *this;
+    }
+
+    bool areParallel( const B2IVector& rVecA, const B2IVector& rVecB )
+    {
+        double fVal(rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
+        return ::basegfx::fTools::equalZero(fVal);
+    }
+
+    B2VectorOrientation getOrientation( const B2IVector& rVecA, const B2IVector& rVecB )
+    {
+        double fVal(rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
+
+        if(fVal > 0.0)
+        {
+            return ORIENTATION_POSITIVE;
+        }
+
+        if(fVal < 0.0)
+        {
+            return ORIENTATION_NEGATIVE;
+        }
+
+        return ORIENTATION_NEUTRAL;
+    }
+
+    B2IVector getPerpendicular( const B2IVector& rNormalizedVec )
+    {
+        B2IVector aPerpendicular(-rNormalizedVec.getY(), rNormalizedVec.getX());
+        return aPerpendicular;
+    }
+
+    B2IVector operator*( const B2DHomMatrix& rMat, const B2IVector& rVec )
+    {
+        B2IVector aRes( rVec );
+        return aRes*=rMat;
+    }
+
+    B2VectorContinuity getContinuity(const B2IVector& rBackVector, const B2IVector& rForwardVector )
+    {
+        B2VectorContinuity eRetval(CONTINUITY_NONE);
+
+        if(!rBackVector.equalZero() && !rForwardVector.equalZero())
+        {
+            const B2IVector aInverseForwardVector(-rForwardVector.getX(), -rForwardVector.getY());
+
+            if(rBackVector == aInverseForwardVector)
+            {
+                // same direction and same length -> C2
+                eRetval = CONTINUITY_C2;
+            }
+            else if(areParallel(rBackVector, aInverseForwardVector))
+            {
+                // same direction -> C1
+                eRetval = CONTINUITY_C1;
+            }
+        }
+
+        return eRetval;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx
new file mode 100644
index 000000000000..74e4eb07eb33
--- /dev/null
+++ b/basegfx/source/vector/b3dvector.cxx
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/vector/b3dvector.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    B3DVector& B3DVector::normalize()
+    {
+        double fLen(scalar(*this));
+
+        if(!::basegfx::fTools::equalZero(fLen))
+        {
+            const double fOne(1.0);
+
+            if(!::basegfx::fTools::equal(fOne, fLen))
+            {
+                fLen = sqrt(fLen);
+
+                if(!::basegfx::fTools::equalZero(fLen))
+                {
+                    mfX /= fLen;
+                    mfY /= fLen;
+                    mfZ /= fLen;
+                }
+            }
+        }
+
+        return *this;
+    }
+
+    B3DVector B3DVector::getPerpendicular(const B3DVector& rNormalizedVec) const
+    {
+        B3DVector aNew(*this);
+        aNew = cross(aNew, rNormalizedVec);
+        aNew.normalize();
+        return aNew;
+    }
+
+    B3DVector B3DVector::getProjectionOnPlane(const B3DVector& rNormalizedPlane) const
+    {
+        B3DVector aNew(*this);
+        aNew = cross(aNew, rNormalizedPlane);
+        aNew = cross(aNew, rNormalizedPlane);
+
+        aNew.mfX = mfX - aNew.mfX;
+        aNew.mfY = mfY - aNew.mfY;
+        aNew.mfZ = mfZ - aNew.mfZ;
+
+        return aNew;
+    }
+
+    B3DVector& B3DVector::operator*=( const ::basegfx::B3DHomMatrix& rMat )
+    {
+        const double fTempX( rMat.get(0,0)*mfX + rMat.get(0,1)*mfY + rMat.get(0,2)*mfZ );
+        const double fTempY( rMat.get(1,0)*mfX + rMat.get(1,1)*mfY + rMat.get(1,2)*mfZ );
+        const double fTempZ( rMat.get(2,0)*mfX + rMat.get(2,1)*mfY + rMat.get(2,2)*mfZ );
+        mfX = fTempX;
+        mfY = fTempY;
+        mfZ = fTempZ;
+
+        return *this;
+    }
+
+    B3DVector operator*( const ::basegfx::B3DHomMatrix& rMat, const B3DVector& rVec )
+    {
+        B3DVector aRes( rVec );
+        return aRes*=rMat;
+    }
+
+    bool areParallel( const B3DVector& rVecA, const B3DVector& rVecB )
+    {
+        // i think fastest is to compare relations, need no square or division
+        if(!fTools::equal(rVecA.getX() * rVecB.getY(), rVecA.getY() * rVecB.getX()))
+            return false;
+
+        if(!fTools::equal(rVecA.getX() * rVecB.getZ(), rVecA.getZ() * rVecB.getX()))
+            return false;
+
+        return (fTools::equal(rVecA.getY() * rVecB.getZ(), rVecA.getZ() * rVecB.getY()));
+    }
+
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/vector/b3ivector.cxx b/basegfx/source/vector/b3ivector.cxx
new file mode 100644
index 000000000000..a11871ef1b19
--- /dev/null
+++ b/basegfx/source/vector/b3ivector.cxx
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/vector/b3ivector.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
+
+namespace basegfx
+{
+    B3IVector& B3IVector::operator*=( const B3DHomMatrix& rMat )
+    {
+        mnX = fround( rMat.get(0,0)*mnX + rMat.get(0,1)*mnY + rMat.get(0,2)*mnZ );
+        mnY = fround( rMat.get(1,0)*mnX + rMat.get(1,1)*mnY + rMat.get(1,2)*mnZ );
+        mnZ = fround( rMat.get(2,0)*mnX + rMat.get(2,1)*mnY + rMat.get(2,2)*mnZ );
+
+        return *this;
+    }
+
+    B3IVector operator*( const B3DHomMatrix& rMat, const B3IVector& rVec )
+    {
+        B3IVector aRes( rVec );
+        return aRes*=rMat;
+    }
+} // end of namespace basegfx
+
+// eof
diff --git a/basegfx/source/vector/makefile.mk b/basegfx/source/vector/makefile.mk
new file mode 100644
index 000000000000..defc7a31dd51
--- /dev/null
+++ b/basegfx/source/vector/makefile.mk
@@ -0,0 +1,50 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=basegfx
+TARGET=vector
+
+#UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
+#ENABLE_EXCEPTIONS=FALSE
+#USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+                $(SLO)$/b2dvector.obj		\
+                $(SLO)$/b3dvector.obj		\
+                $(SLO)$/b2ivector.obj		\
+                $(SLO)$/b3ivector.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/basegfx/source/workbench/Makefile b/basegfx/source/workbench/Makefile
new file mode 100644
index 000000000000..fe23a4d06708
--- /dev/null
+++ b/basegfx/source/workbench/Makefile
@@ -0,0 +1,16 @@
+# Testbuild
+
+#test : bezierclip.cxx convexhull.cxx
+#	g++ -Wall -g \
+#	-I. -I. -I../inc -I./inc -I./unx/inc -I./unxlngi4/inc -I. -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/develop4/update/SRX644/unxlngi4/inc.m4/external -I/develop4/update/SRX644/unxlngi4/inc.m4 -I/develop4/update/SRX644/src.m4/solenv/unxlngi4/inc  -I/net/grande/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/include -I/develop4/update/SRX644/src.m4/solenv/inc -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include/X11 -I/develop4/update/SRX644/src.m4/res -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include/linux -I. -I./res -I. \
+#	-include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D_STLP_DEBUG \
+#	bezierclip.cxx convexhull.cxx -o bezierclip
+
+prog : bezierclip.cxx convexhull.cxx
+	g++ -Wall -g bezierclip.cxx convexhull.cxx -o bezierclip
+
+test : testconvexhull.cxx
+	g++ -Wall -g testconvexhull.cxx -o testhull
+
+.cxx.o:
+	g++ -c $(LOCALDEFINES) $(CCFLAGS) $<
diff --git a/basegfx/source/workbench/bezierclip.cxx b/basegfx/source/workbench/bezierclip.cxx
new file mode 100644
index 000000000000..12c0d6f7d6df
--- /dev/null
+++ b/basegfx/source/workbench/bezierclip.cxx
@@ -0,0 +1,2057 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+
+#include <algorithm>
+#include <iterator>
+#include <vector>
+#include <utility>
+
+#include <math.h>
+
+#include "bezierclip.hxx"
+#include "gauss.hxx"
+
+
+
+// what to test
+#define WITH_ASSERTIONS
+//#define WITH_CONVEXHULL_TEST
+//#define WITH_MULTISUBDIVIDE_TEST
+//#define WITH_FATLINE_TEST
+//#define WITH_CALCFOCUS_TEST
+//#define WITH_SAFEPARAMBASE_TEST
+//#define WITH_SAFEPARAMS_TEST
+//#define WITH_SAFEPARAM_DETAILED_TEST
+//#define WITH_SAFEFOCUSPARAM_CALCFOCUS
+//#define WITH_SAFEFOCUSPARAM_TEST
+//#define WITH_SAFEFOCUSPARAM_DETAILED_TEST
+#define WITH_BEZIERCLIP_TEST
+
+
+
+// -----------------------------------------------------------------------------
+
+/* Implementation of the so-called 'Fat-Line Bezier Clipping Algorithm' by Sederberg et al.
+ *
+ * Actual reference is: T. W. Sederberg and T Nishita: Curve
+ * intersection using Bezier clipping. In Computer Aided Design, 22
+ * (9), 1990, pp. 538--549
+ */
+
+// -----------------------------------------------------------------------------
+
+/* Misc helper
+ * ===========
+ */
+int fallFac( int n, int k )
+{
+#ifdef WITH_ASSERTIONS
+    assert(n>=k); // "For factorials, n must be greater or equal k"
+    assert(n>=0); // "For factorials, n must be positive"
+    assert(k>=0); // "For factorials, k must be positive"
+#endif
+
+    int res( 1 );
+
+    while( k-- && n ) res *= n--;
+
+    return res;
+}
+
+// -----------------------------------------------------------------------------
+
+int fac( int n )
+{
+    return fallFac(n, n);
+}
+
+// -----------------------------------------------------------------------------
+
+/* Bezier fat line clipping part
+ * =============================
+ */
+
+// -----------------------------------------------------------------------------
+
+void Impl_calcFatLine( FatLine& line, const Bezier& c )
+{
+    // Prepare normalized implicit line
+    // ================================
+
+    // calculate vector orthogonal to p1-p4:
+    line.a = -(c.p0.y - c.p3.y);
+    line.b = (c.p0.x - c.p3.x);
+
+    // normalize
+    const double len( sqrt( line.a*line.a + line.b*line.b ) );
+    if( !tolZero(len) )
+    {
+        line.a /= len;
+        line.b /= len;
+    }
+
+    line.c = -(line.a*c.p0.x + line.b*c.p0.y);
+
+
+    // Determine bounding fat line from it
+    // ===================================
+
+    // calc control point distances
+    const double dP2( calcLineDistance(line.a, line.b, line.c, c.p1.x, c.p1.y ) );
+    const double dP3( calcLineDistance(line.a, line.b, line.c, c.p2.x, c.p2.y ) );
+
+    // calc approximate bounding lines to curve (tight bounds are
+    // possible here, but more expensive to calculate and thus not
+    // worth the overhead)
+    if( dP2 * dP3 > 0.0 )
+    {
+        line.dMin = 3.0/4.0 * ::std::min(0.0, ::std::min(dP2, dP3));
+        line.dMax = 3.0/4.0 * ::std::max(0.0, ::std::max(dP2, dP3));
+    }
+    else
+    {
+        line.dMin = 4.0/9.0 * ::std::min(0.0, ::std::min(dP2, dP3));
+        line.dMax = 4.0/9.0 * ::std::max(0.0, ::std::max(dP2, dP3));
+    }
+}
+
+void Impl_calcBounds( Point2D&          leftTop,
+                      Point2D&          rightBottom,
+                      const Bezier&     c1          )
+{
+    leftTop.x = ::std::min( c1.p0.x, ::std::min( c1.p1.x, ::std::min( c1.p2.x, c1.p3.x ) ) );
+    leftTop.y = ::std::min( c1.p0.y, ::std::min( c1.p1.y, ::std::min( c1.p2.y, c1.p3.y ) ) );
+    rightBottom.x = ::std::max( c1.p0.x, ::std::max( c1.p1.x, ::std::max( c1.p2.x, c1.p3.x ) ) );
+    rightBottom.y = ::std::max( c1.p0.y, ::std::max( c1.p1.y, ::std::max( c1.p2.y, c1.p3.y ) ) );
+}
+
+bool Impl_doBBoxIntersect( const Bezier& c1,
+                           const Bezier& c2 )
+{
+    // calc rectangular boxes from c1 and c2
+    Point2D lt1;
+    Point2D rb1;
+    Point2D lt2;
+    Point2D rb2;
+
+    Impl_calcBounds( lt1, rb1, c1 );
+    Impl_calcBounds( lt2, rb2, c2 );
+
+    if( ::std::min(rb1.x, rb2.x) < ::std::max(lt1.x, lt2.x) ||
+        ::std::min(rb1.y, rb2.y) < ::std::max(lt1.y, lt2.y) )
+    {
+        return false;
+    }
+    else
+    {
+        return true;
+    }
+}
+
+/* calculates two t's for the given bernstein control polygon: the first is
+ * the intersection of the min value line with the convex hull from
+ * the left, the second is the intersection of the max value line with
+ * the convex hull from the right.
+ */
+bool Impl_calcSafeParams( double&           t1,
+                          double&           t2,
+                          const Polygon2D&  rPoly,
+                          double            lowerYBound,
+                          double            upperYBound )
+{
+    // need the convex hull of the control polygon, as this is
+    // guaranteed to completely bound the curve
+    Polygon2D convHull( convexHull(rPoly) );
+
+    // init min and max buffers
+    t1 = 0.0 ;
+    double currLowerT( 1.0 );
+
+    t2 = 1.0;
+    double currHigherT( 0.0 );
+
+    if( convHull.size() <= 1 )
+        return false; // only one point? Then we're done with clipping
+
+    /* now, clip against lower and higher bounds */
+    Point2D p0;
+    Point2D p1;
+
+    bool bIntersection( false );
+
+    for( Polygon2D::size_type i=0; i<convHull.size(); ++i )
+    {
+        // have to check against convHull.size() segments, as the
+        // convex hull is, by definition, closed. Thus, for the
+        // last point, we take the first point as partner.
+        if( i+1 == convHull.size() )
+        {
+            // close the polygon
+            p0 = convHull[i];
+            p1 = convHull[0];
+        }
+        else
+        {
+            p0 = convHull[i];
+            p1 = convHull[i+1];
+        }
+
+        // is the segment in question within or crossing the
+        // horizontal band spanned by lowerYBound and upperYBound? If
+        // not, we've got no intersection. If yes, we maybe don't have
+        // an intersection, but we've got to update the permissible
+        // range, nevertheless. This is because inside lying segments
+        // leads to full range forbidden.
+        if( (tolLessEqual(p0.y, upperYBound) || tolLessEqual(p1.y, upperYBound)) &&
+            (tolGreaterEqual(p0.y, lowerYBound) || tolGreaterEqual(p1.y, lowerYBound)) )
+        {
+            // calc intersection of convex hull segment with
+            // one of the horizontal bounds lines
+            const double r_x( p1.x - p0.x );
+            const double r_y( p1.y - p0.y );
+
+            if( tolZero(r_y) )
+            {
+                // r_y is virtually zero, thus we've got a horizontal
+                // line. Now check whether we maybe coincide with lower or
+                // upper horizonal bound line.
+                if( tolEqual(p0.y, lowerYBound) ||
+                    tolEqual(p0.y, upperYBound) )
+                {
+                    // yes, simulate intersection then
+                    currLowerT = ::std::min(currLowerT, ::std::min(p0.x, p1.x));
+                    currHigherT = ::std::max(currHigherT, ::std::max(p0.x, p1.x));
+                }
+            }
+            else
+            {
+                // check against lower and higher bounds
+                // =====================================
+
+                // calc intersection with horizontal dMin line
+                const double currTLow( (lowerYBound - p0.y) * r_x / r_y + p0.x );
+
+                // calc intersection with horizontal dMax line
+                const double currTHigh( (upperYBound - p0.y) * r_x / r_y + p0.x );
+
+                currLowerT = ::std::min(currLowerT, ::std::min(currTLow, currTHigh));
+                currHigherT = ::std::max(currHigherT, ::std::max(currTLow, currTHigh));
+            }
+
+            // set flag that at least one segment is contained or
+            // intersects given horizontal band.
+            bIntersection = true;
+        }
+    }
+
+#ifndef WITH_SAFEPARAMBASE_TEST
+    // limit intersections found to permissible t parameter range
+    t1 = ::std::max(0.0, currLowerT);
+    t2 = ::std::min(1.0, currHigherT);
+#endif
+
+    return bIntersection;
+}
+
+
+/* calculates two t's for the given bernstein polynomial: the first is
+ * the intersection of the min value line with the convex hull from
+ * the left, the second is the intersection of the max value line with
+ * the convex hull from the right.
+ *
+ * The polynomial coefficients c0 to c3 given to this method
+ * must correspond to t values of 0, 1/3, 2/3 and 1, respectively.
+ */
+bool Impl_calcSafeParams_clip( double&          t1,
+                               double&          t2,
+                               const FatLine&   bounds,
+                               double           c0,
+                               double           c1,
+                               double           c2,
+                               double           c3 )
+{
+    /* first of all, determine convex hull of c0-c3 */
+    Polygon2D poly(4);
+    poly[0] = Point2D(0,        c0);
+    poly[1] = Point2D(1.0/3.0,  c1);
+    poly[2] = Point2D(2.0/3.0,  c2);
+    poly[3] = Point2D(1,        c3);
+
+#ifndef WITH_SAFEPARAM_DETAILED_TEST
+
+    return Impl_calcSafeParams( t1, t2, poly, bounds.dMin, bounds.dMax );
+
+#else
+    bool bRet( Impl_calcSafeParams( t1, t2, poly, bounds.dMin, bounds.dMax ) );
+
+    Polygon2D convHull( convexHull( poly ) );
+
+    cout << "# convex hull testing" << endl
+         << "plot [t=0:1] ";
+    cout << " bez("
+         << poly[0].x << ","
+         << poly[1].x << ","
+         << poly[2].x << ","
+         << poly[3].x << ",t),bez("
+         << poly[0].y << ","
+         << poly[1].y << ","
+         << poly[2].y << ","
+         << poly[3].y << ",t), "
+         << "t, " << bounds.dMin << ", "
+         << "t, " << bounds.dMax << ", "
+         << t1 << ", t, "
+         << t2 << ", t, "
+         << "'-' using ($1):($2) title \"control polygon\" with lp, "
+         << "'-' using ($1):($2) title \"convex hull\" with lp" << endl;
+
+    unsigned int k;
+    for( k=0; k<poly.size(); ++k )
+    {
+        cout << poly[k].x << " " << poly[k].y << endl;
+    }
+    cout << poly[0].x << " " << poly[0].y << endl;
+    cout << "e" << endl;
+
+    for( k=0; k<convHull.size(); ++k )
+    {
+        cout << convHull[k].x << " " << convHull[k].y << endl;
+    }
+    cout << convHull[0].x << " " << convHull[0].y << endl;
+    cout << "e" << endl;
+
+    return bRet;
+#endif
+}
+
+// -----------------------------------------------------------------------------
+
+void Impl_deCasteljauAt( Bezier&        part1,
+                         Bezier&        part2,
+                         const Bezier&  input,
+                         double         t        )
+{
+    // deCasteljau bezier arc, scheme is:
+    //
+    // First row is    C_0^n,C_1^n,...,C_n^n
+    // Second row is         P_1^n,...,P_n^n
+    // etc.
+    // with P_k^r = (1 - x_s)P_{k-1}^{r-1} + x_s P_k{r-1}
+    //
+    // this results in:
+    //
+    // P1  P2  P3  P4
+    // L1  P2  P3  R4
+    //     L2  H   R3
+    //         L3  R2
+    //             L4/R1
+    if( tolZero(t) )
+    {
+        // t is zero -> part2 is input curve, part1 is empty (input.p0, that is)
+        part1.p0.x = part1.p1.x = part1.p2.x = part1.p3.x = input.p0.x;
+        part1.p0.y = part1.p1.y = part1.p2.y = part1.p3.y = input.p0.y;
+        part2 = input;
+    }
+    else if( tolEqual(t, 1.0) )
+    {
+        // t is one -> part1 is input curve, part2 is empty (input.p3, that is)
+        part1 = input;
+        part2.p0.x = part2.p1.x = part2.p2.x = part2.p3.x = input.p3.x;
+        part2.p0.y = part2.p1.y = part2.p2.y = part2.p3.y = input.p3.y;
+    }
+    else
+    {
+        part1.p0.x = input.p0.x;                                    part1.p0.y = input.p0.y;
+        part1.p1.x = (1.0 - t)*part1.p0.x + t*input.p1.x;           part1.p1.y = (1.0 - t)*part1.p0.y + t*input.p1.y;
+        const double Hx ( (1.0 - t)*input.p1.x + t*input.p2.x ),    Hy ( (1.0 - t)*input.p1.y + t*input.p2.y );
+        part1.p2.x = (1.0 - t)*part1.p1.x + t*Hx;                   part1.p2.y = (1.0 - t)*part1.p1.y + t*Hy;
+        part2.p3.x = input.p3.x;                                    part2.p3.y = input.p3.y;
+        part2.p2.x = (1.0 - t)*input.p2.x + t*input.p3.x;           part2.p2.y = (1.0 - t)*input.p2.y + t*input.p3.y;
+        part2.p1.x = (1.0 - t)*Hx + t*part2.p2.x;                   part2.p1.y = (1.0 - t)*Hy + t*part2.p2.y;
+        part2.p0.x = (1.0 - t)*part1.p2.x + t*part2.p1.x;           part2.p0.y = (1.0 - t)*part1.p2.y + t*part2.p1.y;
+        part1.p3.x = part2.p0.x;                                    part1.p3.y = part2.p0.y;
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1, double t2_c1,
+                               const Bezier& c2_part, const FatLine& bounds_c2 )
+{
+    static int offset = 0;
+
+    cout << "# safe param range testing" << endl
+         << "plot [t=0.0:1.0] ";
+
+    // clip safe ranges off c1
+    Bezier c1_part1;
+    Bezier c1_part2;
+    Bezier c1_part3;
+
+    // subdivide at t1_c1
+    Impl_deCasteljauAt( c1_part1, c1_part2, c1, t1_c1 );
+    // subdivide at t2_c1
+    Impl_deCasteljauAt( c1_part1, c1_part3, c1_part2, t2_c1 );
+
+    // output remaining segment (c1_part1)
+
+    cout << "bez("
+         << c1.p0.x+offset << ","
+         << c1.p1.x+offset << ","
+         << c1.p2.x+offset << ","
+         << c1.p3.x+offset << ",t),bez("
+         << c1.p0.y << ","
+         << c1.p1.y << ","
+         << c1.p2.y << ","
+         << c1.p3.y << ",t), bez("
+         << c2.p0.x+offset << ","
+         << c2.p1.x+offset << ","
+         << c2.p2.x+offset << ","
+         << c2.p3.x+offset << ",t),bez("
+         << c2.p0.y << ","
+         

path: root/mm/Kconfig

config SELECT_MEMORY_MODEL
	def_bool y
	depends on EXPERIMENTAL || ARCH_SELECT_MEMORY_MODEL

choice
	prompt "Memory model"
	depends on SELECT_MEMORY_MODEL
	default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT
	default SPARSEMEM_MANUAL if ARCH_SPARSEMEM_DEFAULT
	default FLATMEM_MANUAL

config FLATMEM_MANUAL
	bool "Flat Memory"
	depends on !(ARCH_DISCONTIGMEM_ENABLE || ARCH_SPARSEMEM_ENABLE) || ARCH_FLATMEM_ENABLE
	help
	  This option allows you to change some of the ways that
	  Linux manages its memory internally.  Most users will
	  only have one option here: FLATMEM.  This is normal
	  and a correct option.

	  Some users of more advanced features like NUMA and
	  memory hotplug may have different options here.
	  DISCONTIGMEM is an more mature, better tested system,
	  but is incompatible with memory hotplug and may suffer
	  decreased performance over SPARSEMEM.  If unsure between
	  "Sparse Memory" and "Discontiguous Memory", choose
	  "Discontiguous Memory".

	  If unsure, choose this option (Flat Memory) over any other.

config DISCONTIGMEM_MANUAL
	bool "Discontiguous Memory"
	depends on ARCH_DISCONTIGMEM_ENABLE
	help
	  This option provides enhanced support for discontiguous
	  memory systems, over FLATMEM.  These systems have holes
	  in their physical address spaces, and this option provides
	  more efficient handling of these holes.  However, the vast
	  majority of hardware has quite flat address spaces, and
	  can have degraded performance from the extra overhead that
	  this option imposes.

	  Many NUMA configurations will have this as the only option.

	  If unsure, choose "Flat Memory" over this option.

config SPARSEMEM_MANUAL
	bool "Sparse Memory"
	depends on ARCH_SPARSEMEM_ENABLE
	help
	  This will be the only option for some systems, including
	  memory hotplug systems.  This is normal.

	  For many other systems, this will be an alternative to
	  "Discontiguous Memory".  This option provides some potential
	  performance benefits, along with decreased code complexity,
	  but it is newer, and more experimental.

	  If unsure, choose "Discontiguous Memory" or "Flat Memory"
	  over this option.

endchoice

config DISCONTIGMEM
	def_bool y
	depends on (!SELECT_MEMORY_MODEL && ARCH_DISCONTIGMEM_ENABLE) || DISCONTIGMEM_MANUAL

config SPARSEMEM
	def_bool y
	depends on (!SELECT_MEMORY_MODEL && ARCH_SPARSEMEM_ENABLE) || SPARSEMEM_MANUAL

config FLATMEM
	def_bool y
	depends on (!DISCONTIGMEM && !SPARSEMEM) || FLATMEM_MANUAL

config FLAT_NODE_MEM_MAP
	def_bool y
	depends on !SPARSEMEM

#
# Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's
# to represent different areas of memory.  This variable allows
# those dependencies to exist individually.
#
config NEED_MULTIPLE_NODES
	def_bool y
	depends on DISCONTIGMEM || NUMA

config HAVE_MEMORY_PRESENT
	def_bool y
	depends on ARCH_HAVE_MEMORY_PRESENT || SPARSEMEM

#
# SPARSEMEM_EXTREME (which is the default) does some bootmem
# allocations when memory_present() is called.  If this cannot
# be done on your architecture, select this option.  However,
# statically allocating the mem_section[] array can potentially
# consume vast quantities of .bss, so be careful.
#
# This option will also potentially produce smaller runtime code
# with gcc 3.4 and later.
#
config SPARSEMEM_STATIC
	bool

#
# Architecture platforms which require a two level mem_section in SPARSEMEM
# must select this option. This is usually for architecture platforms with
# an extremely sparse physical address space.
#
config SPARSEMEM_EXTREME
	def_bool y
	depends on SPARSEMEM && !SPARSEMEM_STATIC

config SPARSEMEM_VMEMMAP_ENABLE
	bool

config SPARSEMEM_VMEMMAP
	bool "Sparse Memory virtual memmap"
	depends on SPARSEMEM && SPARSEMEM_VMEMMAP_ENABLE
	default y
	help
	 SPARSEMEM_VMEMMAP uses a virtually mapped memmap to optimise
	 pfn_to_page and page_to_pfn operations.  This is the most
	 efficient option when sufficient kernel resources are available.

# eventually, we can have this option just 'select SPARSEMEM'
config MEMORY_HOTPLUG
	bool "Allow for memory hot-add"
	depends on SPARSEMEM || X86_64_ACPI_NUMA
	depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG
	depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390)

config MEMORY_HOTPLUG_SPARSE
	def_bool y
	depends on SPARSEMEM && MEMORY_HOTPLUG

config MEMORY_HOTREMOVE
	bool "Allow for memory hot remove"
	depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE
	depends on MIGRATION

#
# If we have space for more page flags then we can enable additional
# optimizations and functionality.
#
# Regular Sparsemem takes page flag bits for the sectionid if it does not
# use a virtual memmap. Disable extended page flags for 32 bit platforms
# that require the use of a sectionid in the page flags.
#
config PAGEFLAGS_EXTENDED
	def_bool y
	depends on 64BIT || SPARSEMEM_VMEMMAP || !SPARSEMEM

# Heavily threaded applications may benefit from splitting the mm-wide
# page_table_lock, so that faults on different parts of the user address
# space can be handled with less contention: split it at this NR_CPUS.
# Default to 4 for wider testing, though 8 might be more appropriate.
# ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
# PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.
#
config SPLIT_PTLOCK_CPUS
	int
	default "4096" if ARM && !CPU_CACHE_VIPT
	default "4096" if PARISC && !PA20
	default "4"

#
# support for page migration
#
config MIGRATION
	bool "Page migration"
	def_bool y
	depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE
	help
	  Allows the migration of the physical location of pages of processes
	  while the virtual addresses are not changed. This is useful for
	  example on NUMA systems to put pages nearer to the processors accessing
	  the page.

config PHYS_ADDR_T_64BIT
	def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT

config ZONE_DMA_FLAG
	int
	default "0" if !ZONE_DMA
	default "1"

config BOUNCE
	def_bool y
	depends on BLOCK && MMU && (ZONE_DMA || HIGHMEM)

config NR_QUICK
	int
	depends on QUICKLIST
	default "2" if SUPERH || AVR32
	default "1"

config VIRT_TO_BUS
	def_bool y
	depends on !ARCH_NO_VIRT_TO_BUS

config HAVE_MLOCK
	bool
	default y if MMU=y

config HAVE_MLOCKED_PAGE_BIT
	bool
	default y if HAVE_MLOCK=y

config MMU_NOTIFIER
	bool

config KSM
	bool "Enable KSM for page merging"
	depends on MMU
	help
	  Enable Kernel Samepage Merging: KSM periodically scans those areas
	  of an application's address space that an app has advised may be
	  mergeable.  When it finds pages of identical content, it replaces
	  the many instances by a single resident page with that content, so
	  saving memory until one or another app needs to modify the content.
	  Recommended for use with KVM, or with other duplicative applications.
	  See Documentation/vm/ksm.txt for more information: KSM is inactive
	  until a program has madvised that an area is MADV_MERGEABLE, and
	  root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).

config DEFAULT_MMAP_MIN_ADDR
        int "Low address space to protect from user allocation"
        default 4096
        help
	  This is the portion of low virtual memory which should be protected
	  from userspace allocation.  Keeping a user from writing to low pages
	  can help reduce the impact of kernel NULL pointer bugs.

	  For most ia64, ppc64 and x86 users with lots of address space
	  a value of 65536 is reasonable and should cause no problems.
	  On arm and other archs it should not be higher than 32768.
	  Programs which use vm86 functionality or have some need to map
	  this low address space will need CAP_SYS_RAWIO or disable this
	  protection by setting the value to 0.

	  This value can be changed after boot using the
	  /proc/sys/vm/mmap_min_addr tunable.

config ARCH_SUPPORTS_MEMORY_FAILURE
	bool

config MEMORY_FAILURE
	depends on MMU
	depends on ARCH_SUPPORTS_MEMORY_FAILURE
	bool "Enable recovery from hardware memory errors"
	help
	  Enables code to recover from some memory failures on systems
	  with MCA recovery. This allows a system to continue running
	  even when some of its memory has uncorrected errors. This requires
	  special hardware support and typically ECC memory.

config HWPOISON_INJECT
	tristate "Poison pages injector"
	depends on MEMORY_FAILURE && DEBUG_KERNEL

config NOMMU_INITIAL_TRIM_EXCESS
	int "Turn on mmap() excess space trimming before booting"
	depends on !MMU
	default 1
	help
	  The NOMMU mmap() frequently needs to allocate large contiguous chunks
	  of memory on which to store mappings, but it can only ask the system
	  allocator for chunks in 2^N*PAGE_SIZE amounts - which is frequently
	  more than it requires.  To deal with this, mmap() is able to trim off
	  the excess and return it to the allocator.

	  If trimming is enabled, the excess is trimmed off and returned to the
	  system allocator, which can cause extra fragmentation, particularly
	  if there are a lot of transient processes.

	  If trimming is disabled, the excess is kept, but not used, which for
	  long-term mappings means that the space is wasted.

	  Trimming can be dynamically controlled through a sysctl option
	  (/proc/sys/vm/nr_trim_pages) which specifies the minimum number of
	  excess pages there must be before trimming should occur, or zero if
	  no trimming is to occur.

	  This option specifies the initial value of this option.  The default
	  of 1 says that all excess pages should be trimmed.

	  See Documentation/nommu-mmap.txt for more information.